diff --git a/.editorconfig b/.editorconfig
index 95915a432b7..1f812bb38b1 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -6,5 +6,8 @@ indent_style = space
 insert_final_newline = true
 trim_trailing_whitespace = true
 
+[*.{fxml,java,properties,sh}]
+end_of_line = lf
+
 [*.md]
 trim_trailing_whitespace = false
diff --git a/.gitattributes b/.gitattributes
index 7752b0e534a..18bbb30fc6d 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -5,12 +5,17 @@ gradlew text eol=lf
 # windows line endings at windows files
 *.bat text eol=crlf
 
-# ensure that line endings of *.java, and *.properties are normalized
-*.java text
-*.properties text
+# ensure that line endings of *.fxml, *.java, and *.properties are normalized
+*.fxml text eol=lf
+*.java text eol=lf
+*.properties text eol=lf
 
 # .bib files have to be written using OS specific line endings to enable our tests working
 *.bib text !eol
 
-# disable after a release
-CHANGELOG.md merge=union
+# Citavi needs to be LF line ending
+# This overwrites the setting of "*.bib"
+Citavi*.bib eol=lf
+
+# disable after a release (otherwise, duplicate CHANGELOG.md entries will be generated)
+# CHANGELOG.md merge=union
diff --git a/.gitbook.yaml b/.gitbook.yaml
deleted file mode 100644
index e454be0e259..00000000000
--- a/.gitbook.yaml
+++ /dev/null
@@ -1 +0,0 @@
-root: ./docs/
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 0a0eaa92ca9..ef4a1dd6b23 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -12,7 +12,7 @@ body:
     attributes:
       label: JabRef version
       options:
-        - "5.5 (latest release)"
+        - "5.7 (latest release)"
         - "3.8.2"
         - Latest development branch build (please note build date below)
         - Other (please describe below)
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 3dd717dcc54..1bf428b8b64 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -15,4 +15,5 @@ The title of the PR must not reference an issue, because GitHub does not support
 - [ ] Tests created for changes (if applicable)
 - [ ] Manually tested changed features in running JabRef (always required)
 - [ ] Screenshots added in PR description (for UI changes)
+- [ ] [Checked developer's documentation](https://devdocs.jabref.org/): Is the information available and up to date? If not, I outlined it in this pull request.
 - [ ] [Checked documentation](https://docs.jabref.org/): Is the information available and up to date? If not, I created an issue at <https://github.com/JabRef/user-documentation/issues> or, even better, I submitted a pull request to the documentation repository.
diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
index 053be6ce2f3..9783e2a9aaa 100644
--- a/.github/workflows/automerge.yml
+++ b/.github/workflows/automerge.yml
@@ -9,19 +9,19 @@ jobs:
     steps:
       - name: 'Wait for status checks'
         id: waitforstatuschecks
-        uses: "WyriHaximus/github-action-wait-for-status@v1.4"
+        uses: "WyriHaximus/github-action-wait-for-status@v1.6"
         with:
           ignoreActions: Automerge Dependabot,Code coverage,Create snapcraft image,Deploy binaries on builds.jabref.org,codecov/project,markdown-link-check
           checkInterval: 13
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
       - name: Auto approve
-        uses: hmarr/auto-approve-action@v2.1.0
+        uses: hmarr/auto-approve-action@v2.4.0
         if: steps.waitforstatuschecks.outputs.status == 'success'
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
       - name: Merge pull requests
-        uses: pascalgn/automerge-action@v0.14.3
+        uses: pascalgn/automerge-action@v0.15.3
         if: steps.waitforstatuschecks.outputs.status == 'success'
         env:
           MERGE_METHOD: "merge"
diff --git a/.github/workflows/check-links.yaml b/.github/workflows/check-links.yaml
index 2077d20ff80..9c0ab03ccea 100644
--- a/.github/workflows/check-links.yaml
+++ b/.github/workflows/check-links.yaml
@@ -13,7 +13,7 @@ jobs:
   markdown-link-check:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: gaurav-nelson/github-action-markdown-link-check@v1
         with:
           use-quiet-mode: 'yes'
diff --git a/.github/workflows/cleanup_pr.yml b/.github/workflows/cleanup_pr.yml
index 63090aba74a..20747030207 100644
--- a/.github/workflows/cleanup_pr.yml
+++ b/.github/workflows/cleanup_pr.yml
@@ -27,7 +27,7 @@ jobs:
           echo "##[set-output name=branch;]$(echo ${{ github.event.pull_request.head.ref }})"
       - name: Delete folder on builds.jabref.org
         if: ${{ steps.checksecrets.outputs.secretspresent }}
-        uses: appleboy/ssh-action@v0.1.4
+        uses: appleboy/ssh-action@v0.1.5
         with:
           script: rm -rf /var/www/builds.jabref.org/www/${{ steps.extract_branch.outputs.branch }} || true
           host: build-upload.jabref.org
diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml
index 1a8d92e0878..121fb51d795 100644
--- a/.github/workflows/deployment.yml
+++ b/.github/workflows/deployment.yml
@@ -22,6 +22,7 @@ env:
   SpringerNatureAPIKey: ${{ secrets.SpringerNatureAPIKey }}
   AstrophysicsDataSystemAPIKey: ${{ secrets.AstrophysicsDataSystemAPIKey }}
   IEEEAPIKey: ${{ secrets.IEEEAPIKey }}
+  BiodiversityHeritageApiKey: ${{ secrets.BiodiversityHeritageApiKey}}
   OSXCERT: ${{ secrets.OSX_SIGNING_CERT }}
   GRADLE_OPTS: -Xmx4g -Dorg.gradle.daemon=false -Dorg.gradle.vfs.watch=false
   JAVA_OPTS: -Xmx4g
@@ -51,20 +52,20 @@ jobs:
     name: Create installer and portable version for ${{ matrix.displayName }}
     steps:
       - name: Fetch all history for all tags and branches
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
       - name: Install GitVersion
-        uses: gittools/actions/gitversion/setup@v0.9.11
+        uses: gittools/actions/gitversion/setup@v0.9.13
         with:
           versionSpec: "5.x"
       - name: Run GitVersion
         id: gitversion
-        uses: gittools/actions/gitversion/execute@v0.9.11
+        uses: gittools/actions/gitversion/execute@v0.9.13
       - name: Set up JDK
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 18
           distribution: 'temurin'
           cache: 'gradle'
       - name: Setup OSX key chain on OSX
@@ -152,16 +153,16 @@ jobs:
         env:
           BUILDJABREFPRIVATEKEY: ${{ secrets.buildJabRefPrivateKey }}
       - name: Checkout source
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Fetch all history for all tags and branches
         run: git fetch --prune --unshallow
       - name: Install GitVersion
-        uses: gittools/actions/gitversion/setup@v0.9.11
+        uses: gittools/actions/gitversion/setup@v0.9.13
         with:
           versionSpec: '5.x'
       - name: Run GitVersion
         id: gitversion
-        uses: gittools/actions/gitversion/execute@v0.9.11
+        uses: gittools/actions/gitversion/execute@v0.9.13
       - name: Get linux binaries
         uses: actions/download-artifact@master
         with:
diff --git a/.github/workflows/gource.yml b/.github/workflows/gource.yml
index bf04acc1d4c..253ef9702a8 100644
--- a/.github/workflows/gource.yml
+++ b/.github/workflows/gource.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: 'Checkout'
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
       - name: Determine dates
diff --git a/.github/workflows/refresh-csl-subtrees.yml b/.github/workflows/refresh-csl-subtrees.yml
index d7cdf3efbf1..85aad208e7e 100644
--- a/.github/workflows/refresh-csl-subtrees.yml
+++ b/.github/workflows/refresh-csl-subtrees.yml
@@ -6,6 +6,9 @@ on:
     - cron: '1 2 1,15 * *'
   workflow_dispatch:
 
+permissions:
+  contents: read
+
 jobs:
   publish:
     name: Refresh Citation Style Language Files
@@ -13,7 +16,7 @@ jobs:
     if: github.repository == 'JabRef/jabref'
     steps:
       - name: Checkout source
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           ref: main
           fetch-depth: 0
@@ -42,7 +45,7 @@ jobs:
           cp buildres/csl/csl-locales/locales-en-US.xml src/main/resources/csl-locales/
           git add .
           git commit -m"Refresh example styles" || true
-      - uses: peter-evans/create-pull-request@v3
+      - uses: peter-evans/create-pull-request@v4
         with:
           token: ${{ secrets.GH_TOKEN_UPDATE_GRADLE_WRAPPER }}
           branch: refresh-csl
diff --git a/.github/workflows/refresh-journal-lists.yml b/.github/workflows/refresh-journal-lists.yml
index eb2f9715f33..d975875963a 100644
--- a/.github/workflows/refresh-journal-lists.yml
+++ b/.github/workflows/refresh-journal-lists.yml
@@ -4,21 +4,27 @@ on:
   workflow_dispatch:
     # Allow to run manually
 
+permissions:
+  contents: read
+
 jobs:
   publish:
+    permissions:
+      contents: write  # for peter-evans/create-pull-request to create branch
+      pull-requests: write  # for peter-evans/create-pull-request to create a PR
     name: Refresh Journal List Files
     runs-on: ubuntu-latest
     steps:
       - name: Fetch all history for all tags and branches
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           ref: main
           persist-credentials: false
           fetch-depth: 0
       - name: Set up JDK
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 18
           distribution: 'temurin'
           cache: 'gradle'
       - name: Update journal lists
@@ -46,7 +52,7 @@ jobs:
           # create .mv file
           cd $GITHUB_WORKSPACE
           ./gradlew generateJournalAbbreviationList
-      - uses: peter-evans/create-pull-request@v3
+      - uses: peter-evans/create-pull-request@v4
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           branch: update-journallist
diff --git a/.github/workflows/snap.yml b/.github/workflows/snap.yml
index 564ad5f0971..24bdde21743 100644
--- a/.github/workflows/snap.yml
+++ b/.github/workflows/snap.yml
@@ -30,7 +30,7 @@ jobs:
         env:
           SNAPCRAFT_LOGIN_FILE: ${{ secrets.SNAPCRAFT_LOGIN_FILE }}
       - name: Checkout source
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       # The image relies on https://builds.jabref.org/master/JabRef-5.0-portable_linux.tar.gz^
       # See snap/snapcraft.yml for details
       - name: Run snapcraft build
diff --git a/.github/workflows/tests-fetchers.yml b/.github/workflows/tests-fetchers.yml
index 7371194d9f7..8bf681fb7cc 100644
--- a/.github/workflows/tests-fetchers.yml
+++ b/.github/workflows/tests-fetchers.yml
@@ -26,22 +26,26 @@ env:
   SpringerNatureAPIKey: ${{ secrets.SPRINGERNATUREAPIKEY_FOR_TESTS }}
   AstrophysicsDataSystemAPIKey: ${{ secrets.AstrophysicsDataSystemAPIKey_FOR_TESTS }}
   IEEEAPIKey: ${{ secrets.IEEEAPIKey_FOR_TESTS }}
+  BiodiversityHeritageApiKey: ${{ secrets.BiodiversityHeritageApiKey_FOR_TESTS}}
 
 concurrency:
   group: fetcher-tests-${{ github.head_ref }}
   cancel-in-progress: true
 
+permissions:
+  contents: read
+
 jobs:
   fetchertests:
     name: Fetcher tests
     runs-on: ubuntu-latest
     steps:
       - name: Checkout source
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Set up JDK
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 18
           distribution: 'temurin'
           cache: 'gradle'
       - name: Run fetcher tests
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 226c4275064..70cad8a62dd 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -13,6 +13,7 @@ env:
   SpringerNatureAPIKey: ${{ secrets.SpringerNatureAPIKey }}
   AstrophysicsDataSystemAPIKey: ${{ secrets.AstrophysicsDataSystemAPIKey }}
   IEEEAPIKey: ${{ secrets.IEEEAPIKey }}
+  BiodiversityHeritageApiKey: ${{ secrets.BiodiversityHeritageApiKey}}
   GRADLE_OPTS: -Xmx4g
   JAVA_OPTS: -Xmx4g
 
@@ -26,18 +27,20 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout source
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Set up JDK
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 18
           distribution: 'temurin'
           cache: 'gradle'
       - name: Run check style reporter
         uses: nikitasavinov/checkstyle-action@master
         with:
-          reporter: github-pr-check
+          reporter: github-pr-review
+          github_token: ${{ secrets.GITHUB_TOKEN }}
           checkstyle_config: 'config/checkstyle/checkstyle_reviewdog.xml'
+          checkstyle_version: '10.3'
       - name: Run checkstyle gradle
         run: ./gradlew checkstyleMain checkstyleTest checkstyleJmh
       - name: Run markdown-lint
@@ -50,11 +53,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout source
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Set up JDK
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 18
           distribution: 'temurin'
           cache: 'gradle'
       - name: Run tests
@@ -82,11 +85,11 @@ jobs:
         options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
     steps:
       - name: Checkout source
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Set up JDK
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 18
           distribution: 'temurin'
           cache: 'gradle'
       - name: Run tests on PostgreSQL
@@ -116,11 +119,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout source
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Set up JDK
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 18
           distribution: 'temurin'
           cache: 'gradle'
       - name: Run GUI tests
@@ -154,11 +157,11 @@ jobs:
         env:
           SNAPCRAFT_LOGIN_FILE: ${{ secrets.CODECOV_TOKEN }}
       - name: Checkout source
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Set up JDK
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 18
           distribution: 'temurin'
           cache: 'gradle'
       - name: Update test coverage metrics
@@ -174,5 +177,5 @@ jobs:
     name: "Validate Gradle Wrapper"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: gradle/wrapper-validation-action@v1
diff --git a/.github/workflows/update-gradle-wrapper.yml b/.github/workflows/update-gradle-wrapper.yml
index b27c660e5cf..bed3b544fed 100644
--- a/.github/workflows/update-gradle-wrapper.yml
+++ b/.github/workflows/update-gradle-wrapper.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Update Gradle Wrapper
         uses: gradle-update/update-gradle-wrapper-action@v1
diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile
new file mode 100644
index 00000000000..007108a0f49
--- /dev/null
+++ b/.gitpod.Dockerfile
@@ -0,0 +1,8 @@
+# See https://www.gitpod.io/docs/java-in-gitpod/ for a full documentation of Java in GitPod
+
+FROM gitpod/workspace-full
+
+# All available versions can be listed using sdk ls java
+# More information about SDKMAN available at https://github.com/sdkman/sdkman-cli#sdkman-cli
+RUN bash -c ". /home/gitpod/.sdkman/bin/sdkman-init.sh \
+             && sdk install java 18.0.1.1-open"
diff --git a/.gitpod.yml b/.gitpod.yml
new file mode 100644
index 00000000000..a0aa262ea90
--- /dev/null
+++ b/.gitpod.yml
@@ -0,0 +1,16 @@
+image:
+  file: .gitpod.Dockerfile
+tasks:
+  - init: ./gradlew assemble
+jetbrains:
+  intellij:
+    plugins:
+      - CheckStyle-IDEA
+      - zielu.gittoolbox
+vscode:
+  extensions:
+    - redhat.java
+    - richardwillis.vscode-gradle
+    - vscjava.vscode-java-debug
+    - kiteco.kite
+    - DavidAnson.vscode-markdownlint
diff --git a/.idea/runConfigurations/JabRef_Main.xml b/.idea/runConfigurations/JabRef_Main.xml
index a588730b31a..731578b5c75 100644
--- a/.idea/runConfigurations/JabRef_Main.xml
+++ b/.idea/runConfigurations/JabRef_Main.xml
@@ -2,7 +2,7 @@
   <configuration default="false" name="JabRef Main" type="Application" factoryName="Application" singleton="true">
     <option name="MAIN_CLASS_NAME" value="org.jabref.gui.JabRefMain" />
     <module name="JabRef.main" />
-    <option name="VM_PARAMETERS" value="--patch-module test=fastparse_2.12-1.0.0.jar --patch-module test2=fastparse-utils_2.12-1.0.0.jar --patch-module test3=sourcecode_2.12-0.1.4.jar --patch-module org.jabref=build/resources/main --add-exports javafx.controls/com.sun.javafx.scene.control=org.jabref --add-exports org.controlsfx.controls/impl.org.controlsfx.skin=org.jabref --add-opens javafx.controls/javafx.scene.control=org.jabref --add-opens org.controlsfx.controls/org.controlsfx.control.textfield=org.jabref --add-exports javafx.graphics/com.sun.javafx.scene=org.controlsfx.controls --add-exports javafx.graphics/com.sun.javafx.scene.traversal=org.controlsfx.controls --add-exports javafx.graphics/com.sun.javafx.css=org.controlsfx.controls --add-exports javafx.controls/com.sun.javafx.scene.control.behavior=org.controlsfx.controls --add-exports javafx.controls/com.sun.javafx.scene.control=org.controlsfx.controls --add-exports javafx.controls/com.sun.javafx.scene.control.inputmap=org.controlsfx.controls --add-exports javafx.base/com.sun.javafx.event=org.controlsfx.controls --add-exports javafx.base/com.sun.javafx.collections=org.controlsfx.controls --add-exports javafx.base/com.sun.javafx.runtime=org.controlsfx.controls --add-exports javafx.web/com.sun.webkit=org.controlsfx.controls --add-exports javafx.graphics/com.sun.javafx.css=org.controlsfx.controls --add-opens javafx.controls/javafx.scene.control.skin=org.controlsfx.controls --add-opens javafx.graphics/javafx.scene=org.controlsfx.controls --add-exports com.oracle.truffle.regex/com.oracle.truffle.regex=org.graalvm.truffle --add-exports javafx.graphics/com.sun.javafx.stage=com.jfoenix --add-exports javafx.controls/com.sun.javafx.scene.control.behavior=com.jfoenix" />
+    <option name="VM_PARAMETERS" value="--patch-module org.jabref=build/resources/main --add-exports javafx.controls/com.sun.javafx.scene.control=org.jabref --add-exports org.controlsfx.controls/impl.org.controlsfx.skin=org.jabref --add-opens javafx.controls/javafx.scene.control=org.jabref --add-opens org.controlsfx.controls/org.controlsfx.control.textfield=org.jabref --add-exports javafx.graphics/com.sun.javafx.scene=org.controlsfx.controls --add-exports javafx.graphics/com.sun.javafx.scene.traversal=org.controlsfx.controls --add-exports javafx.graphics/com.sun.javafx.css=org.controlsfx.controls --add-exports javafx.controls/com.sun.javafx.scene.control.behavior=org.controlsfx.controls --add-exports javafx.controls/com.sun.javafx.scene.control=org.controlsfx.controls --add-exports javafx.controls/com.sun.javafx.scene.control.inputmap=org.controlsfx.controls --add-exports javafx.base/com.sun.javafx.event=org.controlsfx.controls --add-exports javafx.base/com.sun.javafx.collections=org.controlsfx.controls --add-exports javafx.base/com.sun.javafx.runtime=org.controlsfx.controls --add-exports javafx.web/com.sun.webkit=org.controlsfx.controls --add-exports javafx.graphics/com.sun.javafx.css=org.controlsfx.controls --add-opens javafx.controls/javafx.scene.control.skin=org.controlsfx.controls --add-opens javafx.graphics/javafx.scene=org.controlsfx.controls --add-exports com.oracle.truffle.regex/com.oracle.truffle.regex=org.graalvm.truffle --add-exports javafx.graphics/com.sun.javafx.stage=com.jfoenix --add-exports javafx.controls/com.sun.javafx.scene.control.behavior=com.jfoenix" />
     <option name="WORKING_DIRECTORY" value="$MODULE_WORKING_DIR$" />
     <RunnerSettings RunnerId="Profile ">
       <option name="myExternalizedOptions" value="additional-options2=onexit\=snapshot,_no_java_version_check&#13;&#10;startup=12" />
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 56f770609f4..23f76110599 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,35 +11,166 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 
 ### Added
 
-- We added an extra option when right-clicking an entry in the Entry List to copy either the DOI or the DOI url.
+- In case a backup is found, the filename of the backup is shown.
+- On startup, JabRef notifies the user if there were parsing errors during opening.
+- We integrated a new three-way merge UI for merging entries in the Entries Merger Dialog, the Duplicate Resolver Dialog, the Entry Importer Dialog, and the External Changes Resolver Dialog. [#8945](https://github.com/JabRef/jabref/pull/8945)
+- We added the ability to merge groups, keywords, comments and files when merging entries. [#9022](https://github.com/JabRef/jabref/pull/9022)
+- We added a warning message next to the authors field in the merge dialog to warn users when the authors are the same but formatted differently. [#8745](https://github.com/JabRef/jabref/issues/8745)
 
 ### Changed
 
-- The CSL preview styles now also support displaying data from cross references entries that are linked via the `crossref` field [#7378](https://github.com/JabRef/jabref/issues/7378)
-- We made the Search button in Web Search wider. We also skewed the panel titles to the left [#8397](https://github.com/JabRef/jabref/issues/8397)
-- We introduced a preference to disable fulltext indexing [#8468](https://github.com/JabRef/jabref/issues/8468)
+- 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`.
+- JabRef keeps 10 older versions of a `.bib` file in the [user data dir](https://github.com/harawata/appdirs#supported-directories) (instead of a single `.sav` (now: `.bak`) file in the directory of the `.bib` file)
+- We changed the button label from "Return to JabRef" to "Return to library" to better indicate the purpose of the action.
+- We removed "last-search-date" from the SLR feature, because the last-search-date can be deducted from the git logs.
+- We reworked the External Changes Resolver dialog. [#9021](https://github.com/JabRef/jabref/pull/9021)
+
 
 ### Fixed
 
-- We fixed an issue where an exception could occur when saving the preferences [#7614](https://github.com/JabRef/jabref/issues/7614)
-- We fixed an issue where "Copy DOI url" in the right-click menu of the Entry List would just copy the DOI and not the DOI url. [#8389](https://github.com/JabRef/jabref/issues/8389)
-- We fixed an issue where opening the console from the drop-down menu would cause an exception. [#8466](https://github.com/JabRef/jabref/issues/8466)
+- We fixed an issue where the possibilty 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)
+- We fixed the page ranges checker to detect article numbers in the pages field (used at [Check Integrity](https://docs.jabref.org/finding-sorting-and-cleaning-entries/checkintegrity)). [#8607](https://github.com/JabRef/jabref/pull/8607)
+- The [HtmlToLaTeXFormatter](https://docs.jabref.org/finding-sorting-and-cleaning-entries/saveactions#html-to-latex) keeps single `<` characters.
+- We fixed a performance regression when opening large libraries [#9041](https://github.com/JabRef/jabref/issues/9041)
+- We fixed a bug where spaces are trimmed when highlighting differences in the Entries merge dialog. [koppor#371](https://github.com/koppor/jabref/issues/371)
+- We fixed some visual glitches with the linked files editor field in the entry editor and increased its height. [#8823](https://github.com/JabRef/jabref/issues/8823)
+- We fixed several bugs regarding the manual and the autosave of library files that sometimes lead to exceptions or data loss. [#9067](https://github.com/JabRef/jabref/pull/9067), [#8448](https://github.com/JabRef/jabref/issues/8484), [#8746](https://github.com/JabRef/jabref/issues/8746), [#6684](https://github.com/JabRef/jabref/issues/6684), [#6644](https://github.com/JabRef/jabref/issues/6644), [#6102](https://github.com/JabRef/jabref/issues/6102), [#6002](https://github.com/JabRef/jabref/issues/6000)
+- We fixed an issue where applied save actions on saving the library file would lead to the dialog "The libary has been modified by another program" popping up [#4877](https://github.com/JabRef/jabref/issues/4877)
+- We fixed an issue where title case didn't capitalize words after en-dash characters [#9068]
+- 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)
 
 ### Removed
 
-- We removed the option to copy CSL Citation styles data as `XSL_FO`, `ASCIIDOC`, and `RTF` as these haven not been working since a long time and are no longe rsupported in the external library used for processing the styles [#7378](https://github.com/JabRef/jabref/issues/7378)
 
 
 
 
 
 
+## [5.7] - 2022-08-05
+
+### Added
+
+- We added a fetcher for [Biodiversity Heritage Library](https://www.biodiversitylibrary.org/). [8539](https://github.com/JabRef/jabref/issues/8539)
+- We added support for multiple messages in the snackbar. [#7340](https://github.com/JabRef/jabref/issues/7340)
+- We added an extra option in the 'Find Unlinked Files' dialog view to ignore unnecessary files like Thumbs.db, DS_Store, etc. [koppor#373](https://github.com/koppor/jabref/issues/373)
+- JabRef now writes log files. Linux: `$home/.cache/jabref/logs/version`, Windows: `%APPDATA%\..\Local\harawata\jabref\version\logs`, Mac: `Users/.../Library/Logs/jabref/version`
+- We added an importer for Citavi backup files, support ".ctv5bak" and ".ctv6bak" file formats. [#8322](https://github.com/JabRef/jabref/issues/8322)
+- We added a feature to drag selected entries and drop them to other opened inactive library tabs [koppor521](https://github.com/koppor/jabref/issues/521).
+- We added support for the [biblatex-apa](https://github.com/plk/biblatex-apa) legal entry types `Legislation`, `Legadminmaterial`, `Jurisdiction`, `Constitution` and `Legal` [#8931](https://github.com/JabRef/jabref/issues/8931)
+
+### Changed
+
+- The file column in the main table now shows the corresponding defined icon for the linked file [8930](https://github.com/JabRef/jabref/issues/8930).
+- We improved the color of the selected entries and the color of the summary in the Import Entries Dialog in the dark theme. [#7927](https://github.com/JabRef/jabref/issues/7927)
+- We upgraded to Lucene 9.2 for the fulltext search.
+  Thus, the now created search index cannot be read from older versions of JabRef anylonger.
+  ⚠️ JabRef will recreate the index in a new folder for new files and this will take a long time for a huge library.
+  Moreover, switching back and forth JabRef versions and meanwhile adding PDFs also requires rebuilding the index now and then.
+  [#8868](https://github.com/JabRef/jabref/pull/8868)
+- We improved the Latex2Unicode conversion [#8639](https://github.com/JabRef/jabref/pull/8639)
+- Writing BibTeX data into a PDF (XMP) removes braces. [#8452](https://github.com/JabRef/jabref/issues/8452)
+- Writing BibTeX data into a PDF (XMP) does not write the `file` field.
+- Writing BibTeX data into a PDF (XMP) considers the configured keyword separator (and does not use "," as default any more)
+- The Medline/Pubmed search now also supports the [default fields and operators for searching](https://docs.jabref.org/collect/import-using-online-bibliographic-database#search-syntax). [forum#3554](https://discourse.jabref.org/t/native-pubmed-search/3354)
+- We improved group expansion arrow that prevent it from activating group when expanding or collapsing. [#7982](https://github.com/JabRef/jabref/issues/7982), [#3176](https://github.com/JabRef/jabref/issues/3176)
+- When configured SSL certificates changed, JabRef warns the user to restart to apply the configuration.
+- We improved the appearances and logic of the "Manage field names & content" dialog, and renamed it to "Automatic field editor". [#6536](https://github.com/JabRef/jabref/issues/6536)
+- We improved the message explaining the options when modifying an automatic keyword group [#8911](https://github.com/JabRef/jabref/issues/8911)
+- We moved the preferences option "Warn about duplicates on import" option from the tab "File" to the tab "Import and Export". [koppor#570](https://github.com/koppor/jabref/issues/570)
+- When JabRef encounters `% Encoding: UTF-8` header, it is kept during writing (and not removed). [#8964](https://github.com/JabRef/jabref/pull/8964)
+- We replace characters which cannot be decoded using the specified encoding by a (probably another) valid character. This happens if JabRef detects the wrong charset (e.g., UTF-8 instead of Windows 1252). One can use the [Integrity Check](https://docs.jabref.org/finding-sorting-and-cleaning-entries/checkintegrity) to find those characters.
+
+### Fixed
+
+- We fixed an issue where the user could not rate an entry in the main table when an entry was not yet ranked. [#5842](https://github.com/JabRef/jabref/issues/5842)
+- We fixed an issue that caused JabRef to sometimes open multiple instances when "Remote Operation" is enabled. [#8653](https://github.com/JabRef/jabref/issues/8653)
+- We fixed an issue where linked files with the filetype "application/pdf" in an entry were not shown with the correct PDF-Icon in the main table [8930](https://github.com/JabRef/jabref/issues/8930)
+- We fixed an issue where "open folder" for linked files did not open the folder and did not select the file unter certain Linux desktop environments [#8679](https://github.com/JabRef/jabref/issues/8679), [#8849](https://github.com/JabRef/jabref/issues/8849)
+- We fixed an issue where the content of a big shared database library is not shown [#8788](https://github.com/JabRef/jabref/issues/8788)
+- We fixed the unnecessary horizontal scroll bar in group panel [#8467](https://github.com/JabRef/jabref/issues/8467)
+- We fixed an issue where the notification bar message, icon and actions appeared to be invisible. [#8761](https://github.com/JabRef/jabref/issues/8761)
+- We fixed an issue where deprecated fields tab is shown when the fields don't contain any values. [#8396](https://github.com/JabRef/jabref/issues/8396)
+- We fixed an issue where an exception for DOI search occurred when the DOI contained urlencoded characters. [#8787](https://github.com/JabRef/jabref/issues/8787)
+- We fixed an issue which allow us to select and open identifiers from a popup list in the maintable [#8758](https://github.com/JabRef/jabref/issues/8758), [8802](https://github.com/JabRef/jabref/issues/8802)
+- We fixed an issue where the escape button had no functionality within the "Filter groups" textfield. [koppor#562](https://github.com/koppor/jabref/issues/562)
+- We fixed an issue where the exception that there are invalid characters in filename. [#8786](https://github.com/JabRef/jabref/issues/8786)
+- When the proxy configuration removed the proxy user/password, this change is applied immediately.
+- We fixed an issue where removing several groups deletes only one of them. [#8390](https://github.com/JabRef/jabref/issues/8390)
+- We fixed an issue where the Sidepane (groups, web search and open office) width is not remembered after restarting JabRef. [#8907](https://github.com/JabRef/jabref/issues/8907)
+- We fixed a bug where switching between themes will cause an error/exception. [#8939](https://github.com/JabRef/jabref/pull/8939)
+- We fixed a bug where files that were deleted in the source bibtex file were kept in the index. [#8962](https://github.com/JabRef/jabref/pull/8962)
+- We fixed "Error while sending to JabRef" when the browser extension interacts with JabRef. [JabRef-Browser-Extension#479](https://github.com/JabRef/JabRef-Browser-Extension/issues/479)
+- We fixed a bug where updating group view mode (intersection or union) requires re-selecting groups to take effect. [#6998](https://github.com/JabRef/jabref/issues/6998)
+- We fixed a bug that prevented external group metadata changes from being merged. [#8873](https://github.com/JabRef/jabref/issues/8873)
+- We fixed the shared database opening dialog to remember autosave folder and tick. [#7516](https://github.com/JabRef/jabref/issues/7516)
+
+### Removed
+
+- We removed the social media buttons for our Twitter and Facebook pages. [#8774](https://github.com/JabRef/jabref/issues/8774)
+
+## [5.6] - 2022-04-25
+
+### Added
+
+- We enabled the user to customize the API Key for some fetchers. [#6877](https://github.com/JabRef/jabref/issues/6877)
+- We added an extra option when right-clicking an entry in the Entry List to copy either the DOI or the DOI url.
+- We added a fetcher for [Directory of Open Access Books (DOAB)](https://doabooks.org/) [8576](https://github.com/JabRef/jabref/issues/8576)
+- We added an extra option to ask the user whether they want to open to reveal the folder holding the saved file with the file selected. [#8195](https://github.com/JabRef/jabref/issues/8195)
+- We added a new section to network preferences to allow using custom SSL certificates. [#8126](https://github.com/JabRef/jabref/issues/8126)
+- We improved the version check to take also beta version into account and now redirect to the right changelog for the version.
+- We added two new web and fulltext fetchers: SemanticScholar and ResearchGate.
+- We added notifications on success and failure when writing metadata to a PDF-file. [#8276](https://github.com/JabRef/jabref/issues/8276)
+- We added a cleanup action that escapes `$` (by adding a backslash in front). [#8673](https://github.com/JabRef/jabref/issues/8673)
 
+### Changed
 
+- We upgraded to Lucene 9.1 for the fulltext search.
+  Thus, the now created search index cannot be read from older versions of JabRef any longer.
+  ⚠️ JabRef will recreate the index in a new folder for new files and this will take a long time for a huge library.
+  Moreover, switching back and forth JabRef versions and meanwhile adding PDFs also requires rebuilding the index now and then.
+  [#8362](https://github.com/JabRef/jabref/pull/8362)
+- We changed the list of CSL styles to those that support formatting bibliographies. [#8421](https://github.com/JabRef/jabref/issues/8421) [citeproc-java#116](https://github.com/michel-kraemer/citeproc-java/issues/116)
+- The CSL preview styles now also support displaying data from cross references entries that are linked via the `crossref` field. [#7378](https://github.com/JabRef/jabref/issues/7378)
+- We made the Search button in Web Search wider. We also skewed the panel titles to the left. [#8397](https://github.com/JabRef/jabref/issues/8397)
+- We introduced a preference to disable fulltext indexing. [#8468](https://github.com/JabRef/jabref/issues/8468)
+- When exporting entries, the encoding is always UTF-8.
+- When embedding BibTeX data into a PDF, the encoding is always UTF-8.
+- We replaced the [OttoBib](https://en.wikipedia.org/wiki/OttoBib) fetcher by a fetcher by [OpenLibrary](https://openlibrary.org/dev/docs/api/books). [#8652](https://github.com/JabRef/jabref/issues/8652)
+- We first fetch ISBN data from OpenLibrary, if nothing found, ebook.de is tried.
+- We now only show a warning when exiting for tasks that will not be recovered automatically upon relaunch of JabRef. [#8468](https://github.com/JabRef/jabref/issues/8468)
 
+### Fixed
 
+- We fixed an issue where right clicking multiple entries and pressing "Change entry type" would only change one entry. [#8654](https://github.com/JabRef/jabref/issues/8654)
+- We fixed an issue where it was no longer possible to add or delete multiple files in the `file` field in the entry editor. [#8659](https://github.com/JabRef/jabref/issues/8659)
+- We fixed an issue where the author's lastname was not used for the citation key generation if it started with a lowercase letter. [#8601](https://github.com/JabRef/jabref/issues/8601)
+- We fixed an issue where custom "Protected terms" files were missing after a restart of JabRef. [#8608](https://github.com/JabRef/jabref/issues/8608)
+- We fixed an issue where JabRef could not start due to a missing directory for the fulltex index. [#8579](https://github.com/JabRef/jabref/issues/8579)
+- We fixed an issue where long article numbers in the `pages` field would cause an exception and preventing the citation style to display. [#8381](https://github.com/JabRef/jabref/issues/8381), [citeproc-java](https://github.com/michel-kraemer/citeproc-java/issues/114)
+- We fixed an issue where online links in the file field were not detected correctly and could produce an exception. [#8150](https://github.com/JabRef/jabref/issues/8510)
+- We fixed an issue where an exception could occur when saving the preferences [#7614](https://github.com/JabRef/jabref/issues/7614)
+- We fixed an issue where "Copy DOI url" in the right-click menu of the Entry List would just copy the DOI and not the DOI url. [#8389](https://github.com/JabRef/jabref/issues/8389)
+- We fixed an issue where opening the console from the drop-down menu would cause an exception. [#8466](https://github.com/JabRef/jabref/issues/8466)
+- We fixed an issue when reading non-UTF-8 encoded. When no encoding header is present, the encoding is now detected from the file content (and the preference option is disregarded). [#8417](https://github.com/JabRef/jabref/issues/8417)
+- We fixed an issue where pasting a URL was replacing `+` signs by spaces making the URL unreachable. [#8448](https://github.com/JabRef/jabref/issues/8448)
+- We fixed an issue where creating subsidiary files from aux files created with some versions of biblatex would produce incorrect results. [#8513](https://github.com/JabRef/jabref/issues/8513)
+- We fixed an issue where opening the changelog from withing JabRef led to a 404 error. [#8563](https://github.com/JabRef/jabref/issues/8563)
+- We fixed an issue where not all found unlinked local files were imported correctly due to some race condition. [#8444](https://github.com/JabRef/jabref/issues/8444)
+- We fixed an issue where Merge entries dialog exceeds screen boundaries.
+- We fixed an issue where the app lags when selecting an entry after a fresh start. [#8446](https://github.com/JabRef/jabref/issues/8446)
+- We fixed an issue where no citationkey was generated on import, pasting a doi or an entry on the main table. [8406](https://github.com/JabRef/jabref/issues/8406), [koppor#553](https://github.com/koppor/jabref/issues/553)
+- We fixed an issue where accent search does not perform consistently. [#6815](https://github.com/JabRef/jabref/issues/6815)
+- We fixed an issue where the incorrect entry was selected when "New Article" is pressed while search filters are active. [#8674](https://github.com/JabRef/jabref/issues/8674)
+- We fixed an issue where "Write BibTeXEntry metadata to PDF" button remains enabled while writing to PDF is in-progress. [#8691](https://github.com/JabRef/jabref/issues/8691)
 
+### Removed
 
+- We removed the option to copy CSL Citation styles data as `XSL_FO`, `ASCIIDOC`, and `RTF` as these have not been working since a long time and are no longer supported in the external library used for processing the styles. [#7378](https://github.com/JabRef/jabref/issues/7378)
+- We removed the option to configure the default encoding. The default encoding is now hard-coded to the modern UTF-8 encoding.
 
 ## [5.5] - 2022-01-17
 
@@ -51,6 +182,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 - We moved the search box in preview preferences closer to the available citation styles list. [#8370](https://github.com/JabRef/jabref/pull/8370)
 - Changing the preference to show the preview panel as a separate tab now has effect without restarting JabRef. [#8370](https://github.com/JabRef/jabref/pull/8370)
 - We enabled switching themes in JabRef without the need to restart JabRef. [#7335](https://github.com/JabRef/jabref/pull/7335)
+- We added support for the field `day`, `rights`, `coverage` and `language` when reading XMP data in Dublin Core format. [#8491](https://github.com/JabRef/jabref/issues/8491)
 
 ### Fixed
 
@@ -64,6 +196,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 - We fixed an issue where someone could add a duplicate field in the customize entry type dialog. [#8194](https://github.com/JabRef/jabref/issues/8194)
 - We fixed a typo in the library properties tab: "String constants". There, one can configure [BibTeX string constants](https://docs.jabref.org/advanced/strings).
 - We fixed an issue when writing a non-UTF-8 encoded file: The header is written again. [#8417](https://github.com/JabRef/jabref/issues/8417)
+- We fixed an issue where folder creation during systemic literature review failed due to an illegal fetcher name. [#8552](https://github.com/JabRef/jabref/pull/8552)
 
 ## [5.4] - 2021-12-20
 
@@ -196,7 +329,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 - The tooltip of the search field explaining the search is always shown. [#7279](https://github.com/JabRef/jabref/pull/7279)
 - We rewrote the ACM fetcher to adapt to the new interface. [#5804](https://github.com/JabRef/jabref/issues/5804)
 - We moved the select/collapse buttons in the unlinked files dialog into a context menu. [#7383](https://github.com/JabRef/jabref/issues/7383)
-- We fixed an issue where journal abbreviations containing curly braces were not recognized  [#7773](https://github.com/JabRef/jabref/issues/7773)
+- We fixed an issue where journal abbreviations containing curly braces were not recognized [#7773](https://github.com/JabRef/jabref/issues/7773)
 
 ### Fixed
 
@@ -297,7 +430,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 - We changed the title of the window "Manage field names and content" to have the same title as the corresponding menu item [#6895](https://github.com/JabRef/jabref/pull/6895)
 - We renamed the menus "View -> Previous citation style" and "View -> Next citation style" into "View -> Previous preview style" and "View -> Next preview style" and renamed the "Preview" style to "Customized preview style". [#6899](https://github.com/JabRef/jabref/pull/6899)
 - We changed the default preference option "Search and store files relative to library file location" to on, as this seems to be a more intuitive behaviour. [#6863](https://github.com/JabRef/jabref/issues/6863)
-- We changed the title of the window  "Manage field names and content":  to have the same title as the corresponding menu item  [#6895](https://github.com/JabRef/jabref/pull/6895)
+- We changed the title of the window "Manage field names and content": to have the same title as the corresponding menu item [#6895](https://github.com/JabRef/jabref/pull/6895)
 - We improved the detection of "short" DOIs [6880](https://github.com/JabRef/jabref/issues/6880)
 - We improved the duplicate detection when identifiers like DOI or arxiv are semantiaclly the same, but just syntactically differ (e.g. with or without http(s):// prefix). [#6707](https://github.com/JabRef/jabref/issues/6707)
 - We improved JabRef start up time [6057](https://github.com/JabRef/jabref/issues/6057)
@@ -306,7 +439,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 - We changed the way JabRef displays the title of a tab and of the window. [4161](https://github.com/JabRef/jabref/issues/4161)
 - We changed connect timeouts for server requests to 30 seconds in general and 5 seconds for GROBID server (special) and improved user notifications on connection issues. [7026](https://github.com/JabRef/jabref/pull/7026)
 - We changed the order of the library tab context menu items. [#7171](https://github.com/JabRef/jabref/issues/7171)
-- We changed the way linked files are opened on Linux to use the native openFile method, compatible with confined  packages. [7037](https://github.com/JabRef/jabref/pull/7037)
+- We changed the way linked files are opened on Linux to use the native openFile method, compatible with confined packages. [7037](https://github.com/JabRef/jabref/pull/7037)
 - We refined the entry preview to show the full names of authors and editors, to list the editor only if no author is present, have the year earlier. [#7083](https://github.com/JabRef/jabref/issues/7083)
 
 ### Fixed
@@ -323,7 +456,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 - We fixed an issue where it was impossible to connect to OpenOffice/LibreOffice on Mac OSX. [#6970](https://github.com/JabRef/jabref/pull/6970)
 - We fixed an issue with the python script used by browser plugins that failed to locate JabRef if not installed in its default location. [#6963](https://github.com/JabRef/jabref/pull/6963/files)
 - We fixed an issue where spaces and newlines in an isbn would generate an exception. [#6456](https://github.com/JabRef/jabref/issues/6456)
-- We fixed an issue where identity column header had incorrect foreground color in the  Dark theme. [#6796](https://github.com/JabRef/jabref/issues/6796)
+- We fixed an issue where identity column header had incorrect foreground color in the Dark theme. [#6796](https://github.com/JabRef/jabref/issues/6796)
 - We fixed an issue where the RIS exporter added extra blank lines.[#7007](https://github.com/JabRef/jabref/pull/7007/files)
 - We fixed an issue where clicking on Collapse All button in the Search for Unlinked Local Files expanded the directory structure erroneously [#6848](https://github.com/JabRef/jabref/issues/6848)
 - We fixed an issue, when pulling changes from shared database via shortcut caused creation of a new tech report [6867](https://github.com/JabRef/jabref/issues/6867)
@@ -612,7 +745,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 - Use integrated graphics card instead of discrete on macOS [#4070](https://github.com/JabRef/jabref/issues/4070)
 - We added a cleanup operation that detects an arXiv identifier in the note, journal or URL field and moves it to the `eprint` field.
   Because of this change, the last-used cleanup operations were reset.
-- We changed the minimum required version of Java to 1.8.0_171, as this is the latest release for which the automatic Java update works.  [#4093](https://github.com/JabRef/jabref/issues/4093)
+- We changed the minimum required version of Java to 1.8.0_171, as this is the latest release for which the automatic Java update works. [#4093](https://github.com/JabRef/jabref/issues/4093)
 - The special fields like `Printed` and `Read status` now show gray icons when the row is hovered.
 - We added a button in the tab header which allows you to close the database with one click. [#494](https://github.com/JabRef/jabref/issues/494)
 - Sorting in the main table now takes information from cross-referenced entries into account. [#2808](https://github.com/JabRef/jabref/issues/2808)
@@ -639,8 +772,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 - We optimized the code responsible for connecting to an external database, which should lead to huge improvements in performance.
 - For automatically created groups, added ability to filter groups by entry type. [#4539](https://github.com/JabRef/jabref/issues/4539)
 - We added the ability to add field names from the Preferences Dialog [#4546](https://github.com/JabRef/jabref/issues/4546)
-- We added the ability to change the column widths directly in the main
-. [#4546](https://github.com/JabRef/jabref/issues/4546)
+- We added the ability to change the column widths directly in the main table. [#4546](https://github.com/JabRef/jabref/issues/4546)
 - We added a description of how recommendations were chosen and better error handling to Related Articles tab
 - We added the ability to execute default action in dialog by using with <kbd>Ctrl</kbd> + <kbd>Enter</kbd> combination [#4496](https://github.com/JabRef/jabref/issues/4496)
 - We grouped and reordered the Main Menu (File, Edit, Library, Quality, Tools, and View tabs & icons). [#4666](https://github.com/JabRef/jabref/issues/4666) [#4667](https://github.com/JabRef/jabref/issues/4667) [#4668](https://github.com/JabRef/jabref/issues/4668) [#4669](https://github.com/JabRef/jabref/issues/4669) [#4670](https://github.com/JabRef/jabref/issues/4670) [#4671](https://github.com/JabRef/jabref/issues/4671) [#4672](https://github.com/JabRef/jabref/issues/4672) [#4673](https://github.com/JabRef/jabref/issues/4673)
@@ -730,7 +862,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 
 ### Removed
 
-- The feature to "mark entries" was removed and merged with the groups functionality.  For migration, a group is created for every value of the `__markedentry` field and the entry is added to this group.
+- The feature to "mark entries" was removed and merged with the groups functionality. For migration, a group is created for every value of the `__markedentry` field and the entry is added to this group.
 - The number column was removed.
 - We removed the global search feature.
 - We removed the coloring of cells in the main table according to whether the field is optional/required.
@@ -750,7 +882,9 @@ The changelog of JabRef 4.x is available at the [v4.3.1 tag](https://github.com/
 The changelog of JabRef 3.x is available at the [v3.8.2 tag](https://github.com/JabRef/jabref/blob/v3.8.2/CHANGELOG.md).
 The changelog of JabRef 2.11 and all previous versions is available as [text file in the v2.11.1 tag](https://github.com/JabRef/jabref/blob/v2.11.1/CHANGELOG).
 
-[Unreleased]: https://github.com/JabRef/jabref/compare/v5.5...HEAD
+[Unreleased]: https://github.com/JabRef/jabref/compare/v5.7...HEAD
+[5.7]: https://github.com/JabRef/jabref/compare/v5.6...v5.7
+[5.6]: https://github.com/JabRef/jabref/compare/v5.5...v5.6
 [5.5]: https://github.com/JabRef/jabref/compare/v5.4...v5.5
 [5.4]: https://github.com/JabRef/jabref/compare/v5.3...v5.4
 [5.3]: https://github.com/JabRef/jabref/compare/v5.2...v5.3
diff --git a/README.md b/README.md
index f719dbf8742..23cc6f637f6 100644
--- a/README.md
+++ b/README.md
@@ -57,8 +57,8 @@ Please see our [Installation Guide](https://docs.jabref.org/installation).
 [![Paypal Donate](https://img.shields.io/badge/donate-paypal-00457c.svg?logo=paypal&style=flat-square)](https://paypal.me/JabRef)
 
 We are thankful for any bug reports or other feedback.
-If you have ideas for new features you want to be included in JabRef, [tell us in our forum](http://discourse.jabref.org/c/features)!
-If you need support in using JabRef, please read [the documentation](https://docs.jabref.org/) first, the [frequently asked questions (FAQ)](https://docs.jabref.org/faq) and also have a look at our [community forum](https://discourse.jabref.org/c/help).
+If you have ideas for new features you want to be included in JabRef, tell us in [the feature section](http://discourse.jabref.org/c/features) of our forum!
+If you need support in using JabRef, please read [the documentation](https://docs.jabref.org/) first, the [frequently asked questions (FAQ)](https://docs.jabref.org/faq) and also have a look at our [community forum](https://discourse.jabref.org/c/help/7).
 You can use our [GitHub issue tracker](https://github.com/JabRef/jabref/issues) to file bug reports.
 
 An explanation of donation possibilities and usage of donations is available at our [donations page](https://donations.jabref.org).
@@ -71,7 +71,7 @@ An explanation of donation possibilities and usage of donations is available at
 [![OpenHub](https://www.openhub.net/p/jabref/widgets/project_thin_badge.gif)](https://www.openhub.net/p/jabref)
 [![Deployment Status](https://github.com/JabRef/jabref/workflows/Deployment/badge.svg)](https://github.com/JabRef/jabref/actions?query=workflow%3ADeployment)
 [![Test Status](https://github.com/JabRef/jabref/workflows/Tests/badge.svg)](https://github.com/JabRef/jabref/actions?query=workflow%3ATests)
-[![codecov.io](https://codecov.io/github/JabRef/jabref/coverage.svg?branch=master)](https://codecov.io/github/JabRef/jabref?branch=master)
+[![codecov.io](https://codecov.io/github/JabRef/jabref/coverage.svg?branch=master)](https://codecov.io/github/JabRef/jabref?branch=main)
 
 Want to be part of a free and open-source project that tens of thousands of scientists use every day?
 Check out the ways you can contribute, below:
@@ -84,11 +84,11 @@ Check out the ways you can contribute, below:
 
 We view pull requests as a collaborative process.
 Submit a pull request early to get feedback from the team on work in progress.
-We will discuss improvements with you and agree to merge them once the [developers](https://github.com/JabRef/jabref/blob/master/DEVELOPERS) approve.
+We will discuss improvements with you and agree to merge them once the [developers](https://github.com/JabRef/jabref/blob/main/MAINTAINERS) approve. Please also remember to discuss bigger changes early with the core developers to avoid a waste of time and work. Some fundamental design decisions can be found within our list of [Architectural Decision Records](https://devdocs.jabref.org/adr.html).
 
 If you want a step-by-step walk-through on how to set-up your workspace, please check [this guideline](https://devdocs.jabref.org/getting-into-the-code/guidelines-for-setting-up-a-local-workspace).
 
-To compile JabRef from source, you need a Java Development Kit 15 and `JAVA_HOME` pointing to this JDK.
+To compile JabRef from source, you need a Java Development Kit 18 and `JAVA_HOME` pointing to this JDK.
 To run it, just execute `gradlew run`.
 When you want to develop, it is necessary to generate additional sources using `gradlew generateSource`
 and then generate the Eclipse `gradlew eclipse`.
diff --git a/build.gradle b/build.gradle
index 7ef6d8a61cb..2fb490c2cf4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,12 +1,8 @@
-import groovy.json.JsonSlurper
 import org.gradle.internal.os.OperatingSystem
 import org.jabref.build.JournalAbbreviationConverter
 import org.jabref.build.xjc.XjcPlugin
 import org.jabref.build.xjc.XjcTask
 
-// to update the gradle wrapper, execute
-// ./gradlew wrapper --gradle-version=6.0 --distribution-type=bin
-
 plugins {
     id 'application'
 
@@ -14,15 +10,15 @@ plugins {
 
     id 'me.champeau.gradle.jmh' version '0.5.3'
 
-    id 'org.javamodularity.moduleplugin' version '1.8.10'
+    id 'org.javamodularity.moduleplugin' version '1.8.12'
 
-    id 'org.openjfx.javafxplugin' version '0.0.11'
+    id 'org.openjfx.javafxplugin' version '0.0.13'
 
-    id 'org.beryx.jlink' version '2.24.4'
+    id 'org.beryx.jlink' version '2.25.0'
 
     // nicer test outputs during running and completion
     // Homepage: https://github.com/radarsh/gradle-test-logger-plugin
-    id 'com.adarshr.test-logger' version '3.1.0'
+    id 'com.adarshr.test-logger' version '3.2.0'
 
     id 'jacoco'
 
@@ -44,8 +40,8 @@ group = "org.jabref"
 version = project.findProperty('projVersion') ?: '100.0.0'
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
+    sourceCompatibility = JavaVersion.VERSION_18
+    targetCompatibility = JavaVersion.VERSION_18
 
     // Workaround needed for Eclipse, probably because of https://github.com/gradle/gradle/issues/16922
     // Should be removed as soon as Gradle 7.0.1 is released ( https://github.com/gradle/gradle/issues/16922#issuecomment-828217060 )
@@ -57,12 +53,6 @@ application {
     mainModule.set('org.jabref')
 }
 
-// TODO: Ugly workaround to temporarily ignore build errors to dependencies of latex2unicode
-// These should be removed, as well as the files in the lib folder, as soon as they have valid module names
-modularity.patchModule("test", "fastparse_2.12-1.0.0.jar")
-modularity.patchModule("test2", "fastparse-utils_2.12-1.0.0.jar")
-modularity.patchModule("test3", "sourcecode_2.12-0.1.4.jar")
-
 // Workaround for https://github.com/openjfx/javafx-gradle-plugin/issues/89
 // See also https://github.com/java9-modularity/gradle-modules-plugin/issues/165
 modularity.disableEffectiveArgumentsAdjustment()
@@ -91,11 +81,10 @@ repositories {
     mavenLocal()
     mavenCentral()
     maven { url 'https://oss.sonatype.org/content/groups/public' }
-    maven { url 'https://repository.apache.org/snapshots' }
+    maven { url 'https://jitpack.io' }
 }
 
 configurations {
-    antlr3
     antlr4
     // TODO: Remove the following workaround for split error messages such as
     // error: module java.xml.bind reads package javax.annotation from both jsr305 and java.annotation
@@ -105,56 +94,68 @@ configurations {
     }
 }
 
+dependencyLocking {
+    lockAllConfigurations()
+}
+
 javafx {
-    version = "17.0.2"
+    version = "18.0.2"
     modules = [ 'javafx.controls', 'javafx.fxml', 'javafx.web', 'javafx.swing' ]
 }
 
+jacoco {
+    toolVersion = "0.8.8"
+}
+
 dependencies {
     // Include all jar-files in the 'lib' folder as dependencies
     implementation fileTree(dir: 'lib', includes: ['*.jar'])
 
-    implementation 'org.apache.pdfbox:pdfbox:2.0.25'
-    implementation 'org.apache.pdfbox:fontbox:2.0.25'
-    implementation 'org.apache.pdfbox:xmpbox:2.0.25'
+    implementation 'org.apache.pdfbox:pdfbox:3.0.0-RC1'
+    implementation 'org.apache.pdfbox:fontbox:3.0.0-RC1'
+    implementation 'org.apache.pdfbox:xmpbox:3.0.0-RC1'
+
+    implementation 'org.apache.lucene:lucene-core:9.3.0'
+    implementation 'org.apache.lucene:lucene-queryparser:9.3.0'
+    implementation 'org.apache.lucene:lucene-queries:9.3.0'
+    implementation 'org.apache.lucene:lucene-analysis-common:9.3.0'
+    implementation 'org.apache.lucene:lucene-highlighter:9.3.0'
 
     implementation group: 'org.apache.commons', name: 'commons-csv', version: '1.9.0'
-    implementation 'com.h2database:h2-mvstore:2.1.210'
+    implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
+    implementation 'com.h2database:h2-mvstore:2.1.214'
 
-    implementation group: 'org.apache.tika', name: 'tika-core', version: '2.3.0'
+    implementation group: 'org.apache.tika', name: 'tika-core', version: '2.4.1'
 
     // required for reading write-protected PDFs - see https://github.com/JabRef/jabref/pull/942#issuecomment-209252635
-    implementation 'org.bouncycastle:bcprov-jdk15on:1.70'
+    implementation 'org.bouncycastle:bcprov-jdk18on:1.71.1'
 
     implementation 'commons-cli:commons-cli:1.5.0'
 
-    implementation 'org.libreoffice:libreoffice:7.3.0'
-    implementation 'org.libreoffice:unoloader:7.3.0'
+    implementation 'org.libreoffice:libreoffice:7.4.0'
+    implementation 'org.libreoffice:unoloader:7.4.0'
 
-    implementation 'io.github.java-diff-utils:java-diff-utils:4.11'
+    implementation 'io.github.java-diff-utils:java-diff-utils:4.12'
     implementation 'info.debatty:java-string-similarity:2.0.0'
 
-    antlr3 'org.antlr:antlr:3.5.2'
-    implementation 'org.antlr:antlr-runtime:3.5.2'
-
     antlr4 'org.antlr:antlr4:4.9.3'
     implementation 'org.antlr:antlr4-runtime:4.9.3'
 
-    implementation group: 'org.eclipse.jgit', name: 'org.eclipse.jgit', version: '6.0.0.202111291000-r'
+    implementation group: 'org.eclipse.jgit', name: 'org.eclipse.jgit', version: '6.2.0.202206071550-r'
 
-    implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: '2.13.1'
-    implementation group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: '2.13.1'
+    implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: '2.13.3'
+    implementation group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: '2.13.3'
 
-    implementation group: 'org.mariadb.jdbc', name: 'mariadb-java-client', version: '2.7.5'
+    implementation group: 'org.mariadb.jdbc', name: 'mariadb-java-client', version: '2.7.6'
 
-    implementation 'org.postgresql:postgresql:42.3.2'
+    implementation 'org.postgresql:postgresql:42.5.0'
 
     implementation ('com.oracle.ojdbc:ojdbc10:19.3.0.0') {
         // causing module issues
         exclude module: 'oraclepki'
     }
 
-    implementation ('com.google.guava:guava:31.0.1-jre') {
+    implementation ('com.google.guava:guava:31.1-jre') {
         // TODO: Remove this as soon as https://github.com/google/guava/issues/2960 is fixed
         exclude module: "jsr305"
     }
@@ -162,33 +163,33 @@ dependencies {
     implementation group: 'jakarta.annotation', name: 'jakarta.annotation-api', version: '1.3.5'
 
     // JavaFX stuff
-    implementation 'org.kordamp.ikonli:ikonli-javafx:12.3.0'
-    implementation 'org.kordamp.ikonli:ikonli-materialdesign2-pack:12.3.0'
-    implementation 'de.saxsys:mvvmfx-validation:1.9.0-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
     implementation 'de.saxsys:mvvmfx:1.8.0'
     implementation 'com.tobiasdiez:easybind:2.2'
-    implementation 'org.fxmisc.flowless:flowless:0.6.8'
-    implementation 'org.fxmisc.richtext:richtextfx:0.10.7'
+    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.14.3'
-    implementation 'com.konghq:unirest-java:3.13.6'
+    implementation 'org.jsoup:jsoup:1.15.3'
+    implementation 'com.konghq:unirest-java:3.13.11'
 
-    implementation 'org.slf4j:slf4j-api:2.0.0-alpha6'
-    implementation "org.tinylog:tinylog-api:2.4.1"
-    implementation "org.tinylog:slf4j-tinylog:2.4.1"
-    implementation "org.tinylog:tinylog-impl:2.4.1"
+    implementation 'org.slf4j:slf4j-api:2.0.0'
+    implementation "org.tinylog:tinylog-api:2.5.0"
+    implementation "org.tinylog:slf4j-tinylog:2.5.0"
+    implementation "org.tinylog:tinylog-impl:2.5.0"
 
-    implementation 'de.undercouch:citeproc-java:3.0.0-alpha.3'
+    implementation 'de.undercouch:citeproc-java:3.0.0-alpha.6'
 
-    implementation group: 'jakarta.activation', name: 'jakarta.activation-api', version: '1.2.1'
-    implementation group: 'jakarta.xml.bind', name: 'jakarta.xml.bind-api', version: '2.3.2'
-    implementation group: 'org.glassfish.jaxb', name: 'jaxb-runtime', version: '2.3.2'
+    // jakarta.activation is already dependency of glassfish
+    implementation group: 'jakarta.xml.bind', name: 'jakarta.xml.bind-api', version: '3.0.1'
+    implementation group: 'org.glassfish.jaxb', name: 'jaxb-runtime', version: '3.0.2'
 
-    implementation ('com.github.tomtung:latex2unicode_2.12:0.2.6') {
-        exclude module: 'fastparse_2.12'
+    implementation ('com.github.tomtung:latex2unicode_2.13:0.3.2') {
+        exclude module: 'fastparse_2.13'
     }
 
     implementation group: 'com.microsoft.azure', name: 'applicationinsights-core', version: '2.4.1'
@@ -196,29 +197,29 @@ dependencies {
         exclude module: "log4j-core"
     }
 
-    implementation 'com.vladsch.flexmark:flexmark:0.62.2'
+    implementation 'com.vladsch.flexmark:flexmark:0.64.0'
     implementation 'com.vladsch.flexmark:flexmark-ext-gfm-strikethrough:0.64.0'
-    implementation 'com.vladsch.flexmark:flexmark-ext-gfm-tasklist:0.62.2'
+    implementation 'com.vladsch.flexmark:flexmark-ext-gfm-tasklist:0.64.0'
 
     implementation group: 'net.harawata', name: 'appdirs', version: '1.2.1'
 
-    testImplementation 'io.github.classgraph:classgraph:4.8.139'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.8.2'
-    testImplementation 'org.junit.platform:junit-platform-launcher:1.8.2'
+    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'
 
-    testRuntimeOnly group: 'org.apache.logging.log4j', name: 'log4j-core', version: '3.0.0-SNAPSHOT'
-    testRuntimeOnly group: 'org.apache.logging.log4j', name: 'log4j-jul', version: '3.0.0-SNAPSHOT'
-    testImplementation 'org.mockito:mockito-core:4.3.0'
-    testImplementation 'org.xmlunit:xmlunit-core:2.8.4'
+    testImplementation 'org.mockito:mockito-core:4.7.0'
+    testImplementation 'org.xmlunit:xmlunit-core:2.9.0'
     testImplementation 'org.xmlunit:xmlunit-matchers:2.9.0'
-    testRuntimeOnly 'com.tngtech.archunit:archunit-junit5-engine:0.22.0'
-    testImplementation 'com.tngtech.archunit:archunit-junit5-api:0.22.0'
-    testImplementation "org.testfx:testfx-core:4.0.17-alpha-SNAPSHOT"
-    testImplementation "org.testfx:testfx-junit5:4.0.17-alpha-SNAPSHOT"
+    testRuntimeOnly 'com.tngtech.archunit:archunit-junit5-engine:0.23.1'
+    testImplementation 'com.tngtech.archunit:archunit-junit5-api:0.23.1'
+    testImplementation "org.testfx:testfx-core:4.0.16-alpha"
+    testImplementation "org.testfx:testfx-junit5:4.0.16-alpha"
     testImplementation "org.hamcrest:hamcrest-library:2.2"
 
-    checkstyle 'com.puppycrawl.tools:checkstyle:9.3'
-    xjc group: 'org.glassfish.jaxb', name: 'jaxb-xjc', version: '2.3.3'
+    checkstyle 'com.puppycrawl.tools:checkstyle:10.3.3'
+    // 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'
 }
 
 clean {
@@ -245,7 +246,8 @@ processResources {
                 "springerNatureAPIKey": System.getenv('SpringerNatureAPIKey') ? System.getenv('SpringerNatureAPIKey') : '',
                 "astrophysicsDataSystemAPIKey": System.getenv('AstrophysicsDataSystemAPIKey') ? System.getenv('AstrophysicsDataSystemAPIKey') : '',
                 "ieeeAPIKey": System.getenv('IEEEAPIKey') ? System.getenv('IEEEAPIKey') : '',
-                "scienceDirectApiKey": System.getenv('SCIENCEDIRECTAPIKEY') ? System.getenv('SCIENCEDIRECTAPIKEY') : ''
+                "scienceDirectApiKey": System.getenv('SCIENCEDIRECTAPIKEY') ? System.getenv('SCIENCEDIRECTAPIKEY') : '',
+                "biodiversityHeritageApiKey": System.getenv('BiodiversityHeritageApiKey') ? System.getenv('BiodiversityHeritageApiKey') : ''
         )
         filteringCharset = 'UTF-8'
     }
@@ -260,20 +262,21 @@ task generateSource(dependsOn: ["generateBstGrammarSource",
                                 "generateMedlineSource",
                                 "generateBibtexmlSource",
                                 "generateEndnoteSource",
-                                "generateModsSource"]) {
+                                "generateModsSource",
+                                "generateCitaviSource"]) {
     group = 'JabRef'
     description 'Generates all necessary (Java) source files.'
 }
 
 tasks.register("generateBstGrammarSource", JavaExec) {
-    main = "org.antlr.Tool"
-    classpath = configurations.antlr3
+    main = "org.antlr.v4.Tool"
+    classpath = configurations.antlr4
     group = "JabRef"
-    description = 'Generates BstLexer.java and BstParser.java from the Bst.g grammar file using antlr3.'
+    description = 'Generates BstLexer.java and BstParser.java from the Bst.g grammar file using antlr4.'
 
-    inputs.dir('src/main/antlr3/org/jabref/bst/')
+    inputs.dir('src/main/antlr4/org/jabref/bst/')
     outputs.dir("src-gen/main/java/org/jabref/logic/bst/")
-    args = ["-o", "src-gen/main/java/org/jabref/logic/bst/" , "$projectDir/src/main/antlr3/org/jabref/bst/Bst.g" ]
+    args = ["-o", "src-gen/main/java/org/jabref/logic/bst/", "-visitor", "-no-listener", "-package", "org.jabref.logic.bst", "$projectDir/src/main/antlr4/org/jabref/bst/Bst.g4"]
 }
 
 tasks.register("generateSearchGrammarSource", JavaExec) {
@@ -314,6 +317,15 @@ task generateEndnoteSource(type: XjcTask) {
     javaPackage = "org.jabref.logic.importer.fileformat.endnote"
 }
 
+task generateCitaviSource(type: XjcTask) {
+    group = 'JabRef'
+    description = "Generates java files for the citavi importer."
+
+    schemaFile = "src/main/resources/xjc/citavi/citavi.xsd"
+    outputDirectory = "src-gen/main/java/"
+    javaPackage = "org.jabref.logic.importer.fileformat.citavi"
+}
+
 task generateModsSource(type: XjcTask) {
     group = 'JabRef'
     description = "Generates java files for the mods importer."
@@ -555,10 +567,8 @@ jlink {
         requires 'jdk.security.jgss'
         requires 'jdk.xml.dom'
         requires 'com.google.gson'
-        requires 'com.sun.xml.fastinfoset'
-        requires 'com.sun.xml.txw2'
         requires 'org.slf4j'
-        uses 'org.controlsfx.glyphfont.GlyphFont'
+        requires 'jakarta.xml.bind'
         uses 'com.airhacks.afterburner.views.ResourceLocator'
         uses 'com.airhacks.afterburner.injection.PresenterFactory'
         uses 'org.mariadb.jdbc.credential.CredentialPlugin'
@@ -567,12 +577,7 @@ jlink {
         uses 'org.mariadb.jdbc.LocalInfileInterceptor'
         uses 'org.eclipse.jgit.transport.SshSessionFactory'
         uses 'org.eclipse.jgit.lib.GpgSigner'
-        uses 'javax.xml.bind.JAXBContextFactory'
-        provides 'org.apache.lucene.codecs.DocValuesFormat' with 'org.apache.lucene.codecs.lucene80.Lucene80DocValuesFormat'
-        provides 'org.controlsfx.glyphfont.GlyphFont' with 'org.controlsfx.glyphfont.FontAwesome'
         provides 'org.mariadb.jdbc.tls.TlsSocketPlugin' with 'org.mariadb.jdbc.internal.protocol.tls.DefaultTlsSocketPlugin'
-        provides 'com.microsoft.applicationinsights.core.dependencies.io.grpc.ServerProvider' with 'com.microsoft.applicationinsights.core.dependencies.io.grpc.netty.shaded.io.grpc.netty.NettyServerProvider'
-        provides 'com.microsoft.applicationinsights.core.dependencies.io.grpc.NameResolverProvider' with 'com.microsoft.applicationinsights.core.dependencies.io.grpc.internal.DnsNameResolverProvider'
         provides 'java.sql.Driver' with 'org.postgresql.Driver'
         provides 'org.mariadb.jdbc.authentication.AuthenticationPlugin' with 'org.mariadb.jdbc.internal.com.send.authentication.CachingSha2PasswordPlugin',
                 'org.mariadb.jdbc.internal.com.send.authentication.ClearPasswordPlugin',
@@ -586,9 +591,7 @@ jlink {
                 'org.mariadb.jdbc.credential.env.EnvCredentialPlugin',
                 'org.mariadb.jdbc.credential.system.PropertiesCredentialPlugin'
         provides 'java.security.Provider' with 'org.bouncycastle.jce.provider.BouncyCastleProvider',
-                'org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider'
-        provides 'com.microsoft.applicationinsights.core.dependencies.io.grpc.ManagedChannelProvider' with 'com.microsoft.applicationinsights.core.dependencies.io.grpc.netty.shaded.io.grpc.netty.NettyChannelProvider'
-    }
+                'org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider'    }
 
     jpackage {
         outputDir = "distribution"
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index bc5a3b392d1..a8c68783372 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -6,9 +6,9 @@ repositories {
 }
 
 dependencies {
-    implementation 'com.h2database:h2-mvstore:2.1.210'
+    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-alpha6'
+    implementation 'org.slf4j:slf4j-api:2.0.0'
 }
 
 sourceSets{
@@ -18,3 +18,10 @@ sourceSets{
         }
     }
 }
+
+/**
+ * This is a workaround for Entry org/jabref/build/JournalAbbreviationConverter$_convert_closure1$_closure2.class is a duplicate but no duplicate handling strategy has been set.
+ *
+ * Source: https://github.com/gradle/gradle/issues/17236#issuecomment-923074298
+ */
+tasks.getByName("jar").setProperty("duplicatesStrategy", DuplicatesStrategy.EXCLUDE);
diff --git a/buildres/csl/csl-locales/.github/workflows/label-gun.yml b/buildres/csl/csl-locales/.github/workflows/label-gun.yml
new file mode 100644
index 00000000000..d4d022673f8
--- /dev/null
+++ b/buildres/csl/csl-locales/.github/workflows/label-gun.yml
@@ -0,0 +1,16 @@
+name: 'Automated tagging for PRs and issues'
+
+on:
+  issues:
+    types: [opened, edited, closed]
+  issue_comment:
+    types: [created, edited, closed]
+
+jobs:
+  label:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: retorquere/label-gun@main
+        with:
+          token: ${{ github.token }}
+          label.awaiting: "waiting-for-response-from-contributor"
diff --git a/buildres/csl/csl-locales/.github/workflows/merge.yaml b/buildres/csl/csl-locales/.github/workflows/merge.yaml
index 4c9a02df776..f52a6ba4110 100644
--- a/buildres/csl/csl-locales/.github/workflows/merge.yaml
+++ b/buildres/csl/csl-locales/.github/workflows/merge.yaml
@@ -19,9 +19,9 @@ jobs:
       GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
       DISTRIBUTION_UPDATER_TOKEN: "${{ secrets.DISTRIBUTION_UPDATER_TOKEN }}"
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       if: github.event_name == 'push'
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       if: github.event_name == 'workflow_dispatch'
       with:
         fetch-depth: 0
@@ -30,7 +30,7 @@ jobs:
       id: release
       run: echo ::set-output name=branch::v1.0.2
     - name: Checkout release branch
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         ref: ${{ steps.release.outputs.branch }}
         path: './release'
@@ -48,6 +48,10 @@ jobs:
             - deleted: [ '*.csl', 'dependent/*.csl', '*.xml' ]
           workflows:
             - added|modified: .github/workflows/*.yaml
+          updated_composer:
+            - added|modified: composer.json
+          deleted_composer:
+            - deleted: composer.json
 
     - name: Changed files
       if: github.event_name == 'push'
@@ -63,7 +67,7 @@ jobs:
         ruby-version: 3.0.2
     - name: but use cache to speed that up
       if: github.event_name == 'workflow_dispatch' || (github.event_name == 'push' && (steps.update.outputs.updated == 'true' || steps.update.outputs.deleted == 'true'))
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: vendor/bundle
         key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
@@ -87,11 +91,24 @@ jobs:
       run: cd release && git rm ${{ steps.update.outputs.deleted_files }}
       if: github.event_name == 'push' && steps.update.outputs.deleted == 'true'
 
+    - name: Update composer.json
+      if: steps.update.outputs.updated_composer == 'true'
+      run: |
+        cp composer.json release/composer.json
+        cd release
+        git add composer.json
+  
+    - name: Delete composer.json
+      if: steps.update.outputs.deleted_composer == 'true'
+      run: |
+        cd release
+        git rm composer.json
+    
     - uses: stefanzweifel/git-auto-commit-action@v4
       with:
         repository: 'release'
-        commit_message: Releasing ${{ steps.update.outputs.updated_files }} ${{ steps.update.outputs.deleted_files }}
-      if: github.event_name == 'push' && (steps.update.outputs.updated == 'true' || steps.update.outputs.deleted == 'true')
+        commit_message: Releasing ${{ steps.update.outputs.updated_files }} ${{ steps.update.outputs.deleted_files }} ${{ steps.update.outputs.updated_composer_files }} ${{ steps.update.outputs.deleted_composer_files }}
+      if: github.event_name == 'push' && (steps.update.outputs.updated == 'true' || steps.update.outputs.deleted == 'true' || steps.update.outputs.updated_composer == 'true' || steps.update.outputs.deleted_composer == 'true')
 
     - uses: stefanzweifel/git-auto-commit-action@v4
       with:
@@ -116,3 +133,21 @@ jobs:
         git-user: "csl-bot"
         git-user-email: github@citationstyles.org
         git-commit-message: copied ${{ steps.update.outputs.workflows_files }} from styles
+  
+    - name: Bump version and push tag
+      id: tag_version
+      uses: mathieudutour/github-tag-action@v6.0
+      with:
+        github_token: ${{ secrets.GITHUB_TOKEN }}
+        default_bump: patch
+      if: github.event_name == 'push' && hashFiles('composer.json') != '' && (steps.update.outputs.updated == 'true' || steps.update.outputs.deleted == 'true')
+  
+    - name: Create a GitHub release
+      uses: softprops/action-gh-release@v1
+      env:
+        github_token: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        tag_name: ${{ steps.tag_version.outputs.new_tag }}
+        name: Release ${{ steps.tag_version.outputs.new_tag }}
+        body: Released ${{ steps.update.outputs.updated_files }} ${{ steps.update.outputs.deleted_files }} ${{ steps.update.outputs.updated_composer_files }} ${{ steps.update.outputs.deleted_composer_files }}
+      if: github.event_name == 'push' && hashFiles('composer.json') != '' && (steps.update.outputs.updated == 'true' || steps.update.outputs.deleted == 'true')
diff --git a/buildres/csl/csl-locales/.github/workflows/sheldon.yaml b/buildres/csl/csl-locales/.github/workflows/sheldon.yaml
index 486e15c2f47..9bf525949f1 100644
--- a/buildres/csl/csl-locales/.github/workflows/sheldon.yaml
+++ b/buildres/csl/csl-locales/.github/workflows/sheldon.yaml
@@ -2,7 +2,7 @@ name: Pull request feedback
 
 on:
   pull_request_target:
-    types: [ opened, synchronize, labeled ]
+    types: [ opened, synchronize, workflow_dispatch]
 
 jobs:
   test:
@@ -15,17 +15,17 @@ jobs:
     # labels to a PR
     # https://securitylab.github.com/research/github-actions-preventing-pwn-requests
     - name: Checkout repo for OWNER TEST
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       if: contains(github.event.pull_request.labels.*.name, 'safe to test')
       with:
         ref: ${{ github.event.pull_request.head.ref }}
 
     # otherwise, checkout the current master, and the pr to the subdirectory 'pull-request'
     - name: Checkout base repo for pull-request test
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       if: "! contains(github.event.pull_request.labels.*.name, 'safe to test')"
     - name: Checkout pull-request
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       if: "! contains(github.event.pull_request.labels.*.name, 'safe to test')"
       with:
         repository: ${{ github.event.pull_request.head.repo.full_name }}
@@ -54,7 +54,7 @@ jobs:
       with:
         ruby-version: 3.0.2
     - name: but use cache to speed that up
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: vendor/bundle
         key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
diff --git a/buildres/csl/csl-locales/Gemfile.lock b/buildres/csl/csl-locales/Gemfile.lock
index 076ec8b24d3..a15585eddab 100644
--- a/buildres/csl/csl-locales/Gemfile.lock
+++ b/buildres/csl/csl-locales/Gemfile.lock
@@ -33,7 +33,7 @@ GEM
     csl-styles (2.0.0)
       csl (~> 2.0)
     diff-lcs (1.5.0)
-    diffy (3.4.0)
+    diffy (3.4.2)
     dotenv (2.7.6)
     erubis (2.7.0)
     faraday (1.8.0)
@@ -62,13 +62,13 @@ GEM
       ruby-progressbar (~> 1.4)
     git_diff (0.4.3)
     hashdiff (0.3.7)
-    mini_portile2 (2.6.1)
+    mini_portile2 (2.8.0)
     multipart-post (2.1.1)
     namae (1.1.1)
-    nokogiri (1.12.5)
-      mini_portile2 (~> 2.6.1)
+    nokogiri (1.13.4)
+      mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
-    nokogiri (1.12.5-x64-mingw32)
+    nokogiri (1.13.4-x64-mingw32)
       racc (~> 1.4)
     octokit (4.21.0)
       faraday (>= 0.9)
diff --git a/buildres/csl/csl-locales/locales-en-GB.xml b/buildres/csl/csl-locales/locales-en-GB.xml
index f364503b35c..d7fa0dee6aa 100644
--- a/buildres/csl/csl-locales/locales-en-GB.xml
+++ b/buildres/csl/csl-locales/locales-en-GB.xml
@@ -309,39 +309,39 @@
     </term>
 
     <!-- SHORT LOCATOR FORMS -->
-    <term name="appendix">			 
+    <term name="appendix" form="short">			 
       <single>app.</single>
       <multiple>apps.</multiple>						 
     </term>
-    <term name="article-locator">			 
+    <term name="article-locator" form="short">			 
       <single>art.</single>
       <multiple>arts.</multiple>
     </term>
-    <term name="elocation">
+    <term name="elocation" form="short">
       <single>loc.</single>
       <multiple>locs.</multiple>
     </term>
-    <term name="equation">			 
+    <term name="equation" form="short">			 
       <single>eq.</single>
       <multiple>eqs.</multiple>
     </term>
-    <term name="rule">			 
+    <term name="rule" form="short">			 
       <single>r.</single>
       <multiple>rr.</multiple>						 
     </term>
-    <term name="scene">			 
+    <term name="scene" form="short">			 
       <single>sc.</single>
       <multiple>scs.</multiple>						 
     </term>
-    <term name="table">			 
+    <term name="table" form="short">			 
       <single>tbl.</single>
       <multiple>tbls.</multiple>						 
     </term>
-    <term name="timestamp"> <!-- generally blank -->
+    <term name="timestamp" form="short"> <!-- generally blank -->
       <single></single>
       <multiple></multiple>						 
     </term>
-    <term name="title-locator">			 
+    <term name="title-locator" form="short">			 
       <single>tit.</single>
       <multiple>tits.</multiple>
     </term>
diff --git a/buildres/csl/csl-locales/locales-en-US.xml b/buildres/csl/csl-locales/locales-en-US.xml
index 83f31d12c80..9d6ab241e08 100644
--- a/buildres/csl/csl-locales/locales-en-US.xml
+++ b/buildres/csl/csl-locales/locales-en-US.xml
@@ -315,39 +315,39 @@
     </term>
 
     <!-- SHORT LOCATOR FORMS -->
-    <term name="appendix">			 
+    <term name="appendix" form="short">			 
       <single>app.</single>
       <multiple>apps.</multiple>						 
     </term>
-    <term name="article-locator">			 
+    <term name="article-locator" form="short">			 
       <single>art.</single>
       <multiple>arts.</multiple>
     </term>
-    <term name="elocation">			 
+    <term name="elocation" form="short">			 
       <single>loc.</single>
       <multiple>locs.</multiple>
     </term>
-    <term name="equation">			 
+    <term name="equation" form="short">			 
       <single>eq.</single>
       <multiple>eqs.</multiple>
     </term>
-    <term name="rule">			 
+    <term name="rule" form="short">			 
       <single>r.</single>
       <multiple>rr.</multiple>						 
     </term>
-    <term name="scene">			 
+    <term name="scene" form="short">			 
       <single>sc.</single>
       <multiple>scs.</multiple>						 
     </term>
-    <term name="table">			 
+    <term name="table" form="short">			 
       <single>tbl.</single>
       <multiple>tbls.</multiple>						 
     </term>
-    <term name="timestamp"> <!-- generally blank -->
+    <term name="timestamp" form="short"> <!-- generally blank -->
       <single></single>
       <multiple></multiple>						 
     </term>
-    <term name="title-locator">			 
+    <term name="title-locator" form="short">			 
       <single>tit.</single>
       <multiple>tits.</multiple>
     </term>
diff --git a/buildres/csl/csl-locales/locales-fr-FR.xml b/buildres/csl/csl-locales/locales-fr-FR.xml
index 72fd4b0bd5d..173dc8654f4 100644
--- a/buildres/csl/csl-locales/locales-fr-FR.xml
+++ b/buildres/csl/csl-locales/locales-fr-FR.xml
@@ -4,6 +4,9 @@
     <translator>
       <name>Grégoire Colly</name>
     </translator>
+    <translator>
+      <name>Collectif Zotero francophone</name>
+    </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>
   </info>
@@ -19,33 +22,33 @@
     <date-part name="year"/>
   </date>
   <terms>
-    <term name="advance-online-publication">advance online publication</term>
+    <term name="advance-online-publication">publication en ligne anticipée</term>
     <term name="album">album</term>
-    <term name="audio-recording">audio recording</term>
+    <term name="audio-recording">enregistrement audio</term>
     <term name="film">film</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="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="henceforth">désormais</term>
+    <term name="loc-cit">loc.&#160;cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
+    <term name="no-place">sans lieu</term>
+    <term name="no-place" form="short">s.&#160;l.</term>
+    <term name="no-publisher">sans nom</term> <!-- sine nomine -->
+    <term name="no-publisher" form="short">s.&#160;n.</term>
+    <term name="on">sur</term>
+    <term name="op-cit">op.&#160;cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
+    <term name="original-work-published">édition originale</term>
     <term name="personal-communication">communication personnelle</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="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="video">video</term>
-    <term name="working-paper">working paper</term>
+    <term name="podcast-episode">épisode de podcast</term>
+    <term name="preprint">prépublication</term>
+    <term name="radio-broadcast">émission de radio</term>
+    <term name="radio-series">série radiophonique</term>
+    <term name="radio-series-episode">épisode de série radiophonique</term>
+    <term name="special-issue">numéro spécial</term>
+    <term name="special-section">section spéciale</term>
+    <term name="television-broadcast">émission de télévision</term>
+    <term name="television-series">série télévisée</term>
+    <term name="television-series-episode">épisode de série télévisée</term>
+    <term name="video">vidéo</term>
+    <term name="working-paper">document de travail</term>
     <term name="accessed">consulté le</term>
     <term name="and">et</term>
     <term name="and others">et autres</term>
@@ -88,74 +91,74 @@
     <term name="version">version</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="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="article">article</term>
+    <term name="article-journal">article de revue</term>
+    <term name="article-magazine">article de magazine</term>
+    <term name="article-newspaper">article de presse</term>
+    <term name="bill">projet de loi</term>
+    <term name="book">livre</term>
+    <term name="broadcast">émission</term>
+    <term name="chapter">chapitre de livre</term>
+    <term name="classic">classique</term>
     <term name="collection">collection</term>
-    <term name="dataset">dataset</term>
+    <term name="dataset">jeu de données</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="entry">entrée</term>
+    <term name="entry-dictionary">entrée de dictionnaire</term>
+    <term name="entry-encyclopedia">entrée d'encyclopédie</term>
+    <term name="event">événement</term>
     <!-- figure is in the list of locator terms -->
-    <term name="graphic">graphic</term>
-    <term name="hearing">hearing</term>
+    <term name="graphic">image</term>
+    <term name="hearing">audience</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="legal_case">affaire</term>
+    <term name="legislation">acte juridique</term>
+    <term name="manuscript">manuscrit</term>
+    <term name="map">carte</term>
+    <term name="motion_picture">enregistrement vidéo</term>
+    <term name="musical_score">partition</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="paper-conference">article de colloque</term>
+    <term name="patent">brevet</term>
+    <term name="performance">interprétation</term>
+    <term name="periodical">périodique</term>
     <term name="personal_communication">communication personnelle</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="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="webpage">webpage</term>
+    <term name="post">billet</term>
+    <term name="post-weblog">billet de blog</term>
+    <term name="regulation">règlement</term>
+    <term name="report">rapport</term>
+    <term name="review">recension</term>
+    <term name="review-book">recension de livre</term>
+    <term name="software">logiciel</term>
+    <term name="song">chanson</term>
+    <term name="speech">présentation</term>
+    <term name="standard">norme</term>
+    <term name="thesis">thèse</term>
+    <term name="treaty">traité</term>
+    <term name="webpage">page 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. de revue</term>
+    <term name="article-magazine" form="short">art. de mag.</term>
+    <term name="article-newspaper" form="short">art. de presse</term>
+    <term name="book" form="short">liv.</term>
+    <term name="chapter" form="short">chap. de liv.</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="manuscript" form="short">MS</term>
-    <term name="motion_picture" form="short">video rec.</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="manuscript" form="short">ms</term>
+    <term name="motion_picture" form="short">enr. vidéo</term>
+    <term name="report" form="short">rap.</term>
+    <term name="review" form="short">recens.</term>
+    <term name="review-book" form="short">recens. de liv.</term>
+    <term name="song" form="short">enr. audio</term>
 
     <!-- HISTORICAL ERA TERMS -->
     <term name="ad">apr. J.-C.</term>
     <term name="bc">av. J.-C.</term>
-    <term name="bce">BCE</term>
-    <term name="ce">CE</term>
+    <term name="bce">av. n. è.</term>
+    <term name="ce">n. è.</term>
 
     <!-- PUNCTUATION -->
     <term name="open-quote">«&#160;</term>
@@ -163,15 +166,15 @@
     <term name="open-inner-quote">“</term>
     <term name="close-inner-quote">”</term>
     <term name="page-range-delimiter">&#8209;</term> <!-- non-breaking hyphen -->
-    <term name="colon">:</term>
+    <term name="colon">&#160;:</term>
     <term name="comma">,</term>
-    <term name="semicolon">;</term>
+    <term name="semicolon">&#160;;</term>
 
     <!-- ORDINALS -->
     <term name="ordinal">ᵉ</term>
     <term name="ordinal-01" gender-form="feminine" match="whole-number">ʳᵉ</term>
     <term name="ordinal-01" gender-form="masculine" match="whole-number">ᵉʳ</term>
-    
+
     <!-- LONG ORDINALS -->
     <term name="long-ordinal-01">premier</term>
     <term name="long-ordinal-02">deuxième</term>
@@ -185,49 +188,49 @@
     <term name="long-ordinal-10">dixième</term>
 
     <!-- LONG LOCATOR FORMS -->
-    <term name="act">			 
-      <single>act</single>
-      <multiple>acts</multiple>						 
+    <term name="act">
+      <single>acte</single>
+      <multiple>actes</multiple>
     </term>
-    <term name="appendix">			 
-      <single>appendix</single>
-      <multiple>appendices</multiple>						 
+    <term name="appendix">
+      <single>appendice</single>
+      <multiple>appendices</multiple>
     </term>
-    <term name="article-locator">			 
+    <term name="article-locator">
       <single>article</single>
-      <multiple>articles</multiple>						 
+      <multiple>articles</multiple>
     </term>
-    <term name="canon">			 
+    <term name="canon">
       <single>canon</single>
-      <multiple>canons</multiple>						 
+      <multiple>canons</multiple>
     </term>
-    <term name="elocation">			 
-      <single>location</single>
-      <multiple>locations</multiple>						 
+    <term name="elocation">
+      <single>emplacement</single>
+      <multiple>emplacements</multiple>
     </term>
-    <term name="equation">			 
-      <single>equation</single>
-      <multiple>equations</multiple>						 
+    <term name="equation">
+      <single>équation</single>
+      <multiple>équations</multiple>
     </term>
-    <term name="rule">			 
-      <single>rule</single>
-      <multiple>rules</multiple>						 
+    <term name="rule">
+      <single>règle</single>
+      <multiple>règles</multiple>
     </term>
-    <term name="scene">			 
-      <single>scene</single>
-      <multiple>scenes</multiple>						 
+    <term name="scene">
+      <single>scène</single>
+      <multiple>scènes</multiple>
     </term>
-    <term name="table">			 
-      <single>table</single>
-      <multiple>tables</multiple>						 
+    <term name="table">
+      <single>tableau</single>
+      <multiple>tableaux</multiple>
     </term>
     <term name="timestamp"> <!-- generally blank -->
       <single></single>
-      <multiple></multiple>						 
+      <multiple></multiple>
     </term>
-    <term name="title-locator">			 
-      <single>title</single>
-      <multiple>titles</multiple>						 
+    <term name="title-locator">
+      <single>titre</single>
+      <multiple>titres</multiple>
     </term>
     <term name="book">
       <single>livre</single>
@@ -299,41 +302,41 @@
     </term>
 
     <!-- SHORT LOCATOR FORMS -->
-    <term name="appendix">			 
-      <single>app.</single>
-      <multiple>apps.</multiple>						 
+    <term name="appendix">
+      <single>append.</single>
+      <multiple>append.</multiple>
     </term>
-    <term name="article-locator">			 
+    <term name="article-locator">
       <single>art.</single>
-      <multiple>arts.</multiple>
+      <multiple>art.</multiple>
     </term>
-    <term name="elocation">			 
-      <single>loc.</single>
-      <multiple>locs.</multiple>
+    <term name="elocation">
+      <single>emplact</single>
+      <multiple>emplact</multiple>
     </term>
-    <term name="equation">			 
+    <term name="equation">
       <single>eq.</single>
-      <multiple>eqs.</multiple>
+      <multiple>eq.</multiple>
     </term>
-    <term name="rule">			 
-      <single>r.</single>
-      <multiple>rr.</multiple>						 
+    <term name="rule">
+      <single>règle</single>
+      <multiple>règles</multiple>
     </term>
-    <term name="scene">			 
+    <term name="scene">
       <single>sc.</single>
-      <multiple>scs.</multiple>						 
+      <multiple>sc.</multiple>
     </term>
-    <term name="table">			 
-      <single>tbl.</single>
-      <multiple>tbls.</multiple>						 
+    <term name="table">
+      <single>tab.</single>
+      <multiple>tab.</multiple>
     </term>
     <term name="timestamp"> <!-- generally blank -->
       <single></single>
-      <multiple></multiple>						 
+      <multiple></multiple>
     </term>
-    <term name="title-locator">			 
+    <term name="title-locator">
       <single>tit.</single>
-      <multiple>tits.</multiple>
+      <multiple>tit.</multiple>
     </term>
     <term name="book" form="short">liv.</term>
     <term name="chapter" form="short">chap.</term>
@@ -386,56 +389,56 @@
 
     <!-- LONG ROLE FORMS -->
     <term name="chair">
-      <single>chair</single>
-      <multiple>chairs</multiple>
+      <single>président</single>
+      <multiple>présidents</multiple>
     </term>
     <term name="compiler">
-      <single>compiler</single>
-      <multiple>compilers</multiple>
+      <single>compilateur</single>
+      <multiple>compilateurs</multiple>
     </term>
     <term name="contributor">
-      <single>contributor</single>
-      <multiple>contributors</multiple>
+      <single>contributeur</single>
+      <multiple>contributeurs</multiple>
     </term>
     <term name="curator">
-      <single>curator</single>
-      <multiple>curators</multiple>
+      <single>commissaire</single>
+      <multiple>commissaires</multiple>
     </term>
     <term name="executive-producer">
-      <single>executive producer</single>
-      <multiple>executive producers</multiple>
+      <single>producteur exécutif</single>
+      <multiple>producteurs exécutifs</multiple>
     </term>
     <term name="guest">
-      <single>guest</single>
-      <multiple>guests</multiple>
+      <single>invité</single>
+      <multiple>invités</multiple>
     </term>
     <term name="host">
-      <single>host</single>
-      <multiple>hosts</multiple>
+      <single>hôte</single>
+      <multiple>hôtes</multiple>
     </term>
     <term name="narrator">
-      <single>narrator</single>
-      <multiple>narrators</multiple>
+      <single>narrateur</single>
+      <multiple>narrateurs</multiple>
     </term>
     <term name="organizer">
-      <single>organizer</single>
-      <multiple>organizers</multiple>
+      <single>organisateur</single>
+      <multiple>organisateurs</multiple>
     </term>
     <term name="performer">
-      <single>performer</single>
-      <multiple>performers</multiple>
+      <single>interprète</single>
+      <multiple>interprètes</multiple>
     </term>
     <term name="producer">
-      <single>producer</single>
-      <multiple>producers</multiple>
+      <single>producteur</single>
+      <multiple>producteurs</multiple>
     </term>
     <term name="script-writer">
-      <single>writer</single>
-      <multiple>writers</multiple>
+      <single>scénariste</single>
+      <multiple>scénaristes</multiple>
     </term>
     <term name="series-creator">
-      <single>series creator</single>
-      <multiple>series creators</multiple>
+      <single>créateur de série</single>
+      <multiple>créateurs de série</multiple>
     </term>
     <term name="director">
       <single>réalisateur</single>
@@ -464,44 +467,44 @@
 
     <!-- SHORT ROLE FORMS -->
     <term name="compiler" form="short">
-      <single>comp.</single>
-      <multiple>comps.</multiple>
+      <single>compil.</single>
+      <multiple>compil.</multiple>
     </term>
     <term name="contributor" form="short">
       <single>contrib.</single>
-      <multiple>contribs.</multiple>
+      <multiple>contrib.</multiple>
     </term>
     <term name="curator" form="short">
-      <single>cur.</single>
-      <multiple>curs.</multiple>
+      <single>commiss.</single>
+      <multiple>commiss.</multiple>
     </term>
     <term name="executive-producer" form="short">
-      <single>exec. prod.</single>
-      <multiple>exec. prods.</multiple>
+      <single>prod. exé.</single>
+      <multiple>prod. exé.</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>interpr.</single>
+      <multiple>interpr.</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>scénar.</single>
+      <multiple>scénar.</multiple>
     </term>
     <term name="series-creator" form="short">
-      <single>cre.</single>
-      <multiple>cres.</multiple>
+      <single>créat.</single>
+      <multiple>créat.</multiple>
     </term>
     <term name="director" form="short">
       <single>réal.</single>
@@ -529,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="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">présidé par</term>
+    <term name="compiler" form="verb">compilé par</term>
+    <term name="contributor" form="verb">avec</term>
+    <term name="curator" form="verb">organisé par</term>
+    <term name="executive-producer" form="verb">production exécutive par</term>
+    <term name="guest" form="verb">avec pour invité</term>
+    <term name="host" form="verb">animé par</term>
+    <term name="narrator" form="verb">lu par</term>
+    <term name="organizer" form="verb">organisé par</term>
+    <term name="performer" form="verb">interprété par</term>
+    <term name="producer" form="verb">produit par</term>
+    <term name="script-writer" form="verb">scénario de</term>
+    <term name="series-creator" form="verb">créé par</term>
     <term name="container-author" form="verb">par</term>
     <term name="director" form="verb">réalisé par</term>
     <term name="editor" form="verb">édité par</term>
@@ -554,18 +557,18 @@
     <term name="editortranslator" form="verb">édité et traduit par</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">compil. par</term>
+    <term name="contributor" form="verb-short">ac</term>
+    <term name="curator" form="verb-short">org. par</term>
+    <term name="executive-producer" form="verb-short">prod. exé. par</term>
+    <term name="guest" form="verb-short">ac pr inv.</term>
+    <term name="host" form="verb-short">anim. par</term>
+    <term name="narrator" form="verb-short">lu par</term>
+    <term name="organizer" form="verb-short">org. par</term>
+    <term name="performer" form="verb-short">interpr. par</term>
+    <term name="producer" form="verb-short">prod. par</term>
+    <term name="script-writer" form="verb-short">scénar. de</term>
+    <term name="series-creator" form="verb-short">créé par</term>
     <term name="director" form="verb-short">réal. par</term>
     <term name="editor" form="verb-short">éd. par</term>
     <term name="editorial-director" form="verb-short">ss la dir. de</term>
diff --git a/buildres/csl/csl-styles/.github/dependabot.yml b/buildres/csl/csl-styles/.github/dependabot.yml
new file mode 100644
index 00000000000..5ace4600a1f
--- /dev/null
+++ b/buildres/csl/csl-styles/.github/dependabot.yml
@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
diff --git a/buildres/csl/csl-styles/.github/workflows/label-gun.yml b/buildres/csl/csl-styles/.github/workflows/label-gun.yml
new file mode 100644
index 00000000000..d4d022673f8
--- /dev/null
+++ b/buildres/csl/csl-styles/.github/workflows/label-gun.yml
@@ -0,0 +1,16 @@
+name: 'Automated tagging for PRs and issues'
+
+on:
+  issues:
+    types: [opened, edited, closed]
+  issue_comment:
+    types: [created, edited, closed]
+
+jobs:
+  label:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: retorquere/label-gun@main
+        with:
+          token: ${{ github.token }}
+          label.awaiting: "waiting-for-response-from-contributor"
diff --git a/buildres/csl/csl-styles/.github/workflows/merge.yaml b/buildres/csl/csl-styles/.github/workflows/merge.yaml
index 4c9a02df776..f52a6ba4110 100644
--- a/buildres/csl/csl-styles/.github/workflows/merge.yaml
+++ b/buildres/csl/csl-styles/.github/workflows/merge.yaml
@@ -19,9 +19,9 @@ jobs:
       GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
       DISTRIBUTION_UPDATER_TOKEN: "${{ secrets.DISTRIBUTION_UPDATER_TOKEN }}"
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       if: github.event_name == 'push'
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       if: github.event_name == 'workflow_dispatch'
       with:
         fetch-depth: 0
@@ -30,7 +30,7 @@ jobs:
       id: release
       run: echo ::set-output name=branch::v1.0.2
     - name: Checkout release branch
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         ref: ${{ steps.release.outputs.branch }}
         path: './release'
@@ -48,6 +48,10 @@ jobs:
             - deleted: [ '*.csl', 'dependent/*.csl', '*.xml' ]
           workflows:
             - added|modified: .github/workflows/*.yaml
+          updated_composer:
+            - added|modified: composer.json
+          deleted_composer:
+            - deleted: composer.json
 
     - name: Changed files
       if: github.event_name == 'push'
@@ -63,7 +67,7 @@ jobs:
         ruby-version: 3.0.2
     - name: but use cache to speed that up
       if: github.event_name == 'workflow_dispatch' || (github.event_name == 'push' && (steps.update.outputs.updated == 'true' || steps.update.outputs.deleted == 'true'))
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: vendor/bundle
         key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
@@ -87,11 +91,24 @@ jobs:
       run: cd release && git rm ${{ steps.update.outputs.deleted_files }}
       if: github.event_name == 'push' && steps.update.outputs.deleted == 'true'
 
+    - name: Update composer.json
+      if: steps.update.outputs.updated_composer == 'true'
+      run: |
+        cp composer.json release/composer.json
+        cd release
+        git add composer.json
+  
+    - name: Delete composer.json
+      if: steps.update.outputs.deleted_composer == 'true'
+      run: |
+        cd release
+        git rm composer.json
+    
     - uses: stefanzweifel/git-auto-commit-action@v4
       with:
         repository: 'release'
-        commit_message: Releasing ${{ steps.update.outputs.updated_files }} ${{ steps.update.outputs.deleted_files }}
-      if: github.event_name == 'push' && (steps.update.outputs.updated == 'true' || steps.update.outputs.deleted == 'true')
+        commit_message: Releasing ${{ steps.update.outputs.updated_files }} ${{ steps.update.outputs.deleted_files }} ${{ steps.update.outputs.updated_composer_files }} ${{ steps.update.outputs.deleted_composer_files }}
+      if: github.event_name == 'push' && (steps.update.outputs.updated == 'true' || steps.update.outputs.deleted == 'true' || steps.update.outputs.updated_composer == 'true' || steps.update.outputs.deleted_composer == 'true')
 
     - uses: stefanzweifel/git-auto-commit-action@v4
       with:
@@ -116,3 +133,21 @@ jobs:
         git-user: "csl-bot"
         git-user-email: github@citationstyles.org
         git-commit-message: copied ${{ steps.update.outputs.workflows_files }} from styles
+  
+    - name: Bump version and push tag
+      id: tag_version
+      uses: mathieudutour/github-tag-action@v6.0
+      with:
+        github_token: ${{ secrets.GITHUB_TOKEN }}
+        default_bump: patch
+      if: github.event_name == 'push' && hashFiles('composer.json') != '' && (steps.update.outputs.updated == 'true' || steps.update.outputs.deleted == 'true')
+  
+    - name: Create a GitHub release
+      uses: softprops/action-gh-release@v1
+      env:
+        github_token: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        tag_name: ${{ steps.tag_version.outputs.new_tag }}
+        name: Release ${{ steps.tag_version.outputs.new_tag }}
+        body: Released ${{ steps.update.outputs.updated_files }} ${{ steps.update.outputs.deleted_files }} ${{ steps.update.outputs.updated_composer_files }} ${{ steps.update.outputs.deleted_composer_files }}
+      if: github.event_name == 'push' && hashFiles('composer.json') != '' && (steps.update.outputs.updated == 'true' || steps.update.outputs.deleted == 'true')
diff --git a/buildres/csl/csl-styles/.github/workflows/sheldon.yaml b/buildres/csl/csl-styles/.github/workflows/sheldon.yaml
index 486e15c2f47..9bf525949f1 100644
--- a/buildres/csl/csl-styles/.github/workflows/sheldon.yaml
+++ b/buildres/csl/csl-styles/.github/workflows/sheldon.yaml
@@ -2,7 +2,7 @@ name: Pull request feedback
 
 on:
   pull_request_target:
-    types: [ opened, synchronize, labeled ]
+    types: [ opened, synchronize, workflow_dispatch]
 
 jobs:
   test:
@@ -15,17 +15,17 @@ jobs:
     # labels to a PR
     # https://securitylab.github.com/research/github-actions-preventing-pwn-requests
     - name: Checkout repo for OWNER TEST
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       if: contains(github.event.pull_request.labels.*.name, 'safe to test')
       with:
         ref: ${{ github.event.pull_request.head.ref }}
 
     # otherwise, checkout the current master, and the pr to the subdirectory 'pull-request'
     - name: Checkout base repo for pull-request test
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       if: "! contains(github.event.pull_request.labels.*.name, 'safe to test')"
     - name: Checkout pull-request
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       if: "! contains(github.event.pull_request.labels.*.name, 'safe to test')"
       with:
         repository: ${{ github.event.pull_request.head.repo.full_name }}
@@ -54,7 +54,7 @@ jobs:
       with:
         ruby-version: 3.0.2
     - name: but use cache to speed that up
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: vendor/bundle
         key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
diff --git a/buildres/csl/csl-styles/Gemfile.lock b/buildres/csl/csl-styles/Gemfile.lock
index 076ec8b24d3..dde35577b7f 100644
--- a/buildres/csl/csl-styles/Gemfile.lock
+++ b/buildres/csl/csl-styles/Gemfile.lock
@@ -33,7 +33,7 @@ GEM
     csl-styles (2.0.0)
       csl (~> 2.0)
     diff-lcs (1.5.0)
-    diffy (3.4.0)
+    diffy (3.4.2)
     dotenv (2.7.6)
     erubis (2.7.0)
     faraday (1.8.0)
@@ -62,13 +62,13 @@ GEM
       ruby-progressbar (~> 1.4)
     git_diff (0.4.3)
     hashdiff (0.3.7)
-    mini_portile2 (2.6.1)
+    mini_portile2 (2.8.0)
     multipart-post (2.1.1)
     namae (1.1.1)
-    nokogiri (1.12.5)
-      mini_portile2 (~> 2.6.1)
+    nokogiri (1.13.6)
+      mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
-    nokogiri (1.12.5-x64-mingw32)
+    nokogiri (1.13.6-x64-mingw32)
       racc (~> 1.4)
     octokit (4.21.0)
       faraday (>= 0.9)
diff --git a/buildres/csl/csl-styles/acta-physica-sinica.csl b/buildres/csl/csl-styles/acta-physica-sinica.csl
new file mode 100644
index 00000000000..23b4ded2146
--- /dev/null
+++ b/buildres/csl/csl-styles/acta-physica-sinica.csl
@@ -0,0 +1,446 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" class="in-text" names-delimiter=". " name-as-sort-order="all" sort-separator=" " demote-non-dropping-particle="never" initialize-with=" " initialize-with-hyphen="false" page-range-format="expanded" default-locale="zh-CN">
+  <info>
+    <title>Acta Physica Sinica (物理学报)</title>
+    <!-- Zotero仓库版-->
+    <id>http://www.zotero.org/styles/acta-physica-sinica</id>
+    <link href="http://www.zotero.org/styles/acta-physica-sinica" rel="self"/>
+    <link href="http://www.zotero.org/styles/china-national-standard-gb-t-7714-2015-numeric" rel="template"/>
+    <link href="https://wulixb.iphy.ac.cn/news/tougaoxuzhi.htm" rel="documentation"/>
+    <author>
+      <name>牛耕田</name>
+      <email>buffalo_d@163.com</email>
+    </author>
+    <contributor>
+      <name>Zeping Lee</name>
+      <email>zepinglee@gmail.com</email>
+    </contributor>
+    <contributor>
+      <name>韩小土</name>
+      <email>redleafnew@163.com</email>
+    </contributor>
+    <category citation-format="numeric"/>
+    <category field="generic-base"/>
+    <summary>The Chinese GB/T 7714-2015 numeric style</summary>
+    <updated>2022-04-06T20:34: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">
+    <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="edition" 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>
+      <term name="translator" form="short"/>
+    </terms>
+  </locale>
+  <locale>
+    <date form="numeric">
+      <date-part name="year" range-delimiter="/"/>
+      <date-part name="month" form="numeric-leading-zeros" prefix="-" range-delimiter="/"/>
+      <date-part name="day" form="numeric-leading-zeros" prefix="-" range-delimiter="/"/>
+    </date>
+    <terms>
+      <term name="page-range-delimiter">&#8211;</term>
+      <!-- 页码间隔为"&#8211;" -->
+    </terms>
+  </locale>
+  <!-- 引用日期 -->
+  <macro name="accessed-date">
+    <date variable="accessed" form="numeric" prefix="[" suffix="]"/>
+  </macro>
+  <!-- 主要责任者 -->
+  <macro name="author">
+    <names variable="author">
+      <name>
+        <name-part name="family"/>
+        <name-part name="given"/>
+      </name>
+      <substitute>
+        <names variable="composer"/>
+        <names variable="illustrator"/>
+        <names variable="director"/>
+        <choose>
+          <if variable="container-title" match="none">
+            <names variable="editor"/>
+          </if>
+        </choose>
+      </substitute>
+    </names>
+  </macro>
+  <!-- 书籍的卷号（“第 x 卷”或“第 x 册”） -->
+  <macro name="book-volume">
+    <choose>
+      <if type="article article-journal article-magazine article-newspaper periodical" match="none">
+        <choose>
+          <if is-numeric="volume">
+            <group delimiter=" ">
+              <label variable="volume" form="short" text-case="capitalize-first"/>
+              <text variable="volume"/>
+            </group>
+          </if>
+          <else>
+            <text variable="volume"/>
+          </else>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <!-- 专著题名 -->
+  <macro name="container-title">
+    <group delimiter=", ">
+      <group delimiter=": ">
+        <choose>
+          <if variable="container-title">
+            <text variable="container-title" font-style="italic" form="short"/>
+          </if>
+          <else>
+            <text variable="event"/>
+          </else>
+        </choose>
+        <text macro="book-volume"/>
+      </group>
+      <choose>
+        <if variable="event-date">
+          <date variable="event-date" form="text"/>
+          <text variable="event-place"/>
+        </if>
+      </choose>
+    </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"/>
+      </else>
+    </choose>
+  </macro>
+  <!-- 电子资源的更新或修改日期 -->
+  <macro name="issued-date">
+    <date variable="issued" form="numeric"/>
+  </macro>
+  <!-- 出版年 -->
+  <macro name="issued-year">
+    <choose>
+      <if is-uncertain-date="issued">
+        <date variable="issued" prefix="[" suffix="]">
+          <date-part name="year" range-delimiter="-"/>
+        </date>
+      </if>
+      <else>
+        <date variable="issued">
+          <date-part name="year" range-delimiter="-"/>
+        </date>
+      </else>
+    </choose>
+  </macro>
+  <!-- 专著的出版项 -->
+  <macro name="publishing">
+    <group delimiter=": ">
+      <group delimiter=", ">
+        <group delimiter=": ">
+          <text variable="publisher-place"/>
+          <text variable="publisher"/>
+        </group>
+      </group>
+      <text variable="page"/>
+    </group>
+    <choose>
+      <!-- 纯电子资源显示“更新或修改日期” -->
+      <if variable="publisher page" type="book chapter paper-conference thesis" match="none">
+        <choose>
+          <if variable="URL DOI" match="any">
+            <text macro="issued-date" prefix="(" suffix=")"/>
+          </if>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <!-- 其他责任者 -->
+  <macro name="secondary-contributor">
+    <names variable="translator">
+      <name>
+        <name-part name="family" text-case="uppercase"/>
+        <name-part name="given"/>
+      </name>
+      <label form="short" prefix=", "/>
+    </names>
+  </macro>
+  <!-- 连续出版物中的析出文献的出处项（年、卷、期等信息） -->
+  <macro name="periodical-publishing">
+    <group delimiter=" ">
+      <text macro="issued-year"/>
+      <text macro="container-title" text-case="title"/>
+      <choose>
+        <if type="article-newspaper">
+          <text macro="issued-date"/>
+        </if>
+      </choose>
+      <text variable="volume" font-weight="bold"/>
+      <text variable="page-first"/>
+      <!-- 只显示首页 如果显示范围为page -->
+    </group>
+  </macro>
+  <!-- 连续出版物的年卷期 -->
+  <macro name="year-volume-issue">
+    <group>
+      <group delimiter=", ">
+        <text macro="issued-year"/>
+        <text variable="volume"/>
+      </group>
+      <text variable="issue" prefix="(" suffix=")"/>
+    </group>
+  </macro>
+  <!-- 专著、译著 -->
+  <macro name="monograph-layout">
+    <!-- 如果是中文，在original-title有内容，添加original-title中的内容，即翻译的英文格式 -->
+    <choose>
+      <if variable="original-title">
+        <text variable="original-title" suffix=" (in Chinese)"/>
+        <group delimiter=" " prefix=" [" suffix="]">
+          <!-- 如果是中文，在original-title有内容，添加original-title中的内容，即翻译的英文格式 -->
+          <choose>
+            <if variable="translator">
+              <text macro="author" suffix="著"/>
+              <text macro="secondary-contributor" prefix="(" suffix="译)"/>
+            </if>
+            <else>
+              <text macro="author"/>
+              <text macro="secondary-contributor"/>
+            </else>
+          </choose>
+          <text macro="issued-year"/>
+          <text variable="title"/>
+          <text macro="edition"/>
+          <text macro="publishing" prefix="(" suffix=")"/>
+          <choose>
+            <!-- 如果有页码则显示 -->
+            <if variable="number-of-pages">
+              <text variable="number-of-pages" prefix="第" suffix="页"/>
+            </if>
+          </choose>
+        </group>
+      </if>
+      <else>
+        <!-- 如果是原版书籍 -->
+        <group delimiter=" ">
+          <text macro="author"/>
+          <text macro="secondary-contributor"/>
+          <text macro="issued-year"/>
+          <text variable="title"/>
+          <text macro="edition"/>
+          <text macro="publishing" prefix="(" suffix=")"/>
+          <choose>
+            <!-- 如果有页码则显示 -->
+            <if variable="number-of-pages">
+              <text variable="number-of-pages" prefix="pp"/>
+            </if>
+          </choose>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <!-- 学位论文 -->
+  <macro name="thesis-layout">
+    <!-- 如果是中文，在original-title有内容，添加original-title中的内容，即翻译的英文格式 -->
+    <choose>
+      <if variable="original-title">
+        <text variable="original-title" suffix=" (in Chinese)"/>
+        <group delimiter=" " prefix=" [" suffix="]">
+          <text macro="author"/>
+          <text macro="issued-year"/>
+          <text variable="genre" suffix="学位论文"/>
+          <text macro="publishing" prefix="(" suffix=")"/>
+        </group>
+      </if>
+      <else>
+        <!-- 如果是原版论文 -->
+        <group delimiter=" ">
+          <text macro="author"/>
+          <text macro="issued-year"/>
+          <text variable="genre" suffix="学位论文"/>
+          <text macro="publishing" prefix="(" suffix=")"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <!-- 会议论文 -->
+  <macro name="paper-conference-layout">
+    <!-- 如果是中文，在original-title有内容，添加original-title中的内容，即翻译的英文格式 -->
+    <choose>
+      <if variable="original-title">
+        <text variable="original-title" suffix=" (in Chinese)"/>
+        <group delimiter=" " prefix=" [" suffix="]">
+          <text macro="author"/>
+          <text macro="issued-year"/>
+          <choose>
+            <if variable="container-title">
+              <text variable="container-title" form="short"/>
+            </if>
+          </choose>
+          <text variable="event-place" suffix=","/>
+          <text macro="issued-date"/>
+          <choose>
+            <!-- 如果有页码则显示 -->
+            <if variable="page">
+              <text variable="page" prefix="第" suffix="页"/>
+            </if>
+          </choose>
+        </group>
+      </if>
+      <else>
+        <!-- 如果是原版会议论文 -->
+        <group delimiter=" ">
+          <text macro="author"/>
+          <text macro="issued-year"/>
+          <choose>
+            <if variable="container-title">
+              <text variable="container-title" form="short"/>
+            </if>
+          </choose>
+          <text variable="event-place"/>
+          <text macro="issued-date" prefix=", "/>
+          <choose>
+            <!-- 如果有页码则显示 -->
+            <if variable="page">
+              <text variable="page" prefix="pp"/>
+            </if>
+          </choose>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <!-- 连续出版物 -->
+  <macro name="serial-layout">
+    <group delimiter=". " suffix="">
+      <text macro="author"/>
+      <text macro="year-volume-issue"/>
+      <text macro="publishing"/>
+    </group>
+  </macro>
+  <!-- 连续出版物中的析出文献 -->
+  <macro name="article-in-periodical-layout">
+    <!-- 如果是中文，在original-title有内容，添加original-title中的内容，即翻译的英文格式 -->
+    <choose>
+      <if variable="original-title">
+        <text variable="original-title" suffix=" (in Chinese)"/>
+        <group delimiter=" " prefix=" [" suffix="]">
+          <text macro="author"/>
+          <text macro="periodical-publishing"/>
+        </group>
+      </if>
+      <else>
+        <!-- 如果是原版论文 -->
+        <group delimiter=" ">
+          <text macro="author"/>
+          <text macro="periodical-publishing"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <!-- 网页 -->
+  <macro name="webpage-layout">
+    <!-- 如果是中文，在original-title有内容，添加original-title中的内容，即翻译的英文格式 -->
+    <choose>
+      <if variable="original-title">
+        <text variable="original-title" suffix=" (in Chinese)"/>
+        <group delimiter=" " prefix=" [" suffix="]">
+          <text variable="title"/>
+          <text macro="author"/>
+          <text variable="URL"/>
+          <text macro="accessed-date"/>
+        </group>
+      </if>
+      <else>
+        <!-- 英文网页 -->
+        <group delimiter=" " suffix="">
+          <text variable="title"/>
+          <text macro="author"/>
+          <text variable="URL"/>
+          <text macro="accessed-date"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <!-- 专利文献 -->
+  <macro name="patent-layout">
+    <!-- 如果是中文，在original-title有内容，添加original-title中的内容，即翻译的英文格式 -->
+    <choose>
+      <if variable="original-title">
+        <text variable="original-title" suffix=" (in Chinese)"/>
+        <group delimiter=" " prefix=" [" suffix="]">
+          <text macro="author"/>
+          <text macro="issued-year"/>
+          <text variable="number" prefix=""/>
+        </group>
+      </if>
+      <else>
+        <!-- 如果是英文专利 -->
+        <group delimiter=" " prefix=" [" suffix="]">
+          <text macro="author"/>
+          <text macro="issued-year"/>
+          <text variable="number" prefix=""/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <!-- 正文中引用的文献标注格式 -->
+  <macro name="citation-layout">
+    <group>
+      <text variable="citation-number"/>
+    </group>
+  </macro>
+  <!-- 参考文献表格式 -->
+  <macro name="entry-layout">
+    <choose>
+      <if type="article-journal article-magazine article-newspaper" match="any">
+        <text macro="article-in-periodical-layout"/>
+      </if>
+      <else-if type="periodical">
+        <text macro="serial-layout"/>
+      </else-if>
+      <else-if type="patent">
+        <text macro="patent-layout"/>
+      </else-if>
+      <else-if type="thesis">
+        <!-- 学位论文参考文献表格式 -->
+        <text macro="thesis-layout"/>
+      </else-if>
+      <else-if type="webpage">
+        <!-- 网页参考文献表格式 -->
+        <text macro="webpage-layout"/>
+      </else-if>
+      <else-if type="paper-conference" variable="container-title" match="any">
+        <!-- 会议论文参考文献表格式 -->
+        <text macro="paper-conference-layout"/>
+      </else-if>
+      <else>
+        <text macro="monograph-layout"/>
+      </else>
+    </choose>
+  </macro>
+  <citation collapse="citation-number" after-collapse-delimiter=",">
+    <layout vertical-align="sup" delimiter="," prefix="[" suffix="]">
+      <text macro="citation-layout"/>
+    </layout>
+  </citation>
+  <bibliography entry-spacing="0" second-field-align="flush">
+    <layout>
+      <text variable="citation-number" prefix="[" suffix="]"/>
+      <text macro="entry-layout"/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/buildres/csl/csl-styles/acta-psychiatrica-scandinavica.csl b/buildres/csl/csl-styles/acta-psychiatrica-scandinavica.csl
deleted file mode 100644
index 3f6a9193d15..00000000000
--- a/buildres/csl/csl-styles/acta-psychiatrica-scandinavica.csl
+++ /dev/null
@@ -1,183 +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" page-range-format="expanded" default-locale="en-GB">
-  <info>
-    <title>Acta Psychiatrica Scandinavica</title>
-    <id>http://www.zotero.org/styles/acta-psychiatrica-scandinavica</id>
-    <link href="http://www.zotero.org/styles/acta-psychiatrica-scandinavica" rel="self"/>
-    <link href="http://www.zotero.org/styles/pediatric-allergy-and-immunology" rel="template"/>
-    <link href="http://onlinelibrary.wiley.com/journal/10.1111/%28ISSN%291600-0447/homepage/ForAuthors.html" rel="documentation"/>
-    <author>
-      <name>Sebastian Karcher</name>
-    </author>
-    <category citation-format="numeric"/>
-    <category field="medicine"/>
-    <issn>0001-690X</issn>
-    <eissn>1600-0447</eissn>
-    <updated>2014-06-27T02:07:39+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" delimiter-precedes-et-al="never">
-        <name-part name="family" font-variant="small-caps"/>
-      </name>
-      <label form="short" prefix=", "/>
-      <substitute>
-        <names variable="editor"/>
-      </substitute>
-    </names>
-  </macro>
-  <macro name="editor">
-    <names variable="editor" suffix=". ">
-      <name sort-separator=" " initialize-with="" name-as-sort-order="all" delimiter=", " delimiter-precedes-last="always">
-        <name-part name="family" font-variant="small-caps"/>
-      </name>
-      <label prefix=", " form="short"/>
-    </names>
-  </macro>
-  <macro name="publisher">
-    <group delimiter=", ">
-      <group delimiter=": ">
-        <text variable="publisher-place"/>
-        <text variable="publisher"/>
-      </group>
-      <text macro="date"/>
-    </group>
-  </macro>
-  <macro name="access">
-    <choose>
-      <if variable="page" match="none">
-        <choose>
-          <if variable="DOI">
-            <text variable="DOI" prefix=" doi:"/>
-          </if>
-          <else-if variable="URL">
-            <text variable="URL"/>
-            <group prefix=" (" suffix=")." delimiter=" ">
-              <text term="accessed"/>
-              <date variable="accessed">
-                <date-part name="day" prefix=" "/>
-                <date-part name="month" prefix=" " form="short" strip-periods="true"/>
-                <date-part name="year"/>
-              </date>
-            </group>
-          </else-if>
-        </choose>
-      </if>
-    </choose>
-  </macro>
-  <macro name="journal-title">
-    <choose>
-      <if type="article-journal article-magazine" match="any">
-        <text variable="container-title" form="short" strip-periods="true"/>
-      </if>
-      <else>
-        <text variable="container-title" suffix=". " form="short"/>
-      </else>
-    </choose>
-  </macro>
-  <macro name="date">
-    <!--Print full date as "Published online first" for
-        journal articles w/o volume and page range and with DOI or URL  -->
-    <choose>
-      <if type="article-journal">
-        <choose>
-          <if variable="volume page" match="none">
-            <choose>
-              <if variable="DOI URL" match="any">
-                <group prefix="Published Online First: ">
-                  <date variable="issued" delimiter=" ">
-                    <date-part name="day"/>
-                    <date-part name="month" form="long" text-case="capitalize-first"/>
-                    <date-part name="year"/>
-                  </date>
-                </group>
-              </if>
-              <else>
-                <date variable="issued">
-                  <date-part name="year"/>
-                </date>
-              </else>
-            </choose>
-          </if>
-          <else>
-            <date variable="issued">
-              <date-part name="year"/>
-            </date>
-          </else>
-        </choose>
-      </if>
-      <else>
-        <date variable="issued">
-          <date-part name="year"/>
-        </date>
-      </else>
-    </choose>
-  </macro>
-  <macro name="title">
-    <choose>
-      <if type="book thesis" match="any">
-        <text variable="title" font-style="italic"/>
-      </if>
-      <else>
-        <text variable="title"/>
-      </else>
-    </choose>
-  </macro>
-  <macro name="edition">
-    <choose>
-      <if is-numeric="edition">
-        <group delimiter=" ">
-          <number variable="edition" form="ordinal"/>
-          <text term="edition" form="short"/>
-        </group>
-      </if>
-      <else>
-        <text variable="edition" suffix="."/>
-      </else>
-    </choose>
-  </macro>
-  <citation collapse="citation-number">
-    <sort>
-      <key variable="citation-number"/>
-    </sort>
-    <layout prefix="(" suffix=")" delimiter=",">
-      <text variable="citation-number"/>
-    </layout>
-  </citation>
-  <bibliography et-al-min="7" et-al-use-first="3" second-field-align="flush">
-    <layout>
-      <text variable="citation-number" suffix="."/>
-      <text macro="author"/>
-      <text macro="title" suffix=". "/>
-      <choose>
-        <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
-          <text macro="edition" prefix=" "/>
-          <text macro="publisher" prefix=" "/>
-        </if>
-        <else-if type="chapter paper-conference" match="any">
-          <group prefix=" " suffix=".">
-            <text term="in" suffix=": " text-case="capitalize-first"/>
-            <text macro="editor"/>
-            <text variable="container-title"/>
-          </group>
-          <group delimiter=", " prefix=" ">
-            <text macro="publisher"/>
-            <text variable="page" suffix="."/>
-          </group>
-        </else-if>
-        <else>
-          <text macro="journal-title"/>
-          <group suffix=".">
-            <text macro="date" prefix=" "/>
-            <group prefix=";">
-              <text variable="volume" font-weight="bold"/>
-              <text variable="page" prefix=":"/>
-            </group>
-          </group>
-        </else>
-      </choose>
-      <text macro="access"/>
-    </layout>
-  </bibliography>
-</style>
diff --git a/buildres/csl/csl-styles/acta-universitatis-agriculturae-sueciae.csl b/buildres/csl/csl-styles/acta-universitatis-agriculturae-sueciae.csl
index 8a0830b3456..1c921f4204b 100644
--- a/buildres/csl/csl-styles/acta-universitatis-agriculturae-sueciae.csl
+++ b/buildres/csl/csl-styles/acta-universitatis-agriculturae-sueciae.csl
@@ -15,12 +15,16 @@
     </contributor>
     <category citation-format="author-date"/>
     <summary>Style as per the May 2019 guidelines.</summary>
-    <updated>2021-11-10T10:39:01+00:00</updated>
+    <updated>2022-07-13T09:26:37+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="edition" form="short">ed</term>
+      <term name="editor" form="short">
+        <single>ed.</single>
+        <multiple>eds</multiple>
+      </term>
     </terms>
   </locale>
   <locale xml:lang="sv">
@@ -34,15 +38,10 @@
     </terms>
   </locale>
   <macro name="container-contributors">
-    <choose>
-      <if type="chapter paper-conference" match="any">
-        <text term="in" text-case="capitalize-first" suffix=":"/>
-        <names variable="editor translator" delimiter=", " prefix=" ">
-          <name and="symbol" initialize-with="." name-as-sort-order="all"/>
-          <label form="short" prefix=" (" suffix=")"/>
-        </names>
-      </if>
-    </choose>
+    <names variable="editor translator" delimiter=", ">
+      <name and="symbol" initialize-with="." name-as-sort-order="all"/>
+      <label form="short" prefix=" (" suffix=")"/>
+    </names>
   </macro>
   <macro name="secondary-contributors">
     <choose>
@@ -93,8 +92,14 @@
   </macro>
   <macro name="title">
     <choose>
-      <if type="bill book graphic legal_case legislation motion_picture patent report song thesis webpage" match="any">
+      <if type="bill book graphic legal_case legislation motion_picture patent report song thesis webpage software" match="any">
         <text variable="title" font-style="italic"/>
+        <choose>
+          <if type="software" variable="version" match="any">
+            <text variable="version" prefix=" (" suffix=")"/>
+            <text variable="medium" prefix=" [" suffix="]"/>
+          </if>
+        </choose>
       </if>
       <else>
         <text variable="title"/>
@@ -244,20 +249,26 @@
           <text macro="publisher" prefix=". "/>
         </if>
         <else-if type="chapter entry-encyclopedia" match="any">
-          <text macro="issued" suffix=" "/>
-          <group suffix=".">
+          <group delimiter=". " suffix=".">
+            <text macro="issued"/>
             <text macro="title"/>
-            <text macro="type"/>
-          </group>
-          <text macro="container-contributors" prefix=" "/>
-          <text macro="secondary-contributors"/>
-          <text variable="container-title" font-style="italic" prefix=" " suffix="."/>
-          <group prefix=" (" suffix=")." delimiter="; ">
-            <text macro="collection-title"/>
-            <text variable="collection-number"/>
-          </group>
-          <text macro="edition" prefix=" "/>
-          <group delimiter=", " prefix=" ">
+            <group delimiter=": ">
+              <choose>
+                <if type="chapter paper-conference" match="any">
+                  <text term="in" text-case="capitalize-first"/>
+                </if>
+              </choose>
+              <group delimiter=" " suffix=".">
+                <text macro="container-contributors"/>
+                <text macro="secondary-contributors"/>
+                <text variable="container-title" font-style="italic" prefix=" " suffix="."/>
+              </group>
+            </group>
+            <group prefix=" (" suffix=")." delimiter="; ">
+              <text macro="collection-title"/>
+              <text variable="collection-number"/>
+            </group>
+            <text macro="edition" prefix=" "/>
             <text macro="publisher"/>
             <text variable="page"/>
           </group>
@@ -313,7 +324,7 @@
           <text macro="edition" prefix=" "/>
           <text macro="publisher" prefix=" " suffix="."/>
         </else-if>
-        <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+        <else-if type="bill book graphic legal_case legislation motion_picture report song software" match="any">
           <choose>
             <if variable="URL">
               <text macro="issued" suffix=" "/>
@@ -325,7 +336,6 @@
               <text macro="secondary-contributors"/>
               <text variable="container-title" font-style="italic" prefix=" "/>
               <text macro="locators"/>
-              <text variable="version" prefix=" Version: " suffix="."/>
               <text macro="publisher" prefix=" " suffix="."/>
             </if>
             <else>
@@ -338,7 +348,6 @@
               <text macro="secondary-contributors"/>
               <text variable="container-title" font-style="italic" prefix=" "/>
               <text macro="locators"/>
-              <text variable="version" prefix=" Version: " suffix="."/>
               <text macro="publisher" prefix=". " suffix="."/>
               <group prefix=" (" suffix=")" delimiter="; ">
                 <text macro="collection-title"/>
diff --git a/buildres/csl/csl-styles/administrative-science-quarterly.csl b/buildres/csl/csl-styles/administrative-science-quarterly.csl
index 86f90713882..04c00332e30 100644
--- a/buildres/csl/csl-styles/administrative-science-quarterly.csl
+++ b/buildres/csl/csl-styles/administrative-science-quarterly.csl
@@ -14,7 +14,7 @@
     <category field="social_science"/>
     <issn>0001-8392</issn>
     <eissn>1930-3815</eissn>
-    <updated>2022-01-07T15:49:10+00:00</updated>
+    <updated>2022-03-28T16:15:40+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">
@@ -219,6 +219,7 @@
           <date variable="issued">
             <date-part name="year"/>
           </date>
+          <text variable="year-suffix"/>
           <choose>
             <if type="article-journal bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="none">
               <date variable="issued">
@@ -310,7 +311,7 @@
       <text macro="citation-locator" prefix=": "/>
     </layout>
   </citation>
-  <bibliography et-al-min="8" et-al-use-first="7" entry-spacing="1" line-spacing="1" subsequent-author-substitute="">
+  <bibliography et-al-min="8" et-al-use-first="7" entry-spacing="1" line-spacing="1">
     <sort>
       <key macro="author"/>
       <key variable="issued" sort="ascending"/>
diff --git a/buildres/csl/csl-styles/advanced-materials.csl b/buildres/csl/csl-styles/advanced-materials.csl
index 621c6d9d34b..8ade35d119e 100644
--- a/buildres/csl/csl-styles/advanced-materials.csl
+++ b/buildres/csl/csl-styles/advanced-materials.csl
@@ -5,7 +5,7 @@
     <id>http://www.zotero.org/styles/advanced-materials</id>
     <link href="http://www.zotero.org/styles/advanced-materials" rel="self"/>
     <link href="http://www.zotero.org/styles/small" rel="template"/>
-    <link href="http://onlinelibrary.wiley.com/journal/10.1002/%28ISSN%291521-4095/homepage/2089_authorresources.html" rel="documentation"/>
+    <link href="https://onlinelibrary.wiley.com/page/journal/15214095/homepage/author-guidelines" rel="documentation"/>
     <author>
       <name>Jimmy Lawrence</name>
       <email>jimmymisc@gmail.com</email>
@@ -16,13 +16,13 @@
     <issn>0935-9648</issn>
     <eissn>1521-4095</eissn>
     <summary>A style for Wiley's Advanced Materials</summary>
-    <updated>2012-09-27T22:06:38+00:00</updated>
+    <updated>2022-06-22T14:43: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="author">
     <names variable="author">
       <name initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-      <label form="short" prefix=", " text-case="capitalize-first" suffix=" "/>
+      <label form="short" text-case="capitalize-first" prefix=", "/>
       <substitute>
         <names variable="editor"/>
         <names variable="translator"/>
@@ -32,7 +32,7 @@
   <macro name="editor">
     <names variable="editor">
       <label form="short" text-case="capitalize-first" suffix=".: " strip-periods="true"/>
-      <name initialize-with="." delimiter=", " delimiter-precedes-last="always"/>
+      <name delimiter-precedes-last="always" initialize-with=". "/>
     </names>
   </macro>
   <macro name="year-date">
@@ -124,7 +124,7 @@
             <text macro="year-date"/>
           </group>
         </else-if>
-        <else-if type="webpage">
+        <else-if type="webpage post post-weblog" match="any">
           <group delimiter=", ">
             <text variable="title" quotes="true"/>
             <text macro="access"/>
diff --git a/buildres/csl/csl-styles/journal-of-aerosol-medicine-and-pulmonary-drug-delivery.csl b/buildres/csl/csl-styles/advanced-pharmaceutical-bulletin.csl
similarity index 60%
rename from buildres/csl/csl-styles/journal-of-aerosol-medicine-and-pulmonary-drug-delivery.csl
rename to buildres/csl/csl-styles/advanced-pharmaceutical-bulletin.csl
index f7fb826bd66..1b14cf9e2ac 100644
--- a/buildres/csl/csl-styles/journal-of-aerosol-medicine-and-pulmonary-drug-delivery.csl
+++ b/buildres/csl/csl-styles/advanced-pharmaceutical-bulletin.csl
@@ -1,43 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" delimiter-precedes-last="never" demote-non-dropping-particle="sort-only" default-locale="en-US">
-  <!-- This style was edited with the Visual CSL Editor (http://editor.citationstyles.org/visualEditor/) -->
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" page-range-format="minimal" initialize-with-hyphen="false" demote-non-dropping-particle="sort-only" default-locale="en-US">
   <info>
-    <title>Journal of Aerosol Medicine and Pulmonary Drug Delivery</title>
-    <title-short>JAMP </title-short>
-    <id>http://www.zotero.org/styles/journal-of-aerosol-medicine-and-pulmonary-drug-delivery</id>
-    <link href="http://www.zotero.org/styles/journal-of-aerosol-medicine-and-pulmonary-drug-delivery" rel="self"/>
+    <title>Advanced Pharmaceutical Bulletin</title>
+    <title-short>APB</title-short>
+    <id>http://www.zotero.org/styles/advanced-pharmaceutical-bulletin</id>
+    <link href="http://www.zotero.org/styles/advanced-pharmaceutical-bulletin" rel="self"/>
     <link href="http://www.zotero.org/styles/american-medical-association" rel="template"/>
-    <link href="http://www.liebertpub.com/manuscript/journal-of-aerosol-medicine-brand-pulmonary-drug-delivery/24/" rel="documentation"/>
+    <link href="https://apb.tbzmed.ac.ir/InstructionsforAuthors" rel="documentation"/>
     <author>
-      <name>Rui Carlos Sá</name>
-      <email>rui.carlos.sa@gmail.com</email>
-      <uri>http://www.ruicarlossa.eu</uri>
+      <name>Patrick O'Brien</name>
     </author>
     <category citation-format="numeric"/>
     <category field="medicine"/>
-    <issn>1941-2711</issn>
-    <eissn>1941-2703</eissn>
-    <issnl>1941-2711</issnl>
-    <summary>Adapted from JAMA style</summary>
-    <updated>2014-07-03T00:02:13+00:00</updated>
+    <issn>2228-5881</issn>
+    <eissn>2251-7308</eissn>
+    <updated>2022-03-01T09:18:02+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 delimiter-precedes-last="never" initialize-with="" name-as-sort-order="all" sort-separator=" "/>
-      <label form="short" prefix=", "/>
+      <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always"/>
+      <label prefix=", "/>
     </names>
   </macro>
   <macro name="author">
-    <group suffix=":">
+    <group suffix=".">
       <names variable="author">
-        <name delimiter-precedes-last="never" initialize-with="" name-as-sort-order="all" sort-separator=" "/>
-        <label form="short" prefix=", "/>
+        <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always"/>
+        <label prefix=", "/>
         <substitute>
           <names variable="editor"/>
           <text macro="title"/>
@@ -47,16 +43,19 @@
   </macro>
   <macro name="access">
     <choose>
-      <if type="article-journal" match="none">
+      <if type="article-newspaper" match="none">
         <choose>
-          <if variable="DOI" match="all">
-            <text value="doi:"/>
+          <if variable="DOI">
+            <text value="doi: "/>
             <text variable="DOI"/>
           </if>
           <else-if variable="URL">
-            <text value="Available at:" suffix=" "/>
             <group delimiter=". ">
-              <text variable="URL"/>
+              <choose>
+                <if type="webpage post post-weblog" match="any">
+                  <date variable="issued" prefix="Published " form="text"/>
+                </if>
+              </choose>
               <group>
                 <text term="accessed" text-case="capitalize-first" suffix=" "/>
                 <date variable="accessed">
@@ -65,6 +64,7 @@
                   <date-part name="year"/>
                 </date>
               </group>
+              <text variable="URL"/>
             </group>
           </else-if>
         </choose>
@@ -112,7 +112,7 @@
       </group>
     </layout>
   </citation>
-  <bibliography hanging-indent="false" second-field-align="flush">
+  <bibliography et-al-min="7" et-al-use-first="6" second-field-align="flush">
     <layout>
       <text variable="citation-number" suffix=". "/>
       <text macro="author"/>
@@ -120,10 +120,14 @@
       <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 prefix=" " macro="publisher"/>
+          <text macro="publisher" prefix=" "/>
           <group suffix="." prefix="; ">
             <date variable="issued">
               <date-part name="year"/>
@@ -131,21 +135,27 @@
             <text variable="page" prefix=":"/>
           </group>
         </if>
-        <else-if type="chapter paper-conference" match="any">
-          <group prefix=" ">
-            <text term="in" text-case="capitalize-first" suffix=": "/>
+        <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" prefix=" " suffix="." text-case="title"/>
-            <text variable="volume" prefix="Vol " suffix="."/>
-            <text macro="edition" prefix=" "/>
-            <text variable="collection-title" prefix=" " suffix="."/>
-            <group suffix=".">
-              <text macro="publisher" prefix=" "/>
-              <group suffix="." prefix="; ">
+            <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 delimiter="; " suffix=".">
+              <text macro="publisher"/>
+              <group delimiter=". " suffix=".">
                 <date variable="issued">
                   <date-part name="year"/>
                 </date>
-                <text variable="page" prefix=":"/>
+                <group delimiter=" ">
+                  <label plural="never" text-case="capitalize-first" variable="page" form="short"/>
+                  <text variable="page"/>
+                </group>
               </group>
             </group>
           </group>
@@ -203,14 +213,51 @@
             </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>
           <text macro="editor" prefix=" " suffix="."/>
           <group prefix=" " suffix=".">
-            <text variable="container-title" font-style="italic" form="short"/>
+            <text variable="container-title" form="short" strip-periods="true" font-style="italic"/>
             <group delimiter=";" prefix=" ">
-              <date variable="issued">
-                <date-part name="year"/>
-              </date>
+              <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=")"/>
@@ -220,7 +267,7 @@
           </group>
         </else>
       </choose>
-      <text prefix=" " macro="access" suffix="."/>
+      <text prefix=" " macro="access"/>
     </layout>
   </bibliography>
 </style>
diff --git a/buildres/csl/csl-styles/american-chemical-society.csl b/buildres/csl/csl-styles/american-chemical-society.csl
index bf75b2d8de7..09c0e9cf088 100644
--- a/buildres/csl/csl-styles/american-chemical-society.csl
+++ b/buildres/csl/csl-styles/american-chemical-society.csl
@@ -250,14 +250,17 @@
           </group>
         </else-if>
         <else-if type="webpage">
-          <group delimiter=" ">
-            <text variable="title"/>
-            <text variable="URL"/>
-            <date variable="accessed" prefix="(accessed " suffix=")" delimiter=" ">
-              <date-part name="year"/>
-              <date-part name="month" prefix="-" form="numeric-leading-zeros"/>
-              <date-part name="day" prefix="-" form="numeric-leading-zeros"/>
-            </date>
+          <group delimiter=". ">
+            <text variable="title" font-style="italic"/>
+            <text variable="container-title"/>
+            <group delimiter=" ">
+              <text variable="URL"/>
+              <date variable="accessed" prefix="(accessed " suffix=")">
+                <date-part name="year"/>
+                <date-part name="month" prefix="-" form="numeric-leading-zeros"/>
+                <date-part name="day" prefix="-" form="numeric-leading-zeros"/>
+              </date>
+            </group>
           </group>
         </else-if>
         <else>
diff --git a/buildres/csl/csl-styles/american-journal-of-archaeology.csl b/buildres/csl/csl-styles/american-journal-of-archaeology.csl
index b7da8ffeca9..b693ac62757 100644
--- a/buildres/csl/csl-styles/american-journal-of-archaeology.csl
+++ b/buildres/csl/csl-styles/american-journal-of-archaeology.csl
@@ -15,7 +15,7 @@
     <issn>0002-9114</issn>
     <eissn>1939-828X</eissn>
     <summary>The American Journal of Archaeology style</summary>
-    <updated>2021-11-12T14:22:00+00:00</updated>
+    <updated>2022-02-27T11:00:00+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <locale>
@@ -262,7 +262,7 @@
         <text macro="container-prefix" suffix=" "/>
       </if>
     </choose>
-    <text variable="container-title" font-style="italic"/>
+    <text variable="container-title" text-case="title" font-style="italic"/>
   </macro>
   <macro name="publisher">
     <group>
@@ -353,7 +353,7 @@
       <key variable="issued"/>
       <key macro="contributors-short"/>
     </sort>
-    <layout delimiter="; ">
+    <layout delimiter="; " suffix=".">
       <group delimiter=", ">
         <group delimiter=" ">
           <text macro="contributors-short"/>
diff --git a/buildres/csl/csl-styles/american-journal-of-botany.csl b/buildres/csl/csl-styles/american-journal-of-botany.csl
index c84340df318..b6d8a879034 100644
--- a/buildres/csl/csl-styles/american-journal-of-botany.csl
+++ b/buildres/csl/csl-styles/american-journal-of-botany.csl
@@ -109,7 +109,7 @@
       </else>
     </choose>
   </macro>
-  <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" collapse="year-suffix">
+  <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="false" collapse="year-suffix">
     <sort>
       <key macro="year-date"/>
     </sort>
diff --git a/buildres/csl/csl-styles/american-medical-association-alphabetical.csl b/buildres/csl/csl-styles/american-medical-association-alphabetical.csl
index 02ddf786ef4..cb323e4ca10 100644
--- a/buildres/csl/csl-styles/american-medical-association-alphabetical.csl
+++ b/buildres/csl/csl-styles/american-medical-association-alphabetical.csl
@@ -27,12 +27,12 @@
     <category citation-format="numeric"/>
     <category field="medicine"/>
     <summary>The American Medical Association style as used in JAMA, with alphabetically sorted bibliography. Version 11 as per November-2019.</summary>
-    <updated>2021-10-28T13:38:04+00:00</updated>
+    <updated>2022-03-17T13:38:04+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="page-range-delimiter">-</term>
       <term name="presented at">presented at</term>
     </terms>
   </locale>
@@ -86,7 +86,7 @@
   </macro>
   <macro name="title">
     <choose>
-      <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+      <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>
@@ -252,6 +252,15 @@
             <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=".">
diff --git a/buildres/csl/csl-styles/american-medical-association-brackets.csl b/buildres/csl/csl-styles/american-medical-association-brackets.csl
index d5d468ec371..ed90ed3bd64 100644
--- a/buildres/csl/csl-styles/american-medical-association-brackets.csl
+++ b/buildres/csl/csl-styles/american-medical-association-brackets.csl
@@ -27,7 +27,7 @@
     <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>2021-10-28T13:38:04+00:00</updated>
+    <updated>2022-03-17T13:38:04+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">
@@ -86,7 +86,7 @@
   </macro>
   <macro name="title">
     <choose>
-      <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+      <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>
@@ -247,6 +247,15 @@
             <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=".">
diff --git a/buildres/csl/csl-styles/american-medical-association-no-et-al.csl b/buildres/csl/csl-styles/american-medical-association-no-et-al.csl
index 1d591d11272..1b784c4ce5f 100644
--- a/buildres/csl/csl-styles/american-medical-association-no-et-al.csl
+++ b/buildres/csl/csl-styles/american-medical-association-no-et-al.csl
@@ -27,12 +27,12 @@
     <category citation-format="numeric"/>
     <category field="medicine"/>
     <summary>The American Medical Association style as used in JAMA, without et al. Version 11 as per November-2019.</summary>
-    <updated>2021-10-28T13:38:04+00:00</updated>
+    <updated>2022-03-17T13:38:04+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="page-range-delimiter">-</term>
       <term name="presented at">presented at</term>
     </terms>
   </locale>
@@ -86,7 +86,7 @@
   </macro>
   <macro name="title">
     <choose>
-      <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+      <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>
@@ -247,6 +247,15 @@
             <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=".">
diff --git a/buildres/csl/csl-styles/american-medical-association-no-url.csl b/buildres/csl/csl-styles/american-medical-association-no-url.csl
index 32e195847b5..dbe940a2173 100644
--- a/buildres/csl/csl-styles/american-medical-association-no-url.csl
+++ b/buildres/csl/csl-styles/american-medical-association-no-url.csl
@@ -27,12 +27,12 @@
     <category citation-format="numeric"/>
     <category field="medicine"/>
     <summary>The American Medical Association style as used in JAMA, without the URL. Version 11 as per November-2019.</summary>
-    <updated>2021-10-28T13:38:04+00:00</updated>
+    <updated>2022-03-17T13:38:04+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="page-range-delimiter">-</term>
       <term name="presented at">presented at</term>
     </terms>
   </locale>
@@ -56,7 +56,7 @@
   </macro>
   <macro name="title">
     <choose>
-      <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+      <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>
@@ -217,6 +217,15 @@
             <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=".">
diff --git a/buildres/csl/csl-styles/american-medical-association.csl b/buildres/csl/csl-styles/american-medical-association.csl
index 44520822d04..b36bbb5488e 100644
--- a/buildres/csl/csl-styles/american-medical-association.csl
+++ b/buildres/csl/csl-styles/american-medical-association.csl
@@ -27,7 +27,7 @@
     <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>2021-10-28T13:38:04+00:00</updated>
+    <updated>2022-03-17T08:48:24+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">
@@ -86,7 +86,7 @@
   </macro>
   <macro name="title">
     <choose>
-      <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+      <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>
@@ -247,6 +247,15 @@
             <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=".">
diff --git a/buildres/csl/csl-styles/american-physics-society.csl b/buildres/csl/csl-styles/american-physics-society.csl
index e5a28cce9a4..e78b1fe8357 100644
--- a/buildres/csl/csl-styles/american-physics-society.csl
+++ b/buildres/csl/csl-styles/american-physics-society.csl
@@ -15,15 +15,18 @@
     <author>
       <name>Brenton M. Wiernik</name>
     </author>
+    <contributor>
+      <name>Anna C. Véron</name>
+    </contributor>
     <category citation-format="numeric"/>
     <category field="physics"/>
     <summary>Common style use by APS publications.</summary>
-    <updated>2012-09-27T22:06:38+00:00</updated>
+    <updated>2022-03-02T11:58:54+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">
-      <name delimiter=", " initialize-with=". " and="text"/>
+      <name and="text" et-al-min="11" et-al-use-first="1" initialize-with=". " delimiter=", "/>
       <label form="long" prefix=", " suffix=" "/>
       <substitute>
         <names variable="editor"/>
diff --git a/buildres/csl/csl-styles/american-society-for-horticultural-science.csl b/buildres/csl/csl-styles/american-society-for-horticultural-science.csl
index dcd104571cd..833064cd28b 100644
--- a/buildres/csl/csl-styles/american-society-for-horticultural-science.csl
+++ b/buildres/csl/csl-styles/american-society-for-horticultural-science.csl
@@ -13,7 +13,7 @@
     <category citation-format="author-date"/>
     <category field="biology"/>
     <category field="botany"/>
-    <updated>2021-07-27T13:34:10+00:00</updated>
+    <updated>2022-06-14T08:25: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="edition">
@@ -32,11 +32,13 @@
   <macro name="container">
     <choose>
       <if type="chapter paper-conference" match="any">
-        <text term="in" text-case="capitalize-first" font-style="italic" prefix=". " suffix=" "/>
-        <names variable="editor translator" delimiter=", " suffix=". ">
-          <name initialize-with="." delimiter=", " delimiter-precedes-last="never" and="symbol"/>
-          <label form="short" prefix=" (" suffix=")"/>
-        </names>
+        <group delimiter=": ">
+          <text term="in" text-case="capitalize-first" font-style="normal" prefix=". " suffix=" "/>
+          <names variable="editor translator" delimiter=", " suffix=". ">
+            <name initialize-with="." delimiter=", " delimiter-precedes-last="never" and="symbol"/>
+            <label form="short" prefix=" (" suffix=")"/>
+          </names>
+        </group>
         <group delimiter=", ">
           <text variable="container-title" text-case="title"/>
           <text variable="collection-title" text-case="title"/>
@@ -49,7 +51,7 @@
         </group>
       </else-if>
       <else>
-        <group prefix=". " delimiter=", ">
+        <group delimiter=", " prefix=". ">
           <text variable="container-title" form="short"/>
           <text variable="collection-title"/>
         </group>
@@ -86,14 +88,7 @@
     </names>
   </macro>
   <macro name="access">
-    <choose>
-      <if type="webpage">
-        <group>
-          <text value="URL" suffix=" "/>
-          <text variable="URL"/>
-        </group>
-      </if>
-    </choose>
+    <text variable="URL" prefix="&lt;" suffix="&gt;"/>
   </macro>
   <macro name="title">
     <choose>
@@ -106,10 +101,6 @@
           </group>
         </group>
       </if>
-      <else-if type="webpage">
-        <text variable="title"/>
-        <text value="WWW Document" prefix=" [" suffix="]"/>
-      </else-if>
       <else>
         <text variable="title"/>
       </else>
@@ -173,13 +164,13 @@
       </if>
       <else-if type="bill book graphic legal_case legislation motion_picture report song thesis" match="any">
         <group delimiter=", " prefix=". ">
+          <text macro="edition"/>
+          <text macro="event"/>
+          <text macro="publisher"/>
           <group>
             <text variable="genre"/>
             <text variable="number" prefix=" No. "/>
           </group>
-          <text macro="edition"/>
-          <text macro="event"/>
-          <text macro="publisher"/>
         </group>
       </else-if>
       <else-if type="chapter paper-conference" match="any">
@@ -188,15 +179,21 @@
           <text macro="publisher"/>
         </group>
       </else-if>
+      <else-if type="webpage post post-weblog" match="any">
+        <group delimiter=". " prefix=". ">
+          <date form="text" date-parts="year-month-day" variable="issued"/>
+          <text macro="access"/>
+        </group>
+      </else-if>
     </choose>
   </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="issued"/>
       <key macro="author"/>
+      <key macro="issued"/>
     </sort>
-    <layout prefix="(" suffix=")" delimiter=", ">
-      <group delimiter=" ">
+    <layout delimiter="; " prefix="(" suffix=")">
+      <group delimiter=", ">
         <text macro="author-short"/>
         <text macro="issued"/>
       </group>
@@ -217,7 +214,6 @@
         </group>
         <text macro="locators"/>
       </group>
-      <text macro="access" prefix=". "/>
     </layout>
   </bibliography>
 </style>
diff --git a/buildres/csl/csl-styles/american-society-of-civil-engineers.csl b/buildres/csl/csl-styles/american-society-of-civil-engineers.csl
index fa839812d59..6ba5f04d634 100644
--- a/buildres/csl/csl-styles/american-society-of-civil-engineers.csl
+++ b/buildres/csl/csl-styles/american-society-of-civil-engineers.csl
@@ -5,16 +5,19 @@
     <title-short>ASCE</title-short>
     <id>http://www.zotero.org/styles/american-society-of-civil-engineers</id>
     <link href="http://www.zotero.org/styles/american-society-of-civil-engineers" rel="self"/>
-    <link href="https://doi.org/10.1061/9780784478998.ch17" rel="documentation"/>
-    <link href="https://doi.org/10.1061/9780784479018.ch05" rel="documentation"/>
+    <link href="https://ascelibrary.org/doi/book/10.1061/9780784479018" rel="documentation"/>
+    <link href="https://ascelibrary.org/doi/pdf/10.1061/9780784479018" rel="documentation"/>
     <author>
       <name>Rintze Zelle</name>
       <uri>http://twitter.com/rintzezelle</uri>
     </author>
+    <contributor>
+      <name>Patrick O'Brien</name>
+    </contributor>
     <category citation-format="author-date"/>
     <category field="engineering"/>
     <summary>A style for American Society of Civil Engineers publications</summary>
-    <updated>2012-09-27T22:06:38+00:00</updated>
+    <updated>2022-02-04T18:00:42+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="container-contributors">
@@ -39,7 +42,7 @@
   </macro>
   <macro name="author">
     <names variable="author">
-      <name name-as-sort-order="all" and="text" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+      <name and="text" delimiter-precedes-last="always" initialize-with=". " name-as-sort-order="first"/>
       <label form="short" prefix=" (" suffix=")" text-case="capitalize-first"/>
       <substitute>
         <names variable="editor"/>
@@ -76,23 +79,25 @@
     </choose>
   </macro>
   <macro name="publisher">
-    <group delimiter=", ">
-      <text variable="genre"/>
-      <text variable="publisher"/>
-      <text variable="publisher-place"/>
-    </group>
+    <choose>
+      <if type="article-magazine article-newspaper" match="none">
+        <group delimiter=". ">
+          <text variable="genre"/>
+          <group delimiter=": ">
+            <text variable="publisher-place"/>
+            <text variable="publisher"/>
+          </group>
+        </group>
+      </if>
+    </choose>
   </macro>
   <macro name="issued">
     <choose>
       <if variable="issued">
-        <group prefix=" (" suffix=").">
-          <date variable="issued">
-            <date-part name="year"/>
-          </date>
-        </group>
+        <date date-parts="year" form="text" variable="issued"/>
       </if>
       <else>
-        <text prefix=" (" term="no date" suffix=")." form="short"/>
+        <text term="no date" form="short"/>
       </else>
     </choose>
   </macro>
@@ -110,9 +115,9 @@
   </macro>
   <macro name="locators">
     <choose>
-      <if type="article-journal article-magazine article-newspaper" match="any">
-        <group delimiter=", ">
-          <group>
+      <if type="article-journal" match="any">
+        <group delimiter=": ">
+          <group delimiter=" ">
             <text variable="volume"/>
             <text variable="issue" prefix="(" suffix=")"/>
           </group>
@@ -122,8 +127,8 @@
       <else-if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="any">
         <text variable="page"/>
       </else-if>
-      <else-if type="webpage">
-        <text variable="URL" prefix="&lt;" suffix="&gt;"/>
+      <else-if type="article-magazine article-newspaper" match="any">
+        <date form="text" date-parts="year-month-day" variable="issued"/>
       </else-if>
     </choose>
   </macro>
@@ -135,13 +140,18 @@
   </macro>
   <macro name="access">
     <choose>
-      <if type="webpage">
-        <date variable="accessed" prefix=" (" suffix=")">
-          <date-part name="month" form="short" suffix=" "/>
-          <date-part name="day" suffix=", "/>
-          <date-part name="year"/>
-        </date>
+      <if type="webpage post post-weblog" match="any">
+        <group delimiter=". ">
+          <group delimiter=" ">
+            <text term="accessed" text-case="capitalize-first"/>
+            <date form="text" variable="accessed"/>
+          </group>
+          <text variable="URL"/>
+        </group>
       </if>
+      <else-if type="article-journal" match="any">
+        <text variable="DOI" prefix="https://doi.org/"/>
+      </else-if>
     </choose>
   </macro>
   <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" collapse="year-suffix">
@@ -163,20 +173,20 @@
       <key variable="issued"/>
     </sort>
     <layout suffix=".">
-      <text macro="author" suffix="."/>
-      <text macro="issued" suffix=" "/>
       <group delimiter=". ">
+        <text macro="author" suffix="."/>
+        <text macro="issued"/>
         <text macro="title"/>
         <group delimiter=", ">
-          <text variable="container-title" font-style="italic"/>
+          <text variable="container-title" form="short" font-style="italic"/>
           <text variable="collection-title"/>
           <text macro="container-contributors"/>
           <text macro="secondary-contributors"/>
-          <text macro="publisher"/>
           <text macro="locators"/>
         </group>
+        <text macro="publisher"/>
       </group>
-      <text macro="access"/>
+      <text macro="access" prefix=". "/>
     </layout>
   </bibliography>
 </style>
diff --git a/buildres/csl/csl-styles/american-sociological-association.csl b/buildres/csl/csl-styles/american-sociological-association.csl
index 6657716cde8..fdb2b74875d 100644
--- a/buildres/csl/csl-styles/american-sociological-association.csl
+++ b/buildres/csl/csl-styles/american-sociological-association.csl
@@ -125,13 +125,25 @@
   <macro name="year-date">
     <choose>
       <if variable="issued">
-        <group delimiter=" ">
-          <date variable="original-date" form="numeric" date-parts="year" prefix="[" suffix="]"/>
-          <date variable="issued" form="numeric" date-parts="year"/>
+        <group>
+          <group delimiter=" ">
+            <date variable="original-date" form="numeric" date-parts="year" prefix="[" suffix="]"/>
+            <date variable="issued" form="numeric" date-parts="year"/>
+          </group>
+          <text variable="year-suffix"/>
         </group>
       </if>
+      <else-if variable="status">
+        <group>
+          <text variable="status" text-case="lowercase"/>
+          <text variable="year-suffix" prefix="-"/>
+        </group>
+      </else-if>
       <else>
-        <text term="no date" form="short"/>
+        <group>
+          <text term="no date" form="short"/>
+          <text variable="year-suffix" prefix="-"/>
+        </group>
       </else>
     </choose>
   </macro>
@@ -140,6 +152,12 @@
       <if variable="issued">
         <date variable="issued" form="numeric" date-parts="year"/>
       </if>
+      <else-if variable="status">
+        <group>
+          <text variable="status" text-case="lowercase"/>
+          <text variable="year-suffix" prefix="-"/>
+        </group>
+      </else-if>
       <else>
         <text term="no date" form="short"/>
       </else>
diff --git a/buildres/csl/csl-styles/anais-da-academia-brasileira-de-ciencias.csl b/buildres/csl/csl-styles/anais-da-academia-brasileira-de-ciencias.csl
new file mode 100644
index 00000000000..d3c14f3c89c
--- /dev/null
+++ b/buildres/csl/csl-styles/anais-da-academia-brasileira-de-ciencias.csl
@@ -0,0 +1,159 @@
+<?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>Anais da Academia Brasileira de Ciências</title>
+    <title-short>An. Acad. Bras. Cienc.</title-short>
+    <id>http://www.zotero.org/styles/anais-da-academia-brasileira-de-ciencias</id>
+    <link href="http://www.zotero.org/styles/anais-da-academia-brasileira-de-ciencias" rel="self"/>
+    <link href="https://www.scielo.br/journal/aabc/about/#instructions" rel="documentation"/>
+    <author>
+      <name>Alex C.</name>
+    </author>
+    <category citation-format="author-date"/>
+    <category field="science"/>
+    <issn>0001-3765</issn>
+    <eissn>1678-2690</eissn>
+    <summary>Annals of the Brazilian Academy of Sciences author-date style</summary>
+    <updated>2022-05-19T13:50:00+00:00</updated>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
+  </info>
+  <locale>
+    <terms>
+      <term name="editor" form="short">
+        <single>ed.</single>
+        <multiple>eds</multiple>
+      </term>
+    </terms>
+  </locale>
+  <macro name="editor">
+    <names variable="editor">
+      <name et-al-min="3" et-al-use-first="1" and="symbol" delimiter-precedes-last="never" initialize-with="" name-as-sort-order="all" sort-separator=" ">
+        <name-part name="family" text-case="uppercase"/>
+      </name>
+      <label form="short" text-case="capitalize-first" prefix=" (" suffix=")"/>
+    </names>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name and="symbol" delimiter-precedes-last="never" initialize-with="" name-as-sort-order="all" sort-separator=" ">
+        <name-part name="family" text-case="uppercase"/>
+      </name>
+      <label form="short" prefix=", "/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <text variable="title"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="author-short">
+    <names variable="author">
+      <name form="short" and="symbol" delimiter=", " delimiter-precedes-last="never" initialize-with="."/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <text variable="title"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="title">
+    <text variable="title"/>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=": ">
+      <text variable="publisher-place"/>
+      <text variable="publisher"/>
+    </group>
+  </macro>
+  <macro name="year-date">
+    <choose>
+      <if variable="issued">
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
+      </if>
+      <else>
+        <text term="no date" form="short"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="edition">
+    <group delimiter=" ">
+      <number variable="edition"/>
+      <text term="edition" form="short"/>
+    </group>
+  </macro>
+  <macro name="pages">
+    <group>
+      <label variable="page" form="short" plural="never"/>
+      <text variable="page"/>
+    </group>
+  </macro>
+  <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" collapse="year-suffix">
+    <layout prefix="(" suffix=")" delimiter=", ">
+      <group delimiter=", ">
+        <group delimiter=" ">
+          <text macro="author-short"/>
+          <text macro="year-date"/>
+        </group>
+        <group>
+          <label variable="locator" form="short"/>
+          <text variable="locator"/>
+        </group>
+      </group>
+    </layout>
+  </citation>
+  <bibliography hanging-indent="false" et-al-min="20" et-al-use-first="1" line-spacing="1" entry-spacing="2">
+    <sort>
+      <key macro="author"/>
+      <key macro="year-date"/>
+      <key variable="title"/>
+    </sort>
+    <layout suffix=".">
+      <text macro="author" suffix="."/>
+      <date variable="issued" prefix=" " suffix=".">
+        <date-part name="year"/>
+      </date>
+      <choose>
+        <if type="book" match="any">
+          <group prefix=" " delimiter=", ">
+            <text macro="title"/>
+            <text macro="edition"/>
+            <text macro="publisher"/>
+            <text variable="number-of-pages" suffix=" p."/>
+          </group>
+        </if>
+        <else-if type="chapter paper-conference" match="any">
+          <text macro="title" prefix=" " suffix="."/>
+          <group prefix=" " delimiter=" ">
+            <text term="in" text-case="capitalize-first" suffix=":"/>
+            <text macro="editor" suffix=","/>
+            <text variable="container-title" suffix=","/>
+            <text macro="publisher" suffix=","/>
+            <text macro="pages"/>
+          </group>
+        </else-if>
+        <else-if type="thesis">
+          <group prefix=" " delimiter=". ">
+            <text macro="title"/>
+            <text variable="genre"/>
+            <text macro="publisher"/>
+          </group>
+        </else-if>
+        <else>
+          <group suffix="." prefix=" " delimiter=" ">
+            <text macro="title"/>
+            <text macro="editor"/>
+          </group>
+          <group prefix=" " delimiter=" ">
+            <text variable="container-title" form="short" strip-periods="true"/>
+            <group delimiter=": ">
+              <text variable="volume"/>
+              <text variable="page"/>
+            </group>
+          </group>
+        </else>
+      </choose>
+    </layout>
+  </bibliography>
+</style>
diff --git a/buildres/csl/csl-styles/diabetes-technology-and-therapeutics.csl b/buildres/csl/csl-styles/annals-of-allergy-asthma-and-immunology.csl
similarity index 69%
rename from buildres/csl/csl-styles/diabetes-technology-and-therapeutics.csl
rename to buildres/csl/csl-styles/annals-of-allergy-asthma-and-immunology.csl
index a9f0ceb8519..b612c5ff55f 100644
--- a/buildres/csl/csl-styles/diabetes-technology-and-therapeutics.csl
+++ b/buildres/csl/csl-styles/annals-of-allergy-asthma-and-immunology.csl
@@ -1,27 +1,26 @@
 <?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" page-range-format="expanded">
+<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>Diabetes Technology &amp; Therapeutics</title>
-    <title-short>DTT</title-short>
-    <id>http://www.zotero.org/styles/diabetes-technology-and-therapeutics</id>
-    <link href="http://www.zotero.org/styles/diabetes-technology-and-therapeutics" rel="self"/>
-    <link href="http://www.zotero.org/styles/clinical-gastroenterology-and-hepatology" rel="template"/>
-    <link href="https://home.liebertpub.com/publications/diabetes-technology-and-therapeutics/11/for-authors" rel="documentation"/>
+    <title>Annals of Allergy, Asthma &amp; Immunology</title>
+    <id>http://www.zotero.org/styles/annals-of-allergy-asthma-and-immunology</id>
+    <link href="http://www.zotero.org/styles/annals-of-allergy-asthma-and-immunology" rel="self"/>
+    <link href="https://www.elsevier.com/journals/annals-of-allergy-asthma-and-immunology/1081-1206/guide-for-authors#References" rel="documentation"/>
+    <link href="http://www.zotero.org/styles/american-medical-association" rel="template"/>
     <author>
-      <name>Patrick O'Brien, PhD</name>
+      <name>Patrick O'Brien</name>
     </author>
     <category citation-format="numeric"/>
     <category field="medicine"/>
-    <category field="biology"/>
-    <category field="engineering"/>
-    <issn>1520-9156</issn>
-    <eissn>1557-8593</eissn>
-    <updated>2019-11-08T13:48:29+00:00</updated>
+    <issn>1081-1206</issn>
+    <eissn>1534-4436</eissn>
+    <summary>AMA style with et-al set to 6/7</summary>
+    <updated>2022-04-28T08:17:08+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">
@@ -31,7 +30,7 @@
     </names>
   </macro>
   <macro name="author">
-    <group>
+    <group suffix=".">
       <names variable="author">
         <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always"/>
         <label form="short" prefix=", "/>
@@ -44,13 +43,16 @@
   </macro>
   <macro name="access">
     <choose>
-      <if type="article-newspaper article-journal" match="none">
+      <if type="article-newspaper" match="none">
         <choose>
-          <if variable="URL">
+          <if variable="DOI">
+            <text value="doi:"/>
+            <text variable="DOI"/>
+          </if>
+          <else-if variable="URL">
             <group delimiter=". ">
-              <text variable="URL"/>
               <choose>
-                <if type="webpage">
+                <if type="webpage post post-weblog" match="any">
                   <date variable="issued" prefix="Published " form="text"/>
                 </if>
               </choose>
@@ -62,8 +64,9 @@
                   <date-part name="year"/>
                 </date>
               </group>
+              <text variable="URL"/>
             </group>
-          </if>
+          </else-if>
         </choose>
       </if>
     </choose>
@@ -71,7 +74,7 @@
   <macro name="title">
     <choose>
       <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
-        <text variable="title" text-case="title" font-style="normal"/>
+        <text variable="title" font-style="italic" text-case="title"/>
       </if>
       <else>
         <text variable="title"/>
@@ -79,10 +82,7 @@
     </choose>
   </macro>
   <macro name="publisher">
-    <group delimiter=": ">
-      <text variable="publisher-place"/>
-      <text variable="publisher"/>
-    </group>
+    <text variable="publisher"/>
   </macro>
   <macro name="edition">
     <choose>
@@ -109,11 +109,11 @@
       </group>
     </layout>
   </citation>
-  <bibliography et-al-min="4" et-al-use-first="3" second-field-align="flush">
+  <bibliography hanging-indent="false" et-al-min="7" et-al-use-first="6" second-field-align="flush">
     <layout>
       <text variable="citation-number" suffix=". "/>
       <text macro="author"/>
-      <text macro="title" prefix=": " suffix="."/>
+      <text macro="title" prefix=" " suffix="."/>
       <choose>
         <if type="bill book graphic legislation motion_picture report song" match="any">
           <group suffix="." prefix=" " delimiter=" ">
@@ -125,7 +125,7 @@
             <text macro="editor" prefix="(" suffix=")"/>
           </group>
           <text macro="publisher" prefix=" "/>
-          <group prefix=", " suffix=".">
+          <group suffix="." prefix="; ">
             <date variable="issued">
               <date-part name="year"/>
             </date>
@@ -136,7 +136,7 @@
           <group prefix=" " delimiter=" ">
             <text term="in" text-case="capitalize-first" suffix=":"/>
             <text macro="editor"/>
-            <text variable="container-title" text-case="title" font-style="normal" suffix="."/>
+            <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="."/>
@@ -145,7 +145,7 @@
             <text variable="collection-title" suffix="."/>
             <group suffix=".">
               <text macro="publisher"/>
-              <group prefix=", " suffix=".">
+              <group suffix="." prefix="; ">
                 <date variable="issued">
                   <date-part name="year"/>
                 </date>
@@ -155,7 +155,7 @@
           </group>
         </else-if>
         <else-if type="article-newspaper">
-          <text variable="container-title" prefix=" " suffix=". "/>
+          <text variable="container-title" font-style="italic" prefix=" " suffix=". "/>
           <choose>
             <if variable="URL">
               <group delimiter=". " suffix=".">
@@ -207,13 +207,37 @@
             </date>
           </group>
         </else-if>
-        <else-if type="webpage">
+        <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>
           <text macro="editor" prefix=" " suffix="."/>
           <group prefix=" " suffix=".">
-            <text variable="container-title" form="short" strip-periods="true" font-style="normal"/>
+            <text variable="container-title" font-style="italic" form="short" strip-periods="true" suffix="."/>
             <group delimiter=";" prefix=" ">
               <choose>
                 <if variable="issue volume" match="any">
@@ -222,19 +246,22 @@
                   </date>
                 </if>
                 <else>
-                  <date variable="issued">
-                    <date-part name="month" suffix=" "/>
-                    <date-part name="year"/>
-                  </date>
+                  <group delimiter=" ">
+                    <text value="Published online"/>
+                    <date form="text" date-parts="year-month-day" variable="issued"/>
+                  </group>
                 </else>
               </choose>
-              <text variable="volume"/>
+              <group>
+                <text variable="volume"/>
+                <text variable="issue" prefix="(" suffix=")"/>
+              </group>
             </group>
             <text variable="page" prefix=":"/>
           </group>
         </else>
       </choose>
-      <text prefix=" " macro="access" suffix="."/>
+      <text prefix=" " macro="access"/>
     </layout>
   </bibliography>
 </style>
diff --git a/buildres/csl/csl-styles/the-crispr-journal.csl b/buildres/csl/csl-styles/annals-of-laboratory-medicine.csl
similarity index 74%
rename from buildres/csl/csl-styles/the-crispr-journal.csl
rename to buildres/csl/csl-styles/annals-of-laboratory-medicine.csl
index 078795ece2a..b8ac0a9fee1 100644
--- a/buildres/csl/csl-styles/the-crispr-journal.csl
+++ b/buildres/csl/csl-styles/annals-of-laboratory-medicine.csl
@@ -1,29 +1,24 @@
 <?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">
-  <!-- This style was edited with the Visual CSL Editor (https://editor.citationstyles.org/visualEditor/) -->
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only" default-locale="en-GB">
   <info>
-    <title>The CRISPR Journal</title>
-    <title-short>CRISPR J</title-short>
-    <id>http://www.zotero.org/styles/the-crispr-journal</id>
-    <link href="http://www.zotero.org/styles/the-crispr-journal" rel="self"/>
-    <link href="http://www.zotero.org/styles/sage-vancouver" rel="template"/>
-    <link href="https://home.liebertpub.com/publications/the-crispr-journal/642/for-authors" rel="documentation"/>
+    <title>Annals of Laboratory Medicine</title>
+    <title-short>ALM</title-short>
+    <id>http://www.zotero.org/styles/annals-of-laboratory-medicine</id>
+    <link href="http://www.zotero.org/styles/annals-of-laboratory-medicine" rel="self"/>
+    <link href="http://www.zotero.org/styles/sage-vancouver-brackets" rel="template"/>
+    <link href="http://www.annlabmed.org/content/authors/file/Author%E2%80%99s_Checklist.pdf?v=2203101106" rel="documentation"/>
     <author>
-      <name>Heather Malloy</name>
+      <name>Taeo Ma</name>
+      <email>mcmdma@naver.com</email>
     </author>
     <category citation-format="numeric"/>
-    <category field="biology"/>
     <category field="medicine"/>
-    <issn>2573-1599</issn>
-    <eissn>2573-1602</eissn>
-    <updated>2021-02-05T01:22:24+00:00</updated>
+    <summary>Annals of Laboratory Medicine style</summary>
+    <issn>2234-3806</issn>
+    <eissn>2234-3814</eissn>
+    <updated>2022-03-10T09:47:13+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
-  <locale xml:lang="en">
-    <terms>
-      <term name="available at">available from</term>
-    </terms>
-  </locale>
   <macro name="author">
     <names variable="author" suffix=". ">
       <name sort-separator=" " initialize-with="" name-as-sort-order="all" delimiter=", " delimiter-precedes-last="always"/>
@@ -36,7 +31,7 @@
   <macro name="editor">
     <names variable="editor">
       <name sort-separator=" " initialize-with="" name-as-sort-order="all" delimiter=", " delimiter-precedes-last="always"/>
-      <label form="short" strip-periods="true" prefix=" (" suffix=")"/>
+      <label form="short" prefix=" (" suffix=")" strip-periods="true"/>
     </names>
   </macro>
   <macro name="date">
@@ -50,7 +45,7 @@
     </choose>
   </macro>
   <macro name="publisher">
-    <group delimiter=". ">
+    <group delimiter=", ">
       <group delimiter=" ">
         <text variable="genre" text-case="title"/>
         <text variable="number"/>
@@ -81,11 +76,8 @@
             </group>
           </if>
           <else>
-            <group delimiter=". ">
-              <group delimiter=": ">
-                <text term="available at" text-case="capitalize-first"/>
-                <text variable="URL"/>
-              </group>
+            <group delimiter=" " prefix=", ">
+              <text variable="URL"/>
               <text macro="accessed-date"/>
             </group>
           </else>
@@ -96,10 +88,10 @@
   <macro name="accessed-date">
     <choose>
       <if variable="URL">
-        <group delimiter=". ">
+        <group prefix="(" suffix=")" delimiter=", ">
           <text macro="date"/>
           <group delimiter=" ">
-            <text term="accessed" text-case="capitalize-first"/>
+            <text term="accessed"/>
             <date variable="accessed" form="text"/>
           </group>
         </group>
@@ -109,10 +101,10 @@
   <macro name="container-title">
     <choose>
       <if type="article-journal" match="any">
-        <text variable="container-title" form="short" strip-periods="true" font-style="normal"/>
+        <text variable="container-title" form="short" strip-periods="true"/>
       </if>
       <else>
-        <text variable="container-title" font-style="italic"/>
+        <text variable="container-title"/>
       </else>
     </choose>
   </macro>
@@ -149,29 +141,30 @@
     <sort>
       <key variable="citation-number"/>
     </sort>
-    <layout delimiter="," vertical-align="sup">
+    <layout delimiter=", " prefix="[" suffix="]">
       <text variable="citation-number"/>
     </layout>
   </citation>
-  <bibliography delimiter-precedes-et-al="always" et-al-min="4" et-al-use-first="3" second-field-align="flush" line-spacing="2">
+  <bibliography et-al-min="7" et-al-use-first="6" second-field-align="flush">
     <layout suffix=".">
-      <text variable="citation-number" suffix=". "/>
+      <text variable="citation-number" prefix="" 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 term="in" suffix=": " text-case="capitalize-first"/>
             <text macro="edition"/>
             <text macro="publisher"/>
           </group>
         </if>
         <else-if type="chapter paper-conference" match="any">
-          <group delimiter="; " prefix=". ">
+          <group delimiter=", " prefix=". ">
             <group delimiter=". ">
               <group delimiter=" ">
-                <text term="in" suffix=":" text-case="capitalize-first"/>
+                <text term="in" suffix=": " text-case="capitalize-first"/>
                 <text macro="editor"/>
-                <text variable="container-title" font-style="normal"/>
+                <text variable="container-title"/>
               </group>
               <text macro="publisher"/>
             </group>
@@ -202,7 +195,7 @@
           </group>
         </else>
       </choose>
-      <text macro="access" prefix=" "/>
+      <text macro="access"/>
     </layout>
   </bibliography>
 </style>
diff --git a/buildres/csl/csl-styles/annual-review-of-linguistics.csl b/buildres/csl/csl-styles/annual-review-of-linguistics.csl
new file mode 100644
index 00000000000..dc75f6568fa
--- /dev/null
+++ b/buildres/csl/csl-styles/annual-review-of-linguistics.csl
@@ -0,0 +1,399 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" page-range-format="chicago" demote-non-dropping-particle="never" default-locale="en-US">
+  <!-- This style was edited with the Visual CSL Editor (https://editor.citationstyles.org/visualEditor/) -->
+  <info>
+    <title>Annual Review of Linguistics</title>
+    <id>http://www.zotero.org/styles/annual-review-of-linguistics</id>
+    <link href="http://www.zotero.org/styles/annual-review-of-linguistics" rel="self"/>
+    <link href="http://www.zotero.org/styles/annual-reviews-alphabetical" rel="template"/>
+    <link href="http://www.annualreviews.org/page/authors/author-instructions/preparing/handbooks" rel="documentation"/>
+    <author>
+      <name>Michael Berkowitz</name>
+      <email>mberkowi@gmu.edu</email>
+    </author>
+    <contributor>
+      <name>Julian Onions</name>
+      <email>julian.onions@gmail.com</email>
+    </contributor>
+    <contributor>
+      <name>Rintze Zelle</name>
+      <uri>http://twitter.com/rintzezelle</uri>
+    </contributor>
+    <contributor>
+      <name>Sebastian Karcher</name>
+    </contributor>
+    <contributor>
+      <name>Aurimas Vinckevicius</name>
+      <email>aurimas.dev@gmail.com</email>
+    </contributor>
+    <contributor>
+      <name>Brenton Wiernik</name>
+      <email>wiernik@workpsy.ch</email>
+    </contributor>
+    <contributor>
+      <name>Dan Villarreal</name>
+      <email>d.vill@pitt.edu</email>
+    </contributor>
+    <category citation-format="author-date"/>
+    <category field="generic-base"/>
+    <updated>2022-03-28T19:39:51+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="short">
+        <single>ed</single>
+        <multiple>eds</multiple>
+      </term>
+      <term name="month-03" form="short">March</term>
+      <term name="month-04" form="short">April</term>
+      <term name="month-05" form="short">May</term>
+      <term name="month-06" form="short">June</term>
+      <term name="month-07" form="short">July</term>
+    </terms>
+  </locale>
+  <macro name="author">
+    <names variable="author">
+      <name et-al-min="6" initialize-with="" name-as-sort-order="all" sort-separator=" "/>
+      <label form="short" prefix=", "/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <text macro="title"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="author-short">
+    <names variable="author">
+      <name form="short" delimiter=", " and="symbol" delimiter-precedes-last="never"/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <text macro="title"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="author-last-names">
+    <names variable="author">
+      <name form="short"/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="editor">
+    <names variable="editor">
+      <label form="short" suffix=". " plural="contextual"/>
+      <name initialize-with="" delimiter=", "/>
+    </names>
+  </macro>
+  <macro name="year-date">
+    <date variable="issued">
+      <date-part name="year"/>
+    </date>
+  </macro>
+  <macro name="date-original">
+    <group delimiter=" ">
+      <date variable="issued">
+        <date-part name="year"/>
+      </date>
+      <date variable="original-date" prefix="(" suffix=")">
+        <date-part name="year"/>
+      </date>
+    </group>
+  </macro>
+  <macro name="date-m-d">
+    <date variable="issued" delimiter=" ">
+      <date-part name="month" form="short"/>
+      <date-part name="day"/>
+    </date>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="bill graphic legal_case legislation motion_picture song thesis webpage manuscript" match="any">
+        <text variable="title" font-style="italic"/>
+      </if>
+      <else-if type="book" match="any">
+        <group delimiter=", ">
+          <text variable="title" font-style="italic" text-case="title"/>
+          <group>
+            <label variable="volume" form="short" suffix=" " text-case="capitalize-first"/>
+            <text variable="volume" text-case="title"/>
+          </group>
+        </group>
+      </else-if>
+      <else>
+        <text variable="title"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="container-title">
+    <choose>
+      <if type="paper-conference" match="any">
+        <text variable="event" text-case="title" font-style="italic" prefix="Presented to "/>
+      </if>
+      <else-if type="chapter" match="any">
+        <text term="in" text-case="capitalize-first" suffix=" "/>
+        <group delimiter=", ">
+          <text variable="container-title" text-case="title" font-style="italic"/>
+          <group>
+            <label variable="volume" form="short" suffix=" " text-case="capitalize-first"/>
+            <text variable="volume" text-case="title"/>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="article-newspaper article-magazine article-journal" match="any">
+        <text variable="container-title" form="short" font-style="italic"/>
+      </else-if>
+      <else-if type="report">
+        <text variable="collection-title" font-style="italic" form="short"/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=": ">
+      <text variable="publisher-place"/>
+      <text variable="publisher"/>
+    </group>
+  </macro>
+  <macro name="locator">
+    <choose>
+      <if type="article-journal" match="any">
+        <group prefix=". ">
+          <group suffix=":">
+            <text variable="volume"/>
+            <text variable="issue" prefix="(" suffix=")"/>
+          </group>
+          <group delimiter=". ">
+            <text variable="page"/>
+            <text macro="status"/>
+          </group>
+        </group>
+      </if>
+      <else-if type="paper-conference" match="any">
+        <choose>
+          <if variable="volume">
+            <group prefix=". ">
+              <group suffix=":">
+                <text variable="volume"/>
+                <text variable="issue" prefix="(" suffix=")"/>
+              </group>
+              <choose>
+                <if variable="page" match="any">
+                  <group delimiter=". ">
+                    <text variable="page"/>
+                    <text macro="status"/>
+                  </group>
+                </if>
+                <else>
+                  <text variable="URL" prefix=". "/>
+                </else>
+              </choose>
+            </group>
+          </if>
+          <else>
+            <choose>
+              <if is-numeric="page" match="all">
+                <group prefix=", ">
+                  <label variable="page" form="short" suffix=" "/>
+                  <text variable="page"/>
+                </group>
+              </if>
+              <else>
+                <text variable="page" prefix=". "/>
+              </else>
+            </choose>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="chapter" match="any">
+        <group prefix=", ">
+          <label variable="page" form="short" suffix=" "/>
+          <text variable="page"/>
+        </group>
+      </else-if>
+      <else-if type="article-magazine article-newspaper" match="any">
+        <group delimiter=", ">
+          <text macro="date-m-d"/>
+          <choose>
+            <if variable="page" match="any">
+              <choose>
+                <if is-numeric="page" match="all">
+                  <group prefix=", ">
+                    <label variable="page" form="short" suffix=" "/>
+                    <text variable="page"/>
+                  </group>
+                </if>
+                <else>
+                  <text variable="page" prefix=". "/>
+                </else>
+              </choose>
+            </if>
+            <else>
+              <text variable="URL" prefix=". "/>
+            </else>
+          </choose>
+        </group>
+      </else-if>
+      <else>
+        <text variable="page"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="container">
+    <choose>
+      <if type="book" match="any">
+        <group delimiter=". ">
+          <text macro="publisher"/>
+          <group delimiter=" ">
+            <number variable="edition" form="ordinal"/>
+            <label variable="edition" form="short"/>
+          </group>
+          <text macro="status"/>
+        </group>
+      </if>
+      <else-if type="chapter" match="any">
+        <group delimiter=". ">
+          <group>
+            <text macro="container-title"/>
+            <text macro="editor" prefix=", "/>
+            <text macro="locator"/>
+          </group>
+          <text macro="publisher"/>
+          <group delimiter=" ">
+            <number variable="edition" form="ordinal"/>
+            <label variable="edition" form="short"/>
+          </group>
+          <text macro="status"/>
+        </group>
+      </else-if>
+      <else-if type="article-journal" match="any">
+        <text macro="container-title"/>
+        <text macro="locator"/>
+      </else-if>
+      <else-if type="paper-conference" match="any">
+        <choose>
+          <if variable="volume" match="any">
+            <text macro="container-title"/>
+            <text macro="locator"/>
+          </if>
+          <else>
+            <text macro="container-title"/>
+            <text macro="locator"/>
+            <choose>
+              <if variable="publisher" match="any">
+                <group delimiter=". " prefix=". ">
+                  <text macro="publisher"/>
+                  <text macro="status"/>
+                </group>
+              </if>
+              <else>
+                <text variable="URL" prefix=". "/>
+              </else>
+            </choose>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="article-magazine article-newspaper" match="any">
+        <group delimiter=". ">
+          <group delimiter=", ">
+            <text macro="container-title"/>
+            <text macro="locator"/>
+          </group>
+          <text macro="status"/>
+        </group>
+      </else-if>
+      <else-if type="broadcast" match="any">
+        <group delimiter=", ">
+          <text variable="publisher-place"/>
+          <group delimiter=" " font-style="italic">
+            <text variable="publisher"/>
+            <text value="Broadcast"/>
+          </group>
+          <text macro="date-m-d"/>
+        </group>
+      </else-if>
+      <else-if type="patent" match="any">
+        <group font-style="italic">
+          <text variable="number"/>
+        </group>
+      </else-if>
+      <else-if type="report" match="any">
+        <group delimiter=". ">
+          <text macro="container-title"/>
+          <group delimiter=". ">
+            <group delimiter=", ">
+              <text variable="number" font-style="italic"/>
+              <text variable="publisher"/>
+              <text variable="publisher-place"/>
+            </group>
+            <text macro="status"/>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="thesis" match="any">
+        <group delimiter=", ">
+          <text variable="genre"/>
+          <text variable="publisher" form="short"/>
+          <text variable="event-place"/>
+        </group>
+      </else-if>
+      <else-if type="post-weblog" match="any">
+        <group delimiter=", " suffix=". ">
+          <text variable="container-title" font-style="italic"/>
+          <date date-parts="year-month" form="text" variable="issued"/>
+        </group>
+        <text variable="URL"/>
+      </else-if>
+      <else-if type="webpage" match="any">
+        <group delimiter=". ">
+          <text variable="container-title"/>
+          <text variable="URL" form="short"/>
+        </group>
+      </else-if>
+      <else-if type="manuscript">
+        <group>
+          <text value="Work. Pap."/>
+        </group>
+        <text variable="publisher-place" prefix=", "/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="status">
+    <text variable="status" text-case="capitalize-first"/>
+  </macro>
+  <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" collapse="year-suffix-ranged" year-suffix-delimiter="," after-collapse-delimiter="; ">
+    <sort>
+      <key macro="author-short" names-min="2" names-use-first="1"/>
+      <key macro="year-date"/>
+    </sort>
+    <layout prefix="(" suffix=")" delimiter=", ">
+      <group delimiter=", ">
+        <group delimiter=" ">
+          <text macro="author-short"/>
+          <text macro="year-date"/>
+        </group>
+        <group delimiter=" ">
+          <label variable="locator" form="short"/>
+          <text variable="locator"/>
+        </group>
+      </group>
+    </layout>
+  </citation>
+  <bibliography entry-spacing="0" line-spacing="2" hanging-indent="true" et-al-min="7" et-al-use-first="5">
+    <sort>
+      <key macro="author" names-min="2" names-use-first="1" names-use-last="false"/>
+      <key macro="author-last-names"/>
+      <key macro="year-date"/>
+    </sort>
+    <layout>
+      <group delimiter=". ">
+        <text macro="author"/>
+        <text macro="date-original"/>
+        <text macro="title"/>
+        <text macro="container"/>
+      </group>
+    </layout>
+  </bibliography>
+</style>
diff --git a/buildres/csl/csl-styles/antioxidants-and-redox-signaling.csl b/buildres/csl/csl-styles/antioxidants-and-redox-signaling.csl
deleted file mode 100644
index de5e0011a7d..00000000000
--- a/buildres/csl/csl-styles/antioxidants-and-redox-signaling.csl
+++ /dev/null
@@ -1,145 +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>Antioxidants &amp; Redox Signaling</title>
-    <title-short>ARS</title-short>
-    <id>http://www.zotero.org/styles/antioxidants-and-redox-signaling</id>
-    <link href="http://www.zotero.org/styles/antioxidants-and-redox-signaling" rel="self"/>
-    <link href="http://www.zotero.org/styles/spandidos-publications" rel="template"/>
-    <link href="https://home.liebertpub.com/publications/antioxidants-and-redox-signaling/4/for-authors" rel="documentation"/>
-    <author>
-      <name>Patrick O'Brien</name>
-    </author>
-    <category citation-format="numeric"/>
-    <category field="biology"/>
-    <issn>1523-0864</issn>
-    <eissn>1557-7716</eissn>
-    <updated>2018-09-12T15:52:16+00:00</updated>
-    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
-  </info>
-  <macro name="author">
-    <names variable="author">
-      <name and="text" initialize-with="" name-as-sort-order="all" sort-separator=" "/>
-      <et-al font-style="italic"/>
-      <label form="short" text-case="capitalize-first" strip-periods="true" prefix=" (" suffix=")"/>
-      <substitute>
-        <names variable="editor"/>
-      </substitute>
-    </names>
-  </macro>
-  <macro name="editor">
-    <names variable="editor">
-      <label form="verb" strip-periods="true"/>
-      <name prefix=" " and="text" delimiter-precedes-last="never" initialize-with="" name-as-sort-order="all" sort-separator=" "/>
-    </names>
-  </macro>
-  <macro name="publisher">
-    <group delimiter=", ">
-      <text variable="publisher-place"/>
-      <text variable="publisher"/>
-    </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>
-  <macro name="title">
-    <choose>
-      <if type="book" match="any">
-        <text variable="title" font-style="italic"/>
-      </if>
-      <else>
-        <text variable="title"/>
-      </else>
-    </choose>
-  </macro>
-  <macro name="date">
-    <date variable="issued">
-      <date-part name="year"/>
-    </date>
-  </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" entry-spacing="0">
-    <sort>
-      <key macro="author"/>
-      <key variable="issued"/>
-    </sort>
-    <layout suffix=".">
-      <text variable="citation-number" suffix=". "/>
-      <group delimiter=". " suffix=".">
-        <text macro="author"/>
-        <text macro="title"/>
-      </group>
-      <choose>
-        <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
-          <group delimiter=", " prefix=" ">
-            <group suffix=".">
-              <text macro="edition" prefix=" "/>
-              <text macro="editor" prefix=" (" suffix=")"/>
-            </group>
-            <text macro="publisher"/>
-            <text macro="date"/>
-          </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" font-style="italic"/>
-                <text macro="edition"/>
-                <text macro="editor"/>
-              </group>
-            </group>
-            <group delimiter=", ">
-              <group>
-                <text variable="volume" form="long" prefix="vol. "/>
-                <text macro="publisher"/>
-              </group>
-              <text macro="date"/>
-              <group delimiter=" ">
-                <label strip-periods="false" variable="page" form="short"/>
-                <text variable="page"/>
-              </group>
-            </group>
-          </group>
-        </else-if>
-        <else-if type="webpage post-weblog post" match="any">
-          <group delimiter=". " prefix=" ">
-            <text variable="container-title"/>
-            <text variable="URL"/>
-            <date form="text" variable="accessed"/>
-          </group>
-        </else-if>
-        <else>
-          <group delimiter=", ">
-            <group delimiter=": " prefix=" ">
-              <group delimiter=" ">
-                <text variable="container-title" form="short" strip-periods="true" font-style="italic"/>
-                <text variable="volume"/>
-              </group>
-              <text variable="page"/>
-            </group>
-            <text macro="date"/>
-          </group>
-        </else>
-      </choose>
-    </layout>
-  </bibliography>
-</style>
diff --git a/buildres/csl/csl-styles/antiquites-africaines.csl b/buildres/csl/csl-styles/antiquites-africaines.csl
index 743bbce5935..624a700db45 100644
--- a/buildres/csl/csl-styles/antiquites-africaines.csl
+++ b/buildres/csl/csl-styles/antiquites-africaines.csl
@@ -9,27 +9,26 @@
     <link href="https://journals.openedition.org/antafr/340" rel="documentation"/>
     <author>
       <name>Antonio Mendes da Silva</name>
-      <email>mendes@mmsh.univ-aix.fr</email>
+      <email>antonio.mendes@cnrs.fr</email>
     </author>
     <category citation-format="author-date"/>
     <category field="humanities"/>
     <category field="history"/>
     <issn>0066-4871</issn>
     <eissn>2117-539X</eissn>
-    <summary>Style conçu pour la revue Antiquités africaines. Histoire et archéologie de
-            l’Afrique du Nord, de la protohistoire à la conquête arabe &#8211; History and
-            archaeology of North Africa, from protohistory to the Arab conquests. Centre Camille
-            Jullian, CNRS</summary>
-    <updated>2020-05-04T12:23:43+00:00</updated>
+    <summary>Style conçu pour la revue Antiquités africaines. Histoire et archéologie de l’Afrique
+      du Nord, de la protohistoire à la conquête arabe &#8211; History and archaeology of North
+      Africa, from protohistory to the Arab conquests. Centre Camille Jullian, CNRS</summary>
+    <updated>2020-05-10T04:06:15+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <locale xml:lang="fr">
     <terms>
-      <term name="no date" form="short">[s.d.]</term>
+      <term name="no date" form="short">s.d.</term>
       <term name="et-al">et alii</term>
       <term name="editor" form="short">
-        <single>dir.</single>
-        <multiple>dirs.</multiple>
+        <single>éd.</single>
+        <multiple>éd.</multiple>
       </term>
     </terms>
   </locale>
@@ -105,7 +104,7 @@
         </names>
       </else-if>
       <else-if type="book">
-        <text variable="title-short"/>
+        <text variable="title-short" font-style="italic"/>
       </else-if>
       <else-if type="map">
         <text variable="title-short"/>
@@ -133,6 +132,14 @@
           <label form="short" prefix=" (" suffix=".)"/>
         </names>
       </else-if>
+      <else-if variable="editorial-director">
+        <names variable="editorial-director" suffix=" ">
+          <name name-as-sort-order="all" and="text" initialize-with=". " delimiter-precedes-last="never" sort-separator=" ">
+            <name-part name="family" font-variant="small-caps"/>
+          </name>
+          <label form="short" prefix=" (" suffix=".)"/>
+        </names>
+      </else-if>
     </choose>
   </macro>
   <macro name="editor">
@@ -274,7 +281,7 @@
           <choose>
             <if variable="issued">
               <text macro="volume" prefix=", "/>
-              <text variable="issue" prefix="&amp;#160;"/>
+              <text variable="issue" prefix="&#160;"/>
             </if>
             <else>
               <text macro="volume" prefix=", "/>
@@ -343,10 +350,9 @@
   <macro name="collection">
     <choose>
       <if type="motion_picture map entry-dictionary entry-encyclopedia book speech paper-conference chapter" match="any">
-        <group prefix=" (" suffix=")" delimiter=", ">
+        <group prefix=" (" suffix=")">
           <text variable="collection-title"/>
-          <text macro="volume"/>
-          <text variable="collection-number"/>
+          <text variable="collection-number" prefix=" "/>
         </group>
       </if>
       <else-if type="article-journal">
@@ -361,6 +367,7 @@
     <group suffix=", " prefix=" ">
       <choose>
         <if variable="issued">
+          <text macro="originally-published" suffix=" "/>
           <date variable="issued">
             <date-part name="year" form="long"/>
           </date>
@@ -383,6 +390,15 @@
       </else>
     </choose>
   </macro>
+  <macro name="originally-published">
+    <group delimiter=", " prefix=" [" suffix="]">
+      <date variable="original-date">
+        <date-part name="day" suffix=" "/>
+        <date-part name="month" suffix=" "/>
+        <date-part name="year"/>
+      </date>
+    </group>
+  </macro>
   <macro name="page-bib">
     <choose>
       <if type="book" match="any"/>
@@ -444,7 +460,6 @@
     <group suffix=", ">
       <choose>
         <if is-numeric="volume">
-          <text term="volume" form="short" suffix=". "/>
           <text variable="volume"/>
           <text variable="number-of-volumes" prefix="/"/>
         </if>
@@ -465,19 +480,28 @@
       </names>
     </group>
   </macro>
-  <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" collapse="year" year-suffix-delimiter=", " after-collapse-delimiter="&amp;#160;; " name-delimiter=", " initialize-with=". " delimiter-precedes-last="never" name-as-sort-order="all" sort-separator=" ">
+  <macro name="archive">
+    <group suffix="." prefix=". ">
+      <group delimiter=", ">
+        <text variable="archive"/>
+        <text variable="archive_location"/>
+        <text variable="call-number"/>
+      </group>
+    </group>
+  </macro>
+  <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" collapse="year" year-suffix-delimiter=", " after-collapse-delimiter="&#160;; " name-delimiter=", " initialize-with=". " delimiter-precedes-last="never" name-as-sort-order="all" sort-separator=" ">
     <sort>
       <key variable="issued" sort="descending"/>
       <key macro="author-citation"/>
       <key macro="title"/>
     </sort>
-    <layout delimiter="&amp;#160;; ">
-      <group delimiter=",&amp;#160;">
+    <layout delimiter="&#160;; ">
+      <group delimiter=",&#160;">
         <group delimiter=" ">
           <text macro="author-citation"/>
           <text macro="year-date-short"/>
         </group>
-        <group delimiter="&amp;#160;">
+        <group delimiter="&#160;">
           <label variable="locator" form="short"/>
           <text variable="locator"/>
         </group>
@@ -501,6 +525,7 @@
         <text macro="place"/>
         <text macro="collection"/>
         <text macro="page-bib"/>
+        <text macro="archive"/>
       </group>
       <text variable="URL"/>
     </layout>
diff --git a/buildres/csl/csl-styles/apa-5th-edition.csl b/buildres/csl/csl-styles/apa-5th-edition.csl
index a2784ca4b5b..87cc83196a3 100644
--- a/buildres/csl/csl-styles/apa-5th-edition.csl
+++ b/buildres/csl/csl-styles/apa-5th-edition.csl
@@ -183,7 +183,7 @@
       </else-if>
       <else>
         <choose>
-          <if variable="event" match="none">
+          <if variable="event event-title" match="none">
             <text variable="genre" suffix=", "/>
           </if>
         </choose>
@@ -196,23 +196,37 @@
   </macro>
   <macro name="event">
     <choose>
-      <if variable="event">
+      <if variable="event event-title" match="any">
         <choose>
           <if variable="genre" match="none">
             <text term="presented at" text-case="capitalize-first" suffix=" "/>
-            <text variable="event"/>
+            <text macro="event-title"/>
           </if>
           <else>
             <group delimiter=" ">
               <text variable="genre" text-case="capitalize-first"/>
               <text term="presented at"/>
-              <text variable="event"/>
+              <text macro="event-title"/>
             </group>
           </else>
         </choose>
       </if>
     </choose>
   </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="issued">
     <choose>
       <if variable="issued">
diff --git a/buildres/csl/csl-styles/apa-6th-edition-no-ampersand.csl b/buildres/csl/csl-styles/apa-6th-edition-no-ampersand.csl
index b0f618ec31f..70e5db1f6ab 100644
--- a/buildres/csl/csl-styles/apa-6th-edition-no-ampersand.csl
+++ b/buildres/csl/csl-styles/apa-6th-edition-no-ampersand.csl
@@ -897,32 +897,52 @@
   </macro>
   <macro name="event">
     <choose>
-      <if variable="event" type="speech paper-conference" match="any">
+      <if variable="event event-title" match="any">
+        <!-- To prevent Zotero from printing event-place due to its double-mapping of all 'place' to
+             both publisher-place and event-place. Remove this 'choose' when that is changed. -->
         <choose>
-          <!-- Don't print event info if published in a proceedings -->
-          <if variable="collection-editor editor issue page volume" match="none">
-            <group delimiter=" ">
-              <text variable="genre" text-case="capitalize-first"/>
-              <group delimiter=" ">
-                <choose>
-                  <if variable="genre">
-                    <text term="presented at"/>
-                  </if>
-                  <else>
-                    <text term="presented at" text-case="capitalize-first"/>
-                  </else>
-                </choose>
-                <group delimiter=", ">
-                  <text variable="event"/>
-                  <text variable="event-place"/>
+          <if variable="event" type="speech paper-conference" match="any">
+            <choose>
+              <!-- Don't print event info if published in a proceedings -->
+              <if variable="collection-editor editor issue page volume" match="none">
+                <group delimiter=" ">
+                  <text variable="genre" text-case="capitalize-first"/>
+                  <group delimiter=" ">
+                    <choose>
+                      <if variable="genre">
+                        <text term="presented at"/>
+                      </if>
+                      <else>
+                        <text term="presented at" text-case="capitalize-first"/>
+                      </else>
+                    </choose>
+                    <group delimiter=", ">
+                      <text macro="event-title"/>
+                      <text variable="event-place"/>
+                    </group>
+                  </group>
                 </group>
-              </group>
-            </group>
+              </if>
+            </choose>
           </if>
         </choose>
       </if>
     </choose>
   </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="issued">
     <choose>
       <if type="bill legal_case legislation" match="any"/>
@@ -1401,7 +1421,7 @@
         <group prefix="(" suffix=")">
           <choose>
             <if variable="references">
-              <!-- This provides the option for more elaborate description 
+              <!-- This provides the option for more elaborate description
                    of publication history, such as full "reprinted" references
                    (example 26) or retracted references -->
               <text variable="references"/>
diff --git a/buildres/csl/csl-styles/apa-6th-edition.csl b/buildres/csl/csl-styles/apa-6th-edition.csl
index 775857accbe..82ad9ae3084 100644
--- a/buildres/csl/csl-styles/apa-6th-edition.csl
+++ b/buildres/csl/csl-styles/apa-6th-edition.csl
@@ -896,32 +896,52 @@
   </macro>
   <macro name="event">
     <choose>
-      <if variable="event" type="speech paper-conference" match="any">
+      <if variable="event event-title" match="any">
+        <!-- To prevent Zotero from printing event-place due to its double-mapping of all 'place' to
+             both publisher-place and event-place. Remove this 'choose' when that is changed. -->
         <choose>
-          <!-- Don't print event info if published in a proceedings -->
-          <if variable="collection-editor editor issue page volume" match="none">
-            <group delimiter=" ">
-              <text variable="genre" text-case="capitalize-first"/>
-              <group delimiter=" ">
-                <choose>
-                  <if variable="genre">
-                    <text term="presented at"/>
-                  </if>
-                  <else>
-                    <text term="presented at" text-case="capitalize-first"/>
-                  </else>
-                </choose>
-                <group delimiter=", ">
-                  <text variable="event"/>
-                  <text variable="event-place"/>
+          <if variable="event" type="speech paper-conference" match="any">
+            <choose>
+              <!-- Don't print event info if published in a proceedings -->
+              <if variable="collection-editor editor issue page volume" match="none">
+                <group delimiter=" ">
+                  <text variable="genre" text-case="capitalize-first"/>
+                  <group delimiter=" ">
+                    <choose>
+                      <if variable="genre">
+                        <text term="presented at"/>
+                      </if>
+                      <else>
+                        <text term="presented at" text-case="capitalize-first"/>
+                      </else>
+                    </choose>
+                    <group delimiter=", ">
+                      <text macro="event-title"/>
+                      <text variable="event-place"/>
+                    </group>
+                  </group>
                 </group>
-              </group>
-            </group>
+              </if>
+            </choose>
           </if>
         </choose>
       </if>
     </choose>
   </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="issued">
     <choose>
       <if type="bill legal_case legislation" match="any"/>
@@ -1400,7 +1420,7 @@
         <group prefix="(" suffix=")">
           <choose>
             <if variable="references">
-              <!-- This provides the option for more elaborate description 
+              <!-- This provides the option for more elaborate description
                    of publication history, such as full "reprinted" references
                    (example 26) or retracted references -->
               <text variable="references"/>
diff --git a/buildres/csl/csl-styles/apa-annotated-bibliography.csl b/buildres/csl/csl-styles/apa-annotated-bibliography.csl
index 014ae44f162..055541d0d4f 100644
--- a/buildres/csl/csl-styles/apa-annotated-bibliography.csl
+++ b/buildres/csl/csl-styles/apa-annotated-bibliography.csl
@@ -320,8 +320,8 @@
   <!-- General categories of item types:
        Periodical: article-journal article-magazine article-newspaper post-weblog review review-book
        Periodical or Booklike: paper-conference
-       Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure 
-                 graphic interview manuscript map motion_picture musical_score pamphlet patent 
+       Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure
+                 graphic interview manuscript map motion_picture musical_score pamphlet patent
                  personal_communication report song speech thesis post webpage
        Legal: bill legal_case legislation treaty
   -->
@@ -389,7 +389,7 @@
       </if>
       <else-if type="interview personal_communication" match="any">
         <choose>
-          <!-- These variables indicate that the letter is retrievable by the reader. 
+          <!-- These variables indicate that the letter is retrievable by the reader.
                 If not, then use the APA in-text-only personal communication format -->
           <if variable="archive container-title DOI publisher URL" match="none">
             <group delimiter=", ">
@@ -470,7 +470,7 @@
                   </if>
                 </choose>
               </else-if>
-              <!-- Only year: article article-journal book chapter entry entry-dictionary entry-encyclopedia dataset figure graphic 
+              <!-- Only year: article article-journal book chapter entry entry-dictionary entry-encyclopedia dataset figure graphic
                    manuscript map musical_score paper-conference[published] patent report review review-book thesis -->
             </choose>
           </if>
@@ -529,7 +529,7 @@
                 <if type="interview personal_communication" match="any">
                   <choose>
                     <if variable="archive container-title DOI publisher URL" match="none">
-                      <!-- These variables indicate that the communication is retrievable by the reader. 
+                      <!-- These variables indicate that the communication is retrievable by the reader.
                            If not, then use the in-text-only personal communication format -->
                       <date variable="issued" form="text"/>
                     </if>
@@ -1294,7 +1294,7 @@
   <macro name="reviewed-title">
     <choose>
       <if variable="reviewed-title">
-        <!-- Not possible to distinguish TV series episode from other reviewed 
+        <!-- Not possible to distinguish TV series episode from other reviewed
               works [Ex. 69] -->
         <text variable="reviewed-title" font-style="italic"/>
       </if>
@@ -1552,14 +1552,14 @@
   </macro>
   <macro name="event">
     <choose>
-      <if variable="event">
+      <if variable="event event-title" match="any">
         <!-- To prevent Zotero from printing event-place due to its double-mapping of all 'place' to
              both publisher-place and event-place. Remove this 'choose' when that is changed. -->
         <choose>
           <if variable="collection-editor editor editorial-director issue page volume" match="none">
             <!-- Don't print event info if published in a proceedings -->
             <group delimiter=", ">
-              <text variable="event"/>
+              <text macro="event-title"/>
               <text variable="event-place"/>
             </group>
           </if>
@@ -1567,6 +1567,20 @@
       </if>
     </choose>
   </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>
   <!-- After 'source', APA also prints publication history (original publication, reprint info, retraction info) -->
   <macro name="publication-history">
     <choose>
@@ -1574,7 +1588,7 @@
         <group prefix="(" suffix=")">
           <choose>
             <if variable="references">
-              <!-- This provides the option for more elaborate description 
+              <!-- This provides the option for more elaborate description
                    of publication history, such as full "reprinted" references
                    (examples 11, 43, 44) or retracted references -->
               <text variable="references"/>
diff --git a/buildres/csl/csl-styles/apa-cv.csl b/buildres/csl/csl-styles/apa-cv.csl
index 5a766c3dc61..44888982952 100644
--- a/buildres/csl/csl-styles/apa-cv.csl
+++ b/buildres/csl/csl-styles/apa-cv.csl
@@ -320,8 +320,8 @@
   <!-- General categories of item types:
         Periodical: article-journal article-magazine article-newspaper post-weblog review review-book
         Periodical or Booklike: paper-conference
-        Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure 
-                  graphic interview manuscript map motion_picture musical_score pamphlet patent 
+        Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure
+                  graphic interview manuscript map motion_picture musical_score pamphlet patent
                   personal_communication report song speech thesis post webpage
         Legal: bill legal_case legislation treaty
   -->
@@ -415,7 +415,7 @@
                   </if>
                 </choose>
               </else-if>
-              <!-- Only year: article article-journal book chapter entry entry-dictionary entry-encyclopedia dataset figure graphic 
+              <!-- Only year: article article-journal book chapter entry entry-dictionary entry-encyclopedia dataset figure graphic
                     manuscript map musical_score paper-conference[published] patent report review review-book thesis -->
             </choose>
           </if>
@@ -1085,7 +1085,7 @@
   <macro name="reviewed-title">
     <choose>
       <if variable="reviewed-title">
-        <!-- Not possible to distinguish TV series episode from other reviewed 
+        <!-- Not possible to distinguish TV series episode from other reviewed
               works [Ex. 69] -->
         <text variable="reviewed-title" font-style="italic"/>
       </if>
@@ -1299,14 +1299,14 @@
   </macro>
   <macro name="event">
     <choose>
-      <if variable="event">
+      <if variable="event event-title" match="any">
         <!-- To prevent Zotero from printing event-place due to its double-mapping of all 'place' to
-              both publisher-place and event-place. Remove this 'choose' when that is changed. -->
+             both publisher-place and event-place. Remove this 'choose' when that is changed. -->
         <choose>
           <if variable="collection-editor editor editorial-director issue page volume" match="none">
             <!-- Don't print event info if published in a proceedings -->
             <group delimiter=", ">
-              <text variable="event"/>
+              <text macro="event-title"/>
               <text variable="event-place"/>
             </group>
           </if>
@@ -1314,6 +1314,20 @@
       </if>
     </choose>
   </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>
   <!-- After 'source', APA also prints publication history (original publication, reprint info, retraction info) -->
   <macro name="publication-history">
     <choose>
@@ -1321,7 +1335,7 @@
         <group prefix="(" suffix=")">
           <choose>
             <if variable="references">
-              <!-- This provides the option for more elaborate description 
+              <!-- This provides the option for more elaborate description
                     of publication history, such as full "reprinted" references
                     (examples 11, 43, 44) or retracted references -->
               <text variable="references"/>
diff --git a/buildres/csl/csl-styles/apa-fr-provost.csl b/buildres/csl/csl-styles/apa-fr-provost.csl
index 4b068cf752d..9e7928dca71 100644
--- a/buildres/csl/csl-styles/apa-fr-provost.csl
+++ b/buildres/csl/csl-styles/apa-fr-provost.csl
@@ -245,7 +245,7 @@
       <else-if type="map post-weblog post" match="none">
         <group delimiter=", ">
           <choose>
-            <if variable="event" match="none">
+            <if variable="event event-title" match="none">
               <text variable="genre" prefix="[" suffix="]"/>
             </if>
           </choose>
@@ -298,17 +298,17 @@
     <choose>
       <if variable="container-title" match="none">
         <choose>
-          <if variable="event">
+          <if variable="event event-title" match="any">
             <choose>
               <if variable="genre" match="none">
                 <text term="presented at" text-case="capitalize-first" suffix=" "/>
-                <text variable="event"/>
+                <text macro="event-title"/>
               </if>
               <else>
                 <group delimiter=" ">
                   <text variable="genre" text-case="capitalize-first"/>
                   <text term="presented at"/>
-                  <text variable="event"/>
+                  <text macro="event-title"/>
                 </group>
               </else>
             </choose>
@@ -317,6 +317,20 @@
       </if>
     </choose>
   </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="extra">
     <choose>
       <if type="manuscript">
diff --git a/buildres/csl/csl-styles/apa-no-ampersand.csl b/buildres/csl/csl-styles/apa-no-ampersand.csl
index 446103abb69..bf9f189455b 100644
--- a/buildres/csl/csl-styles/apa-no-ampersand.csl
+++ b/buildres/csl/csl-styles/apa-no-ampersand.csl
@@ -320,8 +320,8 @@
   <!-- General categories of item types:
         Periodical: article-journal article-magazine article-newspaper post-weblog review review-book
         Periodical or Booklike: paper-conference
-        Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure 
-                  graphic interview manuscript map motion_picture musical_score pamphlet patent 
+        Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure
+                  graphic interview manuscript map motion_picture musical_score pamphlet patent
                   personal_communication report song speech thesis post webpage
         Legal: bill legal_case legislation treaty
   -->
@@ -389,7 +389,7 @@
       </if>
       <else-if type="interview personal_communication" match="any">
         <choose>
-          <!-- These variables indicate that the letter is retrievable by the reader. 
+          <!-- These variables indicate that the letter is retrievable by the reader.
                 If not, then use the APA in-text-only personal communication format -->
           <if variable="archive container-title DOI publisher URL" match="none">
             <group delimiter=", ">
@@ -470,7 +470,7 @@
                   </if>
                 </choose>
               </else-if>
-              <!-- Only year: article article-journal book chapter entry entry-dictionary entry-encyclopedia dataset figure graphic 
+              <!-- Only year: article article-journal book chapter entry entry-dictionary entry-encyclopedia dataset figure graphic
                     manuscript map musical_score paper-conference[published] patent report review review-book thesis -->
             </choose>
           </if>
@@ -529,7 +529,7 @@
                 <if type="interview personal_communication" match="any">
                   <choose>
                     <if variable="archive container-title DOI publisher URL" match="none">
-                      <!-- These variables indicate that the communication is retrievable by the reader. 
+                      <!-- These variables indicate that the communication is retrievable by the reader.
                             If not, then use the in-text-only personal communication format -->
                       <date variable="issued" form="text"/>
                     </if>
@@ -1294,7 +1294,7 @@
   <macro name="reviewed-title">
     <choose>
       <if variable="reviewed-title">
-        <!-- Not possible to distinguish TV series episode from other reviewed 
+        <!-- Not possible to distinguish TV series episode from other reviewed
               works [Ex. 69] -->
         <text variable="reviewed-title" font-style="italic"/>
       </if>
@@ -1552,14 +1552,14 @@
   </macro>
   <macro name="event">
     <choose>
-      <if variable="event">
+      <if variable="event event-title" match="any">
         <!-- To prevent Zotero from printing event-place due to its double-mapping of all 'place' to
-              both publisher-place and event-place. Remove this 'choose' when that is changed. -->
+             both publisher-place and event-place. Remove this 'choose' when that is changed. -->
         <choose>
           <if variable="collection-editor editor editorial-director issue page volume" match="none">
             <!-- Don't print event info if published in a proceedings -->
             <group delimiter=", ">
-              <text variable="event"/>
+              <text macro="event-title"/>
               <text variable="event-place"/>
             </group>
           </if>
@@ -1567,6 +1567,20 @@
       </if>
     </choose>
   </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>
   <!-- After 'source', APA also prints publication history (original publication, reprint info, retraction info) -->
   <macro name="publication-history">
     <choose>
@@ -1574,7 +1588,7 @@
         <group prefix="(" suffix=")">
           <choose>
             <if variable="references">
-              <!-- This provides the option for more elaborate description 
+              <!-- This provides the option for more elaborate description
                     of publication history, such as full "reprinted" references
                     (examples 11, 43, 44) or retracted references -->
               <text variable="references"/>
diff --git a/buildres/csl/csl-styles/apa-no-doi-no-issue.csl b/buildres/csl/csl-styles/apa-no-doi-no-issue.csl
index 08306362d76..5c314996729 100644
--- a/buildres/csl/csl-styles/apa-no-doi-no-issue.csl
+++ b/buildres/csl/csl-styles/apa-no-doi-no-issue.csl
@@ -903,32 +903,52 @@
   </macro>
   <macro name="event">
     <choose>
-      <if variable="event" type="speech paper-conference" match="any">
+      <if variable="event event-title" match="any">
+        <!-- To prevent Zotero from printing event-place due to its double-mapping of all 'place' to
+             both publisher-place and event-place. Remove this 'choose' when that is changed. -->
         <choose>
-          <!-- Don't print event info if published in a proceedings -->
-          <if variable="collection-editor editor issue page volume" match="none">
-            <group delimiter=" ">
-              <text variable="genre" text-case="capitalize-first"/>
-              <group delimiter=" ">
-                <choose>
-                  <if variable="genre">
-                    <text term="presented at"/>
-                  </if>
-                  <else>
-                    <text term="presented at" text-case="capitalize-first"/>
-                  </else>
-                </choose>
-                <group delimiter=", ">
-                  <text variable="event"/>
-                  <text variable="event-place"/>
+          <if variable="event" type="speech paper-conference" match="any">
+            <choose>
+              <!-- Don't print event info if published in a proceedings -->
+              <if variable="collection-editor editor issue page volume" match="none">
+                <group delimiter=" ">
+                  <text variable="genre" text-case="capitalize-first"/>
+                  <group delimiter=" ">
+                    <choose>
+                      <if variable="genre">
+                        <text term="presented at"/>
+                      </if>
+                      <else>
+                        <text term="presented at" text-case="capitalize-first"/>
+                      </else>
+                    </choose>
+                    <group delimiter=", ">
+                      <text macro="event-title"/>
+                      <text variable="event-place"/>
+                    </group>
+                  </group>
                 </group>
-              </group>
-            </group>
+              </if>
+            </choose>
           </if>
         </choose>
       </if>
     </choose>
   </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="issued">
     <choose>
       <if type="bill legal_case legislation" match="any"/>
@@ -1414,7 +1434,7 @@
         <group prefix="(" suffix=")">
           <choose>
             <if variable="references">
-              <!-- This provides the option for more elaborate description 
+              <!-- This provides the option for more elaborate description
                    of publication history, such as full "reprinted" references
                    (example 26) or retracted references -->
               <text variable="references"/>
diff --git a/buildres/csl/csl-styles/apa-no-initials.csl b/buildres/csl/csl-styles/apa-no-initials.csl
index b8bcab11e79..910de1713e0 100644
--- a/buildres/csl/csl-styles/apa-no-initials.csl
+++ b/buildres/csl/csl-styles/apa-no-initials.csl
@@ -320,8 +320,8 @@
   <!-- General categories of item types:
        Periodical: article-journal article-magazine article-newspaper post-weblog review review-book
        Periodical or Booklike: paper-conference
-       Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure 
-                 graphic interview manuscript map motion_picture musical_score pamphlet patent 
+       Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure
+                 graphic interview manuscript map motion_picture musical_score pamphlet patent
                  personal_communication report song speech thesis post webpage
        Legal: bill legal_case legislation treaty
   -->
@@ -389,7 +389,7 @@
       </if>
       <else-if type="interview personal_communication" match="any">
         <choose>
-          <!-- These variables indicate that the letter is retrievable by the reader. 
+          <!-- These variables indicate that the letter is retrievable by the reader.
                 If not, then use the APA in-text-only personal communication format -->
           <if variable="archive container-title DOI publisher URL" match="none">
             <group delimiter=", ">
@@ -470,7 +470,7 @@
                   </if>
                 </choose>
               </else-if>
-              <!-- Only year: article article-journal book chapter entry entry-dictionary entry-encyclopedia dataset figure graphic 
+              <!-- Only year: article article-journal book chapter entry entry-dictionary entry-encyclopedia dataset figure graphic
                    manuscript map musical_score paper-conference[published] patent report review review-book thesis -->
             </choose>
           </if>
@@ -529,7 +529,7 @@
                 <if type="interview personal_communication" match="any">
                   <choose>
                     <if variable="archive container-title DOI publisher URL" match="none">
-                      <!-- These variables indicate that the communication is retrievable by the reader. 
+                      <!-- These variables indicate that the communication is retrievable by the reader.
                            If not, then use the in-text-only personal communication format -->
                       <date variable="issued" form="text"/>
                     </if>
@@ -1294,7 +1294,7 @@
   <macro name="reviewed-title">
     <choose>
       <if variable="reviewed-title">
-        <!-- Not possible to distinguish TV series episode from other reviewed 
+        <!-- Not possible to distinguish TV series episode from other reviewed
               works [Ex. 69] -->
         <text variable="reviewed-title" font-style="italic"/>
       </if>
@@ -1552,14 +1552,14 @@
   </macro>
   <macro name="event">
     <choose>
-      <if variable="event">
+      <if variable="event event-title" match="any">
         <!-- To prevent Zotero from printing event-place due to its double-mapping of all 'place' to
              both publisher-place and event-place. Remove this 'choose' when that is changed. -->
         <choose>
           <if variable="collection-editor editor editorial-director issue page volume" match="none">
             <!-- Don't print event info if published in a proceedings -->
             <group delimiter=", ">
-              <text variable="event"/>
+              <text macro="event-title"/>
               <text variable="event-place"/>
             </group>
           </if>
@@ -1567,6 +1567,20 @@
       </if>
     </choose>
   </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>
   <!-- After 'source', APA also prints publication history (original publication, reprint info, retraction info) -->
   <macro name="publication-history">
     <choose>
@@ -1574,7 +1588,7 @@
         <group prefix="(" suffix=")">
           <choose>
             <if variable="references">
-              <!-- This provides the option for more elaborate description 
+              <!-- This provides the option for more elaborate description
                    of publication history, such as full "reprinted" references
                    (examples 11, 43, 44) or retracted references -->
               <text variable="references"/>
diff --git a/buildres/csl/csl-styles/apa-numeric-superscript-brackets.csl b/buildres/csl/csl-styles/apa-numeric-superscript-brackets.csl
index c6d3de36f82..6f26b02e4c8 100644
--- a/buildres/csl/csl-styles/apa-numeric-superscript-brackets.csl
+++ b/buildres/csl/csl-styles/apa-numeric-superscript-brackets.csl
@@ -123,8 +123,8 @@
   <!-- General categories of item types:
        Periodical: article-journal article-magazine article-newspaper post-weblog review review-book
        Periodical or Booklike: paper-conference
-       Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure 
-                 graphic interview manuscript map motion_picture musical_score pamphlet patent 
+       Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure
+                 graphic interview manuscript map motion_picture musical_score pamphlet patent
                  personal_communication report song speech thesis post webpage
        Legal: bill legal_case legislation treaty
   -->
@@ -192,7 +192,7 @@
       </if>
       <else-if type="interview personal_communication" match="any">
         <choose>
-          <!-- These variables indicate that the letter is retrievable by the reader. 
+          <!-- These variables indicate that the letter is retrievable by the reader.
                 If not, then use the APA in-text-only personal communication format -->
           <if variable="archive container-title DOI publisher URL" match="none">
             <group delimiter=", ">
@@ -273,7 +273,7 @@
                   </if>
                 </choose>
               </else-if>
-              <!-- Only year: article article-journal book chapter entry entry-dictionary entry-encyclopedia dataset figure graphic 
+              <!-- Only year: article article-journal book chapter entry entry-dictionary entry-encyclopedia dataset figure graphic
                    manuscript map musical_score paper-conference[published] patent report review review-book thesis -->
             </choose>
           </if>
@@ -332,7 +332,7 @@
                 <if type="interview personal_communication" match="any">
                   <choose>
                     <if variable="archive container-title DOI publisher URL" match="none">
-                      <!-- These variables indicate that the communication is retrievable by the reader. 
+                      <!-- These variables indicate that the communication is retrievable by the reader.
                            If not, then use the in-text-only personal communication format -->
                       <date variable="issued" form="text"/>
                     </if>
@@ -1097,7 +1097,7 @@
   <macro name="reviewed-title">
     <choose>
       <if variable="reviewed-title">
-        <!-- Not possible to distinguish TV series episode from other reviewed 
+        <!-- Not possible to distinguish TV series episode from other reviewed
               works [Ex. 69] -->
         <text variable="reviewed-title" font-style="italic"/>
       </if>
@@ -1355,14 +1355,14 @@
   </macro>
   <macro name="event">
     <choose>
-      <if variable="event">
+      <if variable="event event-title" match="any">
         <!-- To prevent Zotero from printing event-place due to its double-mapping of all 'place' to
              both publisher-place and event-place. Remove this 'choose' when that is changed. -->
         <choose>
           <if variable="collection-editor editor editorial-director issue page volume" match="none">
             <!-- Don't print event info if published in a proceedings -->
             <group delimiter=", ">
-              <text variable="event"/>
+              <text macro="event-title"/>
               <text variable="event-place"/>
             </group>
           </if>
@@ -1370,6 +1370,20 @@
       </if>
     </choose>
   </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>
   <!-- After 'source', APA also prints publication history (original publication, reprint info, retraction info) -->
   <macro name="publication-history">
     <choose>
@@ -1377,7 +1391,7 @@
         <group prefix="(" suffix=")">
           <choose>
             <if variable="references">
-              <!-- This provides the option for more elaborate description 
+              <!-- This provides the option for more elaborate description
                    of publication history, such as full "reprinted" references
                    (examples 11, 43, 44) or retracted references -->
               <text variable="references"/>
diff --git a/buildres/csl/csl-styles/apa-numeric-superscript.csl b/buildres/csl/csl-styles/apa-numeric-superscript.csl
index 0a6af38540b..641bb4f02c4 100644
--- a/buildres/csl/csl-styles/apa-numeric-superscript.csl
+++ b/buildres/csl/csl-styles/apa-numeric-superscript.csl
@@ -123,8 +123,8 @@
   <!-- General categories of item types:
        Periodical: article-journal article-magazine article-newspaper post-weblog review review-book
        Periodical or Booklike: paper-conference
-       Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure 
-                 graphic interview manuscript map motion_picture musical_score pamphlet patent 
+       Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure
+                 graphic interview manuscript map motion_picture musical_score pamphlet patent
                  personal_communication report song speech thesis post webpage
        Legal: bill legal_case legislation treaty
   -->
@@ -192,7 +192,7 @@
       </if>
       <else-if type="interview personal_communication" match="any">
         <choose>
-          <!-- These variables indicate that the letter is retrievable by the reader. 
+          <!-- These variables indicate that the letter is retrievable by the reader.
                 If not, then use the APA in-text-only personal communication format -->
           <if variable="archive container-title DOI publisher URL" match="none">
             <group delimiter=", ">
@@ -273,7 +273,7 @@
                   </if>
                 </choose>
               </else-if>
-              <!-- Only year: article article-journal book chapter entry entry-dictionary entry-encyclopedia dataset figure graphic 
+              <!-- Only year: article article-journal book chapter entry entry-dictionary entry-encyclopedia dataset figure graphic
                    manuscript map musical_score paper-conference[published] patent report review review-book thesis -->
             </choose>
           </if>
@@ -332,7 +332,7 @@
                 <if type="interview personal_communication" match="any">
                   <choose>
                     <if variable="archive container-title DOI publisher URL" match="none">
-                      <!-- These variables indicate that the communication is retrievable by the reader. 
+                      <!-- These variables indicate that the communication is retrievable by the reader.
                            If not, then use the in-text-only personal communication format -->
                       <date variable="issued" form="text"/>
                     </if>
@@ -1097,7 +1097,7 @@
   <macro name="reviewed-title">
     <choose>
       <if variable="reviewed-title">
-        <!-- Not possible to distinguish TV series episode from other reviewed 
+        <!-- Not possible to distinguish TV series episode from other reviewed
               works [Ex. 69] -->
         <text variable="reviewed-title" font-style="italic"/>
       </if>
@@ -1355,14 +1355,14 @@
   </macro>
   <macro name="event">
     <choose>
-      <if variable="event">
+      <if variable="event event-title" match="any">
         <!-- To prevent Zotero from printing event-place due to its double-mapping of all 'place' to
              both publisher-place and event-place. Remove this 'choose' when that is changed. -->
         <choose>
           <if variable="collection-editor editor editorial-director issue page volume" match="none">
             <!-- Don't print event info if published in a proceedings -->
             <group delimiter=", ">
-              <text variable="event"/>
+              <text macro="event-title"/>
               <text variable="event-place"/>
             </group>
           </if>
@@ -1370,6 +1370,20 @@
       </if>
     </choose>
   </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>
   <!-- After 'source', APA also prints publication history (original publication, reprint info, retraction info) -->
   <macro name="publication-history">
     <choose>
@@ -1377,7 +1391,7 @@
         <group prefix="(" suffix=")">
           <choose>
             <if variable="references">
-              <!-- This provides the option for more elaborate description 
+              <!-- This provides the option for more elaborate description
                    of publication history, such as full "reprinted" references
                    (examples 11, 43, 44) or retracted references -->
               <text variable="references"/>
diff --git a/buildres/csl/csl-styles/apa-old-doi-prefix.csl b/buildres/csl/csl-styles/apa-old-doi-prefix.csl
index 02ecfc75fac..2ede590912d 100644
--- a/buildres/csl/csl-styles/apa-old-doi-prefix.csl
+++ b/buildres/csl/csl-styles/apa-old-doi-prefix.csl
@@ -897,32 +897,52 @@
   </macro>
   <macro name="event">
     <choose>
-      <if variable="event" type="speech paper-conference" match="any">
+      <if variable="event event-title" match="any">
+        <!-- To prevent Zotero from printing event-place due to its double-mapping of all 'place' to
+             both publisher-place and event-place. Remove this 'choose' when that is changed. -->
         <choose>
-          <!-- Don't print event info if published in a proceedings -->
-          <if variable="collection-editor editor issue page volume" match="none">
-            <group delimiter=" ">
-              <text variable="genre" text-case="capitalize-first"/>
-              <group delimiter=" ">
-                <choose>
-                  <if variable="genre">
-                    <text term="presented at"/>
-                  </if>
-                  <else>
-                    <text term="presented at" text-case="capitalize-first"/>
-                  </else>
-                </choose>
-                <group delimiter=", ">
-                  <text variable="event"/>
-                  <text variable="event-place"/>
+          <if variable="event" type="speech paper-conference" match="any">
+            <choose>
+              <!-- Don't print event info if published in a proceedings -->
+              <if variable="collection-editor editor issue page volume" match="none">
+                <group delimiter=" ">
+                  <text variable="genre" text-case="capitalize-first"/>
+                  <group delimiter=" ">
+                    <choose>
+                      <if variable="genre">
+                        <text term="presented at"/>
+                      </if>
+                      <else>
+                        <text term="presented at" text-case="capitalize-first"/>
+                      </else>
+                    </choose>
+                    <group delimiter=", ">
+                      <text macro="event-title"/>
+                      <text variable="event-place"/>
+                    </group>
+                  </group>
                 </group>
-              </group>
-            </group>
+              </if>
+            </choose>
           </if>
         </choose>
       </if>
     </choose>
   </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="issued">
     <choose>
       <if type="bill legal_case legislation" match="any"/>
@@ -1401,7 +1421,7 @@
         <group prefix="(" suffix=")">
           <choose>
             <if variable="references">
-              <!-- This provides the option for more elaborate description 
+              <!-- This provides the option for more elaborate description
                    of publication history, such as full "reprinted" references
                    (example 26) or retracted references -->
               <text variable="references"/>
diff --git a/buildres/csl/csl-styles/apa-single-spaced.csl b/buildres/csl/csl-styles/apa-single-spaced.csl
index c2157cb296a..ad7890fa539 100644
--- a/buildres/csl/csl-styles/apa-single-spaced.csl
+++ b/buildres/csl/csl-styles/apa-single-spaced.csl
@@ -320,8 +320,8 @@
   <!-- General categories of item types:
         Periodical: article-journal article-magazine article-newspaper post-weblog review review-book
         Periodical or Booklike: paper-conference
-        Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure 
-                  graphic interview manuscript map motion_picture musical_score pamphlet patent 
+        Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure
+                  graphic interview manuscript map motion_picture musical_score pamphlet patent
                   personal_communication report song speech thesis post webpage
         Legal: bill legal_case legislation treaty
   -->
@@ -389,7 +389,7 @@
       </if>
       <else-if type="interview personal_communication" match="any">
         <choose>
-          <!-- These variables indicate that the letter is retrievable by the reader. 
+          <!-- These variables indicate that the letter is retrievable by the reader.
                 If not, then use the APA in-text-only personal communication format -->
           <if variable="archive container-title DOI publisher URL" match="none">
             <group delimiter=", ">
@@ -470,7 +470,7 @@
                   </if>
                 </choose>
               </else-if>
-              <!-- Only year: article article-journal book chapter entry entry-dictionary entry-encyclopedia dataset figure graphic 
+              <!-- Only year: article article-journal book chapter entry entry-dictionary entry-encyclopedia dataset figure graphic
                     manuscript map musical_score paper-conference[published] patent report review review-book thesis -->
             </choose>
           </if>
@@ -529,7 +529,7 @@
                 <if type="interview personal_communication" match="any">
                   <choose>
                     <if variable="archive container-title DOI publisher URL" match="none">
-                      <!-- These variables indicate that the communication is retrievable by the reader. 
+                      <!-- These variables indicate that the communication is retrievable by the reader.
                             If not, then use the in-text-only personal communication format -->
                       <date variable="issued" form="text"/>
                     </if>
@@ -1294,7 +1294,7 @@
   <macro name="reviewed-title">
     <choose>
       <if variable="reviewed-title">
-        <!-- Not possible to distinguish TV series episode from other reviewed 
+        <!-- Not possible to distinguish TV series episode from other reviewed
               works [Ex. 69] -->
         <text variable="reviewed-title" font-style="italic"/>
       </if>
@@ -1552,14 +1552,14 @@
   </macro>
   <macro name="event">
     <choose>
-      <if variable="event">
+      <if variable="event event-title" match="any">
         <!-- To prevent Zotero from printing event-place due to its double-mapping of all 'place' to
-              both publisher-place and event-place. Remove this 'choose' when that is changed. -->
+             both publisher-place and event-place. Remove this 'choose' when that is changed. -->
         <choose>
           <if variable="collection-editor editor editorial-director issue page volume" match="none">
             <!-- Don't print event info if published in a proceedings -->
             <group delimiter=", ">
-              <text variable="event"/>
+              <text macro="event-title"/>
               <text variable="event-place"/>
             </group>
           </if>
@@ -1567,6 +1567,20 @@
       </if>
     </choose>
   </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>
   <!-- After 'source', APA also prints publication history (original publication, reprint info, retraction info) -->
   <macro name="publication-history">
     <choose>
@@ -1574,7 +1588,7 @@
         <group prefix="(" suffix=")">
           <choose>
             <if variable="references">
-              <!-- This provides the option for more elaborate description 
+              <!-- This provides the option for more elaborate description
                     of publication history, such as full "reprinted" references
                     (examples 11, 43, 44) or retracted references -->
               <text variable="references"/>
diff --git a/buildres/csl/csl-styles/apa-tr.csl b/buildres/csl/csl-styles/apa-tr.csl
index 557066dafd8..d17be770985 100644
--- a/buildres/csl/csl-styles/apa-tr.csl
+++ b/buildres/csl/csl-styles/apa-tr.csl
@@ -223,7 +223,7 @@
       <else>
         <group delimiter=", ">
           <choose>
-            <if variable="event" match="none">
+            <if variable="event event-title" match="none">
               <text variable="genre"/>
             </if>
           </choose>
@@ -241,15 +241,15 @@
   </macro>
   <macro name="event">
     <choose>
-      <if variable="event">
+      <if variable="event event-title" match="any">
         <choose>
           <if variable="genre" match="none">
-            <text variable="event"/>
+            <text macro="event-title"/>
             <text term="presented at" prefix=", "/>
           </if>
           <else>
             <group delimiter=" ">
-              <text variable="event"/>
+              <text macro="event-title"/>
               <text variable="genre"/>
             </group>
           </else>
@@ -257,6 +257,20 @@
       </if>
     </choose>
   </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="issued">
     <choose>
       <if type="bill legal_case legislation" match="none">
diff --git a/buildres/csl/csl-styles/apa-with-abstract.csl b/buildres/csl/csl-styles/apa-with-abstract.csl
index ddff715c9d6..694b609f754 100644
--- a/buildres/csl/csl-styles/apa-with-abstract.csl
+++ b/buildres/csl/csl-styles/apa-with-abstract.csl
@@ -320,8 +320,8 @@
   <!-- General categories of item types:
        Periodical: article-journal article-magazine article-newspaper post-weblog review review-book
        Periodical or Booklike: paper-conference
-       Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure 
-                 graphic interview manuscript map motion_picture musical_score pamphlet patent 
+       Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure
+                 graphic interview manuscript map motion_picture musical_score pamphlet patent
                  personal_communication report song speech thesis post webpage
        Legal: bill legal_case legislation treaty
   -->
@@ -389,7 +389,7 @@
       </if>
       <else-if type="interview personal_communication" match="any">
         <choose>
-          <!-- These variables indicate that the letter is retrievable by the reader. 
+          <!-- These variables indicate that the letter is retrievable by the reader.
                 If not, then use the APA in-text-only personal communication format -->
           <if variable="archive container-title DOI publisher URL" match="none">
             <group delimiter=", ">
@@ -470,7 +470,7 @@
                   </if>
                 </choose>
               </else-if>
-              <!-- Only year: article article-journal book chapter entry entry-dictionary entry-encyclopedia dataset figure graphic 
+              <!-- Only year: article article-journal book chapter entry entry-dictionary entry-encyclopedia dataset figure graphic
                    manuscript map musical_score paper-conference[published] patent report review review-book thesis -->
             </choose>
           </if>
@@ -529,7 +529,7 @@
                 <if type="interview personal_communication" match="any">
                   <choose>
                     <if variable="archive container-title DOI publisher URL" match="none">
-                      <!-- These variables indicate that the communication is retrievable by the reader. 
+                      <!-- These variables indicate that the communication is retrievable by the reader.
                            If not, then use the in-text-only personal communication format -->
                       <date variable="issued" form="text"/>
                     </if>
@@ -1294,7 +1294,7 @@
   <macro name="reviewed-title">
     <choose>
       <if variable="reviewed-title">
-        <!-- Not possible to distinguish TV series episode from other reviewed 
+        <!-- Not possible to distinguish TV series episode from other reviewed
               works [Ex. 69] -->
         <text variable="reviewed-title" font-style="italic"/>
       </if>
@@ -1552,14 +1552,14 @@
   </macro>
   <macro name="event">
     <choose>
-      <if variable="event">
+      <if variable="event event-title" match="any">
         <!-- To prevent Zotero from printing event-place due to its double-mapping of all 'place' to
              both publisher-place and event-place. Remove this 'choose' when that is changed. -->
         <choose>
           <if variable="collection-editor editor editorial-director issue page volume" match="none">
             <!-- Don't print event info if published in a proceedings -->
             <group delimiter=", ">
-              <text variable="event"/>
+              <text macro="event-title"/>
               <text variable="event-place"/>
             </group>
           </if>
@@ -1567,6 +1567,20 @@
       </if>
     </choose>
   </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>
   <!-- After 'source', APA also prints publication history (original publication, reprint info, retraction info) -->
   <macro name="publication-history">
     <choose>
@@ -1574,7 +1588,7 @@
         <group prefix="(" suffix=")">
           <choose>
             <if variable="references">
-              <!-- This provides the option for more elaborate description 
+              <!-- This provides the option for more elaborate description
                    of publication history, such as full "reprinted" references
                    (examples 11, 43, 44) or retracted references -->
               <text variable="references"/>
diff --git a/buildres/csl/csl-styles/apa.csl b/buildres/csl/csl-styles/apa.csl
index 09f4635a505..4d965a02d24 100644
--- a/buildres/csl/csl-styles/apa.csl
+++ b/buildres/csl/csl-styles/apa.csl
@@ -320,8 +320,8 @@
   <!-- General categories of item types:
        Periodical: article-journal article-magazine article-newspaper post-weblog review review-book
        Periodical or Booklike: paper-conference
-       Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure 
-                 graphic interview manuscript map motion_picture musical_score pamphlet patent 
+       Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure
+                 graphic interview manuscript map motion_picture musical_score pamphlet patent
                  personal_communication report song speech thesis post webpage
        Legal: bill legal_case legislation treaty
   -->
@@ -389,7 +389,7 @@
       </if>
       <else-if type="interview personal_communication" match="any">
         <choose>
-          <!-- These variables indicate that the letter is retrievable by the reader. 
+          <!-- These variables indicate that the letter is retrievable by the reader.
                 If not, then use the APA in-text-only personal communication format -->
           <if variable="archive container-title DOI publisher URL" match="none">
             <group delimiter=", ">
@@ -470,7 +470,7 @@
                   </if>
                 </choose>
               </else-if>
-              <!-- Only year: article article-journal book chapter entry entry-dictionary entry-encyclopedia dataset figure graphic 
+              <!-- Only year: article article-journal book chapter entry entry-dictionary entry-encyclopedia dataset figure graphic
                    manuscript map musical_score paper-conference[published] patent report review review-book thesis -->
             </choose>
           </if>
@@ -530,7 +530,7 @@
                 <if type="interview personal_communication" match="any">
                   <choose>
                     <if variable="archive container-title DOI publisher URL" match="none">
-                      <!-- These variables indicate that the communication is retrievable by the reader. 
+                      <!-- These variables indicate that the communication is retrievable by the reader.
                            If not, then use the in-text-only personal communication format -->
                       <date variable="issued" form="text"/>
                     </if>
@@ -1295,7 +1295,7 @@
   <macro name="reviewed-title">
     <choose>
       <if variable="reviewed-title">
-        <!-- Not possible to distinguish TV series episode from other reviewed 
+        <!-- Not possible to distinguish TV series episode from other reviewed
               works [Ex. 69] -->
         <text variable="reviewed-title" font-style="italic"/>
       </if>
@@ -1553,14 +1553,14 @@
   </macro>
   <macro name="event">
     <choose>
-      <if variable="event">
+      <if variable="event event-title" match="any">
         <!-- To prevent Zotero from printing event-place due to its double-mapping of all 'place' to
              both publisher-place and event-place. Remove this 'choose' when that is changed. -->
         <choose>
           <if variable="collection-editor editor editorial-director issue page volume" match="none">
             <!-- Don't print event info if published in a proceedings -->
             <group delimiter=", ">
-              <text variable="event"/>
+              <text macro="event-title"/>
               <text variable="event-place"/>
             </group>
           </if>
@@ -1568,6 +1568,20 @@
       </if>
     </choose>
   </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>
   <!-- After 'source', APA also prints publication history (original publication, reprint info, retraction info) -->
   <macro name="publication-history">
     <choose>
@@ -1575,7 +1589,7 @@
         <group prefix="(" suffix=")">
           <choose>
             <if variable="references">
-              <!-- This provides the option for more elaborate description 
+              <!-- This provides the option for more elaborate description
                    of publication history, such as full "reprinted" references
                    (examples 11, 43, 44) or retracted references -->
               <text variable="references"/>
diff --git a/buildres/csl/csl-styles/applied-in-vitro-toxicology.csl b/buildres/csl/csl-styles/applied-in-vitro-toxicology.csl
deleted file mode 100644
index 2f4fa36100b..00000000000
--- a/buildres/csl/csl-styles/applied-in-vitro-toxicology.csl
+++ /dev/null
@@ -1,211 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" page-range-format="expanded" class="in-text" version="1.0" demote-non-dropping-particle="sort-only" default-locale="en-US">
-  <info>
-    <title>Applied In Vitro Toxicology</title>
-    <id>http://www.zotero.org/styles/applied-in-vitro-toxicology</id>
-    <link href="http://www.zotero.org/styles/applied-in-vitro-toxicology" rel="self"/>
-    <link href="http://www.zotero.org/styles/clinical-journal-of-sport-medicine" rel="template"/>
-    <link href="http://www.liebertpub.com/forauthors/applied-in-vitro-toxicology/626/" rel="documentation"/>
-    <author>
-      <name>Patrick O'Brien</name>
-    </author>
-    <category citation-format="numeric"/>
-    <category field="biology"/>
-    <issn>2332-1512</issn>
-    <eissn>2332-1539</eissn>
-    <updated>2017-07-11T10:15:32+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="access">
-    <choose>
-      <if type="article-journal">
-        <choose>
-          <if match="none" variable="volume">
-            <group delimiter=". ">
-              <text value="Epub ahead of print" prefix="[" suffix="]"/>
-              <text variable="DOI" prefix="doi:"/>
-            </group>
-          </if>
-        </choose>
-      </if>
-      <else-if type="webpage post-weblog" match="any">
-        <choose>
-          <if variable="URL">
-            <group delimiter=". ">
-              <text variable="URL" prefix="Available at: "/>
-              <date variable="accessed" prefix="Accessed " form="text"/>
-            </group>
-          </if>
-        </choose>
-      </else-if>
-    </choose>
-  </macro>
-  <macro name="author">
-    <names variable="author">
-      <name form="long" initialize="true" initialize-with="" delimiter=", " delimiter-precedes-last="always" name-as-sort-order="all" sort-separator=" "/>
-      <label form="long" prefix=", "/>
-      <substitute>
-        <names variable="editor"/>
-        <names variable="translator"/>
-      </substitute>
-    </names>
-  </macro>
-  <macro name="editor">
-    <names variable="editor">
-      <name delimiter-precedes-last="always" name-as-sort-order="all" sort-separator=" "/>
-      <label form="short" strip-periods="true" prefix=" (" suffix=")"/>
-    </names>
-  </macro>
-  <macro name="year-date">
-    <choose>
-      <if variable="issued">
-        <date variable="issued">
-          <date-part name="year" form="long" range-delimiter="&#8211;"/>
-        </date>
-      </if>
-      <else>
-        <text term="no date" form="short"/>
-      </else>
-    </choose>
-  </macro>
-  <macro name="journal-location">
-    <choose>
-      <if type="article-journal article-magazine" match="any">
-        <text variable="volume" form="short"/>
-      </if>
-    </choose>
-  </macro>
-  <macro name="publisher">
-    <group delimiter=": ">
-      <text variable="publisher-place"/>
-      <text variable="publisher"/>
-    </group>
-  </macro>
-  <macro name="publisher_thesis">
-    <group delimiter=", ">
-      <text variable="publisher" form="long"/>
-      <text variable="publisher-place" form="long"/>
-    </group>
-  </macro>
-  <macro name="edition_book">
-    <choose>
-      <if is-numeric="edition">
-        <group delimiter=" ">
-          <number variable="edition" form="ordinal"/>
-          <text term="edition" form="short"/>
-        </group>
-      </if>
-      <else>
-        <text variable="edition"/>
-      </else>
-    </choose>
-  </macro>
-  <macro name="edition_chapter">
-    <choose>
-      <if is-numeric="edition">
-        <group delimiter=" ">
-          <number variable="edition" form="ordinal"/>
-          <text term="edition" form="short"/>
-        </group>
-      </if>
-      <else>
-        <text variable="edition"/>
-      </else>
-    </choose>
-  </macro>
-  <citation collapse="citation-number">
-    <sort>
-      <key variable="citation-number" sort="ascending"/>
-    </sort>
-    <layout delimiter="," vertical-align="sup">
-      <text variable="citation-number"/>
-    </layout>
-  </citation>
-  <bibliography entry-spacing="0" second-field-align="flush" et-al-min="4" et-al-use-first="3">
-    <layout suffix=".">
-      <text variable="citation-number" suffix="."/>
-      <text macro="author" suffix=". "/>
-      <choose>
-        <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
-          <group delimiter=". ">
-            <text variable="title" font-style="italic"/>
-            <text variable="volume" prefix="vol. " form="long"/>
-            <text macro="edition_book"/>
-            <group delimiter="; ">
-              <text macro="publisher"/>
-              <text macro="year-date"/>
-            </group>
-          </group>
-        </if>
-        <else-if type="chapter paper-conference" match="any">
-          <group delimiter=". ">
-            <group>
-              <text variable="title" form="long"/>
-              <group>
-                <text term="in" form="short" text-case="sentence" suffix=": "/>
-                <group delimiter=". ">
-                  <text variable="container-title" form="short" font-style="italic" suffix=". "/>
-                  <text variable="volume" form="long" prefix="vol. "/>
-                </group>
-              </group>
-              <text macro="edition_chapter"/>
-              <group delimiter="; ">
-                <text macro="editor"/>
-                <group delimiter=" ">
-                  <label plural="always" variable="page" form="short"/>
-                  <text variable="page" form="long"/>
-                </group>
-              </group>
-            </group>
-            <group delimiter="; ">
-              <text macro="publisher"/>
-              <text macro="year-date"/>
-            </group>
-          </group>
-        </else-if>
-        <else-if type="patent">
-          <group delimiter=", ">
-            <group delimiter=". ">
-              <text variable="title" form="long"/>
-              <text variable="number" form="long"/>
-            </group>
-            <text macro="year-date"/>
-          </group>
-        </else-if>
-        <else-if type="thesis">
-          <group delimiter=" ">
-            <text variable="title" form="long" font-style="italic" suffix="."/>
-            <text variable="genre" form="long" suffix=","/>
-            <text macro="publisher_thesis" suffix="," text-case="title"/>
-            <text macro="year-date"/>
-          </group>
-        </else-if>
-        <else-if type="webpage">
-          <group delimiter=" ">
-            <text variable="title" form="long" suffix="."/>
-            <text variable="container-title" form="long" suffix=". " text-case="title"/>
-            <text macro="access"/>
-          </group>
-        </else-if>
-        <else>
-          <group delimiter=";">
-            <group delimiter=" ">
-              <group delimiter=". ">
-                <text variable="title" form="long"/>
-                <group delimiter=". ">
-                  <text variable="container-title" form="short" text-case="title" strip-periods="true" font-style="italic"/>
-                </group>
-              </group>
-              <group delimiter=":">
-                <text macro="year-date"/>
-                <text macro="journal-location"/>
-              </group>
-            </group>
-            <text variable="page" form="long"/>
-          </group>
-          <text macro="access" prefix=". "/>
-        </else>
-      </choose>
-    </layout>
-  </bibliography>
-</style>
diff --git a/buildres/csl/csl-styles/archaeonautica.csl b/buildres/csl/csl-styles/archaeonautica.csl
index 5954a1d8c7f..9c1e0ff16d5 100644
--- a/buildres/csl/csl-styles/archaeonautica.csl
+++ b/buildres/csl/csl-styles/archaeonautica.csl
@@ -9,16 +9,15 @@
     <link href="https://journals.openedition.org/archaeonautica/279" rel="documentation"/>
     <author>
       <name>Antonio Mendes da Silva</name>
-      <email>mendes@mmsh.univ-aix.fr</email>
+      <email>antonio.mendes@cnrs.fr</email>
     </author>
     <category citation-format="author-date"/>
     <category field="humanities"/>
     <category field="history"/>
     <issn>0154-1854</issn>
     <eissn>2117-6973</eissn>
-    <summary>Style conçu pour la revue Archaeonautica. L’archéologie maritime et navale de la
-            préhistoire à l’époque contemporaine. Centre Camille Jullian, CNRS</summary>
-    <updated>2020-05-04T12:23:43+00:00</updated>
+    <summary>Style conçu pour la revue Archaeonautica. L’archéologie maritime et navale de la préhistoire à l’époque contemporaine. Centre Camille Jullian, CNRS</summary>
+    <updated>2020-05-10T04:06:42+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="fr">
@@ -80,7 +79,7 @@
           <name form="long" name-as-sort-order="all" initialize-with=". " sort-separator=" ">
             <name-part name="family" font-variant="small-caps"/>
           </name>
-          <label form="short" prefix=", " suffix=". " text-case="uppercase" strip-periods="true"/>
+          <label form="short" prefix=", " text-case="uppercase" strip-periods="true"/>
           <et-al font-style="italic"/>
         </names>
       </if>
@@ -217,11 +216,11 @@
     </choose>
   </macro>
   <macro name="translator">
-    <text term="translator" form="verb" prefix=", " suffix=" "/>
     <names variable="translator">
-      <name form="long" and="text" delimiter-precedes-last="never" sort-separator=" " font-style="normal">
+      <name form="long" and="text" delimiter-precedes-last="never" sort-separator=" ">
         <name-part name="family" font-variant="small-caps"/>
       </name>
+      <label form="short" prefix="&#160;(" suffix=".)"/>
     </names>
   </macro>
   <macro name="edition">
@@ -346,8 +345,9 @@
     </choose>
   </macro>
   <macro name="year-date">
+    <!-- Une tabulation après la date -->
     <group suffix="&#9;">
-      <!-- Une tabulation après la date -->
+      <!-- Fin de la tabulation -->
       <choose>
         <if variable="issued">
           <date variable="issued">
@@ -452,7 +452,7 @@
     </group>
   </macro>
   <macro name="accessed">
-    <text variable="URL" text-decoration="none"/>
+    <text variable="URL" prefix=" "/>
     <group delimiter=" " font-style="normal" prefix=" (" suffix=").">
       <text term="accessed"/>
       <date variable="accessed" form="numeric">
@@ -462,19 +462,28 @@
       </date>
     </group>
   </macro>
-  <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" collapse="year" year-suffix-delimiter=", " after-collapse-delimiter="&amp;#160;; " name-delimiter=", " initialize-with=". " delimiter-precedes-last="never" name-as-sort-order="all" sort-separator=" ">
+  <macro name="archive">
+    <group suffix="." prefix=". ">
+      <group delimiter=", ">
+        <text variable="archive"/>
+        <text variable="archive_location"/>
+        <text variable="call-number"/>
+      </group>
+    </group>
+  </macro>
+  <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" collapse="year" year-suffix-delimiter=", " after-collapse-delimiter="&#160;; " name-delimiter=", " initialize-with=". " delimiter-precedes-last="never" name-as-sort-order="all" sort-separator=" ">
     <sort>
       <key variable="issued" sort="descending"/>
       <key macro="author-citation"/>
       <key macro="title"/>
     </sort>
-    <layout delimiter="&amp;#160;; ">
-      <group delimiter=",&amp;#160;">
+    <layout delimiter="&#160;; " prefix="(" suffix=")">
+      <group delimiter=",&#160;">
         <group delimiter=" ">
           <text macro="author-citation"/>
           <text macro="year-date-short"/>
         </group>
-        <group delimiter="&amp;#160;">
+        <group delimiter="&#160;">
           <label variable="locator" form="short"/>
           <text variable="locator"/>
         </group>
@@ -490,7 +499,7 @@
       <group display="block">
         <text macro="author-bibliography"/>
       </group>
-      <group suffix=". ">
+      <group suffix=".">
         <text macro="year-date"/>
         <text macro="title"/>
         <text macro="translator"/>
@@ -500,6 +509,7 @@
         <text macro="publisher"/>
         <text macro="collection"/>
         <text macro="page-bib"/>
+        <text macro="archive"/>
       </group>
       <text macro="accessed"/>
     </layout>
diff --git a/buildres/csl/csl-styles/associacao-brasileira-de-normas-tecnicas-usp-fmvz.csl b/buildres/csl/csl-styles/associacao-brasileira-de-normas-tecnicas-usp-fmvz.csl
index d0ee2797c29..07ca846cca7 100644
--- a/buildres/csl/csl-styles/associacao-brasileira-de-normas-tecnicas-usp-fmvz.csl
+++ b/buildres/csl/csl-styles/associacao-brasileira-de-normas-tecnicas-usp-fmvz.csl
@@ -6,7 +6,7 @@
     <id>http://www.zotero.org/styles/associacao-brasileira-de-normas-tecnicas-usp-fmvz</id>
     <link href="http://www.zotero.org/styles/associacao-brasileira-de-normas-tecnicas-usp-fmvz" rel="self"/>
     <link href="http://www.zotero.org/styles/associacao-brasileira-de-normas-tecnicas" rel="template"/>
-    <link href="http://biblioteca.fmvz.usp.br/wp-content/uploads/2018/10/DIRETRIZES_22outubro2018.pdf" rel="documentation"/>
+    <link href="https://drive.google.com/file/d/1aGzkTiQOADXYa809BAj_IHvl6_xgJKW9/view" rel="documentation"/>
     <author>
       <name>Alberto Massao Kawai</name>
       <email>alberto.kawai@gmail.com</email>
@@ -15,7 +15,7 @@
     <category citation-format="author-date"/>
     <category field="medicine"/>
     <summary>The Brazilian Standard Style in accordance with ABNT-NBR 10520.2002 and ABNT-NBR 6023.2002</summary>
-    <updated>2018-10-18T13:57:18+00:00</updated>
+    <updated>2022-04-05T16:21:57+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <locale xml:lang="pt-BR">
@@ -46,41 +46,13 @@
       </term>
     </terms>
   </locale>
-  <macro name="container-contributors">
-    <choose>
-      <if type="chapter">
-        <names variable="container-author" delimiter=", ">
-          <name name-as-sort-order="all" sort-separator=", " initialize-with=". " delimiter="; " delimiter-precedes-last="always">
-            <name-part name="family" text-case="uppercase"/>
-            <name-part name="given" text-case="uppercase"/>
-          </name>
-          <label form="short" plural="never" text-case="capitalize-first" font-style="normal" prefix=" (" suffix=".)."/>
-          <substitute>
-            <names variable="editor"/>
-            <names variable="collection-editor"/>
-          </substitute>
-        </names>
-      </if>
-    </choose>
-  </macro>
-  <macro name="secondary-contributors">
-    <choose>
-      <if type="chapter" match="none">
-        <names variable="editor" delimiter="; " prefix=" (" suffix=")">
-          <name initialize-with=". " delimiter=", "/>
-          <label form="short" prefix=", " text-case="capitalize-first" suffix="."/>
-        </names>
-      </if>
-    </choose>
-  </macro>
-  <macro name="translator">
-    <text value="Traducao "/>
-    <names variable="translator" delimiter="; ">
-      <name delimiter="; " sort-separator=" " delimiter-precedes-last="always">
-        <name-part name="given" text-case="capitalize-first"/>
-        <name-part name="family" text-case="capitalize-first"/>
-      </name>
-    </names>
+  <macro name="access">
+    <text variable="URL" prefix="Disponível em: &lt;" suffix="&gt;."/>
+    <date variable="accessed" prefix=". Acesso em: " suffix=".">
+      <date-part name="day" suffix=" "/>
+      <date-part name="month" form="short" suffix=". " text-case="lowercase"/>
+      <date-part name="year"/>
+    </date>
   </macro>
   <macro name="author">
     <names variable="author" font-variant="normal">
@@ -102,6 +74,7 @@
         <name-part name="family" text-case="uppercase"/>
         <name-part name="given" text-case="uppercase"/>
       </name>
+      <et-al font-style="italic"/>
       <substitute>
         <names variable="editor"/>
         <names variable="translator"/>
@@ -116,34 +89,30 @@
       </substitute>
     </names>
   </macro>
-  <macro name="access">
-    <text variable="URL" prefix="Disponível em: &lt;" suffix="&gt;."/>
-    <date variable="accessed" prefix=". Acesso em: " suffix=".">
-      <date-part name="day" suffix=" "/>
-      <date-part name="month" form="short" suffix=". " text-case="lowercase"/>
-      <date-part name="year"/>
-    </date>
+  <macro name="citation-locator">
+    <group>
+      <label variable="locator" form="short"/>
+      <text variable="locator" prefix=" "/>
+    </group>
   </macro>
-  <macro name="title">
+  <macro name="collection-title">
+    <text variable="collection-title"/>
+    <text variable="collection-number" prefix=" "/>
+  </macro>
+  <macro name="container-contributors">
     <choose>
-      <if type="chapter bill" match="any">
-        <text variable="title"/>
+      <if type="chapter">
+        <names variable="container-author" delimiter=", ">
+          <name name-as-sort-order="all" sort-separator=", " initialize-with=". " delimiter="; " delimiter-precedes-last="always">
+            <name-part name="family" text-case="uppercase"/>
+            <name-part name="given" text-case="uppercase"/>
+          </name>
+          <substitute>
+            <names variable="editor"/>
+            <names variable="collection-editor"/>
+          </substitute>
+        </names>
       </if>
-      <else-if type="book thesis" match="any">
-        <text variable="title" font-weight="bold"/>
-      </else-if>
-      <else-if type="article-journal" match="any">
-        <text variable="title" text-case="title" font-weight="normal"/>
-      </else-if>
-      <else-if type="article-newspaper article-magazine" match="any">
-        <text variable="title" text-case="capitalize-first"/>
-      </else-if>
-      <else-if type="paper-conference" match="any">
-        <text variable="title" suffix=". "/>
-      </else-if>
-      <else>
-        <text variable="title" font-weight="bold"/>
-      </else>
     </choose>
   </macro>
   <macro name="container-title">
@@ -156,31 +125,18 @@
       </else>
     </choose>
   </macro>
-  <macro name="publisher">
+  <macro name="edition">
     <choose>
-      <if match="any" variable="publisher">
-        <choose>
-          <if variable="publisher-place">
-            <text variable="publisher-place" suffix=": "/>
-          </if>
-          <else-if type="entry-encyclopedia"/>
-          <else>
-            <text value="[s.l.] "/>
-          </else>
-        </choose>
+      <if type="book chapter" match="any">
         <choose>
-          <if variable="publisher">
-            <text variable="publisher" suffix=", "/>
-            <text macro="issued"/>
+          <if is-numeric="edition">
+            <group delimiter=" ">
+              <number variable="edition" form="numeric" suffix="."/>
+              <text term="edition" form="short" suffix="."/>
+            </group>
           </if>
-          <else>
-            <text value="[s.n.]"/>
-          </else>
         </choose>
       </if>
-      <else>
-        <text value="[s.l: s.n.]"/>
-      </else>
     </choose>
   </macro>
   <macro name="event">
@@ -194,7 +150,6 @@
           <else>
             <group delimiter=" ">
               <text variable="genre" text-case="capitalize-first"/>
-              <text term="presented at"/>
               <text variable="event"/>
             </group>
           </else>
@@ -227,7 +182,7 @@
   <macro name="issued-year">
     <choose>
       <if variable="issued" match="all">
-        <date date-parts="year" form="numeric" variable="issued" prefix=" " suffix=". ">
+        <date date-parts="year" form="numeric" variable="issued" prefix=" ">
           <date-part name="year"/>
         </date>
       </if>
@@ -236,38 +191,9 @@
       </else>
     </choose>
   </macro>
-  <macro name="edition">
-    <choose>
-      <if type="book chapter" match="any">
-        <choose>
-          <if is-numeric="edition">
-            <group delimiter=" ">
-              <number variable="edition" form="numeric" suffix="."/>
-              <text term="edition" form="short" suffix="."/>
-            </group>
-          </if>
-          <else>
-            <text variable="edition" suffix=" ed."/>
-          </else>
-        </choose>
-      </if>
-      <else-if type="paper-conference" match="any"/>
-    </choose>
-  </macro>
   <macro name="locators">
     <choose>
-      <if type="bill">
-        <group prefix=". " delimiter=", ">
-          <date variable="issued">
-            <date-part name="day"/>
-            <date-part prefix=" " name="month" form="short"/>
-            <date-part prefix=" " name="year"/>
-          </date>
-          <text variable="section" prefix="Sec. "/>
-          <text variable="page" prefix="p. " suffix="."/>
-        </group>
-      </if>
-      <else-if match="any" type="article-journal article-magazine article-newspaper">
+      <if match="any" type="article-journal article-magazine article-newspaper">
         <group delimiter=", ">
           <group delimiter=", ">
             <text variable="volume" prefix="v. "/>
@@ -275,63 +201,106 @@
           </group>
           <text variable="page" prefix="p. "/>
         </group>
+      </if>
+      <else-if match="any" type="paper-conference">
+        <group delimiter=", ">
+          <group delimiter=", ">
+            <text variable="volume" prefix="v. "/>
+          </group>
+          <text variable="page" prefix="p. " suffix=". "/>
+        </group>
       </else-if>
       <else-if match="any" type="book">
         <group delimiter=", ">
           <group>
             <text variable="volume" prefix="v. "/>
-            <text variable="page" suffix=" p."/>
+            <text variable="number-of-pages" suffix=" p."/>
           </group>
         </group>
       </else-if>
       <else-if type="chapter" match="any">
-        <group>
-          <group>
-            <text variable="volume"/>
-            <text variable="page" prefix="p. "/>
-          </group>
-        </group>
+        <text variable="page" prefix="p. "/>
       </else-if>
       <else-if type="thesis" match="any">
         <group>
           <group>
-            <text variable="volume"/>
             <text variable="page" suffix=" f."/>
           </group>
         </group>
       </else-if>
-      <else-if type="paper-conference" match="any"/>
     </choose>
   </macro>
-  <macro name="collection-title">
-    <text variable="collection-title"/>
-    <text variable="collection-number" prefix=" "/>
-  </macro>
-  <macro name="genre">
-    <text variable="issue"/>
+  <macro name="publisher">
+    <choose>
+      <if match="any" variable="publisher">
+        <choose>
+          <if variable="publisher-place">
+            <text variable="publisher-place" suffix=": "/>
+          </if>
+          <else-if type="entry-encyclopedia"/>
+          <else>
+            <text value="[s.l.] "/>
+          </else>
+        </choose>
+        <choose>
+          <if variable="publisher">
+            <text variable="publisher" suffix=", "/>
+            <text macro="issued"/>
+          </if>
+          <else>
+            <text value="[s.n.]"/>
+          </else>
+        </choose>
+      </if>
+      <else>
+        <text value="[s.l: s.n.]"/>
+      </else>
+    </choose>
   </macro>
-  <macro name="citation-locator">
-    <group>
-      <label variable="locator" form="short"/>
-      <text variable="locator" prefix=" "/>
-    </group>
+  <macro name="secondary-contributors">
+    <choose>
+      <if type="chapter" match="none">
+        <names variable="editor" delimiter="; " prefix=" (" suffix=")">
+          <name initialize-with=". " delimiter=", "/>
+        </names>
+      </if>
+    </choose>
   </macro>
-  <macro name="place">
+  <macro name="title">
     <choose>
-      <if match="any" variable="publisher-place">
-        <text variable="publisher-place"/>
+      <if type="chapter" match="any">
+        <text variable="title"/>
       </if>
+      <else-if type="book thesis" match="any">
+        <text variable="title" font-weight="bold"/>
+      </else-if>
+      <else-if type="article-journal bill" match="any">
+        <text variable="title" text-case="title" font-weight="normal"/>
+      </else-if>
+      <else-if type="article-newspaper article-magazine" match="any">
+        <text variable="title" text-case="capitalize-first"/>
+      </else-if>
+      <else-if type="paper-conference" match="any">
+        <text variable="title" suffix=". "/>
+      </else-if>
+      <else>
+        <text variable="title" font-weight="bold"/>
+      </else>
     </choose>
   </macro>
-  <macro name="archive">
-    <group>
-      <text variable="archive" prefix=" "/>
-    </group>
+  <macro name="translator">
+    <text value="Tradução "/>
+    <names variable="translator" delimiter="; ">
+      <name delimiter="; " sort-separator=" " delimiter-precedes-last="always">
+        <name-part name="given" text-case="capitalize-first"/>
+        <name-part name="family" text-case="capitalize-first"/>
+      </name>
+    </names>
   </macro>
   <citation et-al-min="4" et-al-use-first="1" collapse="year" disambiguate-add-year-suffix="true">
     <sort>
-      <key macro="issued-year"/>
       <key macro="author"/>
+      <key macro="issued-year"/>
     </sort>
     <layout prefix="(" suffix=")" delimiter="; ">
       <group>
@@ -341,29 +310,34 @@
       </group>
     </layout>
   </citation>
-  <bibliography et-al-min="4" et-al-use-first="1">
+  <bibliography>
     <sort>
       <key macro="author"/>
       <key variable="issued"/>
     </sort>
     <layout>
       <choose>
-        <if type="bill">
+        <if type="article-newspaper article-magazine article-journal" match="any">
           <group>
-            <text macro="author" text-case="uppercase" font-variant="normal" suffix=". "/>
-            <text variable="number" suffix=". "/>
+            <text macro="author" suffix=". "/>
             <text macro="title" suffix=". "/>
-            <text variable="references" font-weight="bold"/>
-            <text variable="note"/>
-            <text macro="locators" suffix=". "/>
+            <text macro="container-title" suffix=", "/>
+            <text variable="collection-title" suffix=". "/>
+            <text macro="edition" suffix=", "/>
+            <text macro="locators" suffix=", "/>
+            <text macro="issued"/>
+            <text macro="access"/>
           </group>
         </if>
-        <else-if type="map">
+        <else-if type="bill">
           <group>
             <text macro="author" suffix=". "/>
-            <text macro="title" suffix=", "/>
+            <text macro="title" suffix=". "/>
+            <text macro="container-title" suffix=", "/>
+            <text macro="edition" suffix=", "/>
+            <text macro="locators" suffix=", "/>
             <text macro="issued"/>
-            <text variable="note" suffix=". "/>
+            <text macro="access"/>
           </group>
         </else-if>
         <else-if type="book">
@@ -381,8 +355,9 @@
             <text macro="author" suffix=". "/>
             <text macro="title" suffix=". "/>
             <text macro="secondary-contributors" suffix=". "/>
-            <text term="in" text-case="capitalize-first" suffix=": "/>
+            <text term="in" text-case="capitalize-first" font-style="italic" suffix=": "/>
             <text macro="container-contributors" suffix=". "/>
+            <text variable="genre" prefix="(" suffix=".). "/>
             <text macro="container-title" suffix=". "/>
             <text variable="collection-title" suffix=". "/>
             <text macro="translator" suffix=". "/>
@@ -391,28 +366,28 @@
             <text macro="locators" suffix=". "/>
           </group>
         </else-if>
-        <else-if type="article-newspaper article-magazine article-journal" match="any">
+        <else-if type="entry-dictionary">
           <group>
             <text macro="author" suffix=". "/>
-            <text macro="title" suffix=". "/>
-            <text macro="container-title" suffix=", "/>
-            <text variable="collection-title" suffix=". "/>
-            <text macro="edition" suffix=", "/>
-            <text macro="locators" suffix=", "/>
-            <text macro="issued"/>
+            <text macro="title"/>
+            <text macro="container-contributors"/>
+            <text macro="secondary-contributors"/>
+            <text macro="container-title"/>
+            <text variable="collection-title" prefix=": " suffix=". "/>
+            <text macro="locators"/>
+            <text macro="event"/>
+            <text macro="publisher" prefix=". " suffix=". "/>
+            <text macro="collection-title" prefix="(Texto para discussao, n. " suffix=")."/>
             <text macro="access"/>
           </group>
         </else-if>
-        <else-if type="thesis">
+        <else-if type="entry-encyclopedia">
           <group>
             <text macro="author" suffix=". "/>
-            <text macro="title" suffix=". "/>
-            <text macro="issued-year"/>
-            <text macro="locators"/>
-            <text variable="publisher" prefix=" " suffix=","/>
-            <text variable="publisher-place" prefix=" " suffix=","/>
-            <text macro="issued-year"/>
-            <text macro="access"/>
+            <text macro="title"/>
+            <text variable="publisher-place" prefix=". " suffix=": "/>
+            <text variable="publisher" suffix=", "/>
+            <text macro="issued" prefix=", " suffix=". (Nota tecnica)."/>
           </group>
         </else-if>
         <else-if type="manuscript">
@@ -420,20 +395,48 @@
             <text macro="author" suffix=". "/>
             <text macro="title" suffix=". "/>
             <text macro="edition" suffix=". "/>
-            <text macro="place" suffix=", "/>
+            <text variable="publisher-place" suffix=", "/>
             <text macro="issued" suffix=". "/>
             <text macro="access" suffix=". "/>
-            <text macro="archive" suffix=". "/>
+            <text variable="archive" suffix=". "/>
           </group>
         </else-if>
-        <else-if type="webpage">
+        <else-if type="map">
           <group>
             <text macro="author" suffix=". "/>
-            <text macro="title" suffix=". "/>
-            <text macro="genre" suffix=". "/>
-            <text macro="access" suffix=". "/>
+            <text macro="title" suffix=", "/>
+            <text macro="issued"/>
+            <text variable="note" suffix=". "/>
           </group>
         </else-if>
+        <else-if type="paper-conference">
+          <text macro="author" text-case="capitalize-all" suffix=". "/>
+          <text macro="title"/>
+          <text macro="container-contributors"/>
+          <text macro="secondary-contributors"/>
+          <text term="in" text-case="capitalize-first" prefix=" " suffix=": "/>
+          <text macro="container-title"/>
+          <text variable="issue" suffix="., "/>
+          <text macro="issued-year" suffix=", "/>
+          <text variable="publisher-place" suffix=". "/>
+          <text variable="genre" font-weight="bold"/>
+          <text value="[...]" prefix=" " suffix=". "/>
+          <text variable="publisher-place" prefix=" " suffix=": "/>
+          <text variable="publisher" suffix=", "/>
+          <text macro="issued-year" suffix=". "/>
+          <text macro="locators"/>
+        </else-if>
+        <else-if type="patent" match="any">
+          <text macro="author" suffix=". "/>
+          <text macro="title" suffix=". "/>
+          <text variable="number" suffix=". "/>
+          <text variable="genre" suffix=". "/>
+          <date variable="issued" suffix=". ">
+            <date-part name="day" prefix="Concessão: " suffix=" "/>
+            <date-part name="month" form="short" suffix=" " text-case="lowercase"/>
+            <date-part name="year"/>
+          </date>
+        </else-if>
         <else-if type="report">
           <group>
             <text macro="author" suffix=". "/>
@@ -448,68 +451,40 @@
             <text macro="access" suffix="."/>
           </group>
         </else-if>
-        <else-if type="entry-dictionary">
+        <else-if type="thesis">
           <group>
             <text macro="author" suffix=". "/>
-            <text macro="title"/>
-            <text macro="container-contributors"/>
-            <text macro="secondary-contributors"/>
-            <text macro="container-title"/>
-            <text variable="collection-title" prefix=": " suffix=". "/>
+            <text macro="title" suffix=". "/>
+            <text macro="issued-year" suffix=". "/>
             <text macro="locators"/>
-            <text macro="event"/>
-            <text macro="publisher" prefix=". " suffix=". "/>
-            <text macro="collection-title" prefix="(Texto para discussao, n. " suffix=")."/>
+            <text variable="publisher" prefix=" " suffix=","/>
+            <text variable="publisher-place" prefix=" " suffix=","/>
+            <text macro="issued-year" suffix=". "/>
             <text macro="access"/>
           </group>
         </else-if>
-        <else-if type="entry-encyclopedia">
+        <else-if type="webpage">
           <group>
             <text macro="author" suffix=". "/>
-            <text macro="title"/>
-            <text variable="publisher-place" prefix=". " suffix=": "/>
-            <text variable="publisher" suffix=", "/>
-            <text macro="issued" prefix=", " suffix=". (Nota t?cnica)."/>
-          </group>
-        </else-if>
-        <else-if type="paper-conference">
-          <text macro="author" text-case="capitalize-all" suffix=". "/>
-          <text macro="title"/>
-          <text macro="container-contributors"/>
-          <text macro="secondary-contributors"/>
-          <text term="in" text-case="capitalize-first" prefix=" " suffix=": "/>
-          <text macro="container-title"/>
-          <text variable="edition" suffix="., "/>
-          <text variable="issue" suffix=", "/>
-          <text variable="publisher-place" suffix=". "/>
-          <text value="Anais" font-weight="bold"/>
-          <text value="..."/>
-          <group delimiter=". " prefix=". " suffix=". ">
-            <text macro="event"/>
+            <text macro="title" suffix=". "/>
+            <text variable="genre" suffix=". "/>
+            <text macro="access" suffix=". "/>
           </group>
-          <text variable="publisher-place" prefix=" " suffix=": "/>
-          <text variable="publisher" suffix=", "/>
-          <text macro="issued"/>
-          <text macro="access"/>
-          <text macro="locators"/>
         </else-if>
-        <else-if type="legislation" match="any"/>
-        <else-if type="legal_case" match="any"/>
-        <else-if type="patent" match="any"/>
         <else>
           <text macro="author" suffix=". "/>
           <text macro="title"/>
           <text macro="container-contributors"/>
-          <text macro="secondary-contributors"/>
+          <text macro="secondary-contributors" suffix=". "/>
           <text macro="container-title"/>
-          <text variable="collection-title" prefix=": " suffix="."/>
+          <text variable="collection-title" prefix=": " suffix=". "/>
           <text macro="locators"/>
           <group delimiter=". " prefix=". " suffix=". ">
             <text macro="event"/>
           </group>
-          <text variable="publisher-place"/>
+          <text variable="publisher-place" suffix=". "/>
           <text variable="publisher" suffix=", "/>
-          <text macro="issued" prefix=", " suffix=". "/>
+          <text macro="issued"/>
           <text macro="access"/>
         </else>
       </choose>
diff --git a/buildres/csl/csl-styles/associacao-brasileira-de-normas-tecnicas.csl b/buildres/csl/csl-styles/associacao-brasileira-de-normas-tecnicas.csl
index 2b769703f27..cc8975fa8c2 100644
--- a/buildres/csl/csl-styles/associacao-brasileira-de-normas-tecnicas.csl
+++ b/buildres/csl/csl-styles/associacao-brasileira-de-normas-tecnicas.csl
@@ -82,7 +82,7 @@ tendo as inicias separadas por ponto.-->
             <name-part name="family" text-case="uppercase"/>
             <name-part name="given" text-case="uppercase"/>
           </name>
-          <label form="short" prefix=" (" suffix=".). " text-case="capitalize-first"/>
+          <label form="short" prefix=" (" suffix=".)" text-case="capitalize-first"/>
           <substitute>
             <names variable="editor"/>
             <names variable="collection-editor"/>
@@ -613,7 +613,7 @@ em caixa alta. Utiliza-se antes do nome da conferencia a expressao "In". Segundo
         <else>
           <text macro="author" suffix=". "/>
           <!--Autor-->
-          <text macro="title"/>
+          <text macro="title" suffix=". "/>
           <!--Titulo-->
           <text macro="container-contributors"/>
           <!--Nomes de editore-->
diff --git a/buildres/csl/csl-styles/association-for-computational-linguistics.csl b/buildres/csl/csl-styles/association-for-computational-linguistics.csl
index 63ea2e0f2a4..ec95b2a95b5 100644
--- a/buildres/csl/csl-styles/association-for-computational-linguistics.csl
+++ b/buildres/csl/csl-styles/association-for-computational-linguistics.csl
@@ -67,11 +67,6 @@
       </else>
     </choose>
   </macro>
-  <macro name="month">
-    <date variable="issued">
-      <date-part name="month"/>
-    </date>
-  </macro>
   <macro name="edition">
     <number variable="edition" form="ordinal"/>
     <text term="edition" prefix=" "/>
@@ -199,7 +194,6 @@
             <text variable="volume" prefix=", "/>
             <text variable="issue" prefix="(" suffix=")"/>
             <text variable="page" prefix=":"/>
-            <text macro="month" prefix=", "/>
           </group>
         </if>
         <!-- corresponds to "proceedings", "manual", "book", and "periodical" in bibtex -->
@@ -212,7 +206,6 @@
             <text variable="publisher"/>
             <text variable="publisher-place"/>
             <text macro="edition"/>
-            <text macro="month"/>
           </group>
         </else-if>
         <!-- corresponds to "inbook" and "incollection" in bibtex -->
@@ -236,7 +229,6 @@
             <text variable="publisher"/>
             <text variable="publisher-place"/>
             <text macro="edition"/>
-            <text macro="month"/>
           </group>
         </else-if>
         <!-- corresponds to "booklet" in bibtex -->
@@ -244,7 +236,6 @@
           <text variable="title" prefix=" " suffix="."/>
           <group delimiter=", " prefix=" " suffix=".">
             <text variable="publisher-place"/>
-            <text macro="month"/>
           </group>
         </else-if>
         <!-- corresponds to "inproceedings" and "conference" in bibtex -->
@@ -262,18 +253,10 @@
             <choose>
               <if variable="event-place publisher-place" match="any">
                 <text macro="event-or-publisher-place"/>
-                <text macro="month"/>
-              </if>
-            </choose>
-          </group>
-          <group prefix=" " suffix="." delimiter=", ">
-            <text variable="publisher"/>
-            <choose>
-              <if variable="event-place publisher-place" match="none">
-                <text macro="month"/>
               </if>
             </choose>
           </group>
+          <text variable="publisher" prefix=" " suffix="."/>
         </else-if>
         <!-- corresponds to "techreport" in bibtex -->
         <else-if type="report">
@@ -282,7 +265,6 @@
             <text macro="technical-report"/>
             <text variable="publisher"/>
             <text variable="publisher-place"/>
-            <text macro="month"/>
           </group>
         </else-if>
         <!-- corresponds to "phdthesis" and "masterthesis" in bibtex -->
@@ -293,13 +275,11 @@
             <text macro="thesis-type"/>
             <text variable="publisher"/>
             <text variable="publisher-place"/>
-            <text macro="month"/>
           </group>
         </else-if>
         <!-- misc. -->
         <else>
           <text variable="title" prefix=" " suffix="."/>
-          <text macro="month" prefix=" " suffix="."/>
         </else>
       </choose>
       <!-- note -->
diff --git a/buildres/csl/csl-styles/australasian-journal-of-philosophy.csl b/buildres/csl/csl-styles/australasian-journal-of-philosophy.csl
new file mode 100644
index 00000000000..ed846706972
--- /dev/null
+++ b/buildres/csl/csl-styles/australasian-journal-of-philosophy.csl
@@ -0,0 +1,317 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" and="text" page-range-format="chicago" demote-non-dropping-particle="sort-only" default-locale="en-GB">
+  <info>
+    <title>Australasian Journal of Philosophy</title>
+    <title-short>AJP</title-short>
+    <id>http://www.zotero.org/styles/australasian-journal-of-philosophy</id>
+    <link href="http://www.zotero.org/styles/australasian-journal-of-philosophy" rel="self"/>
+    <link href="http://www.zotero.org/styles/journal-of-international-relations-and-development" rel="template"/>
+    <link href="https://aap.org.au/style" rel="documentation"/>
+    <author>
+      <name>Antony Eagle</name>
+      <uri>https://antonyeagle.org</uri>
+    </author>
+    <category citation-format="author-date"/>
+    <category field="philosophy"/>
+    <category field="humanities"/>
+    <issn>0004-8402</issn>
+    <eissn>1471-6828</eissn>
+    <updated>2022-07-05T21:41:58+09:30</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>
+    <style-options punctuation-in-quote="false"/>
+    <terms>
+      <term name="translator" form="short">trans.</term>
+      <term name="editortranslator" form="short">
+        <single>ed., trans.</single>
+        <multiple>eds., trans.</multiple>
+      </term>
+      <term name="ad"> CE</term>
+      <term name="bc"> BCE</term>
+      <term name="chapter" form="short">
+        <single>ch.</single>
+        <multiple>chs.</multiple>
+      </term>
+      <term name="figure" form="short">
+        <single>fig.</single>
+        <multiple>figs.</multiple>
+      </term>
+      <term name="equation" form="short">
+        <single>eqn.</single>
+        <multiple>eqns.</multiple>
+      </term>
+    </terms>
+  </locale>
+  <macro name="author">
+    <names variable="author">
+      <name and="text" initialize="false" initialize-with=" " name-as-sort-order="first"/>
+      <label form="short" prefix=", " suffix="."/>
+      <et-al font-style="italic"/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <text macro="title"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="author-short">
+    <names variable="author">
+      <name form="short" and="text" delimiter=", " initialize="true" initialize-with="" name-as-sort-order="first"/>
+      <et-al font-style="italic"/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <text variable="container-title" font-style="italic"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="container-contributors">
+    <choose>
+      <if type="chapter paper-conference" match="any">
+        <text term="in" suffix=" "/>
+        <choose>
+          <if variable="editor translator" match="any">
+            <names variable="editor translator" delimiter=", ">
+              <name and="text" delimiter-precedes-last="never" initialize="false" initialize-with=" "/>
+              <label form="short" prefix=", " suffix=","/>
+            </names>
+          </if>
+        </choose>
+      </if>
+      <else-if type="book" match="any">
+        <names variable="editor translator" delimiter="; " prefix=" ">
+          <name and="text" delimiter-precedes-last="never" initialize="false" initialize-with=" "/>
+          <label form="short" prefix=", "/>
+        </names>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if variable="DOI">
+        <choose>
+          <if type="article-journal article" match="any">
+            <group delimiter=" ">
+              <text variable="DOI" prefix="doi:"/>
+            </group>
+          </if>
+        </choose>
+      </if>
+      <else-if variable="URL">
+        <choose>
+          <if type="webpage manuscript report chapter book thesis paper-conference" match="any">
+            <group delimiter=" ">
+              <text variable="URL"/>
+            </group>
+          </if>
+        </choose>
+      </else-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" quotes="true" text-case="title"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <choose>
+      <if type="thesis">
+        <group delimiter=", ">
+          <text variable="genre"/>
+          <text variable="publisher-place"/>
+          <text variable="publisher"/>
+        </group>
+      </if>
+      <else-if type="chapter book report paper-conference" match="any">
+        <text variable="genre" suffix=". "/>
+        <group delimiter=": ">
+          <text variable="publisher"/>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="event">
+    <choose>
+      <if variable="event">
+        <text term="presented at" prefix="paper " suffix=" "/>
+        <text variable="event"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="year-date">
+    <group>
+      <choose>
+        <if variable="issued original-date">
+          <date date-parts="year" variable="original-date" form="numeric" suffix="/">
+            <date-part name="year" form="long"/>
+          </date>
+          <date date-parts="year" variable="issued" form="numeric">
+            <date-part name="year" form="long"/>
+          </date>
+        </if>
+        <else-if variable="issued">
+          <date date-parts="year" variable="issued" form="numeric">
+            <date-part name="year" form="long"/>
+          </date>
+        </else-if>
+        <else>
+          <text term="no date" form="short"/>
+        </else>
+      </choose>
+    </group>
+  </macro>
+  <macro name="year-date-inline">
+    <group>
+      <choose>
+        <if variable="issued original-date">
+          <date date-parts="year" variable="original-date" form="numeric">
+            <date-part name="year" form="long"/>
+          </date>
+        </if>
+        <else-if variable="issued">
+          <date date-parts="year" variable="issued" form="numeric">
+            <date-part name="year" form="long"/>
+          </date>
+        </else-if>
+        <else>
+          <text term="no date" form="short"/>
+        </else>
+      </choose>
+    </group>
+  </macro>
+  <macro name="locators">
+    <choose>
+      <if type="article-journal article-magazine" match="any">
+        <group prefix=" " delimiter=": ">
+          <group>
+            <text variable="volume" font-weight="bold"/>
+          </group>
+          <text variable="page"/>
+        </group>
+      </if>
+      <else-if type="article-newspaper">
+        <group delimiter=", ">
+          <date variable="issued">
+            <date-part name="day"/>
+            <date-part name="month" form="long" prefix=" "/>
+          </date>
+          <group delimiter=" ">
+            <text variable="page"/>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="chapter paper-conference report" match="any">
+        <text value=""/>
+      </else-if>
+      <else>
+        <text variable="page"/>
+      </else>
+    </choose>
+  </macro>
+  <citation et-al-min="4" et-al-use-first="2" disambiguate-add-year-suffix="true" disambiguate-add-names="false" disambiguate-add-givenname="true" givenname-disambiguation-rule="by-cite" collapse="year-suffix-ranged">
+    <sort>
+      <key macro="year-date-inline"/>
+      <key macro="author"/>
+    </sort>
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <group delimiter=" ">
+        <text macro="author-short"/>
+        <choose>
+          <if variable="locator">
+            <group delimiter=": ">
+              <text macro="year-date-inline"/>
+              <choose>
+                <if match="any" locator="section paragraph">
+                  <group delimiter="">
+                    <label text-case="lowercase" strip-periods="false" variable="locator" form="symbol"/>
+                    <text variable="locator" form="short"/>
+                  </group>
+                </if>
+                <else-if locator="page">
+                  <text variable="locator" form="short"/>
+                </else-if>
+                <else>
+                  <group delimiter=" ">
+                    <label variable="locator" form="short"/>
+                    <text variable="locator" form="short"/>
+                  </group>
+                </else>
+              </choose>
+            </group>
+          </if>
+          <else>
+            <text macro="year-date-inline"/>
+          </else>
+        </choose>
+      </group>
+    </layout>
+  </citation>
+  <bibliography et-al-min="7" et-al-use-first="5" subsequent-author-substitute-rule="partial-each" hanging-indent="true">
+    <sort>
+      <key macro="author"/>
+      <key macro="year-date"/>
+    </sort>
+    <layout suffix=".">
+      <group delimiter=" ">
+        <text macro="author"/>
+        <text macro="year-date" prefix="(" suffix=")"/>
+        <text macro="title"/>
+      </group>
+      <group>
+        <choose>
+          <if type="book report" match="any">
+            <choose>
+              <if is-numeric="volume">
+                <group delimiter=" " prefix=", ">
+                  <text term="volume" form="short"/>
+                  <text variable="volume"/>
+                </group>
+              </if>
+            </choose>
+            <choose>
+              <if is-numeric="edition">
+                <group delimiter=" " prefix=", ">
+                  <number variable="edition" form="ordinal"/>
+                  <label variable="edition"/>
+                </group>
+              </if>
+            </choose>
+          </if>
+        </choose>
+      </group>
+      <group prefix=", ">
+        <text macro="container-contributors"/>
+        <text variable="container-title" text-case="title" font-style="italic" prefix=" "/>
+        <choose>
+          <if type="chapter paper-conference" match="any">
+            <choose>
+              <if variable="volume">
+                <text term="volume" form="short" prefix=", "/>
+                <text variable="volume" font-weight="bold" prefix=" "/>
+              </if>
+            </choose>
+            <choose>
+              <if match="any" variable="page locator">
+                <group delimiter="" prefix=": ">
+                  <text variable="page" prefix=""/>
+                </group>
+              </if>
+            </choose>
+          </if>
+        </choose>
+      </group>
+      <group delimiter=". " prefix=". ">
+        <text macro="event"/>
+        <text macro="publisher"/>
+      </group>
+      <text macro="locators" prefix=" "/>
+      <text macro="access" prefix=". "/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/buildres/csl/csl-styles/australian-road-research-board.csl b/buildres/csl/csl-styles/australian-road-research-board.csl
new file mode 100644
index 00000000000..820d749d86e
--- /dev/null
+++ b/buildres/csl/csl-styles/australian-road-research-board.csl
@@ -0,0 +1,208 @@
+<?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-GB" page-range-format="minimal">
+  <info>
+    <title>Australian Road Research Board</title>
+    <id>http://www.zotero.org/styles/australian-road-research-board</id>
+    <link href="http://www.zotero.org/styles/australian-road-research-board" rel="self"/>
+    <link href="http://www.zotero.org/styles/style-manual-australian-government" rel="template"/>
+    <link href="https://www.railknowledgebank.com/Presto/pl/NmQ5ZmY0YWQtNTc4NS00YzZiLTk3MTItNjEzYWQxZTgyMTRlLjcxNjg=" rel="documentation"/>
+    <author>
+      <name>TMason</name>
+      <email>tony.mason@arrb.com.au</email>
+    </author>
+    <category citation-format="author-date"/>
+    <category field="generic-base"/>
+    <summary>Australian Road Research Board Style based on the Australian Style Manual author-date 6th edition</summary>
+    <updated>2017-10-12T00:16:23+00:00</updated>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
+  </info>
+  <locale xml:lang="en">
+    <terms>
+      <term name="edition" form="short">edn</term>
+      <term name="editor" form="short">
+        <single>ed</single>
+        <multiple>eds</multiple>
+      </term>
+    </terms>
+  </locale>
+  <macro name="editor">
+    <names variable="editor">
+      <name and="symbol" initialize-with=""/>
+      <label form="short" prefix=" (" suffix=")"/>
+    </names>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with="" delimiter=", " delimiter-precedes-last="never"/>
+      <label form="short" prefix=" (" suffix=")"/>
+      <substitute>
+        <names variable="editor"/>
+        <text macro="title"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="author-short">
+    <names variable="author">
+      <name form="short" and="symbol" delimiter-precedes-last="never"/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <text macro="title"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if variable="URL">
+        <group delimiter=", ">
+          <group delimiter=" ">
+            <text value="viewed"/>
+            <date variable="accessed">
+              <date-part name="day" suffix=" "/>
+              <date-part name="month" suffix=" "/>
+              <date-part name="year"/>
+            </date>
+          </group>
+          <text variable="URL" prefix="&lt;" suffix="&gt;"/>
+        </group>
+      </if>
+	  <else>
+        <text variable="DOI" prefix="doi: "/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="bill book graphic legal_case legislation motion_picture report song thesis webpage" match="any">
+        <text variable="title" font-style="italic"/>
+      </if>
+      <else>
+        <text variable="title" quotes="true"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=", " prefix=", ">
+      <text variable="publisher"/>
+      <text variable="publisher-place"/>
+    </group>
+  </macro>
+  <macro name="year-date">
+    <choose>
+      <if variable="issued">
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
+      </if>
+      <else>
+        <text term="no date" form="short"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <text term="edition" form="short"/>
+        </group>
+      </if>
+      <else>
+        <text variable="edition"/>
+      </else>
+    </choose>
+  </macro>
+  <citation et-al-min="4" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true">
+    <layout prefix="(" suffix=")" delimiter=", ">
+      <group delimiter=", ">
+        <group delimiter=" ">
+          <text macro="author-short"/>
+          <text macro="year-date"/>
+        </group>
+        <group>
+          <label variable="locator" form="short"/>
+          <text variable="locator"/>
+        </group>
+      </group>
+    </layout>
+  </citation>
+  <bibliography hanging-indent="true">
+    <sort>
+      <key macro="author"/>
+      <key variable="issued"/>
+    </sort>
+    <layout suffix=".">
+      <text macro="author"/>
+      <text macro="year-date" prefix=" "/>
+      <choose>
+        <if type="bill book graphic legal_case legislation motion_picture song" match="any">
+          <group delimiter=", ">
+            <text macro="title" prefix=", "/>
+            <text macro="edition"/>
+            <text macro="editor"/>
+			<text variable="version" prefix=" "/>
+          </group>
+          <text macro="publisher"/>
+        </if>
+		<else-if type="report" match="any">
+          <group delimiter=", ">
+            <text macro="title" prefix=", "/>
+            <text macro="edition"/>
+            <text macro="editor"/>
+			<text variable="number"/>
+          </group>
+          <text macro="publisher"/>
+        </else-if>
+        <else-if type="chapter paper-conference" match="any">
+          <group prefix=", ">
+            <text macro="title"/>
+            <text macro="editor" prefix=", in "/>
+            <text variable="container-title" font-style="italic" prefix=", "/>
+            <text variable="collection-title" prefix=", "/>
+            <group>
+              <text macro="publisher"/>
+            </group>
+            <group prefix=", ">
+              <label variable="page" form="short"/>
+              <text variable="page" prefix=" "/>
+            </group>
+          </group>
+        </else-if>
+        <else-if type="thesis">
+          <group prefix=", ">
+            <text variable="title" quotes="true"/>
+            <text variable="genre" prefix=", "/>
+            <text macro="publisher"/>
+          </group>
+        </else-if>
+		<else-if type="article-newspaper">
+          <group prefix=", ">
+            <text variable="title" quotes="true"/>
+            <text variable="container-title" font-style="italic" prefix=", "/>
+			<text variable="section" prefix=", "/>
+            <text variable="edition" prefix=", "/>
+          </group>
+        </else-if>
+        <else>
+          <group prefix=", ">
+            <text macro="title"/>
+			<text variable="note" prefix=", "/>
+			<text macro="publisher"/>
+          </group>
+          <group prefix=", ">
+            <text variable="container-title" font-style="italic"/>
+            <group prefix=", ">
+              <text variable="volume" prefix="vol. "/>
+              <text variable="issue" prefix=", no. "/>
+            </group>
+            <group prefix=", ">
+              <label variable="page" form="short"/>
+              <text variable="page" prefix=". "/>
+            </group>
+          </group>
+        </else>
+      </choose>
+      <text prefix=", " macro="access"/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/buildres/csl/csl-styles/avian-conservation-and-ecology.csl b/buildres/csl/csl-styles/avian-conservation-and-ecology.csl
index e509aebd02d..c1bccf809f6 100644
--- a/buildres/csl/csl-styles/avian-conservation-and-ecology.csl
+++ b/buildres/csl/csl-styles/avian-conservation-and-ecology.csl
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" default-locale="en-US" version="1.0" demote-non-dropping-particle="sort-only">
+<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>Avian Conservation and Ecology</title>
+    <title-short>ACE</title-short>
     <id>http://www.zotero.org/styles/avian-conservation-and-ecology</id>
     <link href="http://www.zotero.org/styles/avian-conservation-and-ecology" rel="self"/>
     <link href="http://www.zotero.org/styles/ecology" rel="template"/>
@@ -12,7 +13,7 @@
     <category citation-format="author-date"/>
     <category field="biology"/>
     <eissn>1712-6568</eissn>
-    <updated>2012-09-27T22:06:38+00:00</updated>
+    <updated>2022-08-22T08:26: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>
   <macro name="container-contributors">
@@ -77,9 +78,9 @@
   <macro name="access">
     <choose>
       <if variable="DOI">
-        <text variable="DOI" prefix="doi: "/>
+        <text variable="DOI" prefix="https://doi.org/"/>
       </if>
-      <else-if type="webpage">
+      <else-if type="webpage post post-weblog report" match="any">
         <text variable="URL"/>
       </else-if>
     </choose>
@@ -147,7 +148,7 @@
   <macro name="locators">
     <choose>
       <if type="article-journal article-magazine article-newspaper" match="any">
-        <text variable="container-title" prefix=". " font-style="italic"/>
+        <text variable="container-title" prefix=". "/>
         <text variable="volume" prefix=" "/>
         <text variable="page" prefix=":"/>
       </if>
diff --git a/buildres/csl/csl-styles/beilstein-journal-of-organic-chemistry.csl b/buildres/csl/csl-styles/beilstein-journal-of-organic-chemistry.csl
index 8487b04c1ee..2ab0fe83caf 100644
--- a/buildres/csl/csl-styles/beilstein-journal-of-organic-chemistry.csl
+++ b/buildres/csl/csl-styles/beilstein-journal-of-organic-chemistry.csl
@@ -3,7 +3,7 @@
   <!-- This style was edited with the Visual CSL Editor (https://editor.citationstyles.org/visualEditor/) -->
   <info>
     <title>Beilstein Journal of Organic Chemistry</title>
-    <title-short>Beilstein</title-short>
+    <title-short>BJOC</title-short>
     <id>http://www.zotero.org/styles/beilstein-journal-of-organic-chemistry</id>
     <link href="http://www.zotero.org/styles/beilstein-journal-of-organic-chemistry" rel="self"/>
     <link href="http://www.zotero.org/styles/american-chemical-society" rel="template"/>
@@ -154,7 +154,6 @@
                 <if variable="volume">
                   <group delimiter=" ">
                     <text variable="volume" font-style="italic"/>
-                    <text variable="issue" prefix="(" suffix=")"/>
                   </group>
                 </if>
                 <else>
diff --git a/buildres/csl/csl-styles/bibliothek-forschung-und-praxis.csl b/buildres/csl/csl-styles/bibliothek-forschung-und-praxis.csl
new file mode 100644
index 00000000000..5e85189c238
--- /dev/null
+++ b/buildres/csl/csl-styles/bibliothek-forschung-und-praxis.csl
@@ -0,0 +1,623 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.0" page-range-format="chicago">
+  <info>
+    <title>Bibliothek &#8211; Forschung und Praxis</title>
+    <id>http://www.zotero.org/styles/bibliothek-forschung-und-praxis</id>
+    <link href="http://www.zotero.org/styles/bibliothek-forschung-und-praxis" rel="self"/>
+    <link href="http://www.zotero.org/styles/chicago-fullnote-bibliography-16th-edition" rel="template"/>
+    <link href="https://www.degruyter.com/publication/journal_key/BFUP/downloadAsset/BFUP_Instructions%20for%20Authors.pdf" rel="documentation"/>
+    <author>
+      <name>Jens Mittelbach</name>
+      <email>mail@jensmittelbach.de</email>
+      <uri>https://orcid.org/0000-0002-2222-7172</uri>
+    </author>
+    <category citation-format="note"/>
+    <category field="social_science"/>
+    <issn>1865-7648</issn>
+    <issn>0341-4183</issn>
+    <summary>The BFP citation style based on the Chicago Manual of Style</summary>
+    <updated>2022-04-26T12:22:18+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="de">
+    <terms>
+      <term name="internet">veröffentlicht am</term>
+      <term name="accessed">zugegriffen am</term>
+      <term name="presented at">gehalten auf</term>
+      <term name="et-al" form="long">et&#8239;al.</term>
+    </terms>
+  </locale>
+  <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>
+      <term name="internet">published</term>
+      <term name="et-al" form="long">et&#8239;al.</term>
+    </terms>
+  </locale>
+  <macro name="secondary-contributors">
+    <choose>
+      <if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="none">
+        <group delimiter=". ">
+          <names variable="editor translator" delimiter=". ">
+            <label form="verb" text-case="capitalize-first" suffix=" "/>
+            <name and="text" delimiter=", "/>
+          </names>
+          <names variable="director" delimiter=". ">
+            <label form="verb" text-case="capitalize-first" suffix=" "/>
+            <name and="text" delimiter=", "/>
+          </names>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="container-contributors">
+    <choose>
+      <if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
+        <group prefix=", " delimiter=", ">
+          <names variable="container-author" delimiter=", ">
+            <label form="verb" suffix=" "/>
+            <name and="text" delimiter-precedes-last="never"/>
+          </names>
+          <names variable="editor translator" delimiter=", ">
+            <label form="verb-short" suffix=" "/>
+            <name and="text" delimiter-precedes-last="never"/>
+          </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-magazine article-newspaper review review-book" match="any">
+        <text macro="container-title"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="contributors">
+    <group delimiter=". ">
+      <names variable="author">
+        <name delimiter="; " name-as-sort-order="all"/>
+        <label form="short" prefix=" (" suffix=")"/>
+        <substitute>
+          <names variable="editor"/>
+          <names variable="translator"/>
+          <names variable="director"/>
+          <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"/>
+        <names variable="director"/>
+        <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>
+      <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" form="text"/>
+          </group>
+        </if>
+      </choose>
+      <choose>
+        <if type="legal_case" match="none">
+          <choose>
+            <if variable="DOI">
+              <text variable="DOI" prefix="DOI:"/>
+            </if>
+            <else-if match="all" variable="URL">
+              <text term="available at" text-case="sentence" suffix=" "/>
+              <text variable="URL"/>
+              <group delimiter=": " prefix=", ">
+                <choose>
+                  <if type="post-weblog" match="any">
+                    <text term="internet"/>
+                    <date form="numeric" variable="issued"/>
+                  </if>
+                </choose>
+              </group>
+              <group delimiter=" " prefix=", ">
+                <text term="accessed"/>
+                <date form="numeric" variable="accessed"/>
+              </group>
+            </else-if>
+          </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 song" match="any">
+        <text variable="title" font-style="normal"/>
+        <group prefix=" (" suffix=")" delimiter=" ">
+          <text term="version"/>
+          <text variable="version"/>
+        </group>
+      </else-if>
+      <else-if variable="reviewed-author">
+        <choose>
+          <if variable="reviewed-title">
+            <group delimiter=". ">
+              <text variable="title" quotes="true"/>
+              <group delimiter=", ">
+                <group delimiter=" ">
+                  <text variable="reviewed-title" font-style="italic"/>
+                </group>
+                <names variable="reviewed-author">
+                  <label form="verb-short" text-case="lowercase" suffix=" "/>
+                  <name and="text" delimiter=", "/>
+                </names>
+              </group>
+            </group>
+          </if>
+          <else>
+            <group delimiter=", ">
+              <group delimiter=" ">
+                <text term="review-of" text-case="capitalize-first"/>
+                <text variable="title" font-style="italic"/>
+              </group>
+              <names variable="reviewed-author">
+                <label form="verb-short" text-case="lowercase" suffix=" "/>
+                <name and="text" delimiter=", "/>
+              </names>
+            </group>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="legal_case interview patent" match="any">
+        <text variable="title"/>
+      </else-if>
+      <else>
+        <text variable="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" text-case="capitalize-first" prefix=". "/>
+          </else>
+        </choose>
+      </if>
+      <else-if type="chapter entry-dictionary entry-encyclopedia 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=" (" suffix=")">
+              <text variable="issue"/>
+              <date variable="issued">
+                <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 entry-dictionary entry-encyclopedia 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 entry-dictionary entry-encyclopedia 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" suffix=":"/>
+  </macro>
+  <macro name="container-title">
+    <choose>
+      <if type="chapter entry-dictionary entry-encyclopedia paper-conference article-journal article-magazine article-newspaper" match="any">
+        <text macro="container-prefix" suffix=" "/>
+      </if>
+    </choose>
+    <choose>
+      <if type="legal_case" match="none">
+        <group delimiter=" ">
+          <text variable="container-title" font-style="italic"/>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=": ">
+      <text variable="publisher-place"/>
+      <text variable="publisher"/>
+    </group>
+  </macro>
+  <macro name="date">
+    <choose>
+      <if variable="issued">
+        <group delimiter=" ">
+          <date variable="original-date" form="text" date-parts="year" prefix="(" suffix=")"/>
+          <date variable="issued">
+            <date-part name="year"/>
+          </date>
+        </group>
+      </if>
+      <else-if variable="status">
+        <text variable="status" text-case="capitalize-first"/>
+      </else-if>
+      <else>
+        <text term="no date" form="short"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="date-in-text">
+    <choose>
+      <if variable="issued">
+        <group delimiter=" ">
+          <date variable="original-date" form="text" date-parts="year" prefix="[" suffix="]"/>
+          <date variable="issued">
+            <date-part name="year"/>
+          </date>
+        </group>
+      </if>
+      <else-if variable="status">
+        <text variable="status"/>
+      </else-if>
+      <else>
+        <text term="no date" form="short"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="day-month">
+    <date form="numeric" variable="issued"/>
+  </macro>
+  <macro name="collection-title">
+    <choose>
+      <if match="none" type="article-journal">
+        <choose>
+          <if match="all" type="report">
+            <group delimiter=": ">
+              <text variable="collection-title"/>
+              <text variable="number"/>
+            </group>
+          </if>
+          <else>
+            <group delimiter=": ">
+              <text variable="collection-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 delimiter=" ">
+      <choose>
+        <if variable="genre">
+          <text term="presented at"/>
+        </if>
+        <else>
+          <text term="presented at" text-case="capitalize-first"/>
+        </else>
+      </choose>
+      <text variable="event"/>
+    </group>
+  </macro>
+  <macro name="description">
+    <choose>
+      <if variable="interviewer" type="interview" match="any">
+        <group delimiter=". ">
+          <text macro="interviewer"/>
+          <text variable="medium" text-case="capitalize-first"/>
+        </group>
+      </if>
+      <else-if type="patent">
+        <group delimiter=" " prefix=". ">
+          <text variable="authority"/>
+          <text variable="number"/>
+        </group>
+      </else-if>
+      <else>
+        <text variable="medium" text-case="capitalize-first" prefix=". "/>
+      </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">
+        <date variable="issued" form="text" prefix=", "/>
+      </else-if>
+      <else-if type="patent">
+        <group delimiter=", " prefix=", ">
+          <group delimiter=" ">
+            <text value="filed"/>
+            <date variable="submitted" form="text"/>
+          </group>
+          <group delimiter=" ">
+            <choose>
+              <if variable="issued submitted" match="all">
+                <text term="and"/>
+              </if>
+            </choose>
+            <text value="issued"/>
+            <date variable="issued" form="text"/>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="article-journal" match="any"/>
+      <else>
+        <group prefix=". " delimiter=", ">
+          <choose>
+            <if type="thesis report article" match="any">
+              <text variable="genre" text-case="capitalize-first"/>
+            </if>
+          </choose>
+          <text macro="publisher"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <citation delimiter-precedes-last="never" et-al-min="3" et-al-use-first="1" disambiguate-add-names="true" disambiguate-add-givenname="true" disambiguate-add-year-suffix="true" givenname-disambiguation-rule="primary-name" collapse="year" after-collapse-delimiter="; ">
+    <layout delimiter="; " suffix=".">
+      <group delimiter=" ">
+        <choose>
+          <if variable="issued accessed" match="any">
+            <group delimiter=" ">
+              <text macro="contributors-short"/>
+              <text macro="date-in-text" prefix="(" suffix=")"/>
+            </group>
+          </if>
+          <else>
+            <group delimiter=" ">
+              <text macro="contributors-short"/>
+              <text macro="date-in-text" prefix="(" suffix=")"/>
+            </group>
+          </else>
+        </choose>
+        <text macro="point-locators"/>
+      </group>
+    </layout>
+  </citation>
+  <bibliography hanging-indent="true" et-al-min="11" et-al-use-first="7" entry-spacing="0">
+    <sort>
+      <key macro="contributors"/>
+      <key variable="issued"/>
+      <key variable="title"/>
+    </sort>
+    <layout suffix=".">
+      <group delimiter=" ">
+        <text macro="contributors"/>
+        <text macro="date" prefix="(" suffix="):"/>
+        <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="issue"/>
+      <text macro="collection-title" prefix=" (" suffix=")"/>
+      <text macro="locators-article"/>
+      <text macro="access" prefix=". "/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/buildres/csl/csl-styles/bibtex.csl b/buildres/csl/csl-styles/bibtex.csl
index 1dd01793b39..9004dda89f4 100644
--- a/buildres/csl/csl-styles/bibtex.csl
+++ b/buildres/csl/csl-styles/bibtex.csl
@@ -13,7 +13,11 @@
       <email>karnesky+zotero@gmail.com</email>
       <uri>http://arc.nucapt.northwestern.edu/Richard_Karnesky</uri>
     </contributor>
-    <category citation-format="author-date"/>
+    <contributor>
+      <name>Brenton M. Wiernik</name>
+      <email>zotero@wiernik.org</email>
+    </contributor>
+    <category citation-format="label"/>
     <category field="generic-base"/>
     <updated>2012-09-14T21:22:32+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>
@@ -123,6 +127,7 @@
     <text variable="page"/>
   </macro>
   <macro name="edition">
+    <!-- This should probably be ordinal? -->
     <text variable="edition"/>
   </macro>
   <citation disambiguate-add-year-suffix="true" disambiguate-add-names="false" disambiguate-add-givenname="false" collapse="year">
@@ -143,19 +148,19 @@
       <text macro="zotero2bibtexType" prefix=" @"/>
       <group prefix="{" suffix=" }" delimiter=", ">
         <text macro="citeKey"/>
-        <text variable="publisher-place" prefix=" place={" suffix="}"/>
+        <text variable="publisher-place" prefix=" address={" suffix="}"/>
         <!--Fix This-->
         <text variable="chapter-number" prefix=" chapter={" suffix="}"/>
         <!--Fix This-->
         <text macro="edition" prefix=" edition={" suffix="}"/>
-        <!--Is this in CSL? <text variable="type" prefix=" type={" suffix="}"/>-->
+        <text variable="genre" prefix=" type={" suffix="}"/>
         <text variable="collection-title" prefix=" series={" suffix="}"/>
         <text macro="title" prefix=" title={" suffix="}"/>
         <text variable="volume" prefix=" volume={" suffix="}"/>
-        <!--Not in CSL<text variable="rights" prefix=" rights={" suffix="}"/>-->
+        <text variable="license" prefix=" rights={" suffix="}"/>
         <text variable="ISBN" prefix=" ISBN={" suffix="}"/>
         <text variable="ISSN" prefix=" ISSN={" suffix="}"/>
-        <!--Not in CSL <text variable="LCCN" prefix=" callNumber={" suffix="}"/>-->
+        <text variable="call-number" prefix=" callNumber={" suffix="}"/>
         <text variable="archive_location" prefix=" archiveLocation={" suffix="}"/>
         <text variable="URL" prefix=" url={" suffix="}"/>
         <text variable="DOI" prefix=" DOI={" suffix="}"/>
@@ -170,6 +175,9 @@
         <text macro="issued-month" prefix=" month={" suffix="}"/>
         <text macro="pages" prefix=" pages={" suffix="}"/>
         <text variable="collection-title" prefix=" collection={" suffix="}"/>
+        <text variable="keyword" prefix=" keywords={" suffix="}"/>
+        <text variable="language" prefix="language={" suffix="}"/>
+        <text variable="annote" prefix="annote={" suffix="}"/>
       </group>
     </layout>
   </bibliography>
diff --git a/buildres/csl/csl-styles/biological-reviews.csl b/buildres/csl/csl-styles/biological-reviews.csl
index b4bcd77c339..a6a3a6783b6 100644
--- a/buildres/csl/csl-styles/biological-reviews.csl
+++ b/buildres/csl/csl-styles/biological-reviews.csl
@@ -5,7 +5,7 @@
     <id>http://www.zotero.org/styles/biological-reviews</id>
     <link href="http://www.zotero.org/styles/biological-reviews" rel="self"/>
     <link href="http://www.zotero.org/styles/oryx" rel="template"/>
-    <link href="http://onlinelibrary.wiley.com/journal/10.1111/%28ISSN%291469-185X/homepage/ForAuthors.html" rel="documentation"/>
+    <link href="https://onlinelibrary.wiley.com/page/journal/1469185x/homepage/ForAuthors.html" rel="documentation"/>
     <author>
       <name>Sebastian Karcher</name>
     </author>
@@ -17,7 +17,7 @@
     <eissn>1469-185X</eissn>
     <issnl>0006-3231</issnl>
     <summary>Style for Biological Reviews, aka Biological reviews of the Cambridge Philosophical Society</summary>
-    <updated>2017-09-18T10:11:09+00:00</updated>
+    <updated>2022-06-29T10:11:09+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">
@@ -60,7 +60,7 @@
   </macro>
   <macro name="author-short">
     <names variable="author">
-      <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
+      <name form="short" and="symbol" delimiter=", " initialize-with=". " delimiter-precedes-last="never"/>
       <et-al font-style="italic"/>
       <substitute>
         <names variable="editor"/>
diff --git a/buildres/csl/csl-styles/bluebook-law-review.csl b/buildres/csl/csl-styles/bluebook-law-review.csl
index 7074e859622..5ce50f1f0ab 100644
--- a/buildres/csl/csl-styles/bluebook-law-review.csl
+++ b/buildres/csl/csl-styles/bluebook-law-review.csl
@@ -13,19 +13,22 @@
       <name>Nancy Sims</name>
       <email>nsims@umich.edu</email>
     </author>
+    <contributor>
+      <name>Patrick O'Brien</name>
+    </contributor>
     <category citation-format="note"/>
     <category field="law"/>
     <summary>The Bluebook legal citation style for law reviews.</summary>
-    <updated>2018-12-04T16:38:55+00:00</updated>
+    <updated>2022-03-09T09:33:23+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <locale>
     <terms>
       <term name="editor" form="verb-short">ed.</term>
+      <term name="ibid">id.</term>
       <term name="translator" form="verb-short">trans.</term>
     </terms>
   </locale>
-  <!-- sets up basics of dealing with authors -->
   <macro name="name-macro">
     <names variable="author">
       <name and="symbol" delimiter=", " delimiter-precedes-last="never"/>
@@ -57,7 +60,7 @@
   <macro name="author">
     <choose>
       <if type="legal_case">
-        <text macro="name-macro" font-variant="normal"/>
+        <text macro="name-macro"/>
       </if>
       <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
         <text macro="name-macro" font-variant="small-caps"/>
@@ -67,53 +70,58 @@
       </else>
     </choose>
   </macro>
-  <!-- sets up basics of dealing with editors and translators. Will generally only show up in book citations, as called in XXXX, below -->
   <macro name="editor-translator">
-    <names variable="editor translator" suffix=" " delimiter=", ">
+    <names variable="editor translator" delimiter=", ">
       <name and="symbol" delimiter=", "/>
-      <label form="short" prefix=" " suffix=".," strip-periods="true"/>
+      <label form="short" strip-periods="false" prefix=" "/>
     </names>
   </macro>
-  <!-- link to online content, called in YYYYY -->
   <macro name="access">
     <choose>
       <if variable="URL">
-        <text variable="URL"/>
-        <group prefix=" (" suffix=")">
-          <text value="last visited" suffix=" "/>
-          <date variable="accessed">
-            <date-part name="month" form="short" suffix=" " strip-periods="true"/>
-            <date-part name="day" suffix=", "/>
-            <date-part name="year"/>
-          </date>
+        <group delimiter=" ">
+          <text variable="URL"/>
+          <group delimiter=" " prefix="(" suffix=")">
+            <text value="last visited"/>
+            <date variable="accessed">
+              <date-part name="month" form="short" suffix=" " strip-periods="true"/>
+              <date-part name="day" suffix=", "/>
+              <date-part name="year"/>
+            </date>
+          </group>
         </group>
       </if>
     </choose>
   </macro>
   <macro name="source">
-    <!-- This macro seems really problematic, with a ton of redundancy. I'd move some of
-    the conditional logic into the appropriate macros (like 'title') and try to remove this
-    macro entirely. -->
     <choose>
       <if type="article-journal" match="any">
-        <text variable="title" font-style="italic"/>
-        <group prefix=", " delimiter=" ">
-          <text variable="volume"/>
-          <text macro="container"/>
+        <group delimiter=" ">
+          <group delimiter=", ">
+            <text variable="title" font-style="italic"/>
+            <group delimiter=" ">
+              <text variable="volume"/>
+              <text macro="container"/>
+              <text variable="page-first"/>
+            </group>
+            <text variable="locator"/>
+          </group>
+          <text macro="issuance" prefix="(" suffix=")"/>
         </group>
-        <text variable="page" prefix=" "/>
-        <text variable="locator" prefix=", "/>
-        <text macro="issuance" prefix=" (" suffix=")"/>
       </if>
       <else-if type="legal_case">
-        <text variable="title" font-variant="normal"/>
-        <group prefix=", " delimiter=" ">
-          <text variable="volume"/>
+        <group delimiter=" ">
+          <group delimiter=", ">
+            <text variable="title"/>
+            <text variable="volume"/>
+          </group>
           <text macro="container"/>
+          <group delimiter=", ">
+            <text variable="page-first"/>
+            <text variable="locator"/>
+          </group>
+          <text macro="issuance" prefix="(" suffix=")"/>
         </group>
-        <text variable="page" prefix=" "/>
-        <text variable="locator" prefix=", "/>
-        <text macro="issuance" prefix=" (" suffix=")"/>
       </else-if>
       <else-if type="article-newspaper article-magazine thesis" match="any">
         <group delimiter=", ">
@@ -125,7 +133,7 @@
           <text macro="issuance"/>
           <group delimiter=" ">
             <text value="at"/>
-            <text variable="page"/>
+            <text variable="page-first"/>
           </group>
         </group>
       </else-if>
@@ -135,25 +143,26 @@
           <text variable="volume"/>
           <text macro="container"/>
         </group>
-        <text variable="page"/>
+        <text variable="page-first"/>
         <text variable="locator" prefix=", "/>
         <text macro="issuance" prefix=" (" suffix=")"/>
       </else-if>
       <else-if type="book" match="any">
         <text variable="title" font-variant="small-caps"/>
-        <text variable="page" prefix=" "/>
         <text variable="locator" prefix=" "/>
         <text macro="issuance" prefix=" (" suffix=")"/>
       </else-if>
       <else>
-        <text variable="title" font-style="italic"/>
-        <group prefix=", " delimiter=" " suffix=" ">
-          <text variable="volume"/>
-          <text macro="container"/>
+        <group delimiter=", ">
+          <text variable="title" font-style="italic"/>
+          <group delimiter=" ">
+            <text variable="volume"/>
+            <text macro="container"/>
+            <text variable="page-first"/>
+            <text variable="locator"/>
+            <text macro="issuance" prefix="(" suffix=")"/>
+          </group>
         </group>
-        <text variable="page" prefix=" "/>
-        <text variable="locator" prefix=" "/>
-        <text macro="issuance" prefix=" (" suffix=")"/>
       </else>
     </choose>
   </macro>
@@ -177,26 +186,27 @@
         </group>
       </if>
       <else>
-        <!-- removed an extra space in the prefix here NS 20110511 -->
-        <group delimiter=" ">
+        <group delimiter=", ">
           <text macro="editor-translator"/>
-          <text variable="edition" suffix=" ed."/>
-          <!-- replaced a text element with a missing variable reference -->
-          <date variable="issued">
-            <date-part name="year"/>
-          </date>
+          <group delimiter=" ">
+            <group delimiter=" ">
+              <text variable="edition"/>
+              <label variable="edition" form="short"/>
+            </group>
+            <date variable="issued">
+              <date-part name="year"/>
+            </date>
+          </group>
         </group>
       </else>
     </choose>
   </macro>
-  <!-- sets up citing to specific page numbers for id and supra cites -->
   <macro name="at_page">
-    <group>
-      <text value="at" prefix=" "/>
-      <text variable="locator" prefix=" "/>
+    <group delimiter=" ">
+      <text value="at"/>
+      <text variable="locator"/>
     </group>
   </macro>
-  <!-- sets up the "in" in front of book sections, etc. -->
   <macro name="container">
     <choose>
       <if type="chapter paper-conference" match="any">
@@ -219,32 +229,46 @@
   <citation et-al-min="4" et-al-use-first="1">
     <layout suffix="." delimiter="; ">
       <choose>
-        <if position="ibid">
-          <text value="id." text-case="capitalize-first" font-style="italic"/>
-          <text macro="at_page" suffix="."/>
-          <!-- period will not show up - this is for find-and-replace later. -->
+        <if position="ibid-with-locator">
+          <group delimiter=" ">
+            <text term="ibid" text-case="capitalize-first" font-style="italic"/>
+            <text macro="at_page"/>
+          </group>
         </if>
+        <else-if position="ibid">
+          <text term="ibid" text-case="capitalize-first" font-style="italic"/>
+        </else-if>
         <else-if position="subsequent">
-          <choose>
-            <if type="book" match="any">
-              <text variable="volume" suffix=" "/>
-            </if>
-          </choose>
-          <text macro="author-short"/>
-          <text value="supra" font-style="italic" prefix=", "/>
-          <text value="note" prefix=" "/>
-          <text variable="first-reference-note-number" prefix=" "/>
-          <text macro="at_page"/>
+          <group delimiter=", ">
+            <group delimiter=" ">
+              <choose>
+                <if type="book" match="any">
+                  <text variable="volume"/>
+                </if>
+              </choose>
+              <text macro="author-short"/>
+            </group>
+            <group delimiter=" ">
+              <text value="supra" font-style="italic"/>
+              <text value="note"/>
+              <text variable="first-reference-note-number"/>
+              <text macro="at_page"/>
+            </group>
+          </group>
         </else-if>
         <else>
-          <choose>
-            <if type="book" match="any">
-              <text variable="volume" suffix=" "/>
-            </if>
-          </choose>
-          <text macro="author" suffix=", "/>
-          <text macro="source"/>
-          <text macro="access" prefix=", "/>
+          <group delimiter=", ">
+            <group delimiter=" ">
+              <choose>
+                <if type="book" match="any">
+                  <text variable="volume"/>
+                </if>
+              </choose>
+              <text macro="author"/>
+            </group>
+            <text macro="source"/>
+            <text macro="access"/>
+          </group>
         </else>
       </choose>
     </layout>
diff --git a/buildres/csl/csl-styles/bluebook2.csl b/buildres/csl/csl-styles/bluebook2.csl
deleted file mode 100644
index 745a3c63146..00000000000
--- a/buildres/csl/csl-styles/bluebook2.csl
+++ /dev/null
@@ -1,230 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.0" demote-non-dropping-particle="sort-only" default-locale="en-US">
-  <info>
-    <title>Bluebook Law Review (2)</title>
-    <id>http://www.zotero.org/styles/bluebook2</id>
-    <link href="http://www.zotero.org/styles/bluebook2" rel="self"/>
-    <link href="https://www.legalbluebook.com/" rel="documentation"/>
-    <author>
-      <name>Matthew Mazzotta</name>
-      <email>mazznet@gmail.com</email>
-    </author>
-    <contributor>
-      <name>Bruce D'Arcus</name>
-      <email>bdarcus@gmail.com</email>
-    </contributor>
-    <contributor>
-      <name>Nancy Sims</name>
-      <email>nsims@umich.edu</email>
-    </contributor>
-    <category citation-format="note"/>
-    <category field="law"/>
-    <summary>Bluebook citation formatting for citations in footnotes.</summary>
-    <updated>2012-09-27T22: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>
-  <!-- sets up basics of dealing with authors -->
-  <macro name="source-short">
-    <choose>
-      <if type="legal_case">
-        <group delimiter=" ">
-          <text variable="title" form="short" suffix="," font-style="italic"/>
-          <text variable="volume"/>
-          <text variable="container-title"/>
-        </group>
-      </if>
-      <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
-        <group delimiter=" ">
-          <text variable="volume"/>
-          <names variable="author" font-variant="small-caps">
-            <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
-          </names>
-        </group>
-      </else-if>
-      <else>
-        <group delimiter=" ">
-          <names variable="author">
-            <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
-          </names>
-        </group>
-      </else>
-    </choose>
-  </macro>
-  <!-- link to online content, called in YYYYY -->
-  <macro name="access">
-    <choose>
-      <if variable="URL">
-        <text variable="URL"/>
-        <group prefix=" (" suffix=")">
-          <text value="last visited" suffix=" "/>
-          <date variable="accessed">
-            <date-part name="month" form="short" suffix=" " strip-periods="true"/>
-            <date-part name="day" suffix=", "/>
-            <date-part name="year"/>
-          </date>
-        </group>
-      </if>
-    </choose>
-  </macro>
-  <macro name="source-long">
-    <choose>
-      <if type="article-journal" match="any">
-        <names variable="author" suffix=", ">
-          <name and="symbol" delimiter=", " delimiter-precedes-last="never"/>
-        </names>
-        <text variable="title" font-style="italic" suffix=", "/>
-        <text variable="volume" suffix=" "/>
-        <text variable="container-title" font-variant="small-caps" suffix=" "/>
-        <text variable="page"/>
-        <text variable="locator" prefix=", "/>
-        <date variable="issued" prefix=" (" suffix=")">
-          <date-part name="year"/>
-        </date>
-      </if>
-      <else-if type="legal_case">
-        <text variable="title" suffix=", " font-variant="normal"/>
-        <text variable="number" suffix=", "/>
-        <group delimiter=" ">
-          <text variable="volume"/>
-          <text variable="container-title"/>
-          <text variable="page"/>
-        </group>
-        <text variable="locator" prefix=", "/>
-        <group prefix=" (" suffix=")" delimiter=" ">
-          <text variable="authority"/>
-          <date variable="issued">
-            <date-part name="month" form="short" suffix=" "/>
-            <date-part name="day" suffix=", "/>
-            <date-part name="year"/>
-          </date>
-        </group>
-      </else-if>
-      <else-if type="article-newspaper">
-        <names variable="author" suffix=", ">
-          <name and="symbol" delimiter=", " delimiter-precedes-last="never"/>
-        </names>
-        <text variable="title" suffix=", " font-style="italic"/>
-        <text variable="volume" suffix=" "/>
-        <text variable="container-title" suffix=", " font-variant="small-caps"/>
-        <date variable="issued">
-          <date-part name="month" form="short" suffix=" "/>
-          <date-part name="day" suffix=", "/>
-          <date-part name="year"/>
-        </date>
-        <text variable="page" prefix=", at "/>
-      </else-if>
-      <else-if type="article-magazine">
-        <names variable="author" suffix=", ">
-          <name and="symbol" delimiter=", " delimiter-precedes-last="never"/>
-        </names>
-        <text variable="title" suffix=", " font-style="italic"/>
-        <text variable="volume" suffix=" "/>
-        <text variable="container-title" font-variant="small-caps"/>
-        <text variable="issue" prefix=" "/>
-        <date variable="issued">
-          <date-part name="month" form="short" prefix=", " suffix=" "/>
-          <date-part name="day" suffix=", "/>
-          <date-part name="year"/>
-        </date>
-        <text variable="locator" prefix=", at "/>
-      </else-if>
-      <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
-        <group delimiter=" " suffix=" ">
-          <text variable="volume"/>
-          <names variable="author" suffix="," font-variant="small-caps">
-            <name and="symbol" delimiter=", " delimiter-precedes-last="never"/>
-          </names>
-          <text variable="title" font-variant="small-caps"/>
-          <text variable="locator"/>
-        </group>
-        <group prefix="(" suffix=")" delimiter=" ">
-          <names variable="editor" suffix=" ed.,">
-            <name form="long" and="symbol" delimiter=", " delimiter-precedes-last="never" initialize-with=". "/>
-          </names>
-          <names variable="translator" suffix=" trans.,">
-            <name form="long" and="symbol" delimiter=", " delimiter-precedes-last="never" initialize-with=". "/>
-          </names>
-          <text variable="publisher"/>
-          <text variable="edition"/>
-        </group>
-        <date variable="issued" prefix=" (" suffix=")">
-          <date-part name="year"/>
-        </date>
-      </else-if>
-      <else-if type="chapter paper-conference" match="any">
-        <text variable="title" suffix=", " font-style="italic"/>
-        <text variable="volume" suffix=" "/>
-        <text macro="container" suffix=" "/>
-        <text variable="page"/>
-        <text variable="locator" prefix=", "/>
-      </else-if>
-      <else>
-        <text variable="volume" suffix=" "/>
-        <text variable="title" font-variant="small-caps"/>
-        <text macro="container" prefix=" "/>
-        <text variable="page" prefix=" "/>
-        <text variable="locator" prefix=" "/>
-      </else>
-    </choose>
-  </macro>
-  <!-- sets up citing to specific page numbers for id and supra cites -->
-  <macro name="at_page">
-    <group delimiter=" ">
-      <text value="at"/>
-      <text variable="locator"/>
-    </group>
-  </macro>
-  <!-- sets up the "in" in front of book sections, etc. -->
-  <macro name="container">
-    <choose>
-      <if type="chapter paper-conference" match="any">
-        <group>
-          <text term="in" font-style="italic" prefix=" "/>
-          <text variable="container-title" font-variant="small-caps" prefix=" "/>
-        </group>
-      </if>
-      <else-if type="legal_case">
-        <text variable="container-title" form="short" prefix=" "/>
-      </else-if>
-      <else-if type="article-journal">
-        <text variable="container-title" font-variant="small-caps" prefix=" "/>
-      </else-if>
-      <else>
-        <text variable="container-title" font-variant="small-caps"/>
-      </else>
-    </choose>
-  </macro>
-  <citation et-al-min="3" et-al-use-first="1">
-    <layout delimiter="; ">
-      <choose>
-        <if position="ibid">
-          <group delimiter=" ">
-            <text value="id." text-case="capitalize-first" font-style="italic"/>
-            <text macro="at_page"/>
-            <!-- period will not show up - this is for find-and-replace later. -->
-          </group>
-        </if>
-        <else-if position="subsequent" type="legal_case" match="any">
-          <!--CSL does not currently support reference to number of repeats, so cannot follow proper Bluebook repeat rule; choice is either short form, or long form.-->
-          <group delimiter=" ">
-            <text macro="source-short"/>
-            <text variable="locator" prefix="at "/>
-          </group>
-        </else-if>
-        <else-if position="subsequent">
-          <group delimiter=" ">
-            <text macro="source-short" suffix=","/>
-            <text value="supra" font-style="italic"/>
-            <text value="note"/>
-            <text variable="first-reference-note-number"/>
-            <text macro="at_page"/>
-          </group>
-        </else-if>
-        <else>
-          <text macro="source-long"/>
-          <text macro="access" prefix=", "/>
-        </else>
-      </choose>
-    </layout>
-  </citation>
-</style>
diff --git a/buildres/csl/csl-styles/boletin-de-la-sociedad-geologica-mexicana.csl b/buildres/csl/csl-styles/boletin-de-la-sociedad-geologica-mexicana.csl
new file mode 100644
index 00000000000..e50b3bd6229
--- /dev/null
+++ b/buildres/csl/csl-styles/boletin-de-la-sociedad-geologica-mexicana.csl
@@ -0,0 +1,236 @@
+<?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="es-MX">
+  <info>
+    <title>Boletín de la Sociedad Geológica Mexicana (Español - Mexico)</title>
+    <id>http://www.zotero.org/styles/boletin-de-la-sociedad-geologica-mexicana</id>
+    <link href="http://www.zotero.org/styles/boletin-de-la-sociedad-geologica-mexicana" rel="self"/>
+    <link href="http://www.zotero.org/styles/journal-of-structural-geology" rel="template"/>
+    <link href="http://boletinsgm.igeolcu.unam.mx/bsgm/index.php/instrucciones-instructions" rel="documentation"/>
+    <author>
+      <name>Mario Schädel</name>
+      <email>mario.schaedel@gmail.com</email>
+    </author>
+    <contributor>
+      <name>Patrick O'Brien</name>
+    </contributor>
+    <category citation-format="author-date"/>
+    <category field="geology"/>
+    <updated>2022-01-13T11:18:02+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="container-chapter-journal">
+    <choose>
+      <if type="chapter paper-conference article-journal" match="any">
+        <group delimiter=", ">
+          <group>
+            <text term="in" text-case="lowercase" suffix=" "/>
+            <names variable="editor translator" delimiter=", ">
+              <name name-as-sort-order="all" sort-separator=", " initialize-with="." delimiter=", " delimiter-precedes-last="always"/>
+              <label form="short" prefix=" (" suffix=")"/>
+            </names>
+          </group>
+          <text variable="container-title" text-case="title"/>
+          <text variable="collection-title" text-case="title"/>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="container-other">
+    <choose>
+      <if type="chapter paper-conference article-journal" match="none">
+        <group delimiter=", ">
+          <text variable="container-title"/>
+          <text variable="collection-title"/>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name name-as-sort-order="all" sort-separator=", " initialize-with="." delimiter=", " delimiter-precedes-last="always"/>
+      <label form="short" prefix=" (" suffix=")"/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <text macro="title"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="author-short">
+    <names variable="author">
+      <name form="short" and="text" delimiter=", " initialize-with=". "/>
+      <et-al font-style="italic"/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <text variable="title" form="short"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if variable="DOI">
+        <text variable="DOI" prefix="https://doi.org/"/>
+      </if>
+      <else-if type="webpage post post-weblog">
+        <group delimiter=" ">
+          <text term="available at"/>
+          <group delimiter=", ">
+            <text variable="URL" prefix="&lt;" suffix=">"/>
+            <text term="accessed" suffix=" "/>
+          </group>
+          <date form="text" variable="accessed"/>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="report thesis" match="any">
+        <group delimiter=". ">
+          <text variable="title"/>
+          <group delimiter=" ">
+            <text variable="number" prefix="No. "/>
+          </group>
+        </group>
+      </if>
+      <else-if type="bill book graphic legal_case legislation motion_picture report song speech" match="any">
+        <text variable="title"/>
+        <text macro="edition" prefix=", "/>
+      </else-if>
+      <else-if type="webpage post post-weblog" match="any">
+        <group delimiter=" ">
+          <text variable="title"/>
+          <text term="online" prefix="(" suffix=")"/>
+        </group>
+      </else-if>
+      <else>
+        <text variable="title" suffix=":"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=", ">
+      <text variable="publisher-place"/>
+      <text variable="publisher"/>
+      <text variable="genre"/>
+    </group>
+  </macro>
+  <macro name="event">
+    <choose>
+      <if variable="event">
+        <text term="presented at" text-case="capitalize-first" suffix=" "/>
+        <text variable="event"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="issued">
+    <choose>
+      <if variable="issued">
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
+      </if>
+      <else>
+        <text term="no date" form="short"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="edition">
+    <group delimiter=" ">
+      <choose>
+        <if is-numeric="edition">
+          <number variable="edition" form="ordinal"/>
+        </if>
+        <else>
+          <text variable="edition" suffix="."/>
+        </else>
+      </choose>
+      <text term="edition" form="short" strip-periods="true"/>
+    </group>
+  </macro>
+  <macro name="locators">
+    <choose>
+      <if type="article-journal article-magazine article-newspaper" match="any">
+        <group prefix=" " delimiter=", ">
+          <group>
+            <text variable="volume"/>
+            <text variable="issue" prefix="(" suffix=")"/>
+          </group>
+          <text variable="page"/>
+        </group>
+      </if>
+      <else-if type="bill book graphic legal_case legislation motion_picture report song thesis" match="any">
+        <group delimiter=", " prefix=": ">
+          <text macro="event"/>
+          <text macro="publisher"/>
+          <group delimiter=" ">
+            <text variable="number-of-pages"/>
+            <label plural="never" variable="number-of-pages" form="short"/>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="chapter paper-conference" match="any">
+        <group delimiter=", " prefix=", ">
+          <text macro="event"/>
+          <text macro="publisher"/>
+          <text variable="page"/>
+        </group>
+      </else-if>
+      <else-if type="patent">
+        <text variable="number" prefix=". "/>
+      </else-if>
+      <else-if type="map">
+        <group delimiter=", " prefix=", ">
+          <group delimiter=" ">
+            <text term="scale"/>
+            <text variable="scale"/>
+          </group>
+          <text macro="publisher"/>
+          <text macro="edition"/>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <citation et-al-min="3" et-al-use-first="1" disambiguate-add-givenname="true" disambiguate-add-year-suffix="true" collapse="year" cite-group-delimiter=", ">
+    <sort>
+      <key macro="issued" sort="ascending"/>
+      <key macro="author"/>
+    </sort>
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <group delimiter=", ">
+        <text macro="author-short"/>
+        <text macro="issued"/>
+        <group delimiter=" ">
+          <label variable="locator" form="short"/>
+          <text variable="locator"/>
+        </group>
+      </group>
+    </layout>
+  </citation>
+  <bibliography hanging-indent="true" entry-spacing="0" line-spacing="1">
+    <sort>
+      <key macro="author"/>
+      <key macro="issued" sort="descending"/>
+    </sort>
+    <layout>
+      <group delimiter=", " suffix=".">
+        <group delimiter=", ">
+          <text macro="author"/>
+          <text macro="issued"/>
+        </group>
+        <group>
+          <group delimiter=", ">
+            <group delimiter=" ">
+              <text macro="title"/>
+              <text macro="container-chapter-journal"/>
+            </group>
+            <text macro="container-other"/>
+          </group>
+          <text macro="locators"/>
+        </group>
+      </group>
+      <text macro="access" prefix=". "/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/buildres/csl/csl-styles/boletin-de-pediatria.csl b/buildres/csl/csl-styles/boletin-de-pediatria.csl
index 3ff2670688c..285d205f298 100644
--- a/buildres/csl/csl-styles/boletin-de-pediatria.csl
+++ b/buildres/csl/csl-styles/boletin-de-pediatria.csl
@@ -1,10 +1,10 @@
 <?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="es-ES">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only" initialize-with-hyphen="false" page-range-format="expanded">
   <info>
     <title>Boletín de Pediatría (Español)</title>
     <id>http://www.zotero.org/styles/boletin-de-pediatria</id>
     <link href="http://www.zotero.org/styles/boletin-de-pediatria" rel="self"/>
-    <link href="http://www.zotero.org/styles/sage-vancouver-brackets" rel="template"/>
+    <link href="http://www.zotero.org/styles/vancouver" rel="template"/>
     <link href="http://www.sccalp.org/normas-para-la-presentacion-y-publicacion-de-trabajos-en-el-boletin-de-pediatria#Presentacion" rel="documentation"/>
     <author>
       <name>David Pérez Solís</name>
@@ -18,65 +18,57 @@
     <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=". ">
+    <names variable="author">
       <name sort-separator=" " initialize-with="" name-as-sort-order="all" delimiter=", " delimiter-precedes-last="always"/>
-      <label form="short" prefix=" (" suffix=")" strip-periods="true"/>
+      <label form="long" prefix=", "/>
       <substitute>
         <names variable="editor"/>
       </substitute>
     </names>
   </macro>
   <macro name="editor">
-    <names variable="editor">
+    <names variable="editor" suffix=".">
       <name sort-separator=" " initialize-with="" name-as-sort-order="all" delimiter=", " delimiter-precedes-last="always"/>
-      <label form="short" prefix=" (" suffix=")" strip-periods="true"/>
+      <label form="long" prefix=", "/>
     </names>
   </macro>
-  <macro name="date">
+  <macro name="chapter-marker">
     <choose>
-      <if type="article-newspaper report" match="any">
-        <date variable="issued" form="text"/>
+      <if type="chapter paper-conference entry-dictionary entry-encyclopedia" match="any">
+        <text term="in" text-case="capitalize-first"/>
       </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>
+    <choose>
+      <!--discard publisher info for articles-->
+      <if type="article-journal article-magazine article-newspaper" match="none">
+        <group delimiter=": " suffix=";">
+          <choose>
+            <if type="thesis">
+              <text variable="publisher-place" prefix="[" suffix="]"/>
+            </if>
+            <else-if type="speech"/>
+            <else>
+              <text variable="publisher-place"/>
+            </else>
+          </choose>
+          <text variable="publisher"/>
+        </group>
+      </if>
+    </choose>
   </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="Epub ahead of print "/>
-              <text variable="DOI" prefix="DOI: "/>
-            </group>
+            <text variable="DOI" prefix="https://doi.org/"/>
           </if>
           <else>
-            <group delimiter=" ">
+            <group delimiter=": ">
+              <text term="available at" text-case="capitalize-first"/>
               <text variable="URL"/>
-              <text macro="accessed-date"/>
             </group>
           </else>
         </choose>
@@ -86,41 +78,86 @@
   <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 prefix="[" suffix="]" delimiter=" ">
+          <text term="cited" text-case="lowercase"/>
+          <date variable="accessed" form="text"/>
         </group>
       </if>
     </choose>
   </macro>
   <macro name="container-title">
     <choose>
-      <if type="article-journal" match="any">
-        <text variable="container-title" form="short" strip-periods="true" font-style="normal"/>
+      <if type="article-journal article-magazine chapter paper-conference article-newspaper review review-book entry-dictionary entry-encyclopedia" match="any">
+        <group suffix="" delimiter=" ">
+          <choose>
+            <if type="article-journal review review-book" match="any">
+              <text variable="container-title" form="short" strip-periods="true"/>
+            </if>
+            <else>
+              <text variable="container-title" strip-periods="true"/>
+            </else>
+          </choose>
+          <choose>
+            <if variable="URL">
+              <text term="internet" prefix="[" suffix="]" text-case="capitalize-first"/>
+            </if>
+          </choose>
+        </group>
+        <text macro="edition" prefix=" "/>
       </if>
+      <else-if type="bill legislation" match="any">
+        <group delimiter=", ">
+          <group delimiter=". ">
+            <text variable="container-title"/>
+            <group delimiter=" ">
+              <text term="section" form="short" text-case="capitalize-first"/>
+              <text variable="section"/>
+            </group>
+          </group>
+          <text variable="number"/>
+        </group>
+      </else-if>
+      <else-if type="speech">
+        <group delimiter=": " suffix=";">
+          <group delimiter=" ">
+            <text variable="genre" text-case="capitalize-first"/>
+            <text term="presented at"/>
+          </group>
+          <text variable="event"/>
+        </group>
+      </else-if>
       <else>
-        <text variable="container-title" font-style="normal"/>
+        <group delimiter=", " suffix="">
+          <choose>
+            <if variable="collection-title" match="none">
+              <group delimiter=" ">
+                <label variable="volume" form="short" text-case="capitalize-first"/>
+                <text variable="volume"/>
+              </group>
+            </if>
+          </choose>
+          <text variable="container-title"/>
+        </group>
       </else>
     </choose>
   </macro>
   <macro name="title">
+    <text variable="title"/>
     <choose>
-      <if type="book patent report thesis" match="any">
-        <text variable="title" font-style="normal"/>
+      <if type="article-journal article-magazine chapter paper-conference article-newspaper review review-book entry-dictionary entry-encyclopedia" match="none">
+        <choose>
+          <if variable="URL">
+            <text term="internet" prefix=" [" suffix="]" text-case="capitalize-first"/>
+          </if>
+        </choose>
+        <text macro="edition" prefix=". "/>
+      </if>
+    </choose>
+    <choose>
+      <if type="thesis">
+        <text variable="genre" prefix=" [" suffix="]"/>
       </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>
@@ -135,63 +172,157 @@
       </else>
     </choose>
   </macro>
+  <macro name="date">
+    <choose>
+      <if type="article-journal article-magazine article-newspaper review review-book" match="any">
+        <group suffix=";" delimiter=" ">
+          <date variable="issued" form="text" date-parts="year"/>
+          <text macro="accessed-date"/>
+        </group>
+      </if>
+      <else-if type="bill legislation" match="any">
+        <group delimiter=", ">
+          <date variable="issued" delimiter=" ">
+            <date-part name="month" form="short" strip-periods="true"/>
+            <date-part name="day"/>
+          </date>
+          <date variable="issued">
+            <date-part name="year"/>
+          </date>
+        </group>
+      </else-if>
+      <else-if type="report">
+        <date variable="issued" delimiter=" ">
+          <date-part name="year"/>
+          <date-part name="month" form="short" strip-periods="true"/>
+        </date>
+        <text macro="accessed-date" prefix=" "/>
+      </else-if>
+      <else-if type="patent">
+        <group suffix=".">
+          <group delimiter=", ">
+            <text variable="number"/>
+            <date variable="issued">
+              <date-part name="year"/>
+            </date>
+          </group>
+          <text macro="accessed-date" prefix=" "/>
+        </group>
+      </else-if>
+      <else-if type="speech">
+        <group delimiter="; ">
+          <group delimiter=" ">
+            <date variable="issued" delimiter=" ">
+              <date-part name="year"/>
+              <date-part name="month" form="short" strip-periods="true"/>
+              <date-part name="day"/>
+            </date>
+            <text macro="accessed-date"/>
+          </group>
+          <text variable="event-place"/>
+        </group>
+      </else-if>
+      <else>
+        <group suffix=".">
+          <date variable="issued">
+            <date-part name="year"/>
+          </date>
+          <text macro="accessed-date" prefix=" "/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="pages">
+    <choose>
+      <if type="article-journal article-magazine article-newspaper review review-book" match="any">
+        <text variable="page" prefix=":"/>
+      </if>
+      <else-if type="book" match="any">
+        <text variable="number-of-pages" prefix=" "/>
+        <choose>
+          <if is-numeric="number-of-pages">
+            <label variable="number-of-pages" form="short" prefix=" " plural="never"/>
+          </if>
+        </choose>
+      </else-if>
+      <else>
+        <group prefix=" " delimiter=" ">
+          <label variable="page" form="short" plural="never"/>
+          <text variable="page"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="journal-location">
+    <choose>
+      <if type="article-journal article-magazine review review-book" match="any">
+        <text variable="volume"/>
+        <text variable="issue" prefix="(" suffix=")"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="collection-details">
+    <choose>
+      <if type="article-journal article-magazine article-newspaper review review-book" match="none">
+        <choose>
+          <if variable="collection-title">
+            <group delimiter=" " prefix="(" suffix=")">
+              <names variable="collection-editor" suffix=".">
+                <name sort-separator=" " initialize-with="" name-as-sort-order="all" delimiter=", " delimiter-precedes-last="always"/>
+                <label form="long" prefix=", "/>
+              </names>
+              <group delimiter="; ">
+                <text variable="collection-title"/>
+                <group delimiter=" ">
+                  <label variable="volume" form="short"/>
+                  <text variable="volume"/>
+                </group>
+              </group>
+            </group>
+          </if>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="report-details">
+    <choose>
+      <if type="report">
+        <text variable="number" prefix="Report No.: "/>
+      </if>
+    </choose>
+  </macro>
   <citation collapse="citation-number">
     <sort>
       <key variable="citation-number"/>
     </sort>
-    <layout delimiter=", " prefix="(" suffix=")">
+    <layout prefix="(" suffix=")" delimiter=",">
       <text variable="citation-number"/>
     </layout>
   </citation>
   <bibliography et-al-min="7" et-al-use-first="6" second-field-align="flush">
-    <layout suffix=".">
-      <text variable="citation-number" prefix="" 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" font-style="italic"/>
-              </group>
-              <text macro="publisher"/>
-            </group>
-            <text macro="page"/>
-          </group>
-        </else-if>
-        <else-if type="article-newspaper article-magazine" match="any">
-          <group delimiter=", " prefix=". ">
+    <layout>
+      <text variable="citation-number" suffix=". "/>
+      <group delimiter=". " suffix=". ">
+        <text macro="author"/>
+        <text macro="title"/>
+      </group>
+      <group delimiter=" " suffix=". ">
+        <group delimiter=": ">
+          <text macro="chapter-marker"/>
+          <group delimiter=" ">
+            <text macro="editor"/>
             <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>
+        </group>
+        <text macro="publisher"/>
+        <group>
+          <text macro="date"/>
+          <text macro="journal-location"/>
+          <text macro="pages"/>
+        </group>
+      </group>
+      <text macro="collection-details" suffix=". "/>
+      <text macro="report-details" suffix=". "/>
       <text macro="access"/>
     </layout>
   </bibliography>
diff --git a/buildres/csl/csl-styles/cardiff-university-harvard.csl b/buildres/csl/csl-styles/cardiff-university-harvard.csl
index 4a1df22e8e9..401e2abd744 100644
--- a/buildres/csl/csl-styles/cardiff-university-harvard.csl
+++ b/buildres/csl/csl-styles/cardiff-university-harvard.csl
@@ -1,6 +1,5 @@
 <?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">
-  <!-- This style was edited with the Visual CSL Editor (https://editor.citationstyles.org/visualEditor/) -->
   <info>
     <title>Cardiff University - Harvard</title>
     <id>http://www.zotero.org/styles/cardiff-university-harvard</id>
@@ -18,7 +17,7 @@
     <category citation-format="author-date"/>
     <category field="generic-base"/>
     <summary>The Harvard author-date style - adapted for Cardiff University</summary>
-    <updated>2020-07-14T09:11:47+00:00</updated>
+    <updated>2022-08-22T08:20:08+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">
@@ -120,7 +119,7 @@
   </macro>
   <macro name="published-date">
     <choose>
-      <if type="article-newspaper article-magazine post-weblog speech" match="any">
+      <if type="article-newspaper article-magazine speech" match="any">
         <date variable="issued">
           <date-part name="day" prefix=" " suffix=" "/>
           <date-part name="month" form="long"/>
@@ -226,10 +225,9 @@
             <text macro="publisher"/>
           </group>
         </else-if>
-        <else-if type="webpage">
-          <group prefix=" " delimiter=" " suffix=".">
+        <else-if type="webpage post post-weblog" match="any">
+          <group delimiter=". " prefix=" " suffix=".">
             <text macro="title"/>
-            <text macro="edition"/>
           </group>
         </else-if>
         <else-if type="patent" match="any">
diff --git a/buildres/csl/csl-styles/cell-numeric-superscript.csl b/buildres/csl/csl-styles/cell-numeric-superscript.csl
index ad5c0794199..c928f064c24 100644
--- a/buildres/csl/csl-styles/cell-numeric-superscript.csl
+++ b/buildres/csl/csl-styles/cell-numeric-superscript.csl
@@ -36,13 +36,12 @@
   </macro>
   <macro name="access">
     <choose>
-      <if variable="URL">
-        <choose>
-          <if type="webpage dataset entry-dictionary entry-encyclopedia post post-weblog" match="any">
-            <text variable="URL"/>
-          </if>
-        </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">
diff --git a/buildres/csl/csl-styles/cell-numeric.csl b/buildres/csl/csl-styles/cell-numeric.csl
index 9d7c3f3d3ce..57196194159 100644
--- a/buildres/csl/csl-styles/cell-numeric.csl
+++ b/buildres/csl/csl-styles/cell-numeric.csl
@@ -37,18 +37,12 @@
   </macro>
   <macro name="access">
     <choose>
-      <if variable="URL">
-        <text value="Available at:" suffix=" "/>
-        <text variable="URL"/>
-        <group prefix=" [" suffix="]">
-          <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>
+      <if 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">
diff --git a/buildres/csl/csl-styles/cell.csl b/buildres/csl/csl-styles/cell.csl
index 878f2104653..4c29acbd6bf 100644
--- a/buildres/csl/csl-styles/cell.csl
+++ b/buildres/csl/csl-styles/cell.csl
@@ -1,5 +1,5 @@
 <?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>Cell</title>
     <id>http://www.zotero.org/styles/cell</id>
@@ -57,6 +57,16 @@
       <label form="short" prefix=", "/>
     </names>
   </macro>
+  <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 macro="author-short" names-min="1" names-use-first="1"/>
@@ -87,10 +97,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"/>
-            <group delimiter=", ">
+            <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/cellular-and-molecular-gastroenterology-and-hepatology.csl b/buildres/csl/csl-styles/cellular-and-molecular-gastroenterology-and-hepatology.csl
index 1ad94ebb158..32614ad2b34 100644
--- a/buildres/csl/csl-styles/cellular-and-molecular-gastroenterology-and-hepatology.csl
+++ b/buildres/csl/csl-styles/cellular-and-molecular-gastroenterology-and-hepatology.csl
@@ -5,7 +5,7 @@
     <title-short>CMGH</title-short>
     <id>http://www.zotero.org/styles/cellular-and-molecular-gastroenterology-and-hepatology</id>
     <link href="http://www.zotero.org/styles/cellular-and-molecular-gastroenterology-and-hepatology" rel="self"/>
-    <link href="http://www.zotero.org/styles/human-gene-therapy" rel="template"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-vancouver" rel="template"/>
     <link href="https://www.cmghjournal.org/content/authorinfo" rel="documentation"/>
     <link href="https://www.elsevier.com/journals/cellular-and-molecular-gastroenterology-and-hepatology/2352-345x/submitting#guidelines" rel="documentation"/>
     <author>
diff --git a/buildres/csl/csl-styles/centre-de-recherche-sur-les-civilisations-de-l-asie-orientale-auteur-date.csl b/buildres/csl/csl-styles/centre-de-recherche-sur-les-civilisations-de-l-asie-orientale-auteur-date.csl
new file mode 100644
index 00000000000..30b0b14d24e
--- /dev/null
+++ b/buildres/csl/csl-styles/centre-de-recherche-sur-les-civilisations-de-l-asie-orientale-auteur-date.csl
@@ -0,0 +1,539 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" page-range-format="expanded" default-locale="fr-FR">
+  <info>
+    <title>Centre de recherche sur les civilisations de l’Asie orientale (Français - Auteur, Date)</title>
+    <title-short>CRCAO (Auteur, Date)</title-short>
+    <id>http://www.zotero.org/styles/centre-de-recherche-sur-les-civilisations-de-l-asie-orientale-auteur-date</id>
+    <link href="http://www.zotero.org/styles/centre-de-recherche-sur-les-civilisations-de-l-asie-orientale-auteur-date" rel="self"/>
+    <author>
+      <name>Philippe Pons</name>
+      <email>philippe.pons@college-de-france.fr</email>
+    </author>
+    <author>
+      <name>Didier Davin</name>
+      <email>didierdavin@yahoo.co.jp</email>
+    </author>
+    <author>
+      <name>Julien Rabaud</name>
+      <email>julien.rabaud@college-de-france.fr</email>
+      <uri>http://www.zotero.org/cdf-bib</uri>
+    </author>
+    <contributor>
+      <name>Franziska Heimburger</name>
+      <email>zotero@franziska.fr</email>
+    </contributor>
+    <category citation-format="author-date"/>
+    <category field="social_science"/>
+    <updated>2022-03-28T11:55:52.472+01: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="fr">
+    <terms>
+      <term name="ordinal-01">ère</term>
+      <term name="ordinal-02">e</term>
+      <term name="ordinal-03">e</term>
+      <term name="ordinal-04">e</term>
+      <term name="cited">op. cit.</term>
+      <term name="page" form="short">p.</term>
+      <term name="editor" form="short">
+        <single>éd.</single>
+        <multiple>éds.</multiple>
+      </term>
+      <term name="editor" form="verb-short">éd. par</term>
+      <term name="translator" form="short">trad.</term>
+      <term name="translator" form="verb-short">trad. de</term>
+      <term name="editortranslator" form="short">éd. et trad.</term>
+      <term name="editortranslator" form="verb-short">
+        <single>éd. et trad. par</single>
+        <multiple>éd. et trad par</multiple>
+      </term>
+      <term name="editortranslator" form="verb">édité et traduit par</term>
+    </terms>
+  </locale>
+  <macro name="author-intext">
+    <choose>
+      <if type="bill legal_case legislation treaty" match="any">
+        <text variable="container-title" suffix=" "/>
+        <text variable="volume"/>
+      </if>
+      <else-if type="interview personal_communication">
+        <choose>
+          <if variable="archive container-title DOI publisher URL" match="none">
+            <group delimiter=", ">
+              <names variable="author">
+                <name and="symbol" delimiter=", " initialize-with=". "/>
+                <substitute>
+                  <text macro="title-intext"/>
+                </substitute>
+              </names>
+              <text term="letter"/>
+            </group>
+          </if>
+          <else>
+            <names variable="author" delimiter=", ">
+              <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
+              <substitute>
+                <text macro="title-intext"/>
+              </substitute>
+            </names>
+          </else>
+        </choose>
+      </else-if>
+      <else>
+        <names variable="composer" delimiter=", ">
+          <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
+          <substitute>
+            <names variable="author"/>
+            <names variable="illustrator"/>
+            <names variable="director"/>
+            <choose>
+              <if variable="container-title">
+                <choose>
+                  <if type="book entry entry-dictionary entry-encyclopedia" match="any">
+                    <text macro="title-intext"/>
+                  </if>
+                </choose>
+              </if>
+            </choose>
+            <names variable="editor"/>
+            <names variable="editorial-director"/>
+            <text macro="title-intext"/>
+          </substitute>
+        </names>
+      </else>
+    </choose>
+  </macro>
+  <macro name="date-intext">
+    <choose>
+      <if variable="issued">
+        <group delimiter="/">
+          <group delimiter=" ">
+            <choose>
+              <if is-uncertain-date="original-date">
+                <text term="circa" form="short"/>
+              </if>
+            </choose>
+            <date variable="original-date">
+              <date-part name="year"/>
+            </date>
+          </group>
+          <group delimiter=" ">
+            <choose>
+              <if is-uncertain-date="issued">
+                <text term="circa" form="short"/>
+              </if>
+            </choose>
+            <group>
+              <choose>
+                <if type="interview personal_communication">
+                  <choose>
+                    <if variable="archive container-title DOI publisher URL" match="none">
+                      <date variable="issued" form="text"/>
+                    </if>
+                    <else>
+                      <date variable="issued">
+                        <date-part name="year"/>
+                      </date>
+                    </else>
+                  </choose>
+                </if>
+                <else>
+                  <date variable="issued">
+                    <date-part name="year"/>
+                  </date>
+                </else>
+              </choose>
+              <text variable="year-suffix"/>
+            </group>
+          </group>
+        </group>
+      </if>
+      <else-if variable="status">
+        <text variable="status" text-case="lowercase"/>
+        <text variable="year-suffix" prefix="-"/>
+      </else-if>
+      <else-if type="legal_case legislation bill treaty" match="any">
+        <text variable="abstract"/>
+      </else-if>
+      <else>
+        <text term="no date" form="short"/>
+        <text variable="year-suffix" prefix="-"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="title-intext">
+    <choose>
+      <if variable="title" match="none">
+        <text macro="bracketed-intext" prefix="[" suffix="]"/>
+      </if>
+      <else-if type="bill">
+        <choose>
+          <if variable="number container-title" match="none">
+            <text variable="title" form="short" font-style="italic" text-case="title"/>
+          </if>
+          <else-if variable="title">
+            <text variable="title" form="short" text-case="title"/>
+          </else-if>
+          <else>
+            <group delimiter=" ">
+              <text variable="genre"/>
+              <group delimiter=" ">
+                <choose>
+                  <if variable="chapter-number container-title" match="none">
+                    <text term="issue" form="short"/>
+                  </if>
+                </choose>
+                <text variable="number"/>
+              </group>
+            </group>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="legal_case" match="any">
+        <text variable="title" font-style="italic"/>
+      </else-if>
+      <else-if type="legislation treaty" match="any">
+        <text variable="title" form="short" text-case="title"/>
+      </else-if>
+      <else-if type="post webpage" match="any">
+        <text variable="title" form="short" font-style="italic" text-case="title"/>
+      </else-if>
+      <else-if variable="container-title" match="any">
+        <text variable="title" form="short" quotes="true" text-case="title"/>
+      </else-if>
+      <else>
+        <text variable="title" form="short" font-style="italic" text-case="title"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="citation-locator">
+    <group delimiter=" ">
+      <choose>
+        <if locator="chapter">
+          <label variable="locator" text-case="capitalize-first"/>
+        </if>
+        <else>
+          <label variable="locator" form="short"/>
+        </else>
+      </choose>
+      <text variable="locator"/>
+    </group>
+  </macro>
+  <macro name="bracketed-intext">
+    <group prefix="[" suffix="]">
+      <choose>
+        <if type="personal_communication">
+          <choose>
+            <if variable="recipient">
+              <group delimiter=" ">
+                <choose>
+                  <if variable="number" match="none">
+                    <text variable="genre" text-case="capitalize-first"/>
+                  </if>
+                  <else>
+                    <text term="letter" form="short" text-case="capitalize-first"/>
+                  </else>
+                </choose>
+                <names variable="recipient" delimiter=", ">
+                  <label form="verb" suffix=" "/>
+                  <name and="symbol" delimiter=", "/>
+                </names>
+              </group>
+            </if>
+          </choose>
+        </if>
+      </choose>
+    </group>
+  </macro>
+  <macro name="author">
+    <choose>
+      <if variable="author">
+        <names variable="author" delimiter=", ">
+          <name name-as-sort-order="all" form="long" and="text" delimiter=", " delimiter-precedes-last="never" sort-separator=" " font-style="normal">
+            <name-part name="family"/>
+          </name>
+        </names>
+      </if>
+      <else-if variable="editor">
+        <names variable="editor translator" delimiter=", ">
+          <name name-as-sort-order="all" form="long" and="text" delimiter=", " delimiter-precedes-last="never" sort-separator=" " font-style="normal">
+            <name-part name="family"/>
+          </name>
+          <label form="short" prefix=" (" suffix=".)"/>
+        </names>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="author-bib">
+    <choose>
+      <if variable="author">
+        <names variable="author" delimiter=", ">
+          <name name-as-sort-order="all" form="long" and="text" delimiter=", " delimiter-precedes-last="never" sort-separator=" " font-style="normal">
+            <name-part name="family"/>
+          </name>
+        </names>
+      </if>
+      <else-if variable="editor">
+        <names variable="editor translator" delimiter=", ">
+          <name name-as-sort-order="all" form="long" and="text" delimiter=", " delimiter-precedes-last="never" sort-separator=" " font-style="normal">
+            <name-part name="family"/>
+          </name>
+          <label form="short" prefix=" (" suffix=".)"/>
+        </names>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="bill book graphic legal_case motion_picture report song map" match="any">
+        <text variable="title" text-case="capitalize-first" font-style="italic"/>
+      </if>
+      <else-if type="article-journal article-newspaper article-magazine" match="any">
+        <group delimiter=", ">
+          <text variable="title" text-case="capitalize-first" quotes="true"/>
+          <text variable="container-title" font-style="italic"/>
+        </group>
+      </else-if>
+      <else-if type="thesis" match="any">
+        <group delimiter="">
+          <text variable="title" text-case="capitalize-first" font-style="italic" suffix=", "/>
+          <text variable="genre" suffix=", " prefix=" "/>
+          <text variable="publisher"/>
+        </group>
+      </else-if>
+      <else-if type="manuscript" match="any">
+        <group delimiter=",">
+          <text variable="title" text-case="capitalize-first" quotes="true"/>
+          <text variable="genre" prefix=" "/>
+        </group>
+      </else-if>
+      <else-if type="chapter entry-dictionary entry-encyclopedia" match="any">
+        <group delimiter="">
+          <text variable="title" text-case="capitalize-first" quotes="true"/>
+          <text value="in" font-style="italic" suffix=" " prefix=", "/>
+          <group delimiter=", ">
+            <text variable="container-title" text-case="capitalize-first" font-style="italic"/>
+            <names variable="container-author">
+              <name name-as-sort-order="all" form="long" and="text" delimiter-precedes-last="never" sort-separator=" ">
+                <name-part name="family"/>
+              </name>
+            </names>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="webpage" match="any">
+        <group delimiter="">
+          <text variable="title" text-case="capitalize-first" font-style="italic" suffix=", "/>
+          <text variable="URL" text-decoration="underline"/>
+        </group>
+      </else-if>
+      <else>
+        <text variable="title" quotes="true"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="pub-place">
+    <choose>
+      <if type="bill book chapter entry-dictionary entry-encyclopedia thesis graphic legal_case manuscript motion_picture paper-conference report song map" match="any">
+        <text variable="publisher-place"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <choose>
+      <if type="bill book chapter entry-dictionary entry-encyclopedia graphic legal_case motion_picture paper-conference report song map" match="any">
+        <text variable="publisher"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="yearpage-bib">
+    <choose>
+      <if type="bill book graphic legal_case motion_picture paper-conference manuscript report song thesis map" match="any">
+        <group delimiter=", ">
+          <group delimiter=", ">
+            <date variable="issued">
+              <date-part name="year"/>
+            </date>
+            <group delimiter="/">
+              <group delimiter=" ">
+                <text term="volume" form="short" suffix="."/>
+                <text variable="volume"/>
+              </group>
+              <group delimiter=" ">
+                <text variable="number-of-volumes"/>
+                <choose>
+                  <if variable="volume" match="none">
+                    <text term="volume" form="short" suffix="."/>
+                  </if>
+                </choose>
+              </group>
+            </group>
+            <text variable="number-of-pages" suffix=" p"/>
+          </group>
+          <group>
+            <label variable="locator" form="short"/>
+            <text variable="locator"/>
+          </group>
+        </group>
+      </if>
+      <else-if type="chapter entry-dictionary entry-encyclopedia" match="any">
+        <group delimiter=", ">
+          <date variable="issued">
+            <date-part name="year"/>
+          </date>
+          <group>
+            <text term="volume" form="short" suffix="."/>
+            <group prefix=". " delimiter="/">
+              <text variable="volume"/>
+              <text variable="number-of-volumes"/>
+            </group>
+          </group>
+          <group>
+            <label variable="page" form="short"/>
+            <text variable="page" prefix=" "/>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="article-journal chapter" match="any">
+        <date variable="issued">
+          <date-part name="year" suffix=", "/>
+        </date>
+        <group delimiter=" ">
+          <label variable="page" form="short"/>
+          <text variable="page"/>
+        </group>
+      </else-if>
+      <else-if type="article-newspaper article-magazine" match="any">
+        <group delimiter=" ">
+          <label variable="page" form="short"/>
+          <text variable="page"/>
+        </group>
+      </else-if>
+      <else-if type="webpage" match="any">
+        <group delimiter=" ">
+          <text value="consulté le" prefix=" "/>
+          <date variable="accessed" form="text">
+            <date-part name="day"/>
+            <date-part name="month"/>
+            <date-part name="year"/>
+          </date>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if type="bill book graphic legal_case motion_picture report song chapter paper-conference map" match="any">
+        <choose>
+          <if is-numeric="edition">
+            <group delimiter=" ">
+              <number variable="edition" form="ordinal"/>
+              <text term="edition" form="short" suffix="." strip-periods="true"/>
+            </group>
+          </if>
+          <else>
+            <text variable="edition" text-case="capitalize-first" suffix="."/>
+          </else>
+        </choose>
+      </if>
+      <else-if type="article-journal article-magazine" match="any">
+        <group delimiter="">
+          <group delimiter="/">
+            <group delimiter=" ">
+              <text term="volume" form="short" suffix="."/>
+              <text variable="volume"/>
+            </group>
+            <group delimiter=" ">
+              <text variable="number-of-volumes"/>
+              <choose>
+                <if variable="volume" match="none">
+                  <text term="volume" form="short" suffix="."/>
+                </if>
+              </choose>
+            </group>
+          </group>
+        </group>
+      </else-if>
+    </choose>
+    <text macro="issue"/>
+  </macro>
+  <macro name="issue">
+    <choose>
+      <if is-numeric="issue">
+        <choose>
+          <if variable="volume">
+            <text variable="issue" form="short" prefix=", n˚ "/>
+          </if>
+          <else>
+            <text variable="issue" form="short" prefix="n˚ "/>
+          </else>
+        </choose>
+      </if>
+      <else>
+        <text variable="issue"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="collection">
+    <choose>
+      <if is-numeric="collection-number">
+        <text variable="collection-title" prefix=" coll. " quotes="true"/>
+        <text variable="collection-number" prefix=", n˚ "/>
+      </if>
+      <else>
+        <text variable="collection-title" prefix=" coll. " quotes="true"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="secondary-contrib">
+    <choose>
+      <if type="chapter paper-conference book" match="none">
+        <names variable="editor translator" delimiter=", ">
+          <name name-as-sort-order="all" form="long" and="text" delimiter=", " delimiter-precedes-last="never" sort-separator=" ">
+            <name-part name="family"/>
+          </name>
+          <label form="short" text-case="lowercase" prefix=" (" suffix=")"/>
+        </names>
+      </if>
+      <else-if variable="author">
+        <names variable="editor translator" delimiter=", ">
+          <name name-as-sort-order="all" form="long" and="text" delimiter=", " delimiter-precedes-last="never" sort-separator=" ">
+            <name-part name="family"/>
+          </name>
+          <label form="short" text-case="lowercase" prefix=" (" suffix=")"/>
+        </names>
+      </else-if>
+    </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" givenname-disambiguation-rule="primary-name">
+    <sort>
+      <key macro="author-bib" names-min="3" names-use-first="1"/>
+      <key variable="status"/>
+    </sort>
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <group delimiter=", ">
+        <text macro="author-intext"/>
+        <text macro="date-intext"/>
+        <text macro="citation-locator"/>
+      </group>
+    </layout>
+  </citation>
+  <bibliography hanging-indent="true" et-al-min="11" et-al-use-first="7" subsequent-author-substitute="&#8212;&#8212;&#8212;" entry-spacing="0">
+    <sort>
+      <key macro="author" names-min="3" names-use-first="3"/>
+      <key variable="issued" sort="descending"/>
+    </sort>
+    <layout prefix="" suffix=".">
+      <group delimiter=", ">
+        <text macro="author-bib"/>
+        <text macro="title"/>
+        <text macro="secondary-contrib"/>
+        <text macro="edition"/>
+        <text macro="pub-place"/>
+        <text macro="publisher"/>
+        <text macro="collection"/>
+        <text macro="yearpage-bib"/>
+      </group>
+    </layout>
+  </bibliography>
+</style>
diff --git a/buildres/csl/csl-styles/centre-de-recherche-sur-les-civilisations-de-l-asie-orientale.csl b/buildres/csl/csl-styles/centre-de-recherche-sur-les-civilisations-de-l-asie-orientale.csl
index cebb14981cd..d3dbc9ab8aa 100644
--- a/buildres/csl/csl-styles/centre-de-recherche-sur-les-civilisations-de-l-asie-orientale.csl
+++ b/buildres/csl/csl-styles/centre-de-recherche-sur-les-civilisations-de-l-asie-orientale.csl
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.0" page-range-format="expanded" default-locale="fr-FR">
   <info>
-    <title>Centre de recherche sur les civilisations de l'Asie orientale (Français)</title>
-    <title-short>CRCAO</title-short>
+    <title>Centre de recherche sur les civilisations de l'Asie orientale (Français - note)</title>
+    <title-short>CRCAO (note)</title-short>
     <id>http://www.zotero.org/styles/centre-de-recherche-sur-les-civilisations-de-l-asie-orientale</id>
     <link href="http://www.zotero.org/styles/centre-de-recherche-sur-les-civilisations-de-l-asie-orientale" rel="self"/>
     <link href="https://github.com/citation-style-language/styles/pull/1385#issuecomment-73234582" rel="documentation"/>
@@ -25,7 +25,7 @@
     </contributor>
     <category citation-format="note"/>
     <category field="social_science"/>
-    <updated>2020-03-09T09:38:52.472+01:00</updated>
+    <updated>2022-03-27T11:51:52.472+01: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="fr">
@@ -56,14 +56,14 @@
       <if variable="author">
         <names variable="author" delimiter=", ">
           <name name-as-sort-order="all" form="long" and="text" delimiter=", " delimiter-precedes-last="never" sort-separator=" ">
-            <name-part name="family" font-variant="small-caps"/>
+            <name-part name="family"/>
           </name>
         </names>
       </if>
       <else-if variable="editor">
         <names variable="editor translator" delimiter=", ">
           <name name-as-sort-order="all" form="long" and="text" delimiter=", " delimiter-precedes-last="never" sort-separator=" ">
-            <name-part name="family" font-variant="small-caps"/>
+            <name-part name="family"/>
           </name>
           <label form="short" prefix=" (" suffix=".)"/>
         </names>
@@ -75,14 +75,14 @@
       <if variable="author">
         <names variable="author" delimiter=", ">
           <name name-as-sort-order="all" form="long" and="text" delimiter=", " delimiter-precedes-last="never" sort-separator=" ">
-            <name-part name="family" font-variant="small-caps"/>
+            <name-part name="family"/>
           </name>
         </names>
       </if>
       <else-if variable="editor">
         <names variable="editor translator" delimiter=", ">
           <name name-as-sort-order="all" form="long" and="text" delimiter=", " delimiter-precedes-last="never" sort-separator=" ">
-            <name-part name="family" font-variant="small-caps"/>
+            <name-part name="family"/>
           </name>
           <label form="short" prefix=" (" suffix=".)"/>
         </names>
@@ -121,7 +121,7 @@
             <text variable="container-title" text-case="capitalize-first" font-style="italic"/>
             <names variable="container-author">
               <name name-as-sort-order="all" form="long" and="text" delimiter-precedes-last="never" sort-separator=" ">
-                <name-part name="family" font-variant="small-caps"/>
+                <name-part name="family"/>
               </name>
             </names>
           </group>
@@ -225,12 +225,13 @@
           <group delimiter=" ">
             <choose>
               <if variable="locator" match="any">
-                <text variable="locator" prefix="p. "/>
+                <label variable="locator" form="short"/>
+                <text variable="locator"/>
               </if>
-              <else-if variable="locator" match="none">
+              <else>
                 <label variable="page" form="short"/>
                 <text variable="page"/>
-              </else-if>
+              </else>
             </choose>
           </group>
         </group>
@@ -338,7 +339,7 @@
         </choose>
       </if>
       <else-if type="article-journal article-magazine" match="any">
-        <group delimiter="">
+        <group delimiter=", ">
           <group delimiter="/">
             <group delimiter=" ">
               <text term="volume" form="short" suffix="."/>
@@ -353,15 +354,15 @@
               </choose>
             </group>
           </group>
+          <text macro="issue"/>
         </group>
       </else-if>
     </choose>
-    <text macro="issue"/>
   </macro>
   <macro name="issue">
     <choose>
       <if is-numeric="issue">
-        <text variable="issue" form="short" prefix=", n˚ "/>
+        <text variable="issue" form="short" prefix="n˚ "/>
       </if>
       <else>
         <text variable="issue"/>
@@ -384,7 +385,7 @@
       <if type="chapter paper-conference book" match="none">
         <names variable="editor translator" delimiter=", ">
           <name name-as-sort-order="all" form="long" and="text" delimiter=", " delimiter-precedes-last="never" sort-separator=" ">
-            <name-part name="family" font-variant="small-caps"/>
+            <name-part name="family"/>
           </name>
           <label form="short" text-case="lowercase" prefix=" (" suffix=")"/>
         </names>
@@ -392,7 +393,7 @@
       <else-if variable="author">
         <names variable="editor translator" delimiter=", ">
           <name name-as-sort-order="all" form="long" and="text" delimiter=", " delimiter-precedes-last="never" sort-separator=" ">
-            <name-part name="family" font-variant="small-caps"/>
+            <name-part name="family"/>
           </name>
           <label form="short" text-case="lowercase" prefix=" (" suffix=")"/>
         </names>
diff --git a/buildres/csl/csl-styles/chaucer-review.csl b/buildres/csl/csl-styles/chaucer-review.csl
new file mode 100644
index 00000000000..123910b954a
--- /dev/null
+++ b/buildres/csl/csl-styles/chaucer-review.csl
@@ -0,0 +1,775 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.0" demote-non-dropping-particle="display-and-sort" page-range-format="chicago" default-locale="en-US">
+  <info>
+    <title>The Chaucer Review</title>
+    <id>http://www.zotero.org/styles/chaucer-review</id>
+    <link href="http://www.zotero.org/styles/chaucer-review" rel="self"/>
+    <link href="http://www.zotero.org/styles/chicago-fullnote-bibliography-16th-edition" rel="template"/>
+    <link href="https://www.psupress.org/journals/jnls_chaucer.html" rel="documentation"/>
+    <!-- See the "Complete submission guidelines" in the pdf linked from this page -->
+    <author>
+      <name>Ian Cornelius</name>
+      <email>icornelius@luc.edu</email>
+    </author>
+    <category citation-format="note"/>
+    <category field="literature"/>
+    <issn>0009-2002</issn>
+    <eissn>1528-4204</eissn>
+    <summary>The reference style of The Chaucer Review: A Journal of Medieval Studies and Literary Criticism.</summary>
+    <updated>2022-05-14T12:00:00+00:00</updated>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
+  </info>
+  <locale xml:lang="en">
+    <terms>
+      <term name="editor" form="verb-short">ed.</term>
+      <term name="translator" form="verb-short">trans.</term>
+      <term name="translator" form="short">trans.</term>
+      <term name="editortranslator" form="verb-short">ed. and trans.</term>
+      <term name="editortranslator" form="verb">Edited and translated by</term>
+      <term name="translator" form="short">trans.</term>
+    </terms>
+  </locale>
+  <macro name="editor-translator">
+    <group delimiter=", ">
+      <group delimiter=" ">
+        <choose>
+          <if variable="container-author reviewed-author" match="any">
+            <group>
+              <names variable="container-author reviewed-author">
+                <label form="verb-short" text-case="lowercase" suffix=" "/>
+                <name and="text" delimiter=", "/>
+              </names>
+            </group>
+          </if>
+        </choose>
+      </group>
+      <names variable="editor translator" delimiter=", ">
+        <label form="verb-short" text-case="lowercase" suffix=" "/>
+        <name and="text" delimiter=", "/>
+      </names>
+    </group>
+  </macro>
+  <macro name="secondary-contributors-note">
+    <choose>
+      <if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="none">
+        <text macro="editor-translator"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="container-contributors-note">
+    <choose>
+      <if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
+        <text macro="editor-translator"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="recipient-note">
+    <names variable="recipient" delimiter=", ">
+      <label form="verb" text-case="lowercase" suffix=" "/>
+      <name and="text" delimiter=", "/>
+    </names>
+  </macro>
+  <macro name="contributors-note">
+    <group delimiter=" ">
+      <names variable="author">
+        <name and="text" sort-separator=", " delimiter=", "/>
+        <label form="short" prefix=", "/>
+        <substitute>
+          <names variable="editor"/>
+          <names variable="translator"/>
+        </substitute>
+      </names>
+      <text macro="recipient-note"/>
+    </group>
+  </macro>
+  <macro name="recipient-short">
+    <names variable="recipient">
+      <label form="verb" text-case="lowercase" suffix=" "/>
+      <name form="short" and="text" delimiter=", "/>
+    </names>
+  </macro>
+  <macro name="contributors-short">
+    <group delimiter=" ">
+      <names variable="author">
+        <name form="short" and="text" delimiter=", "/>
+        <substitute>
+          <names variable="editor"/>
+          <names variable="translator"/>
+        </substitute>
+      </names>
+      <text macro="recipient-short"/>
+    </group>
+  </macro>
+  <macro name="interviewer-note">
+    <names variable="interviewer" delimiter=", ">
+      <label form="verb" text-case="lowercase" suffix=" "/>
+      <name and="text" delimiter=", "/>
+    </names>
+  </macro>
+  <macro name="title-note">
+    <choose>
+      <if variable="title" match="none">
+        <text variable="genre"/>
+      </if>
+      <else-if type="book graphic motion_picture song" match="any">
+        <text variable="title" text-case="title" font-style="italic"/>
+        <group delimiter=" " prefix=", ">
+          <text term="version"/>
+          <text variable="version"/>
+        </group>
+      </else-if>
+      <else-if type="legal_case interview patent" match="any">
+        <text variable="title"/>
+      </else-if>
+      <else-if variable="reviewed-author">
+        <text variable="title" font-style="italic" prefix="review of "/>
+      </else-if>
+      <else>
+        <text variable="title" text-case="title" quotes="true"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="title-short">
+    <choose>
+      <if variable="title" match="none">
+        <choose>
+          <if type="interview">
+            <text term="interview"/>
+          </if>
+          <else-if type="manuscript speech" match="any">
+            <text variable="genre" form="short"/>
+          </else-if>
+          <else-if type="personal_communication">
+            <text macro="issued"/>
+          </else-if>
+        </choose>
+      </if>
+      <else-if type="book graphic motion_picture song" match="any">
+        <text variable="title" text-case="title" form="short" font-style="italic"/>
+      </else-if>
+      <else-if type="legal_case" variable="title-short" match="all">
+        <text variable="title" font-style="italic" form="short"/>
+      </else-if>
+      <else-if type="patent interview" match="any">
+        <text variable="title" form="short"/>
+      </else-if>
+      <else-if type="legal_case bill legislation" match="any">
+        <text variable="title"/>
+      </else-if>
+      <else>
+        <text variable="title" text-case="title" form="short" quotes="true"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="date-disambiguate">
+    <choose>
+      <if disambiguate="true">
+        <text macro="issued"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="description-note">
+    <group delimiter=", ">
+      <text macro="interviewer-note"/>
+      <text variable="medium"/>
+      <choose>
+        <if variable="title" match="none"/>
+        <else-if type="manuscript thesis speech" match="any"/>
+        <else-if type="patent">
+          <group delimiter=" ">
+            <text variable="authority"/>
+            <text variable="number"/>
+          </group>
+        </else-if>
+        <else>
+          <text variable="genre"/>
+        </else>
+      </choose>
+    </group>
+  </macro>
+  <macro name="container-title-note">
+    <group delimiter=" ">
+      <choose>
+        <if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
+          <text term="in"/>
+        </if>
+      </choose>
+      <choose>
+        <if type="bill legislation legal_case" match="none">
+          <text variable="container-title" text-case="title" font-style="italic"/>
+        </if>
+      </choose>
+    </group>
+  </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="edition-note">
+    <choose>
+      <if type="book chapter graphic motion_picture paper-conference report song" match="any">
+        <choose>
+          <if is-numeric="edition">
+            <group delimiter=" ">
+              <number variable="edition" form="ordinal"/>
+              <text term="edition" form="short"/>
+            </group>
+          </if>
+          <else>
+            <text variable="edition"/>
+          </else>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="locators-note-join-with-space">
+    <choose>
+      <if type="article-journal" variable="volume" match="all">
+        <choose>
+          <if match="none" variable="collection-title">
+            <text macro="locators-note"/>
+          </if>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="locators-note-join-with-comma">
+    <choose>
+      <if type="article-journal" match="none">
+        <text macro="locators-note"/>
+      </if>
+      <else-if type="article-journal">
+        <choose>
+          <if variable="volume" match="none">
+            <text macro="locators-note"/>
+          </if>
+          <else-if match="any" variable="collection-title">
+            <text macro="locators-note"/>
+          </else-if>
+        </choose>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="locators-note">
+    <choose>
+      <if type="article-journal">
+        <group delimiter=", ">
+          <text macro="collection-title-journal"/>
+          <number variable="volume"/>
+        </group>
+      </if>
+      <else-if type="bill legislation legal_case" match="any">
+        <text macro="legal-cites"/>
+      </else-if>
+      <else-if type="book chapter graphic motion_picture paper-conference report song" match="any">
+        <group delimiter=", ">
+          <text macro="edition-note"/>
+          <choose>
+            <if variable="locator" match="none">
+              <group delimiter=" ">
+                <number variable="number-of-volumes" form="numeric"/>
+                <text term="volume" form="short" plural="true"/>
+              </group>
+            </if>
+          </choose>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="legal-cites">
+    <choose>
+      <if type="legal_case" match="any">
+        <group delimiter=" ">
+          <choose>
+            <if variable="container-title">
+              <text variable="volume"/>
+              <text variable="container-title"/>
+              <group delimiter=" ">
+                <!--change to label variable="section" as that becomes available -->
+                <text term="section" form="symbol"/>
+                <text variable="section"/>
+              </group>
+              <text variable="page"/>
+            </if>
+            <else>
+              <text variable="number" prefix="No. "/>
+            </else>
+          </choose>
+        </group>
+      </if>
+      <else-if type="bill legislation" match="any">
+        <group delimiter=", ">
+          <choose>
+            <if variable="number">
+              <!--There's a public law number-->
+              <text variable="number" prefix="Pub. L. No. "/>
+              <group delimiter=" ">
+                <!--change to label variable="section" as that becomes available -->
+                <text term="section" form="symbol"/>
+                <text variable="section"/>
+              </group>
+              <group delimiter=" ">
+                <text variable="volume"/>
+                <text variable="container-title"/>
+                <text variable="page-first"/>
+              </group>
+            </if>
+            <else>
+              <group delimiter=" ">
+                <text variable="volume"/>
+                <text variable="container-title"/>
+                <!--change to label variable="section" as that becomes available -->
+                <text term="section" form="symbol"/>
+                <text variable="section"/>
+              </group>
+            </else>
+          </choose>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="locators-newspaper">
+    <choose>
+      <if type="article-newspaper">
+        <group delimiter=", ">
+          <group delimiter=" ">
+            <number variable="edition"/>
+            <text term="edition"/>
+          </group>
+          <group delimiter=" ">
+            <text term="section" form="short"/>
+            <text variable="section"/>
+          </group>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="event-note">
+    <text variable="event"/>
+  </macro>
+  <macro name="originally-published">
+    <group delimiter=", ">
+      <text variable="original-publisher-place"/>
+      <date variable="original-date" form="text" date-parts="year"/>
+    </group>
+  </macro>
+  <macro name="reprint-note">
+    <!--needs localization-->
+    <choose>
+      <if variable="original-date issued" match="all">
+        <choose>
+          <!--for whatever reason in notes, when we have both original and new publishers, reprint doesn't appear-->
+          <if variable="original-publisher original-publisher-place" match="none">
+            <text value="repr."/>
+          </if>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <choose>
+      <if type="thesis">
+        <text variable="publisher"/>
+      </if>
+      <else-if type="speech">
+        <text variable="event-place"/>
+      </else-if>
+      <else>
+        <text variable="publisher-place"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="issued">
+    <choose>
+      <if variable="issued">
+        <choose>
+          <if type="graphic report" match="any">
+            <date variable="issued" form="text"/>
+          </if>
+          <else-if type="legal_case">
+            <group delimiter=" ">
+              <text variable="authority"/>
+              <choose>
+                <if variable="container-title" match="any">
+                  <!--Only print year for cases published in reporters-->
+                  <date variable="issued" form="numeric" date-parts="year"/>
+                </if>
+                <else>
+                  <date variable="issued" form="text"/>
+                </else>
+              </choose>
+            </group>
+          </else-if>
+          <else-if type="book bill chapter graphic legislation motion_picture paper-conference report song thesis" match="any">
+            <date variable="issued">
+              <date-part name="year"/>
+            </date>
+          </else-if>
+          <else-if type="patent">
+            <group delimiter=", ">
+              <group delimiter=" ">
+                <!--Needs Localization-->
+                <text value="filed"/>
+                <date variable="submitted" form="text"/>
+              </group>
+              <group delimiter=" ">
+                <choose>
+                  <if variable="issued submitted" match="all">
+                    <text term="and"/>
+                  </if>
+                </choose>
+                <!--Needs Localization-->
+                <text value="issued"/>
+                <date variable="issued" form="text"/>
+              </group>
+            </group>
+          </else-if>
+          <else>
+            <date variable="issued" form="text"/>
+          </else>
+        </choose>
+      </if>
+      <else-if variable="status">
+        <text variable="status"/>
+      </else-if>
+      <else-if variable="accessed URL" match="all"/>
+      <else>
+        <text term="no date" form="short"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="point-locators-subsequent">
+    <choose>
+      <if type="legal_case" variable="locator" match="all">
+        <choose>
+          <if locator="page">
+            <group delimiter=":">
+              <number variable="volume"/>
+              <text variable="locator"/>
+            </group>
+          </if>
+          <else>
+            <group delimiter=" ">
+              <label variable="locator" form="short"/>
+              <text variable="locator"/>
+            </group>
+          </else>
+        </choose>
+      </if>
+      <else-if variable="locator">
+        <choose>
+          <if locator="page" match="none">
+            <group delimiter=" ">
+              <choose>
+                <if type="book graphic motion_picture report song" match="any">
+                  <choose>
+                    <if variable="volume">
+                      <group delimiter=", ">
+                        <group delimiter=" ">
+                          <text term="volume" form="short"/>
+                          <number variable="volume" form="numeric"/>
+                        </group>
+                        <label variable="locator" form="short"/>
+                      </group>
+                    </if>
+                    <else>
+                      <label variable="locator" form="short"/>
+                    </else>
+                  </choose>
+                </if>
+                <else>
+                  <label variable="locator" form="short"/>
+                </else>
+              </choose>
+              <text variable="locator"/>
+            </group>
+          </if>
+          <else-if type="book graphic motion_picture report song" match="any">
+            <group delimiter=":">
+              <number variable="volume" form="numeric"/>
+              <text variable="locator"/>
+            </group>
+          </else-if>
+          <else>
+            <text variable="locator"/>
+          </else>
+        </choose>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="point-locators-join-with-colon">
+    <choose>
+      <if type="article-journal">
+        <choose>
+          <if variable="locator page" match="any">
+            <choose>
+              <if variable="volume issue" match="any">
+                <text macro="point-locators"/>
+              </if>
+            </choose>
+          </if>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="point-locators-join-with-comma">
+    <choose>
+      <if type="article-journal" match="none">
+        <text macro="point-locators"/>
+      </if>
+      <else-if variable="volume issue" match="none">
+        <text macro="point-locators"/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="point-locators">
+    <choose>
+      <if type="article-journal">
+        <choose>
+          <if variable="page">
+            <text variable="page"/>
+            <text variable="locator" prefix=", at "/>
+          </if>
+        </choose>
+      </if>
+      <else-if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
+        <choose>
+          <if variable="page">
+            <number variable="volume" suffix=":"/>
+            <text variable="page"/>
+            <text variable="locator" prefix=", at "/>
+          </if>
+        </choose>
+      </else-if>
+      <else-if type="legal_case"/>
+      <else>
+        <group delimiter=" ">
+          <choose>
+            <if locator="page" match="none">
+              <label variable="locator" form="short"/>
+            </if>
+          </choose>
+          <text variable="locator"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="archive-note">
+    <choose>
+      <if type="thesis">
+        <group delimiter=" ">
+          <text variable="archive"/>
+          <text variable="archive_location" prefix="(" suffix=")"/>
+        </group>
+      </if>
+      <else>
+        <group delimiter=", ">
+          <text variable="archive_location"/>
+          <text variable="archive"/>
+          <text variable="archive-place"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="issue-note-join-with-space">
+    <choose>
+      <if type="article-journal bill legislation legal_case manuscript thesis" variable="publisher-place publisher" match="any">
+        <!--Chicago doesn't use publisher/place for Newspapers and we want the date delimited by a comma-->
+        <choose>
+          <if type="article-newspaper" match="none">
+            <choose>
+              <if type="article-journal" match="none">
+                <text macro="issue-note"/>
+              </if>
+              <else-if variable="issue volume" match="any">
+                <text macro="issue-note"/>
+              </else-if>
+            </choose>
+          </if>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="issue-note-join-with-comma">
+    <choose>
+      <if type="article-journal bill legislation legal_case manuscript thesis" variable="publisher-place publisher" match="none">
+        <text macro="issue-note"/>
+      </if>
+      <else-if type="article-newspaper">
+        <text macro="issue-note"/>
+      </else-if>
+      <else-if type="article-journal">
+        <choose>
+          <if variable="volume issue" match="none">
+            <text macro="issue-note"/>
+          </if>
+        </choose>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="issue-note">
+    <choose>
+      <if type="bill legislation legal_case" match="any">
+        <text macro="issued" prefix="(" suffix=")"/>
+      </if>
+      <else-if type="article-journal">
+        <choose>
+          <if variable="volume issue" match="any">
+            <text macro="issued" prefix="(" suffix=")"/>
+          </if>
+          <else>
+            <text macro="issued"/>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="article-newspaper">
+        <text macro="issued"/>
+      </else-if>
+      <else-if variable="publisher-place event-place publisher genre" match="any">
+        <group prefix="(" suffix=")" delimiter=", ">
+          <choose>
+            <if variable="title" match="none"/>
+            <else-if type="manuscript thesis speech" match="any">
+              <text variable="genre"/>
+            </else-if>
+          </choose>
+          <text macro="event-note"/>
+          <group delimiter="; ">
+            <text macro="originally-published"/>
+            <group delimiter=", ">
+              <text macro="reprint-note"/>
+              <text macro="publisher"/>
+            </group>
+          </group>
+          <text macro="issued"/>
+        </group>
+      </else-if>
+      <else>
+        <text macro="issued"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="access-note">
+    <group delimiter=", ">
+      <choose>
+        <if type="graphic report" match="any">
+          <text macro="archive-note"/>
+        </if>
+        <else-if type="article-journal bill book chapter legal_case legislation motion_picture paper-conference" match="none">
+          <text macro="archive-note"/>
+        </else-if>
+      </choose>
+      <choose>
+        <if variable="issued" match="none">
+          <group delimiter=" ">
+            <text term="accessed"/>
+            <date variable="accessed" form="text"/>
+          </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="case-locator-subsequent">
+    <choose>
+      <if type="legal_case">
+        <group delimiter=" ">
+          <text variable="volume"/>
+          <text variable="container-title"/>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="case-pinpoint-subsequent">
+    <choose>
+      <if type="legal_case">
+        <group delimiter=" ">
+          <choose>
+            <if locator="page">
+              <text term="at"/>
+              <text variable="locator"/>
+            </if>
+            <else>
+              <label variable="locator"/>
+              <text variable="locator"/>
+            </else>
+          </choose>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <citation et-al-min="4" et-al-use-first="1" disambiguate-add-names="true">
+    <layout suffix="." delimiter="; ">
+      <choose>
+        <if position="subsequent">
+          <group delimiter=", ">
+            <text macro="contributors-short"/>
+            <group delimiter=" ">
+              <group delimiter=", ">
+                <text macro="title-short"/>
+                <!--if title & author are the same: -->
+                <text macro="date-disambiguate"/>
+                <text macro="case-locator-subsequent"/>
+              </group>
+              <text macro="case-pinpoint-subsequent"/>
+            </group>
+            <choose>
+              <if match="none" type="legal_case">
+                <text macro="point-locators-subsequent"/>
+              </if>
+            </choose>
+          </group>
+        </if>
+        <else>
+          <group delimiter=", ">
+            <group delimiter=": ">
+              <group delimiter=", ">
+                <group delimiter=" ">
+                  <group delimiter=", ">
+                    <group delimiter=" ">
+                      <group delimiter=", ">
+                        <group delimiter=", ">
+                          <text macro="contributors-note"/>
+                          <text macro="title-note"/>
+                        </group>
+                        <text macro="description-note"/>
+                        <text macro="secondary-contributors-note"/>
+                        <text macro="container-title-note"/>
+                        <text macro="container-contributors-note"/>
+                      </group>
+                      <text macro="locators-note-join-with-space"/>
+                    </group>
+                    <text macro="locators-note-join-with-comma"/>
+                    <text macro="issue-note-join-with-comma"/>
+                  </group>
+                  <text macro="issue-note-join-with-space"/>
+                </group>
+                <text macro="locators-newspaper"/>
+                <text macro="point-locators-join-with-comma"/>
+              </group>
+              <text macro="point-locators-join-with-colon"/>
+            </group>
+            <text macro="access-note"/>
+          </group>
+        </else>
+      </choose>
+    </layout>
+  </citation>
+</style>
diff --git a/buildres/csl/csl-styles/chemical-engineering-technology.csl b/buildres/csl/csl-styles/chemical-engineering-technology.csl
new file mode 100644
index 00000000000..8497a7049e3
--- /dev/null
+++ b/buildres/csl/csl-styles/chemical-engineering-technology.csl
@@ -0,0 +1,173 @@
+<?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>Chemical Engineering &amp; Technology</title>
+    <id>http://www.zotero.org/styles/chemical-engineering-technology</id>
+    <link href="http://www.zotero.org/styles/chemical-engineering-technology" rel="self"/>
+    <link href="http://www.zotero.org/styles/chemie-ingenieur-technik" rel="template"/>
+    <link href="https://onlinelibrary.wiley.com/page/journal/15214125/homepage/2044_forauthors.html" rel="documentation"/>
+    <link href="https://onlinelibrary.wiley.com/pb-assets/assets/15214125/CET%20Instructions%20for%20Authors-1645006746923.pdf" rel="documentation"/>
+    <author>
+      <name>Patrick O'Brien</name>
+    </author>
+    <category citation-format="numeric"/>
+    <category field="chemistry"/>
+    <category field="engineering"/>
+    <issn>0930-7516</issn>
+    <eissn>1521-4125</eissn>
+    <updated>2022-04-26T08:51:32+00:00</updated>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
+  </info>
+  <locale xml:lang="en">
+    <terms>
+      <term name="accessed">accessed on</term>
+    </terms>
+  </locale>
+  <macro name="author">
+    <names variable="author">
+      <name initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+      <label form="short" prefix=", " text-case="capitalize-first"/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="editor">
+    <names variable="editor">
+      <label form="short" text-case="capitalize-first" strip-periods="true" suffix=": "/>
+      <name delimiter-precedes-last="always" initialize-with=". "/>
+    </names>
+  </macro>
+  <macro name="year-date">
+    <group font-weight="bold">
+      <choose>
+        <if variable="issued">
+          <date variable="issued">
+            <date-part name="year"/>
+          </date>
+        </if>
+        <else>
+          <text term="no date" form="short"/>
+        </else>
+      </choose>
+    </group>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if variable="DOI">
+        <text variable="DOI" prefix="DOI: https://doi.org/"/>
+      </if>
+      <else-if type="webpage post-weblog post" match="any">
+        <group delimiter=" ">
+          <text variable="URL"/>
+          <group delimiter=" " prefix="(" suffix=")">
+            <text term="accessed" text-case="capitalize-first"/>
+            <date form="text" variable="accessed"/>
+          </group>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=", ">
+      <text variable="publisher" text-case="capitalize-all"/>
+      <text variable="publisher-place" text-case="title"/>
+    </group>
+  </macro>
+  <macro name="edition">
+    <group delimiter=" ">
+      <number variable="edition" form="ordinal"/>
+      <text term="edition" form="short"/>
+    </group>
+  </macro>
+  <macro name="volume">
+    <group delimiter=" ">
+      <text term="volume" form="short" text-case="capitalize-first"/>
+      <number 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 entry-spacing="0" second-field-align="flush" et-al-min="11" et-al-use-first="10">
+    <layout suffix=".">
+      <text variable="citation-number" prefix="[" suffix="]"/>
+      <text macro="author" suffix=", "/>
+      <choose>
+        <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+          <group delimiter=" ">
+            <group delimiter=", ">
+              <text variable="title" text-case="title" font-style="italic"/>
+              <text macro="volume"/>
+              <text macro="edition"/>
+              <text macro="publisher"/>
+            </group>
+            <text macro="year-date"/>
+          </group>
+        </if>
+        <else-if type="chapter paper-conference" match="any">
+          <group delimiter=" ">
+            <group delimiter=", ">
+              <group delimiter=" ">
+                <text term="in"/>
+                <text variable="container-title" form="short" text-case="title" font-style="italic"/>
+                <text macro="editor" strip-periods="false" prefix="(" suffix=")"/>
+              </group>
+              <text macro="edition"/>
+              <text macro="volume"/>
+              <text macro="publisher"/>
+            </group>
+            <text macro="year-date"/>
+          </group>
+        </else-if>
+        <else-if type="patent">
+          <group delimiter=", ">
+            <text variable="title" text-case="title" font-style="italic"/>
+            <group delimiter=" ">
+              <text variable="authority"/>
+              <text variable="number"/>
+            </group>
+            <text macro="year-date"/>
+          </group>
+        </else-if>
+        <else-if type="thesis">
+          <group delimiter=" ">
+            <group delimiter=", ">
+              <text variable="title" text-case="title" font-style="italic"/>
+              <text variable="genre"/>
+              <text macro="publisher"/>
+            </group>
+            <text macro="year-date"/>
+          </group>
+        </else-if>
+        <else-if type="webpage post post-weblog" match="any">
+          <group delimiter=", ">
+            <text variable="title" quotes="true"/>
+            <text macro="access"/>
+            <text macro="year-date"/>
+          </group>
+        </else-if>
+        <else>
+          <group delimiter=". ">
+            <text variable="container-title" form="short" font-style="italic"/>
+            <group delimiter=", ">
+              <text macro="year-date"/>
+              <group delimiter=" ">
+                <text variable="volume" font-style="italic"/>
+                <text variable="issue" font-style="italic" prefix="(" suffix=")"/>
+              </group>
+              <text variable="page" form="short"/>
+            </group>
+            <text macro="access"/>
+          </group>
+        </else>
+      </choose>
+    </layout>
+  </bibliography>
+</style>
diff --git a/buildres/csl/csl-styles/chicago-author-date.csl b/buildres/csl/csl-styles/chicago-author-date.csl
index 8c133354b38..f8c640cd7fb 100644
--- a/buildres/csl/csl-styles/chicago-author-date.csl
+++ b/buildres/csl/csl-styles/chicago-author-date.csl
@@ -45,6 +45,30 @@
       <term name="translator" form="short">trans.</term>
     </terms>
   </locale>
+  <locale xml:lang="pt-PT">
+    <terms>
+      <term name="accessed">acedido a</term>
+    </terms>
+  </locale>
+  <locale xml:lang="pt">
+    <terms>
+      <term name="editor" form="verb">editado por</term>
+      <term name="editor" form="verb-short">ed.</term>
+      <term name="container-author" form="verb">por</term>
+      <term name="translator" form="verb-short">traduzido por</term>
+      <term name="translator" form="short">trad.</term>
+      <term name="editortranslator" form="verb">editado e traduzido por</term>
+      <term name="and">e</term>
+      <term name="no date" form="long">s.d</term>
+      <term name="no date" form="short">s.d.</term>
+      <term name="in">em</term>
+      <term name="at">em</term>
+      <term name="by">por</term>
+      <!-- PUNCTUATION -->
+      <term name="open-quote">"</term>
+      <term name="close-quote">"</term>
+    </terms>
+  </locale>
   <macro name="secondary-contributors">
     <choose>
       <if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="none">
diff --git a/buildres/csl/csl-styles/china-national-standard-gb-t-7714-2015-author-date.csl b/buildres/csl/csl-styles/china-national-standard-gb-t-7714-2015-author-date.csl
index 14f8754b377..3a05577a7c7 100644
--- a/buildres/csl/csl-styles/china-national-standard-gb-t-7714-2015-author-date.csl
+++ b/buildres/csl/csl-styles/china-national-standard-gb-t-7714-2015-author-date.csl
@@ -1,263 +1,465 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" class="in-text" delimiter-precedes-last="always" demote-non-dropping-particle="never" name-delimiter=", " initialize-with=" " names-delimiter=". " name-as-sort-order="all" sort-separator=" " default-locale="zh-CN">
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" class="in-text" names-delimiter=". " name-as-sort-order="all" sort-separator=" " demote-non-dropping-particle="never" initialize-with=" " initialize-with-hyphen="false" page-range-format="expanded" default-locale="zh-CN">
   <info>
     <title>China National Standard GB/T 7714-2015 (author-date, 中文)</title>
-    <title-short>GB/T 7714-2015 (author-date)</title-short>
     <id>http://www.zotero.org/styles/china-national-standard-gb-t-7714-2015-author-date</id>
     <link href="http://www.zotero.org/styles/china-national-standard-gb-t-7714-2015-author-date" rel="self"/>
     <link href="http://www.zotero.org/styles/china-national-standard-gb-t-7714-2015-numeric" rel="template"/>
-    <link href="http://www.std.gov.cn/gb/search/gbDetailed?id=71F772D8055ED3A7E05397BE0A0AB82A" rel="documentation"/>
+    <link href="http://std.samr.gov.cn/gb/search/gbDetailed?id=71F772D8055ED3A7E05397BE0A0AB82A" rel="documentation"/>
     <author>
       <name>牛耕田</name>
       <email>buffalo_d@163.com</email>
     </author>
+    <contributor>
+      <name>Zeping Lee</name>
+      <email>zepinglee@gmail.com</email>
+    </contributor>
     <category citation-format="author-date"/>
     <category field="generic-base"/>
-    <summary>The Chinese GB/T7714-2015 author-date style</summary>
-    <updated>2021-11-25T18:00:00+08:00</updated>
+    <summary>The Chinese GB/T 7714-2015 author-date style</summary>
+    <updated>2022-01-20T00:00: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">
+    <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="anonymous">佚名</term>
-      <term name="edition">版</term>
-      <term name="page" form="short">
-        <single>p.</single>
-        <multiple>pp.</multiple>
-      </term>
+      <term name="anonymous" form="short">佚名</term>
+      <term name="edition" 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>
-  <macro name="accessed-date">
-    <date variable="accessed" delimiter="&#8211;" prefix="[" suffix="]">
-      <date-part name="year"/>
-      <date-part name="month" form="numeric-leading-zeros"/>
-      <date-part name="day" form="numeric-leading-zeros"/>
+  <locale>
+    <date form="numeric">
+      <date-part name="year" range-delimiter="/"/>
+      <date-part name="month" form="numeric-leading-zeros" prefix="-" range-delimiter="/"/>
+      <date-part name="day" form="numeric-leading-zeros" prefix="-" range-delimiter="/"/>
     </date>
+    <terms>
+      <term name="page-range-delimiter">-</term>
+    </terms>
+  </locale>
+  <!-- 引用日期 -->
+  <macro name="accessed-date">
+    <date variable="accessed" form="numeric" prefix="[" suffix="]"/>
   </macro>
-  <macro name="author">
-    <choose>
-      <if variable="author">
-        <names variable="author">
-          <name>
-            <name-part name="family" text-case="uppercase"/>
-            <name-part name="given"/>
-          </name>
-        </names>
-      </if>
-      <else>
-        <text term="anonymous"/>
-      </else>
-    </choose>
-  </macro>
-  <macro name="author-intext">
-    <choose>
-      <if variable="author">
-        <names variable="author">
-          <name form="short">
-            <name-part name="family" text-case="uppercase"/>
-          </name>
-        </names>
-      </if>
-      <else>
-        <text term="anonymous"/>
-      </else>
-    </choose>
+  <macro name="anon">
+    <text term="anonymous" form="short" text-case="capitalize-first" strip-periods="true"/>
   </macro>
-  <macro name="container-author">
-    <names variable="container-author">
+  <!-- 主要责任者 -->
+  <macro name="author">
+    <names variable="author">
       <name>
         <name-part name="family" text-case="uppercase"/>
         <name-part name="given"/>
       </name>
+      <substitute>
+        <names variable="composer"/>
+        <names variable="illustrator"/>
+        <names variable="director"/>
+        <choose>
+          <if variable="container-title" match="none">
+            <names variable="editor"/>
+          </if>
+        </choose>
+        <text macro="anon"/>
+      </substitute>
     </names>
   </macro>
-  <macro name="edition">
+  <!-- 参考文献表的著者姓名与出版年 -->
+  <macro name="author-date">
+    <group delimiter=", ">
+      <text macro="author"/>
+      <text macro="issued-year"/>
+    </group>
+  </macro>
+  <!-- 正文引用的著者姓名 -->
+  <macro name="author-intext">
+    <names variable="author">
+      <!-- 国标 10.2.2 节要求姓氏与“et al.”“等”之间留适当空隙 -->
+      <name form="short" delimiter="&#160;" delimiter-precedes-et-al="always">
+        <name-part name="family" text-case="uppercase"/>
+      </name>
+      <substitute>
+        <names variable="composer"/>
+        <names variable="illustrator"/>
+        <names variable="director"/>
+        <choose>
+          <if variable="container-title" match="none">
+            <names variable="editor"/>
+          </if>
+        </choose>
+        <text macro="anon"/>
+      </substitute>
+    </names>
+  </macro>
+  <!-- 书籍的卷号（“第 x 卷”或“第 x 册”） -->
+  <macro name="book-volume">
     <choose>
-      <if variable="edition">
-        <group delimiter=" ">
-          <text variable="edition"/>
-          <text term="edition"/>
-        </group>
+      <if type="article article-journal article-magazine article-newspaper periodical" match="none">
+        <choose>
+          <if is-numeric="volume">
+            <group delimiter=" ">
+              <label variable="volume" form="short" text-case="capitalize-first"/>
+              <text variable="volume"/>
+            </group>
+          </if>
+          <else>
+            <text variable="volume"/>
+          </else>
+        </choose>
       </if>
     </choose>
   </macro>
-  <macro name="editor">
-    <names variable="editor translator">
+  <!-- 专著主要责任者 -->
+  <macro name="container-author">
+    <names variable="editor">
       <name>
         <name-part name="family" text-case="uppercase"/>
         <name-part name="given"/>
       </name>
-      <label form="short" prefix=", "/>
+      <substitute>
+        <names variable="editorial-director"/>
+        <names variable="collection-editor"/>
+        <names variable="container-author"/>
+      </substitute>
     </names>
   </macro>
-  <macro name="issued-date">
+  <!-- 专著题名 -->
+  <macro name="container-title">
+    <group delimiter=", ">
+      <group delimiter=": ">
+        <choose>
+          <if variable="container-title">
+            <text variable="container-title"/>
+          </if>
+          <else>
+            <text variable="event"/>
+          </else>
+        </choose>
+        <text macro="book-volume"/>
+      </group>
+      <choose>
+        <if variable="event-date">
+          <date variable="event-date" form="text"/>
+          <text variable="event-place"/>
+        </if>
+      </choose>
+    </group>
+  </macro>
+  <!-- 版本项 -->
+  <macro name="edition">
     <choose>
-      <if variable="issued">
-        <date variable="issued" delimiter="&#8211;">
-          <date-part name="year"/>
-          <date-part name="month" form="numeric-leading-zeros"/>
-          <date-part name="day" form="numeric-leading-zeros"/>
-        </date>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <text term="edition" form="short"/>
+        </group>
       </if>
       <else>
-        <text term="no date" prefix="[" suffix="]"/>
+        <text variable="edition"/>
       </else>
     </choose>
   </macro>
-  <macro name="issue-date-year">
+  <!-- 电子资源的更新或修改日期 -->
+  <macro name="issued-date">
+    <date variable="issued" form="numeric"/>
+  </macro>
+  <!-- 出版年 -->
+  <macro name="issued-year">
     <choose>
-      <if variable="issued">
-        <date variable="issued" date-parts="year" form="numeric"/>
+      <if is-uncertain-date="issued">
+        <date variable="issued" prefix="[" suffix="]">
+          <date-part name="year" range-delimiter="-"/>
+        </date>
       </if>
       <else>
-        <text term="no date" prefix="[" suffix="]"/>
+        <date variable="issued">
+          <date-part name="year" range-delimiter="-"/>
+        </date>
       </else>
     </choose>
   </macro>
+  <!-- 专著的出版项 -->
   <macro name="publishing">
-    <choose>
-      <if variable="publisher">
+    <group delimiter=": ">
+      <group delimiter=", ">
         <group delimiter=": ">
           <text variable="publisher-place"/>
-          <group delimiter=", ">
-            <text variable="publisher"/>
-          </group>
+          <text variable="publisher"/>
         </group>
-        <text variable="page" prefix=": "/>
-      </if>
-    </choose>
-  </macro>
-  <macro name="serial-information">
-    <group delimiter=", ">
-      <text variable="volume"/>
+      </group>
+      <text variable="page"/>
     </group>
-    <text variable="issue" prefix="(" suffix=")"/>
-    <text variable="page" prefix=": "/>
-  </macro>
-  <macro name="type-code">
     <choose>
-      <if type="article-journal article-magazine" match="any">
-        <text value="J"/>
+      <!-- 纯电子资源显示“更新或修改日期” -->
+      <if variable="publisher page" type="book chapter paper-conference thesis" match="none">
+        <choose>
+          <if variable="URL DOI" match="any">
+            <text macro="issued-date" prefix="(" suffix=")"/>
+          </if>
+        </choose>
       </if>
-      <else-if type="article-newspaper">
-        <text value="N"/>
-      </else-if>
-      <else-if type="bill legislation" match="any">
-        <text value="S"/>
-      </else-if>
-      <else-if type="book">
-        <text value="M"/>
-      </else-if>
-      <else-if type="chapter">
-        <text value="M"/>
-      </else-if>
-      <else-if type="dataset">
-        <text value="DS"/>
-      </else-if>
-      <else-if type="paper-conference">
-        <text value="C"/>
-      </else-if>
-      <else-if type="patent">
-        <text value="P"/>
-      </else-if>
-      <else-if type="post-weblog webpage" match="any">
-        <text value="EB"/>
-      </else-if>
-      <else-if type="report">
-        <text value="R"/>
-      </else-if>
-      <else-if type="thesis">
-        <text value="D"/>
-      </else-if>
-      <else>
-        <text value="Z"/>
-      </else>
     </choose>
+    <text macro="accessed-date"/>
+  </macro>
+  <!-- 其他责任者 -->
+  <macro name="secondary-contributor">
+    <names variable="translator">
+      <name>
+        <name-part name="family" text-case="uppercase"/>
+        <name-part name="given"/>
+      </name>
+      <label form="short" prefix=", "/>
+    </names>
   </macro>
+  <!-- 连续出版物中的析出文献的出处项（年、卷、期等信息） -->
+  <macro name="periodical-publishing">
+    <group>
+      <group delimiter=": ">
+        <group>
+          <group delimiter=", ">
+            <text macro="container-title" text-case="title"/>
+            <choose>
+              <if type="article-newspaper">
+                <text macro="issued-date"/>
+              </if>
+            </choose>
+            <text variable="volume"/>
+          </group>
+          <text variable="issue" prefix="(" suffix=")"/>
+        </group>
+        <text variable="page"/>
+      </group>
+      <text macro="accessed-date"/>
+    </group>
+  </macro>
+  <!-- 题名 -->
   <macro name="title">
-    <text variable="title" text-case="title"/>
-    <choose>
-        <if type="bill broadcast legal_case legislation patent report song" match="any">
-          <text variable="number" prefix=": "/>
-        </if>
-    </choose>
-    <group delimiter="/" prefix="[" suffix="]">
-      <text macro="type-code"/>
+    <group delimiter=", ">
+      <group delimiter=": ">
+        <text variable="title"/>
+        <group delimiter="&#8195;">
+          <choose>
+            <if variable="container-title" type="paper-conference" match="none">
+              <text macro="book-volume"/>
+            </if>
+          </choose>
+          <choose>
+            <if type="bill legal_case legislation patent regulation report standard" match="any">
+              <text variable="number"/>
+            </if>
+          </choose>
+        </group>
+      </group>
       <choose>
-        <if variable="URL">
-          <text value="OL"/>
+        <if variable="container-title" type="paper-conference" match="none">
+          <choose>
+            <if variable="event-date">
+              <text variable="event-place"/>
+              <date variable="event-date" form="text"/>
+            </if>
+          </choose>
         </if>
       </choose>
     </group>
+    <text macro="type-code" prefix="[" suffix="]"/>
   </macro>
-  <citation et-al-min="2" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true" collapse="year">
-    <sort>
-      <key macro="author-intext"/>
-      <key macro="issue-date-year" sort="ascending"/>
-    </sort>
-    <layout prefix="(" suffix=")" delimiter="; ">
-      <group delimiter=", ">
-        <text macro="author-intext"/>
-        <text macro="issue-date-year"/>
-        <group>
-          <label variable="locator" form="short"/>
-          <text variable="locator"/>
-        </group>
-      </group>
-    </layout>
-  </citation>
-  <bibliography entry-spacing="0" et-al-min="4" et-al-use-first="3" line-spacing="1" hanging-indent="true">
-    <sort>
-      <key macro="author-intext"/>
-      <key macro="issue-date-year" sort="ascending"/>
-    </sort>
-    <layout suffix=".">
-      <text macro="author" suffix=", "/>
-      <text macro="issue-date-year" suffix=". "/>
-      <text macro="title"/>
+  <!-- 文献类型标识 -->
+  <macro name="type-code">
+    <group delimiter="/">
       <choose>
-        <if type="book bill chapter legislation paper-conference report thesis" match="any">
-          <text macro="editor" prefix=". "/>
+        <if type="article">
           <choose>
-            <if variable="container-title">
-              <text value="//"/>
-              <text macro="container-author" suffix=". "/>
-              <text variable="container-title" suffix=". " text-case="title"/>
+            <if variable="archive">
+              <text value="A"/>
             </if>
             <else>
-              <text value=". "/>
+              <text value="M"/>
             </else>
           </choose>
-          <text macro="edition" suffix=". "/>
-          <text macro="publishing"/>
         </if>
-        <else-if type="article-journal article-magazine article-newspaper" match="any">
-          <group prefix=". ">
-            <choose>
-              <if variable="container-title">
-                <text variable="container-title" text-case="title"/>
-                <text macro="serial-information" prefix=", "/>
-              </if>
-              <else>
-                <text macro="serial-information" suffix=". "/>
-                <text macro="publishing"/>
-              </else>
-            </choose>
-          </group>
+        <else-if type="article-journal article-magazine periodical" match="any">
+          <text value="J"/>
+        </else-if>
+        <else-if type="article-newspaper">
+          <text value="N"/>
+        </else-if>
+        <else-if type="bill collection legal_case legislation regulation" match="any">
+          <text value="A"/>
+        </else-if>
+        <else-if type="book chapter" match="any">
+          <text value="M"/>
+        </else-if>
+        <else-if type="dataset">
+          <text value="DS"/>
+        </else-if>
+        <else-if type="map">
+          <text value="CM"/>
+        </else-if>
+        <else-if type="paper-conference">
+          <text value="C"/>
         </else-if>
         <else-if type="patent">
-          <text macro="issued-date" prefix=". "/>
+          <text value="P"/>
+        </else-if>
+        <else-if type="post post-weblog webpage" match="any">
+          <text value="EB"/>
+        </else-if>
+        <else-if type="report">
+          <text value="R"/>
+        </else-if>
+        <else-if type="software">
+          <text value="CP"/>
+        </else-if>
+        <else-if type="standard">
+          <text value="S"/>
+        </else-if>
+        <else-if type="thesis">
+          <text value="D"/>
         </else-if>
         <else>
-          <text macro="publishing" prefix=". "/>
-          <text macro="issued-date" prefix="(" suffix=")"/>
+          <text value="Z"/>
         </else>
       </choose>
-      <text macro="accessed-date"/>
-      <group delimiter=". " prefix=". ">
-        <text variable="URL"/>
-        <text variable="DOI" prefix="DOI:"/>
+      <choose>
+        <if variable="URL DOI" match="any">
+          <text value="OL"/>
+        </if>
+      </choose>
+    </group>
+  </macro>
+  <!-- 获取和访问路径以及 DOI -->
+  <macro name="url-doi">
+    <group delimiter=". ">
+      <text variable="URL"/>
+      <text variable="DOI" prefix="DOI:"/>
+    </group>
+  </macro>
+  <!-- 连续出版物的年卷期 -->
+  <macro name="year-volume-issue">
+    <group>
+      <group delimiter=", ">
+        <text macro="issued-year"/>
+        <text variable="volume"/>
+      </group>
+      <text variable="issue" prefix="(" suffix=")"/>
+    </group>
+  </macro>
+  <!-- 专著和电子资源 -->
+  <macro name="monograph-layout">
+    <group delimiter=". " suffix=".">
+      <text macro="author-date"/>
+      <text macro="title"/>
+      <text macro="secondary-contributor"/>
+      <text macro="edition"/>
+      <text macro="publishing"/>
+      <text macro="url-doi"/>
+    </group>
+  </macro>
+  <!-- 专著中的析出文献 -->
+  <macro name="chapter-in-book-layout">
+    <group delimiter=". " suffix=".">
+      <text macro="author-date"/>
+      <group delimiter="//">
+        <group delimiter=". ">
+          <text macro="title"/>
+          <text macro="secondary-contributor"/>
+        </group>
+        <group delimiter=". ">
+          <text macro="container-author"/>
+          <text macro="container-title"/>
+        </group>
+      </group>
+      <text macro="edition"/>
+      <text macro="publishing"/>
+      <text macro="url-doi"/>
+    </group>
+  </macro>
+  <!-- 连续出版物 -->
+  <macro name="serial-layout">
+    <group delimiter=". " suffix=".">
+      <text macro="author-date"/>
+      <text macro="title"/>
+      <text macro="year-volume-issue"/>
+      <text macro="publishing"/>
+      <text variable="URL"/>
+      <text variable="DOI" prefix="DOI:"/>
+    </group>
+  </macro>
+  <!-- 连续出版物中的析出文献 -->
+  <macro name="article-in-periodical-layout">
+    <group delimiter=". " suffix=".">
+      <text macro="author-date"/>
+      <text macro="title"/>
+      <text macro="periodical-publishing"/>
+      <text macro="url-doi"/>
+    </group>
+  </macro>
+  <!-- 专利文献 -->
+  <macro name="patent-layout">
+    <group delimiter=". " suffix=".">
+      <text macro="author-date"/>
+      <text macro="title"/>
+      <group>
+        <text macro="issued-date"/>
+        <text macro="accessed-date"/>
+      </group>
+      <text macro="url-doi"/>
+    </group>
+  </macro>
+  <!-- 正文中引用的文献标注格式 -->
+  <macro name="citation-layout">
+    <group>
+      <group delimiter=", ">
+        <text macro="author-intext"/>
+        <text macro="issued-year"/>
       </group>
+    </group>
+  </macro>
+  <!-- 参考文献表格式 -->
+  <macro name="entry-layout">
+    <choose>
+      <if type="article-journal article-magazine article-newspaper" match="any">
+        <text macro="article-in-periodical-layout"/>
+      </if>
+      <else-if type="periodical">
+        <text macro="serial-layout"/>
+      </else-if>
+      <else-if type="patent">
+        <text macro="patent-layout"/>
+      </else-if>
+      <else-if type="paper-conference" variable="container-title" match="any">
+        <text macro="chapter-in-book-layout"/>
+      </else-if>
+      <else>
+        <text macro="monograph-layout"/>
+      </else>
+    </choose>
+  </macro>
+  <citation et-al-min="2" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true" givenname-disambiguation-rule="primary-name-with-initials" collapse="year">
+    <!-- 取消这部分注释可以使用 CSL-M 的功能支持双语 -->
+    <!-- <layout prefix="(" suffix=")" delimiter="; " locale="en"><text macro="citation-layout"/></layout> -->
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <text macro="citation-layout"/>
+    </layout>
+  </citation>
+  <bibliography entry-spacing="0" et-al-min="4" et-al-use-first="3" hanging-indent="true">
+    <sort>
+      <key macro="author"/>
+      <key macro="issued-year"/>
+      <key variable="title"/>
+    </sort>
+    <!-- 取消这部分注释可以使用 CSL-M 的功能支持双语 -->
+    <!-- <layout locale="en"><text macro="entry-layout"/></layout> -->
+    <layout>
+      <text macro="entry-layout"/>
     </layout>
   </bibliography>
 </style>
diff --git a/buildres/csl/csl-styles/china-national-standard-gb-t-7714-2015-note.csl b/buildres/csl/csl-styles/china-national-standard-gb-t-7714-2015-note.csl
index f8588580778..7689e73fd1b 100644
--- a/buildres/csl/csl-styles/china-national-standard-gb-t-7714-2015-note.csl
+++ b/buildres/csl/csl-styles/china-national-standard-gb-t-7714-2015-note.csl
@@ -1,302 +1,471 @@
 <?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" version="1.0" class="note" names-delimiter=". " name-as-sort-order="all" sort-separator=" " demote-non-dropping-particle="never" initialize-with=" " initialize-with-hyphen="false" page-range-format="expanded" default-locale="zh-CN">
   <info>
     <title>China National Standard GB/T 7714-2015 (note, 中文)</title>
-    <title-short>GB/T 7714-2015 (note)</title-short>
     <id>http://www.zotero.org/styles/china-national-standard-gb-t-7714-2015-note</id>
     <link href="http://www.zotero.org/styles/china-national-standard-gb-t-7714-2015-note" rel="self"/>
     <link href="http://www.zotero.org/styles/china-national-standard-gb-t-7714-2015-numeric" rel="template"/>
-    <link href="http://www.std.gov.cn/gb/search/gbDetailed?id=71F772D8055ED3A7E05397BE0A0AB82A" rel="documentation"/>
+    <link href="http://std.samr.gov.cn/gb/search/gbDetailed?id=71F772D8055ED3A7E05397BE0A0AB82A" rel="documentation"/>
     <author>
       <name>牛耕田</name>
       <email>buffalo_d@163.com</email>
     </author>
+    <contributor>
+      <name>Zeping Lee</name>
+      <email>zepinglee@gmail.com</email>
+    </contributor>
     <category citation-format="note"/>
     <category field="generic-base"/>
-    <summary>The Chinese GB/T7714-2015 with notes and bibliography</summary>
-    <updated>2020-03-07T05:07:26+00:00</updated>
+    <summary>The Chinese GB/T 7714-2015 with notes and bibliography</summary>
+    <updated>2022-01-20T00:00: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">
+    <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="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="edition" 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>
+      <term name="page" form="short"/>
     </terms>
   </locale>
-  <macro name="accessed-date">
-    <date variable="accessed" delimiter="&#8211;" prefix="[" suffix="]">
-      <date-part name="year"/>
-      <date-part name="month" form="numeric-leading-zeros"/>
-      <date-part name="day" form="numeric-leading-zeros"/>
+  <locale>
+    <date form="numeric">
+      <date-part name="year" range-delimiter="/"/>
+      <date-part name="month" form="numeric-leading-zeros" prefix="-" range-delimiter="/"/>
+      <date-part name="day" form="numeric-leading-zeros" prefix="-" range-delimiter="/"/>
     </date>
+    <terms>
+      <term name="page-range-delimiter">-</term>
+    </terms>
+  </locale>
+  <!-- 引用日期 -->
+  <macro name="accessed-date">
+    <date variable="accessed" form="numeric" prefix="[" suffix="]"/>
   </macro>
+  <!-- 主要责任者 -->
   <macro name="author">
+    <names variable="author">
+      <name>
+        <name-part name="family" text-case="uppercase"/>
+        <name-part name="given"/>
+      </name>
+      <substitute>
+        <names variable="composer"/>
+        <names variable="illustrator"/>
+        <names variable="director"/>
+        <choose>
+          <if variable="container-title" match="none">
+            <names variable="editor"/>
+          </if>
+        </choose>
+      </substitute>
+    </names>
+  </macro>
+  <!-- 书籍的卷号（“第 x 卷”或“第 x 册”） -->
+  <macro name="book-volume">
     <choose>
-      <if variable="author">
-        <names variable="author">
-          <name>
-            <name-part name="family" text-case="uppercase"/>
-            <name-part name="given"/>
-          </name>
-        </names>
+      <if type="article article-journal article-magazine article-newspaper periodical" match="none">
+        <choose>
+          <if is-numeric="volume">
+            <group delimiter=" ">
+              <label variable="volume" form="short" text-case="capitalize-first"/>
+              <text variable="volume"/>
+            </group>
+          </if>
+          <else>
+            <text variable="volume"/>
+          </else>
+        </choose>
       </if>
-      <else>
-        <text term="anonymous"/>
-      </else>
     </choose>
   </macro>
+  <!-- 专著主要责任者 -->
   <macro name="container-author">
-    <names variable="container-author reviewed-author">
+    <names variable="editor">
       <name>
         <name-part name="family" text-case="uppercase"/>
         <name-part name="given"/>
       </name>
-      <!-- <label form="verb-short" prefix=", "/> -->
+      <substitute>
+        <names variable="editorial-director"/>
+        <names variable="collection-editor"/>
+        <names variable="container-author"/>
+      </substitute>
     </names>
   </macro>
+  <!-- 专著题名 -->
+  <macro name="container-title">
+    <group delimiter=", ">
+      <group delimiter=": ">
+        <choose>
+          <if variable="container-title">
+            <text variable="container-title"/>
+          </if>
+          <else>
+            <text variable="event"/>
+          </else>
+        </choose>
+        <text macro="book-volume"/>
+      </group>
+      <choose>
+        <if variable="event-date">
+          <date variable="event-date" form="text"/>
+          <text variable="event-place"/>
+        </if>
+      </choose>
+    </group>
+  </macro>
+  <!-- 版本项 -->
   <macro name="edition">
     <choose>
-      <if variable="edition">
+      <if is-numeric="edition">
         <group delimiter=" ">
-          <text variable="edition"/>
-          <text term="edition"/>
+          <number variable="edition" form="ordinal"/>
+          <text term="edition" form="short"/>
         </group>
       </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=", "/>
-    </names>
-  </macro>
+  <!-- 电子资源的更新或修改日期 -->
   <macro name="issued-date">
+    <date variable="issued" form="numeric"/>
+  </macro>
+  <!-- 出版年 -->
+  <macro name="issued-year">
     <choose>
-      <if variable="issued">
-        <date variable="issued" delimiter="&#8211;">
-          <date-part name="year"/>
-          <date-part name="month" form="numeric-leading-zeros"/>
-          <date-part name="day" form="numeric-leading-zeros"/>
+      <if is-uncertain-date="issued">
+        <date variable="issued" prefix="[" suffix="]">
+          <date-part name="year" range-delimiter="-"/>
         </date>
       </if>
       <else>
-        <text term="no date" prefix="[" suffix="]"/>
+        <date variable="issued">
+          <date-part name="year" range-delimiter="-"/>
+        </date>
       </else>
     </choose>
   </macro>
-  <macro name="issue-date-year">
+  <!-- 引文页码 -->
+  <macro name="page">
     <choose>
-      <if variable="issued">
-        <date variable="issued" date-parts="year" form="numeric"/>
+      <if variable="locator">
+        <text variable="locator"/>
       </if>
       <else>
-        <text term="no date" prefix="[" suffix="]"/>
+        <text variable="page"/>
       </else>
     </choose>
   </macro>
+  <!-- 专著的出版项 -->
   <macro name="publishing">
-    <choose>
-      <if variable="publisher">
+    <group delimiter=": ">
+      <group delimiter=", ">
         <group delimiter=": ">
           <text variable="publisher-place"/>
-          <group delimiter=", ">
-            <text variable="publisher"/>
-            <text macro="issue-date-year"/>
-          </group>
+          <text variable="publisher"/>
         </group>
+        <!-- 非电子资源显示“出版年” -->
         <choose>
-          <if variable="locator">
-            <text variable="locator" prefix=": "/>
+          <if variable="publisher page" type="book chapter paper-conference thesis" match="any">
+            <text macro="issued-year"/>
           </if>
-          <else>
-            <text variable="page" prefix=": "/>
-          </else>
+          <else-if variable="URL DOI" match="none">
+            <text macro="issued-year"/>
+          </else-if>
         </choose>
-      </if>
-    </choose>
-  </macro>
-  <macro name="serial-information">
-    <group delimiter=", ">
-      <text macro="issue-date-year"/>
-      <text variable="volume"/>
+      </group>
+      <text macro="page"/>
     </group>
-    <text variable="issue" prefix="(" suffix=")"/>
-    <text variable="page" prefix=": "/>
-  </macro>
-  <macro name="type-code">
     <choose>
-      <if type="article-journal article-magazine" match="any">
-        <text value="J"/>
+      <!-- 纯电子资源显示“更新或修改日期” -->
+      <if variable="publisher page" type="book chapter paper-conference thesis" match="none">
+        <choose>
+          <if variable="URL DOI" match="any">
+            <text macro="issued-date" prefix="(" suffix=")"/>
+          </if>
+        </choose>
       </if>
-      <else-if type="article-newspaper">
-        <text value="N"/>
-      </else-if>
-      <else-if type="bill legislation" match="any">
-        <text value="S"/>
-      </else-if>
-      <else-if type="book">
-        <text value="M"/>
-      </else-if>
-      <else-if type="chapter">
-        <text value="M"/>
-      </else-if>
-      <else-if type="dataset">
-        <text value="DS"/>
-      </else-if>
-      <else-if type="paper-conference">
-        <text value="C"/>
-      </else-if>
-      <else-if type="patent">
-        <text value="P"/>
-      </else-if>
-      <else-if type="post-weblog webpage" match="any">
-        <text value="EB"/>
-      </else-if>
-      <else-if type="report">
-        <text value="R"/>
-      </else-if>
-      <else-if type="thesis">
-        <text value="D"/>
-      </else-if>
-      <else>
-        <text value="Z"/>
-      </else>
     </choose>
+    <text macro="accessed-date"/>
   </macro>
-  <macro name="title">
-    <text variable="title" text-case="title"/>
-    <text variable="number" prefix=": "/>
-    <group delimiter="/" prefix="[" suffix="]">
-      <text macro="type-code"/>
-      <choose>
-        <if variable="URL">
-          <text value="OL"/>
-        </if>
-      </choose>
+  <!-- 其他责任者 -->
+  <macro name="secondary-contributor">
+    <names variable="translator">
+      <name>
+        <name-part name="family" text-case="uppercase"/>
+        <name-part name="given"/>
+      </name>
+      <label form="short" prefix=", "/>
+    </names>
+  </macro>
+  <!-- 连续出版物中的析出文献的出处项（年、卷、期等信息） -->
+  <macro name="periodical-publishing">
+    <group>
+      <group delimiter=": ">
+        <group>
+          <group delimiter=", ">
+            <text macro="container-title" text-case="title"/>
+            <choose>
+              <if type="article-newspaper">
+                <text macro="issued-date"/>
+              </if>
+              <else>
+                <text macro="issued-year"/>
+              </else>
+            </choose>
+            <text variable="volume"/>
+          </group>
+          <text variable="issue" prefix="(" suffix=")"/>
+        </group>
+        <text macro="page"/>
+      </group>
+      <text macro="accessed-date"/>
     </group>
   </macro>
-  <citation et-al-min="4" et-al-use-first="3" disambiguate-add-names="true">
-    <layout suffix="." delimiter="; ">
+  <!-- 题名 -->
+  <macro name="title">
+    <group delimiter=", ">
+      <group delimiter=": ">
+        <text variable="title"/>
+        <group delimiter="&#8195;">
+          <choose>
+            <if variable="container-title" type="paper-conference" match="none">
+              <text macro="book-volume"/>
+            </if>
+          </choose>
+          <choose>
+            <if type="bill legal_case legislation patent regulation report standard" match="any">
+              <text variable="number"/>
+            </if>
+          </choose>
+        </group>
+      </group>
       <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 variable="first-reference-note-number" prefix="同【" suffix="】"/>
-          <label variable="locator" form="short"/>
-          <text variable="locator"/>
-        </else-if>
-        <else>
-          <text macro="author" suffix=". "/>
-          <text macro="title"/>
+        <if variable="container-title" type="paper-conference" match="none">
           <choose>
-            <if type="book bill chapter legislation paper-conference report thesis" match="any">
-              <text macro="editor" prefix=". "/>
-              <choose>
-                <if variable="container-title">
-                  <text value="//"/>
-                  <text macro="container-author" suffix=". "/>
-                  <text variable="container-title" suffix=". " text-case="title"/>
-                </if>
-                <else>
-                  <text value=". "/>
-                </else>
-              </choose>
-              <text macro="edition" suffix=". "/>
-              <text macro="publishing"/>
+            <if variable="event-date">
+              <text variable="event-place"/>
+              <date variable="event-date" form="text"/>
             </if>
-            <else-if type="article-journal article-magazine article-newspaper" match="any">
-              <group prefix=". ">
-                <choose>
-                  <if variable="container-title">
-                    <text variable="container-title" text-case="title"/>
-                    <text macro="serial-information" prefix=", "/>
-                  </if>
-                  <else>
-                    <text macro="serial-information" suffix=". "/>
-                    <text macro="publishing"/>
-                  </else>
-                </choose>
-              </group>
-            </else-if>
-            <else-if type="patent">
-              <text macro="issued-date" prefix=". "/>
-            </else-if>
-            <else>
-              <text macro="publishing" prefix=". "/>
-              <text macro="issued-date" prefix="(" suffix=")"/>
-            </else>
           </choose>
-          <text macro="accessed-date"/>
-          <group delimiter=". " prefix=". ">
-            <text variable="URL"/>
-            <text variable="DOI" prefix="DOI:"/>
-          </group>
-        </else>
+        </if>
       </choose>
-    </layout>
-  </citation>
-  <bibliography entry-spacing="0" et-al-min="4" et-al-use-first="3" line-spacing="1" second-field-align="flush">
-    <layout suffix=".">
-      <text variable="citation-number" prefix="[" suffix="]"/>
-      <text macro="author" suffix=". "/>
-      <text macro="title"/>
+    </group>
+    <text macro="type-code" prefix="[" suffix="]"/>
+  </macro>
+  <!-- 文献类型标识 -->
+  <macro name="type-code">
+    <group delimiter="/">
       <choose>
-        <if type="book bill chapter legislation paper-conference report thesis" match="any">
-          <text macro="editor" prefix=". "/>
+        <if type="article">
           <choose>
-            <if variable="container-title">
-              <text value="//"/>
-              <text macro="container-author" suffix=". "/>
-              <text variable="container-title" suffix=". " text-case="title"/>
+            <if variable="archive">
+              <text value="A"/>
             </if>
             <else>
-              <text value=". "/>
+              <text value="M"/>
             </else>
           </choose>
-          <text macro="edition" suffix=". "/>
-          <text macro="publishing"/>
         </if>
-        <else-if type="article-journal article-magazine article-newspaper" match="any">
-          <group prefix=". ">
-            <choose>
-              <if variable="container-title">
-                <text variable="container-title" text-case="title"/>
-                <text macro="serial-information" prefix=", "/>
-              </if>
-              <else>
-                <text macro="serial-information" suffix=". "/>
-                <text macro="publishing"/>
-              </else>
-            </choose>
-          </group>
+        <else-if type="article-journal article-magazine periodical" match="any">
+          <text value="J"/>
+        </else-if>
+        <else-if type="article-newspaper">
+          <text value="N"/>
+        </else-if>
+        <else-if type="bill collection legal_case legislation regulation" match="any">
+          <text value="A"/>
+        </else-if>
+        <else-if type="book chapter" match="any">
+          <text value="M"/>
+        </else-if>
+        <else-if type="dataset">
+          <text value="DS"/>
+        </else-if>
+        <else-if type="map">
+          <text value="CM"/>
+        </else-if>
+        <else-if type="paper-conference">
+          <text value="C"/>
         </else-if>
         <else-if type="patent">
-          <text macro="issued-date" prefix=". "/>
+          <text value="P"/>
+        </else-if>
+        <else-if type="post post-weblog webpage" match="any">
+          <text value="EB"/>
+        </else-if>
+        <else-if type="report">
+          <text value="R"/>
+        </else-if>
+        <else-if type="software">
+          <text value="CP"/>
+        </else-if>
+        <else-if type="standard">
+          <text value="S"/>
+        </else-if>
+        <else-if type="thesis">
+          <text value="D"/>
         </else-if>
         <else>
-          <text macro="publishing" prefix=". "/>
-          <text macro="issued-date" prefix="(" suffix=")"/>
+          <text value="Z"/>
         </else>
       </choose>
-      <text macro="accessed-date"/>
-      <group delimiter=". " prefix=". ">
-        <text variable="URL"/>
-        <text variable="DOI" prefix="DOI:"/>
+      <choose>
+        <if variable="URL DOI" match="any">
+          <text value="OL"/>
+        </if>
+      </choose>
+    </group>
+  </macro>
+  <!-- 获取和访问路径以及 DOI -->
+  <macro name="url-doi">
+    <group delimiter=". ">
+      <text variable="URL"/>
+      <text variable="DOI" prefix="DOI:"/>
+    </group>
+  </macro>
+  <!-- 连续出版物的年卷期 -->
+  <macro name="year-volume-issue">
+    <group>
+      <group delimiter=", ">
+        <text macro="issued-year"/>
+        <text variable="volume"/>
+      </group>
+      <text variable="issue" prefix="(" suffix=")"/>
+    </group>
+  </macro>
+  <!-- 专著和电子资源 -->
+  <macro name="monograph-layout">
+    <group delimiter=". " suffix=".">
+      <text macro="author"/>
+      <text macro="title"/>
+      <text macro="secondary-contributor"/>
+      <text macro="edition"/>
+      <text macro="publishing"/>
+      <text macro="url-doi"/>
+    </group>
+  </macro>
+  <!-- 专著中的析出文献 -->
+  <macro name="chapter-in-book-layout">
+    <group delimiter=". " suffix=".">
+      <text macro="author"/>
+      <group delimiter="//">
+        <group delimiter=". ">
+          <text macro="title"/>
+          <text macro="secondary-contributor"/>
+        </group>
+        <group delimiter=". ">
+          <text macro="container-author"/>
+          <text macro="container-title"/>
+        </group>
+      </group>
+      <text macro="edition"/>
+      <text macro="publishing"/>
+      <text macro="url-doi"/>
+    </group>
+  </macro>
+  <!-- 连续出版物 -->
+  <macro name="serial-layout">
+    <group delimiter=". " suffix=".">
+      <text macro="author"/>
+      <text macro="title"/>
+      <text macro="year-volume-issue"/>
+      <text macro="publishing"/>
+      <text variable="URL"/>
+      <text variable="DOI" prefix="DOI:"/>
+    </group>
+  </macro>
+  <!-- 连续出版物中的析出文献 -->
+  <macro name="article-in-periodical-layout">
+    <group delimiter=". " suffix=".">
+      <text macro="author"/>
+      <text macro="title"/>
+      <text macro="periodical-publishing"/>
+      <text macro="url-doi"/>
+    </group>
+  </macro>
+  <!-- 专利文献 -->
+  <macro name="patent-layout">
+    <group delimiter=". " suffix=".">
+      <text macro="author"/>
+      <text macro="title"/>
+      <group>
+        <text macro="issued-date"/>
+        <text macro="accessed-date"/>
       </group>
+      <text macro="url-doi"/>
+    </group>
+  </macro>
+  <!-- 正文中引用的文献标注格式 -->
+  <macro name="citation-layout">
+    <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">
+        <!-- 国标要求提供的示例中脚注编号是用圈码，在 CSL 中无法实现 -->
+        <!-- 这里改为用冒号隔开编号和页码 -->
+        <group delimiter=": ">
+          <text variable="first-reference-note-number" prefix="同"/>
+          <group delimiter=" ">
+            <label variable="locator" form="short"/>
+            <text variable="locator"/>
+          </group>
+        </group>
+      </else-if>
+      <else>
+        <text macro="entry-layout"/>
+      </else>
+    </choose>
+  </macro>
+  <!-- 参考文献表格式 -->
+  <macro name="entry-layout">
+    <choose>
+      <if type="article-journal article-magazine article-newspaper" match="any">
+        <text macro="article-in-periodical-layout"/>
+      </if>
+      <else-if type="periodical">
+        <text macro="serial-layout"/>
+      </else-if>
+      <else-if type="patent">
+        <text macro="patent-layout"/>
+      </else-if>
+      <else-if type="paper-conference" variable="container-title" match="any">
+        <text macro="chapter-in-book-layout"/>
+      </else-if>
+      <else>
+        <text macro="monograph-layout"/>
+      </else>
+    </choose>
+  </macro>
+  <citation et-al-min="4" et-al-use-first="3" disambiguate-add-names="true">
+    <!-- 取消这部分注释可以使用 CSL-M 的功能支持双语 -->
+    <!-- <layout delimiter="; " locale="en"><text macro="citation-layout"/></layout> -->
+    <layout suffix="." delimiter="; ">
+      <text macro="citation-layout"/>
+    </layout>
+  </citation>
+  <bibliography entry-spacing="0" et-al-min="4" et-al-use-first="3" second-field-align="flush">
+    <!-- 取消这部分注释可以使用 CSL-M 的功能支持双语 -->
+    <!-- <layout locale="en"><text variable="citation-number" prefix="[" suffix="]"/><text macro="entry-layout"/></layout> -->
+    <layout>
+      <text variable="citation-number" prefix="[" suffix="]"/>
+      <text macro="entry-layout"/>
     </layout>
   </bibliography>
 </style>
diff --git a/buildres/csl/csl-styles/china-national-standard-gb-t-7714-2015-numeric.csl b/buildres/csl/csl-styles/china-national-standard-gb-t-7714-2015-numeric.csl
index 7e9009a7cdd..d6a72def496 100644
--- a/buildres/csl/csl-styles/china-national-standard-gb-t-7714-2015-numeric.csl
+++ b/buildres/csl/csl-styles/china-national-standard-gb-t-7714-2015-numeric.csl
@@ -1,242 +1,435 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" class="in-text" default-locale="zh-CN" delimiter-precedes-last="always" demote-non-dropping-particle="never" initialize-with=" " name-delimiter=", " names-delimiter=". " name-as-sort-order="all" sort-separator=" ">
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" class="in-text" names-delimiter=". " name-as-sort-order="all" sort-separator=" " demote-non-dropping-particle="never" initialize-with=" " initialize-with-hyphen="false" page-range-format="expanded" default-locale="zh-CN">
   <info>
     <title>China National Standard GB/T 7714-2015 (numeric, 中文)</title>
-    <title-short>GB/T 7714-2015</title-short>
     <id>http://www.zotero.org/styles/china-national-standard-gb-t-7714-2015-numeric</id>
     <link href="http://www.zotero.org/styles/china-national-standard-gb-t-7714-2015-numeric" rel="self"/>
-    <link href="http://www.std.gov.cn/gb/search/gbDetailed?id=71F772D8055ED3A7E05397BE0A0AB82A" rel="documentation"/>
+    <link href="http://std.samr.gov.cn/gb/search/gbDetailed?id=71F772D8055ED3A7E05397BE0A0AB82A" rel="documentation"/>
     <author>
       <name>牛耕田</name>
       <email>buffalo_d@163.com</email>
     </author>
+    <contributor>
+      <name>Zeping Lee</name>
+      <email>zepinglee@gmail.com</email>
+    </contributor>
     <category citation-format="numeric"/>
     <category field="generic-base"/>
-    <summary>The Chinese GB/T7714-2015 numeric style</summary>
-    <updated>2021-11-25T18:00:00+08:00</updated>
+    <summary>The Chinese GB/T 7714-2015 numeric style</summary>
+    <updated>2022-01-20T00:00: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">
+    <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="anonymous">佚名</term>
-      <term name="edition">版</term>
-      <term name="page" form="short">
-        <single>p.</single>
-        <multiple>pp.</multiple>
-      </term>
+      <term name="edition" 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>
-  <macro name="accessed-date">
-    <date variable="accessed" delimiter="&#8211;" prefix="[" suffix="]">
-      <date-part name="year"/>
-      <date-part name="month" form="numeric-leading-zeros"/>
-      <date-part name="day" form="numeric-leading-zeros"/>
+  <locale>
+    <date form="numeric">
+      <date-part name="year" range-delimiter="/"/>
+      <date-part name="month" form="numeric-leading-zeros" prefix="-" range-delimiter="/"/>
+      <date-part name="day" form="numeric-leading-zeros" prefix="-" range-delimiter="/"/>
     </date>
+    <terms>
+      <term name="page-range-delimiter">-</term>
+    </terms>
+  </locale>
+  <!-- 引用日期 -->
+  <macro name="accessed-date">
+    <date variable="accessed" form="numeric" prefix="[" suffix="]"/>
   </macro>
+  <!-- 主要责任者 -->
   <macro name="author">
-    <choose>
-      <if variable="author">
-        <names variable="author">
-          <name>
-            <name-part name="family" text-case="uppercase"/>
-            <name-part name="given"/>
-          </name>
-        </names>
-      </if>
-      <else>
-        <text term="anonymous"/>
-      </else>
-    </choose>
-  </macro>
-  <macro name="container-author">
-    <names variable="container-author">
+    <names variable="author">
       <name>
         <name-part name="family" text-case="uppercase"/>
         <name-part name="given"/>
       </name>
+      <substitute>
+        <names variable="composer"/>
+        <names variable="illustrator"/>
+        <names variable="director"/>
+        <choose>
+          <if variable="container-title" match="none">
+            <names variable="editor"/>
+          </if>
+        </choose>
+      </substitute>
     </names>
   </macro>
-  <macro name="edition">
+  <!-- 书籍的卷号（“第 x 卷”或“第 x 册”） -->
+  <macro name="book-volume">
     <choose>
-      <if variable="edition">
-        <group delimiter=" ">
-          <text variable="edition"/>
-          <text term="edition"/>
-        </group>
+      <if type="article article-journal article-magazine article-newspaper periodical" match="none">
+        <choose>
+          <if is-numeric="volume">
+            <group delimiter=" ">
+              <label variable="volume" form="short" text-case="capitalize-first"/>
+              <text variable="volume"/>
+            </group>
+          </if>
+          <else>
+            <text variable="volume"/>
+          </else>
+        </choose>
       </if>
     </choose>
   </macro>
-  <macro name="editor">
-    <names variable="editor translator">
+  <!-- 专著主要责任者 -->
+  <macro name="container-author">
+    <names variable="editor">
       <name>
         <name-part name="family" text-case="uppercase"/>
         <name-part name="given"/>
       </name>
-      <label form="short" prefix=", "/>
+      <substitute>
+        <names variable="editorial-director"/>
+        <names variable="collection-editor"/>
+        <names variable="container-author"/>
+      </substitute>
     </names>
   </macro>
-  <macro name="issued-date">
+  <!-- 专著题名 -->
+  <macro name="container-title">
+    <group delimiter=", ">
+      <group delimiter=": ">
+        <choose>
+          <if variable="container-title">
+            <text variable="container-title"/>
+          </if>
+          <else>
+            <text variable="event"/>
+          </else>
+        </choose>
+        <text macro="book-volume"/>
+      </group>
+      <choose>
+        <if variable="event-date">
+          <date variable="event-date" form="text"/>
+          <text variable="event-place"/>
+        </if>
+      </choose>
+    </group>
+  </macro>
+  <!-- 版本项 -->
+  <macro name="edition">
     <choose>
-      <if variable="issued">
-        <date variable="issued" delimiter="&#8211;">
-          <date-part name="year"/>
-          <date-part name="month" form="numeric-leading-zeros"/>
-          <date-part name="day" form="numeric-leading-zeros"/>
-        </date>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <text term="edition" form="short"/>
+        </group>
       </if>
       <else>
-        <text term="no date" prefix="[" suffix="]"/>
+        <text variable="edition"/>
       </else>
     </choose>
   </macro>
-  <macro name="issue-date-year">
+  <!-- 电子资源的更新或修改日期 -->
+  <macro name="issued-date">
+    <date variable="issued" form="numeric"/>
+  </macro>
+  <!-- 出版年 -->
+  <macro name="issued-year">
     <choose>
-      <if variable="issued">
-        <date variable="issued" date-parts="year" form="numeric"/>
+      <if is-uncertain-date="issued">
+        <date variable="issued" prefix="[" suffix="]">
+          <date-part name="year" range-delimiter="-"/>
+        </date>
       </if>
       <else>
-        <text term="no date" prefix="[" suffix="]"/>
+        <date variable="issued">
+          <date-part name="year" range-delimiter="-"/>
+        </date>
       </else>
     </choose>
   </macro>
+  <!-- 专著的出版项 -->
   <macro name="publishing">
-    <choose>
-      <if variable="publisher">
+    <group delimiter=": ">
+      <group delimiter=", ">
         <group delimiter=": ">
           <text variable="publisher-place"/>
-          <group delimiter=", ">
-            <text variable="publisher"/>
-            <text macro="issue-date-year"/>
-          </group>
+          <text variable="publisher"/>
         </group>
-        <text variable="page" prefix=": "/>
-      </if>
-    </choose>
-  </macro>
-  <macro name="serial-information">
-    <group delimiter=", ">
-      <text macro="issue-date-year"/>
-      <text variable="volume"/>
+        <!-- 非电子资源显示“出版年” -->
+        <choose>
+          <if variable="publisher page" type="book chapter paper-conference thesis" match="any">
+            <text macro="issued-year"/>
+          </if>
+          <else-if variable="URL DOI" match="none">
+            <text macro="issued-year"/>
+          </else-if>
+        </choose>
+      </group>
+      <text variable="page"/>
     </group>
-    <text variable="issue" prefix="(" suffix=")"/>
-    <text variable="page" prefix=": "/>
-  </macro>
-  <macro name="type-code">
     <choose>
-      <if type="article-journal article-magazine" match="any">
-        <text value="J"/>
+      <!-- 纯电子资源显示“更新或修改日期” -->
+      <if variable="publisher page" type="book chapter paper-conference thesis" match="none">
+        <choose>
+          <if variable="URL DOI" match="any">
+            <text macro="issued-date" prefix="(" suffix=")"/>
+          </if>
+        </choose>
       </if>
-      <else-if type="article-newspaper">
-        <text value="N"/>
-      </else-if>
-      <else-if type="bill legislation" match="any">
-        <text value="S"/>
-      </else-if>
-      <else-if type="book">
-        <text value="M"/>
-      </else-if>
-      <else-if type="chapter">
-        <text value="M"/>
-      </else-if>
-      <else-if type="dataset">
-        <text value="DS"/>
-      </else-if>
-      <else-if type="paper-conference">
-        <text value="C"/>
-      </else-if>
-      <else-if type="patent">
-        <text value="P"/>
-      </else-if>
-      <else-if type="post-weblog webpage" match="any">
-        <text value="EB"/>
-      </else-if>
-      <else-if type="report">
-        <text value="R"/>
-      </else-if>
-      <else-if type="thesis">
-        <text value="D"/>
-      </else-if>
-      <else>
-        <text value="Z"/>
-      </else>
     </choose>
+    <text macro="accessed-date"/>
   </macro>
+  <!-- 其他责任者 -->
+  <macro name="secondary-contributor">
+    <names variable="translator">
+      <name>
+        <name-part name="family" text-case="uppercase"/>
+        <name-part name="given"/>
+      </name>
+      <label form="short" prefix=", "/>
+    </names>
+  </macro>
+  <!-- 连续出版物中的析出文献的出处项（年、卷、期等信息） -->
+  <macro name="periodical-publishing">
+    <group>
+      <group delimiter=": ">
+        <group>
+          <group delimiter=", ">
+            <text macro="container-title" text-case="title"/>
+            <choose>
+              <if type="article-newspaper">
+                <text macro="issued-date"/>
+              </if>
+              <else>
+                <text macro="issued-year"/>
+              </else>
+            </choose>
+            <text variable="volume"/>
+          </group>
+          <text variable="issue" prefix="(" suffix=")"/>
+        </group>
+        <text variable="page"/>
+      </group>
+      <text macro="accessed-date"/>
+    </group>
+  </macro>
+  <!-- 题名 -->
   <macro name="title">
-    <text variable="title" text-case="title"/>
-    <choose>
-        <if type="bill broadcast legal_case legislation patent report song" match="any">
-          <text variable="number" prefix=": "/>
-        </if>
-    </choose>
-    <group delimiter="/" prefix="[" suffix="]">
-      <text macro="type-code"/>
+    <group delimiter=", ">
+      <group delimiter=": ">
+        <text variable="title"/>
+        <group delimiter="&#8195;">
+          <choose>
+            <if variable="container-title" type="paper-conference" match="none">
+              <text macro="book-volume"/>
+            </if>
+          </choose>
+          <choose>
+            <if type="bill legal_case legislation patent regulation report standard" match="any">
+              <text variable="number"/>
+            </if>
+          </choose>
+        </group>
+      </group>
       <choose>
-        <if variable="URL">
-          <text value="OL"/>
+        <if variable="container-title" type="paper-conference" match="none">
+          <choose>
+            <if variable="event-date">
+              <text variable="event-place"/>
+              <date variable="event-date" form="text"/>
+            </if>
+          </choose>
         </if>
       </choose>
     </group>
+    <text macro="type-code" prefix="[" suffix="]"/>
   </macro>
-  <citation collapse="citation-number" after-collapse-delimiter=",">
-    <sort>
-      <key variable="citation-number" sort="ascending"/>
-    </sort>
-    <layout vertical-align="sup" delimiter="," prefix="[" suffix="]">
-      <text variable="citation-number"/>
-      <group prefix="(" suffix=")">
-        <label variable="locator" suffix=". " form="short" strip-periods="true"/>
-        <text variable="locator"/>
-      </group>
-    </layout>
-  </citation>
-  <bibliography entry-spacing="0" et-al-min="4" et-al-use-first="3" line-spacing="1" second-field-align="flush">
-    <layout suffix=".">
-      <text variable="citation-number" prefix="[" suffix="]"/>
-      <text macro="author" suffix=". "/>
-      <text macro="title"/>
+  <!-- 文献类型标识 -->
+  <macro name="type-code">
+    <group delimiter="/">
       <choose>
-        <if type="book bill chapter legislation paper-conference report thesis" match="any">
-          <text macro="editor" prefix=". "/>
+        <if type="article">
           <choose>
-            <if variable="container-title">
-              <text value="//"/>
-              <text macro="container-author" suffix=". "/>
-              <text variable="container-title" suffix=". " text-case="title"/>
+            <if variable="archive">
+              <text value="A"/>
             </if>
             <else>
-              <text value=". "/>
+              <text value="M"/>
             </else>
           </choose>
-          <text macro="edition" suffix=". "/>
-          <text macro="publishing"/>
         </if>
-        <else-if type="article-journal article-magazine article-newspaper" match="any">
-          <group prefix=". ">
-            <choose>
-              <if variable="container-title">
-                <text variable="container-title" text-case="title"/>
-                <text macro="serial-information" prefix=", "/>
-              </if>
-              <else>
-                <text macro="serial-information" suffix=". "/>
-                <text macro="publishing"/>
-              </else>
-            </choose>
-          </group>
+        <else-if type="article-journal article-magazine periodical" match="any">
+          <text value="J"/>
+        </else-if>
+        <else-if type="article-newspaper">
+          <text value="N"/>
+        </else-if>
+        <else-if type="bill collection legal_case legislation regulation" match="any">
+          <text value="A"/>
+        </else-if>
+        <else-if type="book chapter" match="any">
+          <text value="M"/>
+        </else-if>
+        <else-if type="dataset">
+          <text value="DS"/>
+        </else-if>
+        <else-if type="map">
+          <text value="CM"/>
+        </else-if>
+        <else-if type="paper-conference">
+          <text value="C"/>
         </else-if>
         <else-if type="patent">
-          <text macro="issued-date" prefix=". "/>
+          <text value="P"/>
+        </else-if>
+        <else-if type="post post-weblog webpage" match="any">
+          <text value="EB"/>
+        </else-if>
+        <else-if type="report">
+          <text value="R"/>
+        </else-if>
+        <else-if type="software">
+          <text value="CP"/>
+        </else-if>
+        <else-if type="standard">
+          <text value="S"/>
+        </else-if>
+        <else-if type="thesis">
+          <text value="D"/>
         </else-if>
         <else>
-          <text macro="publishing" prefix=". "/>
-          <text macro="issued-date" prefix="(" suffix=")"/>
+          <text value="Z"/>
         </else>
       </choose>
-      <text macro="accessed-date"/>
-      <group delimiter=". " prefix=". ">
-        <text variable="URL"/>
-        <text variable="DOI" prefix="DOI:"/>
+      <choose>
+        <if variable="URL DOI" match="any">
+          <text value="OL"/>
+        </if>
+      </choose>
+    </group>
+  </macro>
+  <!-- 获取和访问路径以及 DOI -->
+  <macro name="url-doi">
+    <group delimiter=". ">
+      <text variable="URL"/>
+      <text variable="DOI" prefix="DOI:"/>
+    </group>
+  </macro>
+  <!-- 连续出版物的年卷期 -->
+  <macro name="year-volume-issue">
+    <group>
+      <group delimiter=", ">
+        <text macro="issued-year"/>
+        <text variable="volume"/>
+      </group>
+      <text variable="issue" prefix="(" suffix=")"/>
+    </group>
+  </macro>
+  <!-- 专著和电子资源 -->
+  <macro name="monograph-layout">
+    <group delimiter=". " suffix=".">
+      <text macro="author"/>
+      <text macro="title"/>
+      <text macro="secondary-contributor"/>
+      <text macro="edition"/>
+      <text macro="publishing"/>
+      <text macro="url-doi"/>
+    </group>
+  </macro>
+  <!-- 专著中的析出文献 -->
+  <macro name="chapter-in-book-layout">
+    <group delimiter=". " suffix=".">
+      <text macro="author"/>
+      <group delimiter="//">
+        <group delimiter=". ">
+          <text macro="title"/>
+          <text macro="secondary-contributor"/>
+        </group>
+        <group delimiter=". ">
+          <text macro="container-author"/>
+          <text macro="container-title"/>
+        </group>
+      </group>
+      <text macro="edition"/>
+      <text macro="publishing"/>
+      <text macro="url-doi"/>
+    </group>
+  </macro>
+  <!-- 连续出版物 -->
+  <macro name="serial-layout">
+    <group delimiter=". " suffix=".">
+      <text macro="author"/>
+      <text macro="title"/>
+      <text macro="year-volume-issue"/>
+      <text macro="publishing"/>
+      <text variable="URL"/>
+      <text variable="DOI" prefix="DOI:"/>
+    </group>
+  </macro>
+  <!-- 连续出版物中的析出文献 -->
+  <macro name="article-in-periodical-layout">
+    <group delimiter=". " suffix=".">
+      <text macro="author"/>
+      <text macro="title"/>
+      <text macro="periodical-publishing"/>
+      <text macro="url-doi"/>
+    </group>
+  </macro>
+  <!-- 专利文献 -->
+  <macro name="patent-layout">
+    <group delimiter=". " suffix=".">
+      <text macro="author"/>
+      <text macro="title"/>
+      <group>
+        <text macro="issued-date"/>
+        <text macro="accessed-date"/>
       </group>
+      <text macro="url-doi"/>
+    </group>
+  </macro>
+  <!-- 正文中引用的文献标注格式 -->
+  <macro name="citation-layout">
+    <group>
+      <text variable="citation-number"/>
+    </group>
+  </macro>
+  <!-- 参考文献表格式 -->
+  <macro name="entry-layout">
+    <choose>
+      <if type="article-journal article-magazine article-newspaper" match="any">
+        <text macro="article-in-periodical-layout"/>
+      </if>
+      <else-if type="periodical">
+        <text macro="serial-layout"/>
+      </else-if>
+      <else-if type="patent">
+        <text macro="patent-layout"/>
+      </else-if>
+      <else-if type="paper-conference" variable="container-title" match="any">
+        <text macro="chapter-in-book-layout"/>
+      </else-if>
+      <else>
+        <text macro="monograph-layout"/>
+      </else>
+    </choose>
+  </macro>
+  <citation collapse="citation-number" after-collapse-delimiter=",">
+    <layout vertical-align="sup" delimiter="," prefix="[" suffix="]">
+      <text macro="citation-layout"/>
+    </layout>
+  </citation>
+  <bibliography entry-spacing="0" et-al-min="4" et-al-use-first="3" second-field-align="flush">
+    <!-- 取消这部分注释可以使用 CSL-M 的功能支持双语 -->
+    <!-- <layout locale="en"><text variable="citation-number" prefix="[" suffix="]"/><text macro="entry-layout"/></layout> -->
+    <layout>
+      <text variable="citation-number" prefix="[" suffix="]"/>
+      <text macro="entry-layout"/>
     </layout>
   </bibliography>
 </style>
diff --git a/buildres/csl/csl-styles/chinese-gb7714-2005-author-date.csl b/buildres/csl/csl-styles/chinese-gb7714-2005-author-date.csl
index cad4f12f213..34706cf034e 100644
--- a/buildres/csl/csl-styles/chinese-gb7714-2005-author-date.csl
+++ b/buildres/csl/csl-styles/chinese-gb7714-2005-author-date.csl
@@ -1,11 +1,11 @@
 <?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="zh-CN">
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" class="in-text" names-delimiter=". " name-as-sort-order="all" sort-separator=" " demote-non-dropping-particle="never" initialize-with=" " initialize-with-hyphen="false" page-range-format="expanded" default-locale="zh-CN">
   <info>
     <title>China National Standard GB/T 7714-2005 (author-date, 中文)</title>
     <id>http://www.zotero.org/styles/chinese-gb7714-2005-author-date</id>
     <link href="http://www.zotero.org/styles/chinese-gb7714-2005-author-date" rel="self"/>
-    <link href="http://www.zotero.org/styles/chinese-gb7714-2005-numeric" rel="template"/>
-    <link href="http://gradschool.ustc.edu.cn/ylb/material/xw/wdxz/19.pdf" rel="documentation"/>
+    <link href="http://www.zotero.org/styles/china-national-standard-gb-t-7714-2015-author-date" rel="template"/>
+    <link href="http://std.samr.gov.cn/gb/search/gbDetailed?id=71F772D78562D3A7E05397BE0A0AB82A" rel="documentation"/>
     <author>
       <name>heromyth</name>
       <email>zxpmyth@yahoo.com.cn</email>
@@ -14,203 +14,471 @@
       <name>Kristene Collins</name>
       <uri>http://www.mendeley.com/profiles/kristene-collins1/</uri>
     </contributor>
+    <contributor>
+      <name>Zeping Lee</name>
+      <email>zepinglee@gmail.com</email>
+    </contributor>
     <category citation-format="author-date"/>
     <category field="generic-base"/>
-    <summary>This style just partly implemented what the Chinese GB/T 7714-2005 requires.</summary>
-    <updated>2014-02-27T02:27:29+00:00</updated>
+    <summary>The Chinese GB/T 7714-2005 author-date style</summary>
+    <updated>2022-01-20T00:00: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">
+    <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="anonymous" form="short">佚名</term>
+      <term name="edition" 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>
+    <date form="numeric">
+      <date-part name="year" range-delimiter="/"/>
+      <date-part name="month" form="numeric-leading-zeros" prefix="-" range-delimiter="/"/>
+      <date-part name="day" form="numeric-leading-zeros" prefix="-" range-delimiter="/"/>
+    </date>
+    <terms>
+      <term name="page-range-delimiter">-</term>
+    </terms>
+  </locale>
+  <!-- 引用日期 -->
+  <macro name="accessed-date">
+    <date variable="accessed" form="numeric" prefix="[" suffix="]"/>
+  </macro>
+  <macro name="anon">
+    <text term="anonymous" form="short" text-case="capitalize-first" strip-periods="true"/>
+  </macro>
+  <!-- 主要责任者 -->
   <macro name="author">
-    <names variable="author" suffix="，">
-      <name initialize-with=" " name-as-sort-order="all" sort-separator=" " delimiter=", " delimiter-precedes-last="always">
+    <names variable="author">
+      <name>
         <name-part name="family" text-case="uppercase"/>
+        <name-part name="given"/>
       </name>
+      <substitute>
+        <names variable="composer"/>
+        <names variable="illustrator"/>
+        <names variable="director"/>
+        <choose>
+          <if variable="container-title" match="none">
+            <names variable="editor"/>
+          </if>
+        </choose>
+        <text macro="anon"/>
+      </substitute>
     </names>
   </macro>
-  <macro name="recipient">
-    <names variable="recipient">
-      <name name-as-sort-order="all" sort-separator=" " delimiter=", " delimiter-precedes-last="always"/>
-      <label form="short" prefix=", " text-case="lowercase"/>
-    </names>
+  <!-- 参考文献表的著者姓名与出版年 -->
+  <macro name="author-date">
+    <group delimiter=". ">
+      <text macro="author"/>
+      <text macro="issued-year"/>
+    </group>
   </macro>
-  <macro name="interviewer">
-    <names variable="interviewer">
-      <name name-as-sort-order="all" sort-separator=" " delimiter=", " delimiter-precedes-last="always"/>
-      <label form="short" prefix=", " text-case="lowercase"/>
+  <!-- 正文引用的著者姓名 -->
+  <macro name="author-intext">
+    <names variable="author">
+      <!-- 国标 10.2.2 节要求姓氏与“et al.”“等”之间留适当空隙 -->
+      <name form="short" delimiter="&#160;" delimiter-precedes-et-al="always">
+        <name-part name="family" text-case="uppercase"/>
+      </name>
+      <substitute>
+        <names variable="composer"/>
+        <names variable="illustrator"/>
+        <names variable="director"/>
+        <choose>
+          <if variable="container-title" match="none">
+            <names variable="editor"/>
+          </if>
+        </choose>
+        <text macro="anon"/>
+      </substitute>
     </names>
   </macro>
-  <macro name="composer">
-    <names variable="composer">
-      <name name-as-sort-order="all" sort-separator=" " delimiter=", " delimiter-precedes-last="always"/>
-      <label form="short" prefix=", " text-case="lowercase"/>
-    </names>
+  <!-- 书籍的卷号（“第 x 卷”或“第 x 册”） -->
+  <macro name="book-volume">
+    <choose>
+      <if type="article article-journal article-magazine article-newspaper periodical" match="none">
+        <choose>
+          <if is-numeric="volume">
+            <group delimiter=" ">
+              <label variable="volume" form="short" text-case="capitalize-first"/>
+              <text variable="volume"/>
+            </group>
+          </if>
+          <else>
+            <text variable="volume"/>
+          </else>
+        </choose>
+      </if>
+    </choose>
   </macro>
-  <macro name="original-author">
-    <names variable="original-author">
-      <name name-as-sort-order="all" sort-separator=" " delimiter=", " delimiter-precedes-last="always"/>
-      <label form="short" prefix=", " text-case="lowercase"/>
+  <!-- 专著主要责任者 -->
+  <macro name="container-author">
+    <names variable="editor">
+      <name>
+        <name-part name="family" text-case="uppercase"/>
+        <name-part name="given"/>
+      </name>
+      <substitute>
+        <names variable="editorial-director"/>
+        <names variable="collection-editor"/>
+        <names variable="container-author"/>
+      </substitute>
     </names>
   </macro>
-  <macro name="title">
-    <text variable="title"/>
+  <!-- 专著题名 -->
+  <macro name="container-title">
+    <group delimiter=", ">
+      <group delimiter=": ">
+        <choose>
+          <if variable="container-title">
+            <text variable="container-title"/>
+          </if>
+          <else>
+            <text variable="event"/>
+          </else>
+        </choose>
+        <text macro="book-volume"/>
+      </group>
+      <choose>
+        <if variable="event-date">
+          <date variable="event-date" form="text"/>
+          <text variable="event-place"/>
+        </if>
+      </choose>
+    </group>
   </macro>
-  <macro name="titleField">
+  <!-- 版本项 -->
+  <macro name="edition">
     <choose>
-      <if type="report">
-        <text macro="title" suffix="[R]. "/>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <text term="edition" form="short"/>
+        </group>
       </if>
-      <else-if type="thesis">
-        <text macro="title" suffix="[D]. "/>
-      </else-if>
-      <else-if type="bill legislation" match="any">
-        <text variable="number" suffix=", "/>
-        <text macro="title" suffix="[S]"/>
-      </else-if>
-      <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
-        <text macro="title" suffix="[M]. "/>
-      </else-if>
-      <else-if type="paper-conference">
-        <text macro="title" suffix="[C]//"/>
-      </else-if>
-      <else-if type="chapter paper-conference" match="any">
-        <text macro="title" suffix="[G]//"/>
-      </else-if>
-      <else-if type="webpage">
-        <text macro="title" suffix="[EB/OL]. "/>
-      </else-if>
-      <else-if type="patent">
-        <text macro="title"/>
-        <text variable="number" prefix=": 中国, " suffix="[P].  "/>
-      </else-if>
       <else>
-        <text macro="title" suffix="[J]. "/>
+        <text variable="edition"/>
       </else>
     </choose>
   </macro>
-  <macro name="secondaryAuthor">
-    <names variable="editor">
-      <name initialize-with=" " name-as-sort-order="all" sort-separator=" " delimiter=", " delimiter-precedes-last="always">
-        <name-part name="family" text-case="uppercase"/>
-      </name>
-    </names>
-    <names variable="translator">
-      <name name-as-sort-order="all" sort-separator=" " delimiter=", " delimiter-precedes-last="always" suffix=", 译"/>
-    </names>
+  <!-- 电子资源的更新或修改日期 -->
+  <macro name="issued-date">
+    <date variable="issued" form="numeric"/>
   </macro>
-  <macro name="publisher">
+  <!-- 出版年 -->
+  <macro name="issued-year">
     <choose>
-      <if type="chapter paper-conference" match="any">
-        <text variable="container-title" suffix=". "/>
+      <if is-uncertain-date="issued">
+        <date variable="issued" prefix="[" suffix="]">
+          <date-part name="year" range-delimiter="-"/>
+        </date>
       </if>
-      <else-if type="report">
-        <text variable="collection-title" suffix=", "/>
-        <text variable="number" suffix=", "/>
-      </else-if>
-      <else-if type="bill legislation" match="any">
-        <text variable="container-title" prefix=". "/>
-      </else-if>
       <else>
-        <text variable="container-title" suffix=", "/>
+        <date variable="issued">
+          <date-part name="year" range-delimiter="-"/>
+        </date>
       </else>
     </choose>
-    <text variable="publisher-place" suffix=": "/>
+  </macro>
+  <!-- 专著的出版项 -->
+  <macro name="publishing">
+    <group delimiter=": ">
+      <group delimiter=", ">
+        <group delimiter=": ">
+          <text variable="publisher-place"/>
+          <text variable="publisher"/>
+        </group>
+      </group>
+      <text variable="page"/>
+    </group>
+    <choose>
+      <!-- 纯电子资源显示“更新或修改日期” -->
+      <if variable="publisher page" type="book chapter paper-conference thesis" match="none">
+        <choose>
+          <if variable="URL DOI" match="any">
+            <text macro="issued-date" prefix="(" suffix=")"/>
+          </if>
+        </choose>
+      </if>
+    </choose>
+    <text macro="accessed-date"/>
+  </macro>
+  <!-- 其他责任者 -->
+  <macro name="secondary-contributor">
+    <names variable="translator">
+      <name>
+        <name-part name="family" text-case="uppercase"/>
+        <name-part name="given"/>
+      </name>
+      <label form="short" prefix=", "/>
+    </names>
+  </macro>
+  <!-- 连续出版物中的析出文献的出处项（年、卷、期等信息） -->
+  <macro name="periodical-publishing">
+    <group>
+      <group delimiter=": ">
+        <group>
+          <group delimiter=", ">
+            <text macro="container-title" text-case="title"/>
+            <choose>
+              <if type="article-newspaper">
+                <text macro="issued-date"/>
+              </if>
+            </choose>
+            <text variable="volume"/>
+          </group>
+          <text variable="issue" prefix="(" suffix=")"/>
+        </group>
+        <text variable="page"/>
+      </group>
+      <text macro="accessed-date"/>
+    </group>
+  </macro>
+  <!-- 题名 -->
+  <macro name="title">
     <group delimiter=", ">
-      <text variable="publisher"/>
+      <group delimiter=": ">
+        <text variable="title"/>
+        <group delimiter="&#8195;">
+          <choose>
+            <if variable="container-title" type="paper-conference" match="none">
+              <text macro="book-volume"/>
+            </if>
+          </choose>
+          <choose>
+            <if type="patent">
+              <group delimiter=", ">
+                <choose>
+                  <!-- 专利的国别应使用 `jurisdiction`，但 Zotero 没有对应的域，所以 `publisher-place` 作为备选 -->
+                  <if variable="jurisdiction">
+                    <text variable="jurisdiction"/>
+                  </if>
+                  <else>
+                    <text variable="publisher-place"/>
+                  </else>
+                </choose>
+                <text variable="number"/>
+              </group>
+            </if>
+            <else-if type="bill legal_case legislation regulation report standard" match="any">
+              <text variable="number"/>
+            </else-if>
+          </choose>
+        </group>
+      </group>
+      <choose>
+        <if variable="container-title" type="paper-conference" match="none">
+          <choose>
+            <if variable="event-date">
+              <text variable="event-place"/>
+              <date variable="event-date" form="text"/>
+            </if>
+          </choose>
+        </if>
+      </choose>
+    </group>
+    <text macro="type-code" prefix="[" suffix="]"/>
+  </macro>
+  <!-- 文献类型标识 -->
+  <macro name="type-code">
+    <group delimiter="/">
       <choose>
-        <if type="webpage" variable="container-title" match="all">
-          <date variable="issued" suffix=". ">
-            <date-part name="year"/>
-            <date-part name="month" form="numeric-leading-zeros" prefix="-"/>
-            <date-part name="day" form="numeric-leading-zeros" prefix="-"/>
-          </date>
+        <if type="article">
+          <choose>
+            <if variable="archive">
+              <text value="A"/>
+            </if>
+            <else>
+              <text value="M"/>
+            </else>
+          </choose>
         </if>
-        <else-if type="webpage"/>
+        <else-if type="article-journal article-magazine periodical" match="any">
+          <text value="J"/>
+        </else-if>
+        <else-if type="article-newspaper">
+          <text value="N"/>
+        </else-if>
+        <else-if type="book chapter" match="any">
+          <text value="M"/>
+        </else-if>
+        <else-if type="dataset">
+          <text value="DB"/>
+        </else-if>
+        <else-if type="paper-conference">
+          <text value="C"/>
+        </else-if>
         <else-if type="patent">
-          <date variable="issued">
-            <date-part name="year"/>
-            <date-part name="month" form="numeric-leading-zeros" prefix="-"/>
-            <date-part name="day" form="numeric-leading-zeros" prefix="-"/>
-          </date>
+          <text value="P"/>
+        </else-if>
+        <else-if type="post post-weblog webpage" match="any">
+          <text value="EB"/>
+        </else-if>
+        <else-if type="report">
+          <text value="R"/>
+        </else-if>
+        <else-if type="software">
+          <text value="CP"/>
+        </else-if>
+        <else-if type="standard">
+          <text value="S"/>
+        </else-if>
+        <else-if type="thesis">
+          <text value="D"/>
         </else-if>
-        <else-if variable="publisher">
-          <date variable="issued">
-            <date-part name="year"/>
-          </date>
+        <else-if variable="URL">
+          <text value="EB"/>
         </else-if>
-        <else-if type="bill legislation" match="any"/>
         <else>
-          <date variable="issued">
-            <date-part name="year"/>
-          </date>
+          <text value="M"/>
         </else>
       </choose>
+      <choose>
+        <if variable="URL DOI" match="any">
+          <text value="OL"/>
+        </if>
+      </choose>
     </group>
-    <text variable="volume" prefix=", "/>
-    <text variable="issue" prefix="(" suffix=")"/>
-  </macro>
-  <macro name="pageField">
-    <text variable="page"/>
   </macro>
-  <macro name="referenceDate">
+  <!-- 获取和访问路径以及 DOI -->
+  <macro name="url-doi">
     <choose>
-      <if type="webpage">
-        <date variable="issued" prefix="(" suffix=")">
-          <date-part name="year"/>
-          <date-part name="month" form="numeric-leading-zeros" prefix="-"/>
-          <date-part name="day" form="numeric-leading-zeros" prefix="-"/>
-        </date>
-        <date variable="accessed" prefix="[" suffix="]">
-          <date-part name="year"/>
-          <date-part name="month" form="numeric-leading-zeros" prefix="-"/>
-          <date-part name="day" form="numeric-leading-zeros" prefix="-"/>
-        </date>
+      <if variable="URL">
+        <text variable="URL"/>
       </if>
+      <else>
+        <text variable="DOI" prefix="https://doi.org/"/>
+      </else>
     </choose>
   </macro>
-  <macro name="access">
+  <!-- 连续出版物的年卷期 -->
+  <macro name="year-volume-issue">
+    <group>
+      <group delimiter=", ">
+        <text macro="issued-year"/>
+        <text variable="volume"/>
+      </group>
+      <text variable="issue" prefix="(" suffix=")"/>
+    </group>
+  </macro>
+  <!-- 专著和电子资源 -->
+  <macro name="monograph-layout">
+    <group delimiter=". " suffix=".">
+      <text macro="author-date"/>
+      <text macro="title"/>
+      <text macro="secondary-contributor"/>
+      <text macro="edition"/>
+      <text macro="publishing"/>
+      <text macro="url-doi"/>
+    </group>
+  </macro>
+  <!-- 专著中的析出文献 -->
+  <macro name="chapter-in-book-layout">
+    <group delimiter=". " suffix=".">
+      <text macro="author-date"/>
+      <group delimiter="//">
+        <group delimiter=". ">
+          <text macro="title"/>
+          <text macro="secondary-contributor"/>
+        </group>
+        <group delimiter=". ">
+          <text macro="container-author"/>
+          <text macro="container-title"/>
+        </group>
+      </group>
+      <text macro="edition"/>
+      <text macro="publishing"/>
+      <text macro="url-doi"/>
+    </group>
+  </macro>
+  <!-- 连续出版物 -->
+  <macro name="serial-layout">
+    <group delimiter=". " suffix=".">
+      <text macro="author-date"/>
+      <text macro="title"/>
+      <text macro="year-volume-issue"/>
+      <text macro="publishing"/>
+      <text variable="URL"/>
+      <text variable="DOI" prefix="DOI:"/>
+    </group>
+  </macro>
+  <!-- 连续出版物中的析出文献 -->
+  <macro name="article-in-periodical-layout">
+    <group delimiter=". " suffix=".">
+      <text macro="author-date"/>
+      <text macro="title"/>
+      <text macro="periodical-publishing"/>
+      <text macro="url-doi"/>
+    </group>
+  </macro>
+  <!-- 专利文献 -->
+  <macro name="patent-layout">
+    <group delimiter=". " suffix=".">
+      <text macro="author-date"/>
+      <text macro="title"/>
+      <group>
+        <text macro="issued-date"/>
+        <text macro="accessed-date"/>
+      </group>
+      <text macro="url-doi"/>
+    </group>
+  </macro>
+  <!-- 正文中引用的文献标注格式 -->
+  <macro name="citation-layout">
+    <group>
+      <group delimiter=", ">
+        <text macro="author-intext"/>
+        <text macro="issued-year"/>
+      </group>
+    </group>
+  </macro>
+  <!-- 参考文献表格式 -->
+  <macro name="entry-layout">
     <choose>
-      <if variable="DOI">
-        <text variable="DOI" prefix="doi:"/>
+      <if type="article-journal article-magazine article-newspaper" match="any">
+        <text macro="article-in-periodical-layout"/>
       </if>
-      <else-if variable="URL">
-        <text variable="URL"/>
+      <else-if type="periodical">
+        <text macro="serial-layout"/>
+      </else-if>
+      <else-if type="patent">
+        <text macro="patent-layout"/>
+      </else-if>
+      <else-if type="paper-conference" variable="container-title" match="any">
+        <text macro="chapter-in-book-layout"/>
       </else-if>
+      <else>
+        <text macro="monograph-layout"/>
+      </else>
     </choose>
   </macro>
-  <citation collapse="citation-number">
-    <sort>
-      <key variable="citation-label"/>
-    </sort>
-    <layout vertical-align="baseline" delimiter="；" prefix="（" suffix="）">
-      <choose>
-        <if match="all" variable="author">
-          <text macro="author"/>
-        </if>
-        <else-if match="all" variable="title">
-          <text macro="title" suffix="，"/>
-        </else-if>
-      </choose>
-      <date date-parts="year" form="numeric" variable="issued"/>
+  <citation et-al-min="2" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true" givenname-disambiguation-rule="primary-name-with-initials" collapse="year">
+    <!-- 取消这部分注释可以使用 CSL-M 的功能支持双语 -->
+    <!-- <layout prefix="(" suffix=")" delimiter="; " locale="en"><text macro="citation-layout"/></layout> -->
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <text macro="citation-layout"/>
     </layout>
   </citation>
-  <bibliography et-al-min="4" et-al-use-first="3" second-field-align="flush" entry-spacing="0">
-    <layout suffix=".">
-      <text macro="author" suffix=". "/>
-      <text macro="titleField"/>
-      <text macro="secondaryAuthor" suffix=". "/>
-      <text variable="edition" prefix="第" suffix="版. "/>
-      <text macro="publisher"/>
-      <text macro="pageField" prefix=": "/>
-      <text macro="referenceDate"/>
-      <choose>
-        <if type="webpage" match="any">
-          <text macro="access" prefix=". "/>
-        </if>
-      </choose>
-      <text macro="recipient"/>
-      <text macro="interviewer"/>
-      <text macro="composer"/>
-      <text macro="original-author"/>
+  <bibliography entry-spacing="0" et-al-min="4" et-al-use-first="3" hanging-indent="true">
+    <sort>
+      <key macro="author"/>
+      <key macro="issued-year"/>
+      <key variable="title"/>
+    </sort>
+    <!-- 取消这部分注释可以使用 CSL-M 的功能支持双语 -->
+    <!-- <layout locale="en"><text macro="entry-layout"/></layout> -->
+    <layout>
+      <text macro="entry-layout"/>
     </layout>
   </bibliography>
 </style>
diff --git a/buildres/csl/csl-styles/chinese-gb7714-2005-numeric.csl b/buildres/csl/csl-styles/chinese-gb7714-2005-numeric.csl
index 77d2368717a..eb9642d426b 100644
--- a/buildres/csl/csl-styles/chinese-gb7714-2005-numeric.csl
+++ b/buildres/csl/csl-styles/chinese-gb7714-2005-numeric.csl
@@ -1,215 +1,451 @@
 <?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="zh-CN">
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" class="in-text" names-delimiter=". " name-as-sort-order="all" sort-separator=" " demote-non-dropping-particle="never" initialize-with=" " initialize-with-hyphen="false" page-range-format="expanded" default-locale="zh-CN">
   <info>
     <title>China National Standard GB/T 7714-2005 (numeric, 中文)</title>
     <id>http://www.zotero.org/styles/chinese-gb7714-2005-numeric</id>
     <link href="http://www.zotero.org/styles/chinese-gb7714-2005-numeric" rel="self"/>
+    <link href="http://www.zotero.org/styles/china-national-standard-gb-t-7714-2015-numeric" rel="template"/>
     <link href="http://std.samr.gov.cn/gb/search/gbDetailed?id=71F772D78562D3A7E05397BE0A0AB82A" rel="documentation"/>
     <author>
       <name>heromyth</name>
       <email>zxpmyth@yahoo.com.cn</email>
     </author>
+    <contributor>
+      <name>Zeping Lee</name>
+      <email>zepinglee@gmail.com</email>
+    </contributor>
     <category citation-format="numeric"/>
-    <category field="engineering"/>
     <category field="generic-base"/>
-    <category field="science"/>
-    <summary>This style just partly implemented what the Chinese GB/T 7714-2005 requires.</summary>
-    <updated>2021-11-21T09:38:41+00:00</updated>
+    <summary>The Chinese GB/T 7714-2005 numeric style</summary>
+    <updated>2022-01-20T00:00: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">
+    <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="edition" 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>
+    <date form="numeric">
+      <date-part name="year" range-delimiter="/"/>
+      <date-part name="month" form="numeric-leading-zeros" prefix="-" range-delimiter="/"/>
+      <date-part name="day" form="numeric-leading-zeros" prefix="-" range-delimiter="/"/>
+    </date>
+    <terms>
+      <term name="page-range-delimiter">-</term>
+    </terms>
+  </locale>
+  <!-- 引用日期 -->
+  <macro name="accessed-date">
+    <date variable="accessed" form="numeric" prefix="[" suffix="]"/>
+  </macro>
+  <!-- 主要责任者 -->
   <macro name="author">
     <names variable="author">
-      <name initialize-with=" " name-as-sort-order="all" sort-separator=" " delimiter=", " delimiter-precedes-last="always">
+      <name>
         <name-part name="family" text-case="uppercase"/>
+        <name-part name="given"/>
       </name>
+      <substitute>
+        <names variable="composer"/>
+        <names variable="illustrator"/>
+        <names variable="director"/>
+        <choose>
+          <if variable="container-title" match="none">
+            <names variable="editor"/>
+          </if>
+        </choose>
+      </substitute>
     </names>
   </macro>
-  <macro name="recipient">
-    <names variable="recipient">
-      <name name-as-sort-order="all" sort-separator=" " delimiter=", " delimiter-precedes-last="always"/>
-      <label form="short" prefix=", " text-case="lowercase"/>
-    </names>
-  </macro>
-  <macro name="interviewer">
-    <names variable="interviewer">
-      <name name-as-sort-order="all" sort-separator=" " delimiter=", " delimiter-precedes-last="always"/>
-      <label form="short" prefix=", " text-case="lowercase"/>
-    </names>
-  </macro>
-  <macro name="composer">
-    <names variable="composer">
-      <name name-as-sort-order="all" sort-separator=" " delimiter=", " delimiter-precedes-last="always"/>
-      <label form="short" prefix=", " text-case="lowercase"/>
-    </names>
+  <!-- 书籍的卷号（“第 x 卷”或“第 x 册”） -->
+  <macro name="book-volume">
+    <choose>
+      <if type="article article-journal article-magazine article-newspaper periodical" match="none">
+        <choose>
+          <if is-numeric="volume">
+            <group delimiter=" ">
+              <label variable="volume" form="short" text-case="capitalize-first"/>
+              <text variable="volume"/>
+            </group>
+          </if>
+          <else>
+            <text variable="volume"/>
+          </else>
+        </choose>
+      </if>
+    </choose>
   </macro>
-  <macro name="original-author">
-    <names variable="original-author">
-      <name name-as-sort-order="all" sort-separator=" " delimiter=", " delimiter-precedes-last="always"/>
-      <label form="short" prefix=", " text-case="lowercase"/>
+  <!-- 专著主要责任者 -->
+  <macro name="container-author">
+    <names variable="editor">
+      <name>
+        <name-part name="family" text-case="uppercase"/>
+        <name-part name="given"/>
+      </name>
+      <substitute>
+        <names variable="editorial-director"/>
+        <names variable="collection-editor"/>
+        <names variable="container-author"/>
+      </substitute>
     </names>
   </macro>
-  <macro name="title">
-    <text variable="title"/>
+  <!-- 专著题名 -->
+  <macro name="container-title">
+    <group delimiter=", ">
+      <group delimiter=": ">
+        <choose>
+          <if variable="container-title">
+            <text variable="container-title"/>
+          </if>
+          <else>
+            <text variable="event"/>
+          </else>
+        </choose>
+        <text macro="book-volume"/>
+      </group>
+      <choose>
+        <if variable="event-date">
+          <date variable="event-date" form="text"/>
+          <text variable="event-place"/>
+        </if>
+      </choose>
+    </group>
   </macro>
-  <macro name="titleField">
+  <!-- 版本项 -->
+  <macro name="edition">
     <choose>
-      <if type="report">
-        <text macro="title" suffix="[R]. "/>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <text term="edition" form="short"/>
+        </group>
       </if>
-      <else-if type="thesis">
-        <text macro="title" suffix="[D]. "/>
-      </else-if>
-      <else-if type="bill legislation" match="any">
-        <text variable="number" suffix=", "/>
-        <text macro="title" suffix="[S]"/>
-      </else-if>
-      <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
-        <text macro="title" suffix="[M]. "/>
-      </else-if>
-      <else-if type="paper-conference">
-        <text macro="title" suffix="[C]//"/>
-      </else-if>
-      <else-if type="chapter paper-conference" match="any">
-        <text macro="title" suffix="[G]//"/>
-      </else-if>
-      <else-if type="webpage">
-        <text macro="title" suffix="[EB/OL]. "/>
-      </else-if>
-      <else-if type="patent">
-        <text macro="title"/>
-        <text variable="number" prefix=": 中国, " suffix="[P].  "/>
-      </else-if>
       <else>
-        <text macro="title" suffix="[J]. "/>
+        <text variable="edition"/>
       </else>
     </choose>
   </macro>
-  <macro name="secondaryAuthor">
-    <names variable="editor">
-      <name initialize-with=" " name-as-sort-order="all" sort-separator=" " delimiter=", " delimiter-precedes-last="always">
-        <name-part name="family" text-case="uppercase"/>
-      </name>
-    </names>
-    <names variable="translator">
-      <name name-as-sort-order="all" sort-separator=" " delimiter=", " delimiter-precedes-last="always" suffix=", 译"/>
-    </names>
+  <!-- 电子资源的更新或修改日期 -->
+  <macro name="issued-date">
+    <date variable="issued" form="numeric"/>
   </macro>
-  <macro name="publisher">
+  <!-- 出版年 -->
+  <macro name="issued-year">
     <choose>
-      <if type="chapter paper-conference" match="any">
-        <text variable="container-title" suffix=". "/>
+      <if is-uncertain-date="issued">
+        <date variable="issued" prefix="[" suffix="]">
+          <date-part name="year" range-delimiter="-"/>
+        </date>
       </if>
-      <else-if type="report">
-        <text variable="collection-title" suffix=", "/>
-        <text variable="number" suffix=", "/>
-      </else-if>
-      <else-if type="bill legislation" match="any">
-        <text variable="container-title" prefix=". "/>
-      </else-if>
       <else>
-        <text variable="container-title" suffix=", "/>
+        <date variable="issued">
+          <date-part name="year" range-delimiter="-"/>
+        </date>
       </else>
     </choose>
-    <!--
-
-<text variable="event" suffix="event "/>
-<text variable="event-place" suffix="event-place "/>
-<text variable="original-title" suffix="original-title"/>
-
- -->
-    <text variable="publisher-place" suffix=": "/>
-    <group delimiter=", ">
-       <choose>
-          <if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="any">
-            <text variable="publisher"/>
+  </macro>
+  <!-- 专著的出版项 -->
+  <macro name="publishing">
+    <group delimiter=": ">
+      <group delimiter=", ">
+        <group delimiter=": ">
+          <text variable="publisher-place"/>
+          <text variable="publisher"/>
+        </group>
+        <!-- 非电子资源显示“出版年” -->
+        <choose>
+          <if variable="publisher page" type="book chapter paper-conference thesis" match="any">
+            <text macro="issued-year"/>
+          </if>
+          <else-if variable="URL DOI" match="none">
+            <text macro="issued-year"/>
+          </else-if>
+        </choose>
+      </group>
+      <text variable="page"/>
+    </group>
+    <choose>
+      <!-- 纯电子资源显示“更新或修改日期” -->
+      <if variable="publisher page" type="book chapter paper-conference thesis" match="none">
+        <choose>
+          <if variable="URL DOI" match="any">
+            <text macro="issued-date" prefix="(" suffix=")"/>
           </if>
-        <else-if type="webpage" variable="container-title" match="all">
-          <date variable="issued" suffix=". ">
-            <date-part name="year"/>
-            <date-part name="month" form="numeric-leading-zeros" prefix="-"/>
-            <date-part name="day" form="numeric-leading-zeros" prefix="-"/>
-          </date>
+        </choose>
+      </if>
+    </choose>
+    <text macro="accessed-date"/>
+  </macro>
+  <!-- 其他责任者 -->
+  <macro name="secondary-contributor">
+    <names variable="translator">
+      <name>
+        <name-part name="family" text-case="uppercase"/>
+        <name-part name="given"/>
+      </name>
+      <label form="short" prefix=", "/>
+    </names>
+  </macro>
+  <!-- 连续出版物中的析出文献的出处项（年、卷、期等信息） -->
+  <macro name="periodical-publishing">
+    <group>
+      <group delimiter=": ">
+        <group>
+          <group delimiter=", ">
+            <text macro="container-title" text-case="title"/>
+            <choose>
+              <if type="article-newspaper">
+                <text macro="issued-date"/>
+              </if>
+              <else>
+                <text macro="issued-year"/>
+              </else>
+            </choose>
+            <text variable="volume"/>
+          </group>
+          <text variable="issue" prefix="(" suffix=")"/>
+        </group>
+        <text variable="page"/>
+      </group>
+      <text macro="accessed-date"/>
+    </group>
+  </macro>
+  <!-- 题名 -->
+  <macro name="title">
+    <group delimiter=", ">
+      <group delimiter=": ">
+        <text variable="title"/>
+        <group delimiter="&#8195;">
+          <choose>
+            <if variable="container-title" type="paper-conference" match="none">
+              <text macro="book-volume"/>
+            </if>
+          </choose>
+          <choose>
+            <if type="patent">
+              <group delimiter=", ">
+                <choose>
+                  <!-- 专利的国别应使用 `jurisdiction`，但 Zotero 没有对应的域，所以 `publisher-place` 作为备选 -->
+                  <if variable="jurisdiction">
+                    <text variable="jurisdiction"/>
+                  </if>
+                  <else>
+                    <text variable="publisher-place"/>
+                  </else>
+                </choose>
+                <text variable="number"/>
+              </group>
+            </if>
+            <else-if type="bill legal_case legislation regulation report standard" match="any">
+              <text variable="number"/>
+            </else-if>
+          </choose>
+        </group>
+      </group>
+      <choose>
+        <if variable="container-title" type="paper-conference" match="none">
+          <choose>
+            <if variable="event-date">
+              <text variable="event-place"/>
+              <date variable="event-date" form="text"/>
+            </if>
+          </choose>
+        </if>
+      </choose>
+    </group>
+    <text macro="type-code" prefix="[" suffix="]"/>
+  </macro>
+  <!-- 文献类型标识 -->
+  <macro name="type-code">
+    <group delimiter="/">
+      <choose>
+        <if type="article">
+          <choose>
+            <if variable="archive">
+              <text value="A"/>
+            </if>
+            <else>
+              <text value="M"/>
+            </else>
+          </choose>
+        </if>
+        <else-if type="article-journal article-magazine periodical" match="any">
+          <text value="J"/>
+        </else-if>
+        <else-if type="article-newspaper">
+          <text value="N"/>
+        </else-if>
+        <else-if type="book chapter" match="any">
+          <text value="M"/>
+        </else-if>
+        <else-if type="dataset">
+          <text value="DB"/>
+        </else-if>
+        <else-if type="paper-conference">
+          <text value="C"/>
         </else-if>
-        <else-if type="webpage"/>
         <else-if type="patent">
-          <date variable="issued">
-            <date-part name="year"/>
-            <date-part name="month" form="numeric-leading-zeros" prefix="-"/>
-            <date-part name="day" form="numeric-leading-zeros" prefix="-"/>
-          </date>
+          <text value="P"/>
         </else-if>
-        <else-if variable="publisher">
-          <date variable="issued">
-            <date-part name="year"/>
-          </date>
+        <else-if type="post post-weblog webpage" match="any">
+          <text value="EB"/>
+        </else-if>
+        <else-if type="report">
+          <text value="R"/>
+        </else-if>
+        <else-if type="software">
+          <text value="CP"/>
+        </else-if>
+        <else-if type="standard">
+          <text value="S"/>
+        </else-if>
+        <else-if type="thesis">
+          <text value="D"/>
+        </else-if>
+        <else-if variable="URL">
+          <text value="EB"/>
         </else-if>
-        <else-if type="bill legislation" match="any"/>
         <else>
-          <date variable="issued">
-            <date-part name="year"/>
-          </date>
+          <text value="M"/>
         </else>
       </choose>
+      <choose>
+        <if variable="URL DOI" match="any">
+          <text value="OL"/>
+        </if>
+      </choose>
     </group>
-    <text variable="volume" prefix=", "/>
-    <text variable="issue" prefix="(" suffix=")"/>
-  </macro>
-  <macro name="pageField">
-    <text variable="page"/>
   </macro>
-  <macro name="referenceDate">
+  <!-- 获取和访问路径以及 DOI -->
+  <macro name="url-doi">
     <choose>
-      <if type="webpage">
-        <date variable="issued" prefix="(" suffix=")">
-          <date-part name="year"/>
-          <date-part name="month" form="numeric-leading-zeros" prefix="-"/>
-          <date-part name="day" form="numeric-leading-zeros" prefix="-"/>
-        </date>
-        <date variable="accessed" prefix="[" suffix="]">
-          <date-part name="year"/>
-          <date-part name="month" form="numeric-leading-zeros" prefix="-"/>
-          <date-part name="day" form="numeric-leading-zeros" prefix="-"/>
-        </date>
+      <if variable="URL">
+        <text variable="URL"/>
       </if>
+      <else>
+        <text variable="DOI" prefix="https://doi.org/"/>
+      </else>
     </choose>
   </macro>
-  <macro name="access">
+  <!-- 连续出版物的年卷期 -->
+  <macro name="year-volume-issue">
+    <group>
+      <group delimiter=", ">
+        <text macro="issued-year"/>
+        <text variable="volume"/>
+      </group>
+      <text variable="issue" prefix="(" suffix=")"/>
+    </group>
+  </macro>
+  <!-- 专著和电子资源 -->
+  <macro name="monograph-layout">
+    <group delimiter=". " suffix=".">
+      <text macro="author"/>
+      <text macro="title"/>
+      <text macro="secondary-contributor"/>
+      <text macro="edition"/>
+      <text macro="publishing"/>
+      <text macro="url-doi"/>
+    </group>
+  </macro>
+  <!-- 专著中的析出文献 -->
+  <macro name="chapter-in-book-layout">
+    <group delimiter=". " suffix=".">
+      <text macro="author"/>
+      <group delimiter="//">
+        <group delimiter=". ">
+          <text macro="title"/>
+          <text macro="secondary-contributor"/>
+        </group>
+        <group delimiter=". ">
+          <text macro="container-author"/>
+          <text macro="container-title"/>
+        </group>
+      </group>
+      <text macro="edition"/>
+      <text macro="publishing"/>
+      <text macro="url-doi"/>
+    </group>
+  </macro>
+  <!-- 连续出版物 -->
+  <macro name="serial-layout">
+    <group delimiter=". " suffix=".">
+      <text macro="author"/>
+      <text macro="title"/>
+      <text macro="year-volume-issue"/>
+      <text macro="publishing"/>
+      <text variable="URL"/>
+      <text variable="DOI" prefix="DOI:"/>
+    </group>
+  </macro>
+  <!-- 连续出版物中的析出文献 -->
+  <macro name="article-in-periodical-layout">
+    <group delimiter=". " suffix=".">
+      <text macro="author"/>
+      <text macro="title"/>
+      <text macro="periodical-publishing"/>
+      <text macro="url-doi"/>
+    </group>
+  </macro>
+  <!-- 专利文献 -->
+  <macro name="patent-layout">
+    <group delimiter=". " suffix=".">
+      <text macro="author"/>
+      <text macro="title"/>
+      <group>
+        <text macro="issued-date"/>
+        <text macro="accessed-date"/>
+      </group>
+      <text macro="url-doi"/>
+    </group>
+  </macro>
+  <!-- 正文中引用的文献标注格式 -->
+  <macro name="citation-layout">
+    <group>
+      <text variable="citation-number"/>
+    </group>
+  </macro>
+  <!-- 参考文献表格式 -->
+  <macro name="entry-layout">
     <choose>
-      <if variable="DOI">
-        <text variable="DOI" prefix="doi:"/>
+      <if type="article-journal article-magazine article-newspaper" match="any">
+        <text macro="article-in-periodical-layout"/>
       </if>
-      <else-if variable="URL">
-        <text variable="URL"/>
+      <else-if type="periodical">
+        <text macro="serial-layout"/>
+      </else-if>
+      <else-if type="patent">
+        <text macro="patent-layout"/>
+      </else-if>
+      <else-if type="paper-conference" variable="container-title" match="any">
+        <text macro="chapter-in-book-layout"/>
       </else-if>
+      <else>
+        <text macro="monograph-layout"/>
+      </else>
     </choose>
   </macro>
-  <citation collapse="citation-number">
-    <sort>
-      <key variable="citation-number" sort="ascending"/>
-    </sort>
-    <layout vertical-align="sup" prefix="[" suffix="]" delimiter=",">
-      <text variable="citation-number"/>
+  <citation collapse="citation-number" after-collapse-delimiter=",">
+    <layout vertical-align="sup" delimiter="," prefix="[" suffix="]">
+      <text macro="citation-layout"/>
     </layout>
   </citation>
-  <bibliography et-al-min="4" et-al-use-first="3" second-field-align="flush" entry-spacing="0">
-    <layout suffix=".">
+  <bibliography entry-spacing="0" et-al-min="4" et-al-use-first="3" second-field-align="flush">
+    <!-- 取消这部分注释可以使用 CSL-M 的功能支持双语 -->
+    <!-- <layout locale="en"><text variable="citation-number" prefix="[" suffix="]"/><text macro="entry-layout"/></layout> -->
+    <layout>
       <text variable="citation-number" prefix="[" suffix="]"/>
-      <text macro="author" suffix=". "/>
-      <text macro="titleField"/>
-      <text macro="secondaryAuthor" suffix=". "/>
-      <text variable="edition" prefix="第" suffix="版. "/>
-      <text macro="publisher"/>
-      <text macro="pageField" prefix=": "/>
-      <text macro="referenceDate"/>
-      <choose>
-        <if type="webpage" match="any">
-          <text macro="access" prefix=". "/>
-        </if>
-      </choose>
-      <text macro="recipient"/>
-      <text macro="interviewer"/>
-      <text macro="composer"/>
-      <text macro="original-author"/>
+      <text macro="entry-layout"/>
     </layout>
   </bibliography>
 </style>
diff --git a/buildres/csl/csl-styles/composer.json b/buildres/csl/csl-styles/composer.json
new file mode 100644
index 00000000000..7906f93ba75
--- /dev/null
+++ b/buildres/csl/csl-styles/composer.json
@@ -0,0 +1,13 @@
+{
+    "name": "citation-style-language/styles",
+    "description": "Citation Style Language (CSL) Styless",
+    "type": "library",
+    "license": "CC-BY-SA-3.0",
+    "homepage": "http://citationstyles.org/",
+    "authors": [
+        {
+            "name": "Citation Style Language (CSL) Team",
+            "homepage": "http://citationstyles.org/about/#Credits"
+        }
+    ]
+}
diff --git a/buildres/csl/csl-styles/copernicus-publications.csl b/buildres/csl/csl-styles/copernicus-publications.csl
index 1745d371a3f..018ec7cb15c 100644
--- a/buildres/csl/csl-styles/copernicus-publications.csl
+++ b/buildres/csl/csl-styles/copernicus-publications.csl
@@ -255,7 +255,7 @@
             <else-if type="article-journal" match="any">
               <group delimiter=", " prefix=" ">
                 <text variable="title"/>
-                <text variable="container-title-short"/>
+                <text variable="container-title" form="short"/>
                 <text variable="volume"/>
                 <text variable="page"/>
                 <text macro="doi"/>
diff --git a/buildres/csl/csl-styles/soft-robotics.csl b/buildres/csl/csl-styles/current-organic-synthesis.csl
similarity index 50%
rename from buildres/csl/csl-styles/soft-robotics.csl
rename to buildres/csl/csl-styles/current-organic-synthesis.csl
index 3cfd9f5e421..d2cae3f699e 100644
--- a/buildres/csl/csl-styles/soft-robotics.csl
+++ b/buildres/csl/csl-styles/current-organic-synthesis.csl
@@ -1,40 +1,73 @@
 <?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">
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" class="in-text" default-locale="en-US">
   <info>
-    <title>Soft Robotics</title>
-    <id>http://www.zotero.org/styles/soft-robotics</id>
-    <link href="http://www.zotero.org/styles/soft-robotics" rel="self"/>
+    <title>Current Organic Synthesis</title>
+    <title-short>COC</title-short>
+    <id>http://www.zotero.org/styles/current-organic-synthesis</id>
+    <link href="http://www.zotero.org/styles/current-organic-synthesis" rel="self"/>
     <link href="http://www.zotero.org/styles/american-chemical-society" rel="template"/>
-    <link href="https://home.liebertpub.com/publications/soft-robotics/616/for-authors" rel="documentation"/>
+    <link href="https://benthamscience.com/journal/manuscript-preparation.php?journalID=cos" rel="documentation"/>
     <author>
-      <name>Debkalpa Goswami</name>
+      <name>Kuldeep Singh</name>
+      <email>singhp@orgsyn.in</email>
     </author>
     <category citation-format="numeric"/>
-    <category field="engineering"/>
-    <issn>2169-5172</issn>
-    <eissn>2169-5180</eissn>
-    <updated>2018-02-04T05:18:06+00:00</updated>
+    <category field="chemistry"/>
+    <issn>1570-1794</issn>
+    <eissn>1875-6271</eissn>
+    <summary>current organic synthesis style</summary>
+    <updated>2022-07-11T08:07: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="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">
-      <name sort-separator=", " initialize-with=". " name-as-sort-order="all" delimiter="; " delimiter-precedes-last="always"/>
-      <et-al font-style="italic"/>
-      <label form="short" prefix=", " text-case="capitalize-first"/>
-    </names>
+    <group delimiter="; ">
+      <names variable="editor translator" delimiter="; ">
+        <name sort-separator=", " initialize-with=". " name-as-sort-order="all" delimiter=", " delimiter-precedes-last="always"/>
+        <label form="short" prefix=", " text-case="title"/>
+      </names>
+      <names variable="collection-editor">
+        <name sort-separator=", " initialize-with=". " name-as-sort-order="all" delimiter=", " delimiter-precedes-last="always"/>
+        <label form="short" prefix=", " text-case="title"/>
+      </names>
+    </group>
   </macro>
   <macro name="author">
     <names variable="author" suffix=".">
-      <name sort-separator=" " initialize-with="" name-as-sort-order="all" delimiter=", " delimiter-precedes-last="always"/>
-      <et-al font-style="italic"/>
+      <name sort-separator=", " initialize-with=". " name-as-sort-order="all" delimiter="; " delimiter-precedes-last="always"/>
       <label form="short" prefix=", " text-case="capitalize-first"/>
     </names>
   </macro>
   <macro name="publisher">
-    <group delimiter=": ">
-      <text variable="publisher"/>
-      <text variable="publisher-place"/>
-    </group>
+    <choose>
+      <if type="thesis" match="any">
+        <group delimiter=", ">
+          <text variable="publisher"/>
+          <text variable="publisher-place"/>
+        </group>
+      </if>
+      <else>
+        <group delimiter=": ">
+          <text variable="publisher"/>
+          <text variable="publisher-place"/>
+        </group>
+      </else>
+    </choose>
   </macro>
   <macro name="title">
     <choose>
@@ -56,18 +89,27 @@
     <text variable="collection-title"/>
   </macro>
   <macro name="pages">
-    <label variable="page" form="short" suffix=" "/>
+    <label variable="page" strip-periods="true" suffix=" " form="short"/>
     <text variable="page"/>
   </macro>
   <macro name="book-container">
-    <group delimiter=" ">
-      <text macro="title" suffix="."/>
-      <text term="in" text-case="capitalize-first"/>
-      <text variable="container-title" font-style="italic"/>
+    <group delimiter=". ">
+      <text macro="title"/>
+      <choose>
+        <if type="entry-dictionary entry-encyclopedia" match="none">
+          <group delimiter=" ">
+            <text term="in" text-case="capitalize-first"/>
+            <text variable="container-title" font-style="italic"/>
+          </group>
+        </if>
+        <else>
+          <text variable="container-title" font-style="italic"/>
+        </else>
+      </choose>
     </group>
   </macro>
   <macro name="issued">
-    <date variable="issued" delimiter=" ">
+    <date delimiter=" " variable="issued" font-weight="bold">
       <date-part name="year"/>
     </date>
   </macro>
@@ -96,24 +138,50 @@
       <key variable="citation-number"/>
     </sort>
     <layout delimiter="," vertical-align="sup">
-      <text variable="citation-number"/>
+      <text variable="citation-number" text-case="sentence" vertical-align="baseline" prefix="[" suffix="]"/>
     </layout>
   </citation>
-  <bibliography second-field-align="flush" entry-spacing="0" et-al-min="11" et-al-use-first="10">
+  <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-magazine">
+        <if type="article-journal review" match="any">
+          <group delimiter=" ">
+            <text macro="title" suffix="."/>
+            <text variable="container-title" font-style="italic" form="short"/>
+            <group delimiter=", ">
+              <text macro="issued" font-weight="bold"/>
+              <choose>
+                <if variable="volume">
+                  <group delimiter=" ">
+                    <text variable="volume" font-style="italic"/>
+                    <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"/>
-            <text macro="full-issued" suffix=","/>
-            <text macro="pages"/>
+            <group delimiter=", ">
+              <text macro="full-issued"/>
+              <text macro="pages"/>
+            </group>
           </group>
-        </if>
+        </else-if>
         <else-if type="thesis">
           <group delimiter=", ">
             <group delimiter=". ">
@@ -128,10 +196,12 @@
         </else-if>
         <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
           <group delimiter="; ">
-            <text macro="title"/>
+            <group delimiter=", ">
+              <text macro="title"/>
+              <text macro="edition"/>
+            </group>
             <text macro="editor" prefix=" "/>
             <text macro="series"/>
-            <text macro="edition"/>
             <choose>
               <if type="report">
                 <group delimiter=" ">
@@ -159,7 +229,7 @@
             <date variable="issued" form="text"/>
           </group>
         </else-if>
-        <else-if type="chapter paper-conference" match="any">
+        <else-if type="chapter paper-conference entry-dictionary entry-encyclopedia" match="any">
           <group delimiter="; ">
             <text macro="book-container"/>
             <text macro="editor"/>
@@ -175,29 +245,16 @@
           </group>
         </else-if>
         <else-if type="webpage">
-          <group delimiter=" ">
-            <text variable="title"/>
-            <text variable="URL"/>
-            <date variable="accessed" prefix="(accessed " suffix=")" delimiter=" ">
-              <date-part name="month" form="short" strip-periods="true"/>
-              <date-part name="day" suffix=", "/>
-              <date-part name="year"/>
-            </date>
-          </group>
-        </else-if>
-        <else-if type="article-journal">
           <group delimiter=". ">
-            <text macro="title" suffix="."/>
-            <text variable="container-title" form="short"/>
-            <group delimiter=";">
-              <text macro="issued"/>
-              <group delimiter="">
-                <text variable="volume"/>
-                <group delimiter=":">
-                  <text variable="issue" prefix="(" suffix=")"/>
-                  <text variable="page"/>
-                </group>
-              </group>
+            <text variable="title" font-style="italic"/>
+            <text variable="container-title"/>
+            <group delimiter=" ">
+              <text variable="URL"/>
+              <date variable="accessed" prefix="(accessed " suffix=")">
+                <date-part name="year"/>
+                <date-part name="month" prefix="-" form="numeric-leading-zeros"/>
+                <date-part name="day" prefix="-" form="numeric-leading-zeros"/>
+              </date>
             </group>
           </group>
         </else-if>
@@ -205,16 +262,17 @@
           <group delimiter=", ">
             <group delimiter=". ">
               <text macro="title"/>
-              <text variable="container-title"/>
+              <text variable="container-title" font-style="italic"/>
             </group>
             <group delimiter=", ">
               <text macro="issued"/>
-              <text variable="volume"/>
+              <text variable="volume" font-style="italic"/>
               <text variable="page"/>
             </group>
           </group>
         </else>
       </choose>
+      <text variable="DOI" prefix=". https://doi.org/"/>
     </layout>
   </bibliography>
 </style>
diff --git a/buildres/csl/csl-styles/cyberpsychology-behavior-and-social-networking.csl b/buildres/csl/csl-styles/cyberpsychology-behavior-and-social-networking.csl
deleted file mode 100644
index 4f220e7585e..00000000000
--- a/buildres/csl/csl-styles/cyberpsychology-behavior-and-social-networking.csl
+++ /dev/null
@@ -1,181 +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>Cyberpsychology, Behavior, and Social Networking</title>
-    <id>http://www.zotero.org/styles/cyberpsychology-behavior-and-social-networking</id>
-    <link href="http://www.zotero.org/styles/cyberpsychology-behavior-and-social-networking" rel="self"/>
-    <link href="http://www.zotero.org/styles/american-heart-association" rel="template"/>
-    <link href="http://www.liebertpub.com/forauthors/cyberpsychology-behavior-and-social-networking/10/" rel="documentation"/>
-    <author>
-      <name>Patrick O'Brien</name>
-    </author>
-    <category citation-format="numeric"/>
-    <category field="psychology"/>
-    <issn>2152-2715</issn>
-    <eissn>2152-2723</eissn>
-    <updated>2018-02-20T13:47: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>
-  <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="anon">
-    <text term="anonymous" form="short" text-case="capitalize-first" strip-periods="true"/>
-  </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=" " strip-periods="true"/>
-        <substitute>
-          <names variable="editor"/>
-          <text macro="anon"/>
-        </substitute>
-      </names>
-    </group>
-  </macro>
-  <macro name="title">
-    <choose>
-      <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
-        <text variable="title" font-style="italic"/>
-      </if>
-      <else>
-        <text variable="title"/>
-      </else>
-    </choose>
-  </macro>
-  <macro name="publisher">
-    <group delimiter=": ">
-      <text variable="publisher-place"/>
-      <text variable="publisher"/>
-    </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>
-  <macro name="date">
-    <choose>
-      <if type="article-journal" match="none">
-        <date date-parts="year" form="text" variable="issued" prefix="(" suffix=")"/>
-      </if>
-    </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="4" et-al-use-first="3" second-field-align="margin" entry-spacing="0">
-    <layout suffix=".">
-      <text variable="citation-number" suffix=". "/>
-      <text macro="author"/>
-      <text macro="date" prefix=" "/>
-      <text macro="title" prefix=" " suffix="."/>
-      <choose>
-        <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
-          <group suffix="." prefix=" " delimiter=" ">
-            <text macro="edition"/>
-            <text macro="editor" prefix="(" suffix=")"/>
-          </group>
-          <text prefix=" " macro="publisher"/>
-        </if>
-        <else-if type="chapter paper-conference" match="any">
-          <group prefix=" ">
-            <text term="in" text-case="capitalize-first" suffix=": "/>
-            <text macro="editor"/>
-            <text variable="container-title" font-style="italic" prefix=" " suffix="."/>
-            <text variable="volume" prefix="Vol " suffix="."/>
-            <text macro="edition" prefix=" "/>
-            <text variable="collection-title" prefix=" " suffix="."/>
-            <group delimiter=", ">
-              <text macro="publisher" prefix=" "/>
-              <group delimiter=" ">
-                <label variable="page" form="short"/>
-                <text variable="page"/>
-              </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="webpage post-weblog" match="any">
-          <group delimiter=" ">
-            <text variable="URL"/>
-            <group delimiter=" " prefix="(" suffix=")">
-              <text term="accessed"/>
-              <date variable="accessed">
-                <date-part name="month" form="short"/>
-                <date-part name="day"/>
-                <date-part name="year" prefix=" "/>
-              </date>
-            </group>
-          </group>
-        </else-if>
-        <else>
-          <text macro="editor" prefix=" " suffix="."/>
-          <group prefix=" ">
-            <text variable="container-title" font-style="italic"/>
-            <group delimiter="; " prefix=" ">
-              <date variable="issued">
-                <date-part name="year"/>
-              </date>
-              <text variable="volume"/>
-            </group>
-            <text variable="page" prefix=":"/>
-          </group>
-        </else>
-      </choose>
-    </layout>
-  </bibliography>
-</style>
diff --git a/buildres/csl/csl-styles/dependent/3d-printing-and-additive-manufacturing.csl b/buildres/csl/csl-styles/dependent/3d-printing-and-additive-manufacturing.csl
new file mode 100644
index 00000000000..b89d09e8d2c
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/3d-printing-and-additive-manufacturing.csl
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>3D Printing and Additive Manufacturing</title>
+	  <title-short>3DP</title-short>
+    <id>http://www.zotero.org/styles/3d-printing-and-additive-manufacturing</id>
+    <link href="http://www.zotero.org/styles/3d-printing-and-additive-manufacturing" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-vancouver" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="engineering"/>
+    <issn>2329-7662</issn>
+    <eissn>2329-7670</eissn>
+    <updated>2022-03-05T12: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/acta-psychiatrica-scandinavica.csl b/buildres/csl/csl-styles/dependent/acta-psychiatrica-scandinavica.csl
new file mode 100644
index 00000000000..040fbbf3f19
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/acta-psychiatrica-scandinavica.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">
+  <info>
+    <title>Acta Psychiatrica Scandinavica</title>
+    <id>http://www.zotero.org/styles/acta-psychiatrica-scandinavica</id>
+    <link href="http://www.zotero.org/styles/acta-psychiatrica-scandinavica" rel="self"/>
+    <link href="http://www.zotero.org/styles/american-medical-association" rel="independent-parent"/>
+    <link href="hhttps://onlinelibrary.wiley.com/page/journal/16000447/homepage/ForAuthors.html#preparing" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="medicine"/>
+    <issn>0001-690X</issn>
+    <eissn>1600-0447</eissn>
+    <updated>2022-02-02T00: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/advanced-theory-and-simulations.csl b/buildres/csl/csl-styles/dependent/advanced-theory-and-simulations.csl
new file mode 100644
index 00000000000..f8f608b7919
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/advanced-theory-and-simulations.csl
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <info>
+    <title>Advanced Theory and Simulations</title>
+    <id>http://www.zotero.org/styles/advanced-theory-and-simulations</id>
+    <link href="http://www.zotero.org/styles/advanced-theory-and-simulations" rel="self"/>
+    <link href="http://www.zotero.org/styles/advanced-materials" rel="independent-parent"/>
+    <link href="https://onlinelibrary.wiley.com/page/journal/25130390/homepage/author-guidelines" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="physics"/>
+    <issn>2513-0390</issn>
+    <updated>2022-06-22T12: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/advances-in-wound-care.csl b/buildres/csl/csl-styles/dependent/advances-in-wound-care.csl
new file mode 100644
index 00000000000..4870d0c0a11
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/advances-in-wound-care.csl
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Advances in Wound Care</title>
+	  <title-short>WOUND</title-short>
+    <id>http://www.zotero.org/styles/advances-in-wound-care</id>
+    <link href="http://www.zotero.org/styles/advances-in-wound-care" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-vancouver" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="medicine"/>
+    <issn>2162-1918</issn>
+    <eissn>2162-1934</eissn>
+    <updated>2022-03-05T12: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/aids-patient-care-and-stds.csl b/buildres/csl/csl-styles/dependent/aids-patient-care-and-stds.csl
new file mode 100644
index 00000000000..25b2a92ed83
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/aids-patient-care-and-stds.csl
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>AIDS Patient Care and STDs</title>
+	  <title-short>APC</title-short>
+    <id>http://www.zotero.org/styles/aids-patient-care-and-stds</id>
+    <link href="http://www.zotero.org/styles/aids-patient-care-and-stds" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-vancouver" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="medicine"/>
+    <issn>1087-2914</issn>
+    <eissn>1557-7449</eissn>
+    <updated>2022-03-05T12: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/aids-research-and-human-retroviruses.csl b/buildres/csl/csl-styles/dependent/aids-research-and-human-retroviruses.csl
new file mode 100644
index 00000000000..3c24a7d6a7e
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/aids-research-and-human-retroviruses.csl
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>AIDS Research and Human Retroviruses</title>
+	  <title-short>AID</title-short>
+    <id>http://www.zotero.org/styles/aids-research-and-human-retroviruses</id>
+    <link href="http://www.zotero.org/styles/aids-research-and-human-retroviruses" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-vancouver" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="medicine"/>
+    <issn>0889-2229</issn>
+    <eissn>1931-8405</eissn>
+    <updated>2022-03-05T12: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/androgens-clinical-research-and-therapeutics.csl b/buildres/csl/csl-styles/dependent/androgens-clinical-research-and-therapeutics.csl
new file mode 100644
index 00000000000..c6e479a339a
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/androgens-clinical-research-and-therapeutics.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">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Androgens: Clinical Research and Therapeutics</title>
+	  <title-short>ANDRO</title-short>
+    <id>http://www.zotero.org/styles/androgens-clinical-research-and-therapeutics</id>
+    <link href="http://www.zotero.org/styles/androgens-clinical-research-and-therapeutics" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-vancouver" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="medicine"/>
+    <eissn>2689-4653</eissn>
+    <updated>2022-03-05T12: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/annals-of-allergy-asthma-and-immunology.csl b/buildres/csl/csl-styles/dependent/annals-of-allergy-asthma-and-immunology.csl
deleted file mode 100644
index 12086db4e67..00000000000
--- a/buildres/csl/csl-styles/dependent/annals-of-allergy-asthma-and-immunology.csl
+++ /dev/null
@@ -1,14 +0,0 @@
-<?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 -->
-  <info>
-    <title>Annals of Allergy, Asthma &amp; Immunology</title>
-    <id>http://www.zotero.org/styles/annals-of-allergy-asthma-and-immunology</id>
-    <link href="http://www.zotero.org/styles/annals-of-allergy-asthma-and-immunology" rel="self"/>
-    <link href="http://www.zotero.org/styles/american-medical-association" rel="independent-parent"/>
-    <category citation-format="numeric"/>
-    <issn>1081-1206</issn>
-    <updated>2018-02-16T12: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/antioxidants-and-redox-signaling.csl b/buildres/csl/csl-styles/dependent/antioxidants-and-redox-signaling.csl
new file mode 100644
index 00000000000..2794a677147
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/antioxidants-and-redox-signaling.csl
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Antioxidants and Redox Signaling</title>
+	  <title-short>ARS</title-short>
+    <id>http://www.zotero.org/styles/antioxidants-and-redox-signaling</id>
+    <link href="http://www.zotero.org/styles/antioxidants-and-redox-signaling" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-harvard" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
+    <category citation-format="author-date"/>
+    <category field="biology"/>
+    <issn>1523-0864</issn>
+    <eissn>1557-7716</eissn>
+    <updated>2022-03-05T12: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/applied-biosafety.csl b/buildres/csl/csl-styles/dependent/applied-biosafety.csl
new file mode 100644
index 00000000000..5e71a18c6d5
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/applied-biosafety.csl
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Applied Biosafety</title>
+	  <title-short>APB</title-short>
+    <id>http://www.zotero.org/styles/applied-biosafety</id>
+    <link href="http://www.zotero.org/styles/applied-biosafety" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-vancouver" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="science"/>
+    <issn>1535-6760</issn>
+    <eissn>2470-1246</eissn>
+    <updated>2022-03-05T12: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/applied-in-vitro-toxicology.csl b/buildres/csl/csl-styles/dependent/applied-in-vitro-toxicology.csl
new file mode 100644
index 00000000000..68a2dfd67dc
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/applied-in-vitro-toxicology.csl
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Applied In Vitro Toxicology</title>
+	  <title-short>AIVT</title-short>
+    <id>http://www.zotero.org/styles/applied-in-vitro-toxicology</id>
+    <link href="http://www.zotero.org/styles/applied-in-vitro-toxicology" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-vancouver" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="biology"/>
+    <issn>2332-1512</issn>
+    <eissn>2332-1539</eissn>
+    <updated>2022-03-05T12: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/assay-and-drug-development-technologies.csl b/buildres/csl/csl-styles/dependent/assay-and-drug-development-technologies.csl
new file mode 100644
index 00000000000..d7350bbd45c
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/assay-and-drug-development-technologies.csl
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>ASSAY and Drug Development Technologies</title>
+	  <title-short>ADT</title-short>
+    <id>http://www.zotero.org/styles/assay-and-drug-development-technologies</id>
+    <link href="http://www.zotero.org/styles/assay-and-drug-development-technologies" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-vancouver" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="biology"/>
+    <issn>1540-658X</issn>
+    <eissn>1557-8127</eissn>
+    <updated>2022-03-05T12: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/astrobiology.csl b/buildres/csl/csl-styles/dependent/astrobiology.csl
new file mode 100644
index 00000000000..5e6cfac0e3a
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/astrobiology.csl
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Astrobiology</title>
+	  <title-short>AST</title-short>
+    <id>http://www.zotero.org/styles/astrobiology</id>
+    <link href="http://www.zotero.org/styles/astrobiology" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-harvard" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
+    <category citation-format="author-date"/>
+    <category field="biology"/>
+    <issn>1531-1074</issn>
+    <eissn>1557-8070</eissn>
+    <updated>2022-03-05T12: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/autism-in-adulthood.csl b/buildres/csl/csl-styles/dependent/autism-in-adulthood.csl
new file mode 100644
index 00000000000..a42d34b9101
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/autism-in-adulthood.csl
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Autism in Adulthood</title>
+	  <title-short>AUT</title-short>
+    <id>http://www.zotero.org/styles/autism-in-adulthood</id>
+    <link href="http://www.zotero.org/styles/autism-in-adulthood" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-vancouver" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="science"/>
+    <issn>2573-9581</issn>
+    <eissn>2573-959X</eissn>
+    <updated>2022-03-05T12: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/avian-research.csl b/buildres/csl/csl-styles/dependent/avian-research.csl
index 3ca017cd9d3..0c4ca1bcf24 100644
--- a/buildres/csl/csl-styles/dependent/avian-research.csl
+++ b/buildres/csl/csl-styles/dependent/avian-research.csl
@@ -1,16 +1,15 @@
 <?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 -->
   <info>
     <title>Avian Research</title>
     <id>http://www.zotero.org/styles/avian-research</id>
     <link href="http://www.zotero.org/styles/avian-research" rel="self"/>
-    <link href="http://www.zotero.org/styles/springer-vancouver-author-date" 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/elsevier-harvard2" rel="independent-parent"/>
+    <link href="https://www.keaipublishing.com/en/journals/avian-research/guide-for-authors/" rel="documentation"/>
     <category citation-format="author-date"/>
+    <issn>2055-6187</issn>
     <eissn>2053-7166</eissn>
-    <updated>2014-05-15T12:00:00+00:00</updated>
+    <updated>2022-05-27T12: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/bariatric-surgical-practice-and-patient-care.csl b/buildres/csl/csl-styles/dependent/bariatric-surgical-practice-and-patient-care.csl
new file mode 100644
index 00000000000..ce5e10bdf41
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/bariatric-surgical-practice-and-patient-care.csl
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Bariatric Surgical Practice and Patient Care</title>
+	  <title-short>BARI</title-short>
+    <id>http://www.zotero.org/styles/bariatric-surgical-practice-and-patient-care</id>
+    <link href="http://www.zotero.org/styles/bariatric-surgical-practice-and-patient-care" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-vancouver" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="medicine"/>
+    <issn>2168-023X</issn>
+    <eissn>2168-0248</eissn>
+    <updated>2022-03-05T12: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/big-data.csl b/buildres/csl/csl-styles/dependent/big-data.csl
new file mode 100644
index 00000000000..986c7fcf8f0
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/big-data.csl
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Big Data</title>
+	  <title-short>BIG</title-short>
+    <id>http://www.zotero.org/styles/big-data</id>
+    <link href="http://www.zotero.org/styles/big-data" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-vancouver" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="engineering"/>
+    <issn>2167-6461</issn>
+    <eissn>2167-647X</eissn>
+    <updated>2022-03-05T12: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/bioelectricity.csl b/buildres/csl/csl-styles/dependent/bioelectricity.csl
new file mode 100644
index 00000000000..cadacc211cf
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/bioelectricity.csl
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Bioelectricity</title>
+	  <title-short>BIOE</title-short>
+    <id>http://www.zotero.org/styles/bioelectricity</id>
+    <link href="http://www.zotero.org/styles/bioelectricity" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-vancouver" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="biology"/>
+    <issn>2576-3105</issn>
+    <eissn>2576-3113</eissn>
+    <updated>2022-03-05T12: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/biopreservation-and-biobanking.csl b/buildres/csl/csl-styles/dependent/biopreservation-and-biobanking.csl
new file mode 100644
index 00000000000..8fb98e97302
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/biopreservation-and-biobanking.csl
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Biopreservation and Biobanking</title>
+	  <title-short>BIO</title-short>
+    <id>http://www.zotero.org/styles/biopreservation-and-biobanking</id>
+    <link href="http://www.zotero.org/styles/biopreservation-and-biobanking" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-vancouver" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="biology"/>
+    <issn>1947-5535</issn>
+    <eissn>1947-5543</eissn>
+    <updated>2022-03-05T12: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/brain-connectivity.csl b/buildres/csl/csl-styles/dependent/brain-connectivity.csl
new file mode 100644
index 00000000000..a8098841992
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/brain-connectivity.csl
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Brain Connectivity</title>
+	  <title-short>BRAIN</title-short>
+    <id>http://www.zotero.org/styles/brain-connectivity</id>
+    <link href="http://www.zotero.org/styles/brain-connectivity" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-harvard" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
+    <category citation-format="author-date"/>
+    <category field="biology"/>
+    <issn>2158-0014</issn>
+    <eissn>2158-0022</eissn>
+    <updated>2022-03-05T12: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/breastfeeding-medicine.csl b/buildres/csl/csl-styles/dependent/breastfeeding-medicine.csl
new file mode 100644
index 00000000000..98986465c08
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/breastfeeding-medicine.csl
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Breastfeeding Medicine</title>
+	  <title-short>BFM</title-short>
+    <id>http://www.zotero.org/styles/breastfeeding-medicine</id>
+    <link href="http://www.zotero.org/styles/breastfeeding-medicine" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-vancouver" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="medicine"/>
+    <issn>1556-8253</issn>
+    <eissn>1556-8342</eissn>
+    <updated>2022-03-05T12: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/cancer-biotherapy-and-radiopharmaceuticals.csl b/buildres/csl/csl-styles/dependent/cancer-biotherapy-and-radiopharmaceuticals.csl
new file mode 100644
index 00000000000..2f85ff23fe1
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/cancer-biotherapy-and-radiopharmaceuticals.csl
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Cancer Biotherapy and Radiopharmaceuticals</title>
+	  <title-short>CBR</title-short>
+    <id>http://www.zotero.org/styles/cancer-biotherapy-and-radiopharmaceuticals</id>
+    <link href="http://www.zotero.org/styles/cancer-biotherapy-and-radiopharmaceuticals" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-vancouver" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="medicine"/>
+    <issn>1084-9785</issn>
+    <eissn>1557-8852</eissn>
+    <updated>2022-03-05T12: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/cannabis-and-cannabinoid-research.csl b/buildres/csl/csl-styles/dependent/cannabis-and-cannabinoid-research.csl
new file mode 100644
index 00000000000..e56901b2d39
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/cannabis-and-cannabinoid-research.csl
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Cannabis and Cannabinoid Research</title>
+	  <title-short>CAN</title-short>
+    <id>http://www.zotero.org/styles/cannabis-and-cannabinoid-research</id>
+    <link href="http://www.zotero.org/styles/cannabis-and-cannabinoid-research" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-vancouver" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="medicine"/>
+    <issn>2578-5125</issn>
+    <eissn>2378-8763</eissn>
+    <updated>2022-03-05T12: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/cellular-reprogramming.csl b/buildres/csl/csl-styles/dependent/cellular-reprogramming.csl
new file mode 100644
index 00000000000..9342d6f1a86
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/cellular-reprogramming.csl
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Cellular Reprogramming</title>
+	  <title-short>CELL</title-short>
+    <id>http://www.zotero.org/styles/cellular-reprogramming</id>
+    <link href="http://www.zotero.org/styles/cellular-reprogramming" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-harvard" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
+    <category citation-format="author-date"/>
+    <category field="biology"/>
+    <issn>2152-4971</issn>
+    <eissn>2152-4998</eissn>
+    <updated>2022-03-05T12: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/childhood-obesity.csl b/buildres/csl/csl-styles/dependent/childhood-obesity.csl
new file mode 100644
index 00000000000..0a7d44b786a
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/childhood-obesity.csl
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Childhood Obesity</title>
+	  <title-short>CHI</title-short>
+    <id>http://www.zotero.org/styles/childhood-obesity</id>
+    <link href="http://www.zotero.org/styles/childhood-obesity" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-vancouver" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="medicine"/>
+    <issn>2153-2168</issn>
+    <eissn>2153-2176</eissn>
+    <updated>2022-03-05T12: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/cyberpsychology-behavior-and-social-networking.csl b/buildres/csl/csl-styles/dependent/cyberpsychology-behavior-and-social-networking.csl
new file mode 100644
index 00000000000..13c9f3ccf2b
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/cyberpsychology-behavior-and-social-networking.csl
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Cyberpsychology, Behavior, and Social Networking</title>
+	  <title-short>CYBER</title-short>
+    <id>http://www.zotero.org/styles/cyberpsychology-behavior-and-social-networking</id>
+    <link href="http://www.zotero.org/styles/cyberpsychology-behavior-and-social-networking" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-vancouver" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="science"/>
+    <issn>2152-2715</issn>
+    <eissn>2152-2723</eissn>
+    <updated>2022-03-05T12: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/diabetes-technology-and-therapeutics.csl b/buildres/csl/csl-styles/dependent/diabetes-technology-and-therapeutics.csl
new file mode 100644
index 00000000000..6b55d34e5a6
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/diabetes-technology-and-therapeutics.csl
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Diabetes Technology and Therapeutics</title>
+	  <title-short>DTT</title-short>
+    <id>http://www.zotero.org/styles/diabetes-technology-and-therapeutics</id>
+    <link href="http://www.zotero.org/styles/diabetes-technology-and-therapeutics" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-vancouver" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="medicine"/>
+    <issn>1520-9156</issn>
+    <eissn>1557-8593</eissn>
+    <updated>2022-03-05T12: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/dna-and-cell-biology.csl b/buildres/csl/csl-styles/dependent/dna-and-cell-biology.csl
new file mode 100644
index 00000000000..dca293b4adc
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/dna-and-cell-biology.csl
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>DNA and Cell Biology</title>
+	  <title-short>DNA</title-short>
+    <id>http://www.zotero.org/styles/dna-and-cell-biology</id>
+    <link href="http://www.zotero.org/styles/dna-and-cell-biology" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-harvard" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
+    <category citation-format="author-date"/>
+    <category field="biology"/>
+    <issn>1044-5498</issn>
+    <eissn>1557-7430</eissn>
+    <updated>2022-03-05T12: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/ecopsychology.csl b/buildres/csl/csl-styles/dependent/ecopsychology.csl
new file mode 100644
index 00000000000..c4f6a191cd6
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/ecopsychology.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">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Ecopsychology</title>
+	  <title-short>ECO</title-short>
+    <id>http://www.zotero.org/styles/ecopsychology</id>
+    <link href="http://www.zotero.org/styles/ecopsychology" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-harvard" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
+    <category citation-format="author-date"/>
+    <category field="science"/>
+    <eissn>1942-9347</eissn>
+    <updated>2022-03-05T12: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/election-law-journal.csl b/buildres/csl/csl-styles/dependent/election-law-journal.csl
new file mode 100644
index 00000000000..4d21d5147b6
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/election-law-journal.csl
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Election Law Journal</title>
+	  <title-short>ELJ</title-short>
+    <id>http://www.zotero.org/styles/election-law-journal</id>
+    <link href="http://www.zotero.org/styles/election-law-journal" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-harvard" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
+    <category citation-format="author-date"/>
+    <category field="law"/>
+    <issn>1533-1296</issn>
+    <eissn>1557-8062</eissn>
+    <updated>2022-03-05T12: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/environmental-engineering-science.csl b/buildres/csl/csl-styles/dependent/environmental-engineering-science.csl
new file mode 100644
index 00000000000..e4eee625c92
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/environmental-engineering-science.csl
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Environmental Engineering Science</title>
+	  <title-short>EES</title-short>
+    <id>http://www.zotero.org/styles/environmental-engineering-science</id>
+    <link href="http://www.zotero.org/styles/environmental-engineering-science" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-harvard" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
+    <category citation-format="author-date"/>
+    <category field="science"/>
+    <issn>1092-8758</issn>
+    <eissn>1557-9018</eissn>
+    <updated>2022-03-05T12: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/foodborne-pathogens-and-disease.csl b/buildres/csl/csl-styles/dependent/foodborne-pathogens-and-disease.csl
new file mode 100644
index 00000000000..a72d86a41c7
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/foodborne-pathogens-and-disease.csl
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Foodborne Pathogens and Disease</title>
+	  <title-short>FPD</title-short>
+    <id>http://www.zotero.org/styles/foodborne-pathogens-and-disease</id>
+    <link href="http://www.zotero.org/styles/foodborne-pathogens-and-disease" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-harvard" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
+    <category citation-format="author-date"/>
+    <category field="biology"/>
+    <issn>1535-3141</issn>
+    <eissn>1556-7125</eissn>
+    <updated>2022-03-05T12: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/forensic-genomics.csl b/buildres/csl/csl-styles/dependent/forensic-genomics.csl
new file mode 100644
index 00000000000..f04696afb2f
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/forensic-genomics.csl
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Forensic Genomics</title>
+	  <title-short>FORENSIC</title-short>
+    <id>http://www.zotero.org/styles/forensic-genomics</id>
+    <link href="http://www.zotero.org/styles/forensic-genomics" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-vancouver" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="biology"/>
+    <issn>2690-8956</issn>
+    <eissn>2690-8964</eissn>
+    <updated>2022-03-05T12: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/games-for-health-journal.csl b/buildres/csl/csl-styles/dependent/games-for-health-journal.csl
new file mode 100644
index 00000000000..b019efd48c1
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/games-for-health-journal.csl
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Games for Health Journal</title>
+	  <title-short>G4H</title-short>
+    <id>http://www.zotero.org/styles/games-for-health-journal</id>
+    <link href="http://www.zotero.org/styles/games-for-health-journal" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-vancouver" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="science"/>
+    <issn>2161-783X</issn>
+    <eissn>2161-7856</eissn>
+    <updated>2022-03-05T12: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/gen-biotechnology.csl b/buildres/csl/csl-styles/dependent/gen-biotechnology.csl
new file mode 100644
index 00000000000..f2654c1a580
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/gen-biotechnology.csl
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Gen BioTechnology</title>
+	  <title-short>GENBIO</title-short>
+    <id>http://www.zotero.org/styles/gen-biotechnology</id>
+    <link href="http://www.zotero.org/styles/gen-biotechnology" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-vancouver" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="biology"/>
+    <issn>2768-1556</issn>
+    <eissn>2768-1572</eissn>
+    <updated>2022-03-05T12: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/genetic-testing-and-molecular-biomarkers.csl b/buildres/csl/csl-styles/dependent/genetic-testing-and-molecular-biomarkers.csl
new file mode 100644
index 00000000000..a522efdc8b6
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/genetic-testing-and-molecular-biomarkers.csl
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Genetic Testing and Molecular Biomarkers</title>
+	  <title-short>GTMB</title-short>
+    <id>http://www.zotero.org/styles/genetic-testing-and-molecular-biomarkers</id>
+    <link href="http://www.zotero.org/styles/genetic-testing-and-molecular-biomarkers" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-harvard" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
+    <category citation-format="author-date"/>
+    <category field="biology"/>
+    <issn>1945-0265</issn>
+    <eissn>1945-0257</eissn>
+    <updated>2022-03-05T12: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/health-equity.csl b/buildres/csl/csl-styles/dependent/health-equity.csl
new file mode 100644
index 00000000000..a74e179321a
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/health-equity.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">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Health Equity</title>
+	  <title-short>HEQ</title-short>
+    <id>http://www.zotero.org/styles/health-equity</id>
+    <link href="http://www.zotero.org/styles/health-equity" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-vancouver" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="medicine"/>
+    <eissn>2473-1242</eissn>
+    <updated>2022-03-05T12: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/high-altitude-medicine-and-biology.csl b/buildres/csl/csl-styles/dependent/high-altitude-medicine-and-biology.csl
new file mode 100644
index 00000000000..c9c6c3dde75
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/high-altitude-medicine-and-biology.csl
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>High Altitude Medicine &amp; Biology</title>
+	  <title-short>HAM</title-short>
+    <id>http://www.zotero.org/styles/high-altitude-medicine-and-biology</id>
+    <link href="http://www.zotero.org/styles/high-altitude-medicine-and-biology" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-harvard" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
+    <category citation-format="author-date"/>
+    <category field="medicine"/>
+    <issn>1527-0297</issn>
+    <eissn>1557-8682</eissn>
+    <updated>2022-03-05T12: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/human-gene-therapy-clinical-development.csl b/buildres/csl/csl-styles/dependent/human-gene-therapy-clinical-development.csl
index 5dfb91945c6..a25a62f1107 100644
--- a/buildres/csl/csl-styles/dependent/human-gene-therapy-clinical-development.csl
+++ b/buildres/csl/csl-styles/dependent/human-gene-therapy-clinical-development.csl
@@ -4,7 +4,7 @@
     <title>Human Gene Therapy Clinical Development</title>
     <id>http://www.zotero.org/styles/human-gene-therapy-clinical-development</id>
     <link href="http://www.zotero.org/styles/human-gene-therapy-clinical-development" rel="self"/>
-    <link href="http://www.zotero.org/styles/human-gene-therapy" rel="independent-parent"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-vancouver" rel="independent-parent"/>
     <link href="http://www.liebertpub.com/forauthors/human-gene-therapy/19/" rel="documentation"/>
     <category citation-format="numeric"/>
     <category field="biology"/>
diff --git a/buildres/csl/csl-styles/dependent/human-gene-therapy-methods.csl b/buildres/csl/csl-styles/dependent/human-gene-therapy-methods.csl
index 0fba1d2448d..34606c6b0d4 100644
--- a/buildres/csl/csl-styles/dependent/human-gene-therapy-methods.csl
+++ b/buildres/csl/csl-styles/dependent/human-gene-therapy-methods.csl
@@ -4,7 +4,7 @@
     <title>Human Gene Therapy Methods</title>
     <id>http://www.zotero.org/styles/human-gene-therapy-methods</id>
     <link href="http://www.zotero.org/styles/human-gene-therapy-methods" rel="self"/>
-    <link href="http://www.zotero.org/styles/human-gene-therapy" rel="independent-parent"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-vancouver" rel="independent-parent"/>
     <link href="http://www.liebertpub.com/forauthors/human-gene-therapy/19/" rel="documentation"/>
     <category citation-format="numeric"/>
     <category field="biology"/>
diff --git a/buildres/csl/csl-styles/dependent/human-gene-therapy.csl b/buildres/csl/csl-styles/dependent/human-gene-therapy.csl
new file mode 100644
index 00000000000..3c9363616fb
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/human-gene-therapy.csl
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Human Gene Therapy</title>
+	  <title-short>HUM</title-short>
+    <id>http://www.zotero.org/styles/human-gene-therapy</id>
+    <link href="http://www.zotero.org/styles/human-gene-therapy" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-vancouver" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="biology"/>
+    <issn>1043-0342</issn>
+    <eissn>1557-7422</eissn>
+    <updated>2022-03-05T12: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/industrial-biotechnology.csl b/buildres/csl/csl-styles/dependent/industrial-biotechnology.csl
new file mode 100644
index 00000000000..7fd16c091cd
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/industrial-biotechnology.csl
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Industrial Biotechnology</title>
+	  <title-short>IND</title-short>
+    <id>http://www.zotero.org/styles/industrial-biotechnology</id>
+    <link href="http://www.zotero.org/styles/industrial-biotechnology" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-vancouver" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="engineering"/>
+    <issn>1550-9087</issn>
+    <eissn>1931-8421</eissn>
+    <updated>2022-03-05T12: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/integrative-and-complementary-therapies.csl b/buildres/csl/csl-styles/dependent/integrative-and-complementary-therapies.csl
new file mode 100644
index 00000000000..8e3382c084d
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/integrative-and-complementary-therapies.csl
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Integrative and Complementary Therapies</title>
+	  <title-short>ICT</title-short>
+    <id>http://www.zotero.org/styles/integrative-and-complementary-therapies</id>
+    <link href="http://www.zotero.org/styles/integrative-and-complementary-therapies" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-vancouver" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="medicine"/>
+    <issn>2768-3192</issn>
+    <eissn>2768-3206</eissn>
+    <updated>2022-03-05T12: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/integrative-medicine-reports.csl b/buildres/csl/csl-styles/dependent/integrative-medicine-reports.csl
new file mode 100644
index 00000000000..a2fac554108
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/integrative-medicine-reports.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">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Integrative Medicine Reports</title>
+	  <title-short>IMR</title-short>
+    <id>http://www.zotero.org/styles/integrative-medicine-reports</id>
+    <link href="http://www.zotero.org/styles/integrative-medicine-reports" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-vancouver" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="medicine"/>
+    <eissn>2768-3222</eissn>
+    <updated>2022-03-05T12: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/journal-of-adolescent-and-young-adult-oncology.csl b/buildres/csl/csl-styles/dependent/journal-of-adolescent-and-young-adult-oncology.csl
new file mode 100644
index 00000000000..85000b0a536
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/journal-of-adolescent-and-young-adult-oncology.csl
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Journal of Adolescent and Young Adult Oncology</title>
+	  <title-short>JAYAO</title-short>
+    <id>http://www.zotero.org/styles/journal-of-adolescent-and-young-adult-oncology</id>
+    <link href="http://www.zotero.org/styles/journal-of-adolescent-and-young-adult-oncology" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-vancouver" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="medicine"/>
+    <issn>2156-5333</issn>
+    <eissn>2156-535X</eissn>
+    <updated>2022-03-05T12: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/journal-of-aerosol-medicine-and-pulmonary-drug-delivery.csl b/buildres/csl/csl-styles/dependent/journal-of-aerosol-medicine-and-pulmonary-drug-delivery.csl
new file mode 100644
index 00000000000..197a4ad1fe8
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/journal-of-aerosol-medicine-and-pulmonary-drug-delivery.csl
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Journal of Aerosol Medicine and Pulmonary Drug Delivery</title>
+	  <title-short>JAMP</title-short>
+    <id>http://www.zotero.org/styles/journal-of-aerosol-medicine-and-pulmonary-drug-delivery</id>
+    <link href="http://www.zotero.org/styles/journal-of-aerosol-medicine-and-pulmonary-drug-delivery" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-vancouver" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="medicine"/>
+    <issn>1941-2711</issn>
+    <eissn>1941-2703</eissn>
+    <updated>2022-03-05T12: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/journal-of-child-and-adolescent-psychopharmacology.csl b/buildres/csl/csl-styles/dependent/journal-of-child-and-adolescent-psychopharmacology.csl
new file mode 100644
index 00000000000..dbd4a26adf8
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/journal-of-child-and-adolescent-psychopharmacology.csl
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Journal of Child and Adolescent Psychopharmacology</title>
+	  <title-short>JCAP</title-short>
+    <id>http://www.zotero.org/styles/journal-of-child-and-adolescent-psychopharmacology</id>
+    <link href="http://www.zotero.org/styles/journal-of-child-and-adolescent-psychopharmacology" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-harvard" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
+    <category citation-format="author-date"/>
+    <category field="medicine"/>
+    <issn>1044-5463</issn>
+    <eissn>1557-8992</eissn>
+    <updated>2022-03-05T12: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/journal-of-computational-biology.csl b/buildres/csl/csl-styles/dependent/journal-of-computational-biology.csl
new file mode 100644
index 00000000000..2625374e02e
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/journal-of-computational-biology.csl
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Journal of Computational Biology</title>
+	  <title-short>CMB</title-short>
+    <id>http://www.zotero.org/styles/journal-of-computational-biology</id>
+    <link href="http://www.zotero.org/styles/journal-of-computational-biology" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-harvard" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
+    <category citation-format="author-date"/>
+    <category field="biology"/>
+    <issn>1066-5277</issn>
+    <eissn>1557-8666</eissn>
+    <updated>2022-03-05T12: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/journal-of-correctional-healthcare.csl b/buildres/csl/csl-styles/dependent/journal-of-correctional-healthcare.csl
new file mode 100644
index 00000000000..d28880986cd
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/journal-of-correctional-healthcare.csl
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Journal of Correctional Healthcare</title>
+	  <title-short>JCHC</title-short>
+    <id>http://www.zotero.org/styles/journal-of-correctional-healthcare</id>
+    <link href="http://www.zotero.org/styles/journal-of-correctional-healthcare" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-vancouver" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="medicine"/>
+    <issn>1078-3458</issn>
+    <eissn>1940-5200</eissn>
+    <updated>2022-03-05T12: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/journal-of-endourology-part-b-videourology.csl b/buildres/csl/csl-styles/dependent/journal-of-endourology-part-b-videourology.csl
new file mode 100644
index 00000000000..6339b4a648f
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/journal-of-endourology-part-b-videourology.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">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Journal of Endourology, Part B: Videourology</title>
+	  <title-short>VID</title-short>
+    <id>http://www.zotero.org/styles/journal-of-endourology-part-b-videourology</id>
+    <link href="http://www.zotero.org/styles/journal-of-endourology-part-b-videourology" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-vancouver" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="medicine"/>
+    <eissn>2151-1136</eissn>
+    <updated>2022-03-05T12: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/journal-of-endourology.csl b/buildres/csl/csl-styles/dependent/journal-of-endourology.csl
new file mode 100644
index 00000000000..17bfb4b3d5d
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/journal-of-endourology.csl
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Journal of Endourology</title>
+	  <title-short>END</title-short>
+    <id>http://www.zotero.org/styles/journal-of-endourology</id>
+    <link href="http://www.zotero.org/styles/journal-of-endourology" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-vancouver" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="medicine"/>
+    <issn>2152-4920</issn>
+    <eissn>2152-4939</eissn>
+    <updated>2022-03-05T12: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/journal-of-gynecologic-surgery.csl b/buildres/csl/csl-styles/dependent/journal-of-gynecologic-surgery.csl
new file mode 100644
index 00000000000..8ccffe12af5
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/journal-of-gynecologic-surgery.csl
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Journal of Gynecologic Surgery</title>
+	  <title-short>GYN</title-short>
+    <id>http://www.zotero.org/styles/journal-of-gynecologic-surgery</id>
+    <link href="http://www.zotero.org/styles/journal-of-gynecologic-surgery" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-vancouver" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="medicine"/>
+    <issn>1042-4067</issn>
+    <eissn>1557-7724</eissn>
+    <updated>2022-03-05T12: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/journal-of-integrative-and-complementary-medicine.csl b/buildres/csl/csl-styles/dependent/journal-of-integrative-and-complementary-medicine.csl
new file mode 100644
index 00000000000..dce45938711
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/journal-of-integrative-and-complementary-medicine.csl
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Journal of Integrative and Complementary Medicine</title>
+	  <title-short>JICM</title-short>
+    <id>http://www.zotero.org/styles/journal-of-integrative-and-complementary-medicine</id>
+    <link href="http://www.zotero.org/styles/journal-of-integrative-and-complementary-medicine" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-vancouver" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="medicine"/>
+    <issn>2768-3605</issn>
+    <eissn>2768-3613</eissn>
+    <updated>2022-03-05T12: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/journal-of-interferon-and-cytokine-research.csl b/buildres/csl/csl-styles/dependent/journal-of-interferon-and-cytokine-research.csl
new file mode 100644
index 00000000000..d1ef565890d
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/journal-of-interferon-and-cytokine-research.csl
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Journal of Interferon and Cytokine Research</title>
+	  <title-short>JICR</title-short>
+    <id>http://www.zotero.org/styles/journal-of-interferon-and-cytokine-research</id>
+    <link href="http://www.zotero.org/styles/journal-of-interferon-and-cytokine-research" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-harvard" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
+    <category citation-format="author-date"/>
+    <category field="medicine"/>
+    <issn>1079-9907</issn>
+    <eissn>1557-7465</eissn>
+    <updated>2022-03-05T12: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/journal-of-laparoendoscopic-and-advanced-surgical-techniques-and-part-b-videoscopy.csl b/buildres/csl/csl-styles/dependent/journal-of-laparoendoscopic-and-advanced-surgical-techniques-and-part-b-videoscopy.csl
new file mode 100644
index 00000000000..d621ddbffd9
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/journal-of-laparoendoscopic-and-advanced-surgical-techniques-and-part-b-videoscopy.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">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Journal of Laparoendoscopic &amp; Advanced Surgical Techniques &amp; Part B: Videoscopy</title>
+	  <title-short>VOR</title-short>
+    <id>http://www.zotero.org/styles/journal-of-laparoendoscopic-and-advanced-surgical-techniques-and-part-b-videoscopy</id>
+    <link href="http://www.zotero.org/styles/journal-of-laparoendoscopic-and-advanced-surgical-techniques-and-part-b-videoscopy" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-vancouver" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="medicine"/>
+    <eissn>2373-3063</eissn>
+    <updated>2022-03-05T12: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/journal-of-laparoendoscopic-and-advanced-surgical-techniques.csl b/buildres/csl/csl-styles/dependent/journal-of-laparoendoscopic-and-advanced-surgical-techniques.csl
new file mode 100644
index 00000000000..ada4a1650b7
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/journal-of-laparoendoscopic-and-advanced-surgical-techniques.csl
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Journal of Laparoendoscopic &amp; Advanced Surgical Techniques</title>
+	  <title-short>LAP</title-short>
+    <id>http://www.zotero.org/styles/journal-of-laparoendoscopic-and-advanced-surgical-techniques</id>
+    <link href="http://www.zotero.org/styles/journal-of-laparoendoscopic-and-advanced-surgical-techniques" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-vancouver" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="medicine"/>
+    <issn>1092-6429</issn>
+    <eissn>1557-9034</eissn>
+    <updated>2022-03-05T12: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/journal-of-macromarketing.csl b/buildres/csl/csl-styles/dependent/journal-of-macromarketing.csl
new file mode 100644
index 00000000000..6f97a0b8f6f
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/journal-of-macromarketing.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">
+  <info>
+    <title>Journal of Macromarketing</title>
+    <id>http://www.zotero.org/styles/journal-of-macromarketing</id>
+    <link href="http://www.zotero.org/styles/journal-of-macromarketing" rel="self"/>
+    <link href="http://www.zotero.org/styles/american-marketing-association" rel="independent-parent"/>
+    <link href="https://journals.sagepub.com/doi/pdf/10.1177/0276146720984815" rel="documentation"/>
+    <category citation-format="author-date"/>
+    <category field="social_science"/>
+    <category field="communications"/>
+    <issn>0276-1467</issn>
+    <eissn>1552-6534</eissn>
+    <updated>2022-03-10T23:56: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>
+</style>
diff --git a/buildres/csl/csl-styles/dependent/journal-of-medicinal-food.csl b/buildres/csl/csl-styles/dependent/journal-of-medicinal-food.csl
new file mode 100644
index 00000000000..c02084a1b3b
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/journal-of-medicinal-food.csl
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Journal of Medicinal Food</title>
+	  <title-short>JMF</title-short>
+    <id>http://www.zotero.org/styles/journal-of-medicinal-food</id>
+    <link href="http://www.zotero.org/styles/journal-of-medicinal-food" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-vancouver" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="medicine"/>
+    <issn>1096-620X</issn>
+    <eissn>1557-7600</eissn>
+    <updated>2022-03-05T12: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/journal-of-neurotrauma.csl b/buildres/csl/csl-styles/dependent/journal-of-neurotrauma.csl
new file mode 100644
index 00000000000..0488cdb07eb
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/journal-of-neurotrauma.csl
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Journal of Neurotrauma</title>
+	  <title-short>NEU</title-short>
+    <id>http://www.zotero.org/styles/journal-of-neurotrauma</id>
+    <link href="http://www.zotero.org/styles/journal-of-neurotrauma" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-vancouver" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="medicine"/>
+    <issn>0897-7151</issn>
+    <eissn>1557-9042</eissn>
+    <updated>2022-03-05T12: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/journal-of-ocular-pharmacology-and-therapeutics.csl b/buildres/csl/csl-styles/dependent/journal-of-ocular-pharmacology-and-therapeutics.csl
index adb199acdfb..2b41606f2ec 100644
--- a/buildres/csl/csl-styles/dependent/journal-of-ocular-pharmacology-and-therapeutics.csl
+++ b/buildres/csl/csl-styles/dependent/journal-of-ocular-pharmacology-and-therapeutics.csl
@@ -1,16 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
   <info>
     <title>Journal of Ocular Pharmacology and Therapeutics</title>
+	  <title-short>JOPT</title-short>
     <id>http://www.zotero.org/styles/journal-of-ocular-pharmacology-and-therapeutics</id>
     <link href="http://www.zotero.org/styles/journal-of-ocular-pharmacology-and-therapeutics" rel="self"/>
-    <link href="http://www.zotero.org/styles/american-medical-association" rel="independent-parent"/>
-    <link href="http://www.liebertpub.com/manuscript/jop" rel="documentation"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-vancouver" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
     <category citation-format="numeric"/>
     <category field="medicine"/>
     <issn>1080-7683</issn>
     <eissn>1557-7732</eissn>
-    <updated>2012-09-14T21:18:00+00:00</updated>
+    <updated>2022-03-05T12: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/journal-of-palliative-medicine.csl b/buildres/csl/csl-styles/dependent/journal-of-palliative-medicine.csl
index 1ae7ac47f1b..dad5b23f9f3 100644
--- a/buildres/csl/csl-styles/dependent/journal-of-palliative-medicine.csl
+++ b/buildres/csl/csl-styles/dependent/journal-of-palliative-medicine.csl
@@ -1,16 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
   <info>
     <title>Journal of Palliative Medicine</title>
+	  <title-short>JPM</title-short>
     <id>http://www.zotero.org/styles/journal-of-palliative-medicine</id>
     <link href="http://www.zotero.org/styles/journal-of-palliative-medicine" rel="self"/>
-    <link href="http://www.zotero.org/styles/vancouver-superscript" rel="independent-parent"/>
-    <link href="http://www.liebertpub.com/manuscript/journal-of-palliative-medicine/41/" rel="documentation"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-vancouver" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
     <category citation-format="numeric"/>
     <category field="medicine"/>
     <issn>1096-6218</issn>
     <eissn>1557-7740</eissn>
-    <updated>2012-09-09T21:58:08+00:00</updated>
+    <updated>2022-03-05T12: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/journal-of-pancreatic-cancer.csl b/buildres/csl/csl-styles/dependent/journal-of-pancreatic-cancer.csl
new file mode 100644
index 00000000000..afeaeb3d360
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/journal-of-pancreatic-cancer.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">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Journal of Pancreatic Cancer</title>
+	  <title-short>PANCAN</title-short>
+    <id>http://www.zotero.org/styles/journal-of-pancreatic-cancer</id>
+    <link href="http://www.zotero.org/styles/journal-of-pancreatic-cancer" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-vancouver" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="medicine"/>
+    <eissn>2475-3246</eissn>
+    <updated>2022-03-05T12: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/journal-of-womens-health.csl b/buildres/csl/csl-styles/dependent/journal-of-womens-health.csl
new file mode 100644
index 00000000000..f8098bdbcfb
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/journal-of-womens-health.csl
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Journal of Womens Health</title>
+	  <title-short>JWH</title-short>
+    <id>http://www.zotero.org/styles/journal-of-womens-health</id>
+    <link href="http://www.zotero.org/styles/journal-of-womens-health" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-vancouver" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="medicine"/>
+    <issn>1540-9996</issn>
+    <eissn>1931-843X</eissn>
+    <updated>2022-03-05T12: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/lgbt-health.csl b/buildres/csl/csl-styles/dependent/lgbt-health.csl
new file mode 100644
index 00000000000..5a7ebaa77d5
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/lgbt-health.csl
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>LGBT Health</title>
+	  <title-short>LGBT</title-short>
+    <id>http://www.zotero.org/styles/lgbt-health</id>
+    <link href="http://www.zotero.org/styles/lgbt-health" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-vancouver" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="medicine"/>
+    <issn>2325-8292</issn>
+    <eissn>2325-8306</eissn>
+    <updated>2022-03-05T12: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/liver-transplantation.csl b/buildres/csl/csl-styles/dependent/liver-transplantation.csl
new file mode 100644
index 00000000000..fd358188785
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/liver-transplantation.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">
+  <info>
+    <title>Liver Transplantation</title>
+    <id>http://www.zotero.org/styles/liver-transplantation</id>
+    <link href="http://www.zotero.org/styles/liver-transplantation" rel="self"/>
+    <link href="http://www.zotero.org/styles/vancouver" rel="independent-parent"/>
+    <link href="https://aasldpubs.onlinelibrary.wiley.com/hub/journal/15276473/about/author-guidelines" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="medicine"/>
+    <issn>1527-6473</issn>
+    <issn>1527-6465</issn>
+    <updated>2022-08-03T21:58:08+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/lymphatic-research-and-biology.csl b/buildres/csl/csl-styles/dependent/lymphatic-research-and-biology.csl
new file mode 100644
index 00000000000..587cf47e62b
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/lymphatic-research-and-biology.csl
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Lymphatic Research and Biology</title>
+	  <title-short>LRB</title-short>
+    <id>http://www.zotero.org/styles/lymphatic-research-and-biology</id>
+    <link href="http://www.zotero.org/styles/lymphatic-research-and-biology" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-vancouver" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="biology"/>
+    <issn>1539-6851</issn>
+    <eissn>1557-8585</eissn>
+    <updated>2022-03-05T12: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/medical-acupuncture.csl b/buildres/csl/csl-styles/dependent/medical-acupuncture.csl
index 815bb781138..b0902c2d184 100644
--- a/buildres/csl/csl-styles/dependent/medical-acupuncture.csl
+++ b/buildres/csl/csl-styles/dependent/medical-acupuncture.csl
@@ -1,15 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
   <info>
     <title>Medical Acupuncture</title>
+	  <title-short>ACU</title-short>
     <id>http://www.zotero.org/styles/medical-acupuncture</id>
     <link href="http://www.zotero.org/styles/medical-acupuncture" rel="self"/>
-    <link href="http://www.zotero.org/styles/vancouver-superscript" rel="independent-parent"/>
-    <link href="http://www.liebertpub.com/manuscript/acu" rel="documentation"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-vancouver" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
     <category citation-format="numeric"/>
     <category field="medicine"/>
     <issn>1933-6586</issn>
-    <updated>2012-09-09T21:58:08+00:00</updated>
+    <eissn>1933-6594</eissn>
+    <updated>2022-03-05T12: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/metabolic-syndrome-and-related-disorders.csl b/buildres/csl/csl-styles/dependent/metabolic-syndrome-and-related-disorders.csl
new file mode 100644
index 00000000000..cd61059ea4c
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/metabolic-syndrome-and-related-disorders.csl
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Metabolic Syndrome and Related Disorders</title>
+	  <title-short>MET</title-short>
+    <id>http://www.zotero.org/styles/metabolic-syndrome-and-related-disorders</id>
+    <link href="http://www.zotero.org/styles/metabolic-syndrome-and-related-disorders" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-vancouver" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="medicine"/>
+    <issn>1540-4196</issn>
+    <eissn>1557-8518</eissn>
+    <updated>2022-03-05T12: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/microbial-drug-resistance.csl b/buildres/csl/csl-styles/dependent/microbial-drug-resistance.csl
new file mode 100644
index 00000000000..b7f8308fb9c
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/microbial-drug-resistance.csl
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Microbial Drug Resistance</title>
+	  <title-short>MDR</title-short>
+    <id>http://www.zotero.org/styles/microbial-drug-resistance</id>
+    <link href="http://www.zotero.org/styles/microbial-drug-resistance" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-vancouver" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="medicine"/>
+    <issn>1076-6294</issn>
+    <eissn>1931-8448</eissn>
+    <updated>2022-03-05T12: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/monoclonal-antibodies-in-immunodiagnosis-and-immunotherapy.csl b/buildres/csl/csl-styles/dependent/monoclonal-antibodies-in-immunodiagnosis-and-immunotherapy.csl
new file mode 100644
index 00000000000..ec9cfcada31
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/monoclonal-antibodies-in-immunodiagnosis-and-immunotherapy.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">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Monoclonal Antibodies in Immunodiagnosis and Immunotherapy</title>
+	  <title-short>MAB</title-short>
+    <id>http://www.zotero.org/styles/monoclonal-antibodies-in-immunodiagnosis-and-immunotherapy</id>
+    <link href="http://www.zotero.org/styles/monoclonal-antibodies-in-immunodiagnosis-and-immunotherapy" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-vancouver" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="biology"/>
+    <eissn>2167-9436</eissn>
+    <updated>2022-03-05T12: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/neurotrauma-reports.csl b/buildres/csl/csl-styles/dependent/neurotrauma-reports.csl
new file mode 100644
index 00000000000..11f49b7f59b
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/neurotrauma-reports.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">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Neurotrauma Reports</title>
+	  <title-short>NEUR</title-short>
+    <id>http://www.zotero.org/styles/neurotrauma-reports</id>
+    <link href="http://www.zotero.org/styles/neurotrauma-reports" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-vancouver" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="medicine"/>
+    <eissn>2689-288X</eissn>
+    <updated>2022-03-05T12: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/new-space.csl b/buildres/csl/csl-styles/dependent/new-space.csl
new file mode 100644
index 00000000000..f689d358e02
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/new-space.csl
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>New Space</title>
+	  <title-short>SPACE</title-short>
+    <id>http://www.zotero.org/styles/new-space</id>
+    <link href="http://www.zotero.org/styles/new-space" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-vancouver" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="engineering"/>
+    <issn>2168-0256</issn>
+    <eissn>2168-0264</eissn>
+    <updated>2022-03-05T12: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/nucleic-acid-therapeutics.csl b/buildres/csl/csl-styles/dependent/nucleic-acid-therapeutics.csl
new file mode 100644
index 00000000000..ac415e36be3
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/nucleic-acid-therapeutics.csl
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Nucleic Acid Therapeutics</title>
+	  <title-short>NAT</title-short>
+    <id>http://www.zotero.org/styles/nucleic-acid-therapeutics</id>
+    <link href="http://www.zotero.org/styles/nucleic-acid-therapeutics" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-vancouver" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="biology"/>
+    <issn>2159-3337</issn>
+    <eissn>2159-3345</eissn>
+    <updated>2022-03-05T12: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/omics-a-journal-of-integrative-biology.csl b/buildres/csl/csl-styles/dependent/omics-a-journal-of-integrative-biology.csl
new file mode 100644
index 00000000000..cfd5b04e594
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/omics-a-journal-of-integrative-biology.csl
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>OMICS: A Journal of Integrative Biology</title>
+	  <title-short>OMICS</title-short>
+    <id>http://www.zotero.org/styles/omics-a-journal-of-integrative-biology</id>
+    <link href="http://www.zotero.org/styles/omics-a-journal-of-integrative-biology" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-harvard" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
+    <category citation-format="author-date"/>
+    <category field="biology"/>
+    <issn>1536-2310</issn>
+    <eissn>1557-8100</eissn>
+    <updated>2022-03-05T12: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/organization-studies.csl b/buildres/csl/csl-styles/dependent/organization-studies.csl
deleted file mode 100644
index dc8ee18f8e1..00000000000
--- a/buildres/csl/csl-styles/dependent/organization-studies.csl
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
-  <info>
-    <title>Organization Studies</title>
-    <id>http://www.zotero.org/styles/organization-studies</id>
-    <link href="http://www.zotero.org/styles/organization-studies" rel="self"/>
-    <link href="http://www.zotero.org/styles/apa-no-initials" rel="independent-parent"/>
-    <link href="https://journals.sagepub.com/author-instructions/OSS" rel="documentation"/>
-    <link href="https://journals.sagepub.com/pb-assets/cmscontent/OSS/OS%20Style%20and%20Reference%20Guide_October%202021-1632991647.pdf" rel="documentation"/>
-    <category citation-format="author-date"/>
-    <category field="social_science"/>
-    <issn>0170-8406</issn>
-    <eissn>1741-3044</eissn>
-    <updated>2021-12-13T09:00:13+00:00</updated>
-    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
-  </info>
-</style>
diff --git a/buildres/csl/csl-styles/dependent/oxford-brookes-university-harvard-no-et-al.csl b/buildres/csl/csl-styles/dependent/oxford-brookes-university-harvard-no-et-al.csl
new file mode 100644
index 00000000000..fa36a8b2460
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/oxford-brookes-university-harvard-no-et-al.csl
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-GB">
+  <info>
+    <title>Oxford Brookes University - Harvard (no "et al.")</title>
+    <id>http://www.zotero.org/styles/oxford-brookes-university-harvard-no-et-al</id>
+    <link href="http://www.zotero.org/styles/oxford-brookes-university-harvard-no-et-al" rel="self"/>
+    <link href="http://www.zotero.org/styles/harvard-cite-them-right-no-et-al" rel="independent-parent"/>
+    <category citation-format="author-date"/>
+    <category field="generic-base"/>
+    <category field="social_science"/>
+    <updated>2018-06-15T00: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/oxford-brookes-university-harvard.csl b/buildres/csl/csl-styles/dependent/oxford-brookes-university-harvard.csl
new file mode 100644
index 00000000000..61143eead54
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/oxford-brookes-university-harvard.csl
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-GB">
+  <info>
+    <title>Oxford Brookes University - Harvard</title>
+    <id>http://www.zotero.org/styles/oxford-brookes-university-harvard</id>
+    <link href="http://www.zotero.org/styles/oxford-brookes-university-harvard" rel="self"/>
+    <link href="http://www.zotero.org/styles/harvard-cite-them-right" rel="independent-parent"/>
+    <category citation-format="author-date"/>
+    <category field="generic-base"/>
+    <category field="social_science"/>
+    <updated>2018-06-15T00: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/palliative-medicine-reports.csl b/buildres/csl/csl-styles/dependent/palliative-medicine-reports.csl
new file mode 100644
index 00000000000..c267d68e1ae
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/palliative-medicine-reports.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">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Palliative Medicine Reports</title>
+	  <title-short>PMR</title-short>
+    <id>http://www.zotero.org/styles/palliative-medicine-reports</id>
+    <link href="http://www.zotero.org/styles/palliative-medicine-reports" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-vancouver" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="medicine"/>
+    <eissn>2689-2820</eissn>
+    <updated>2022-03-05T12: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/pediatric-allergy-immunology-and-pulmonology.csl b/buildres/csl/csl-styles/dependent/pediatric-allergy-immunology-and-pulmonology.csl
new file mode 100644
index 00000000000..c24bf1b137d
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/pediatric-allergy-immunology-and-pulmonology.csl
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Pediatric Allergy, Immunology, and Pulmonology</title>
+	  <title-short>PED</title-short>
+    <id>http://www.zotero.org/styles/pediatric-allergy-immunology-and-pulmonology</id>
+    <link href="http://www.zotero.org/styles/pediatric-allergy-immunology-and-pulmonology" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-vancouver" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="medicine"/>
+    <issn>2151-321X</issn>
+    <eissn>2151-3228</eissn>
+    <updated>2022-03-05T12: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/phage-therapy-applications-and-research.csl b/buildres/csl/csl-styles/dependent/phage-therapy-applications-and-research.csl
new file mode 100644
index 00000000000..97a9322d1b2
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/phage-therapy-applications-and-research.csl
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>PHAGE: Therapy, Applications, and Research</title>
+	  <title-short>PHAGE</title-short>
+    <id>http://www.zotero.org/styles/phage-therapy-applications-and-research</id>
+    <link href="http://www.zotero.org/styles/phage-therapy-applications-and-research" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-vancouver" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="biology"/>
+    <issn>2641-6530</issn>
+    <eissn>2641-6549</eissn>
+    <updated>2022-03-05T12: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/photobiomodulation-photomedicine-and-laser-surgery.csl b/buildres/csl/csl-styles/dependent/photobiomodulation-photomedicine-and-laser-surgery.csl
new file mode 100644
index 00000000000..09aee6baf61
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/photobiomodulation-photomedicine-and-laser-surgery.csl
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Photobiomodulation, Photomedicine, and Laser Surgery</title>
+	  <title-short>PHOTOB</title-short>
+    <id>http://www.zotero.org/styles/photobiomodulation-photomedicine-and-laser-surgery</id>
+    <link href="http://www.zotero.org/styles/photobiomodulation-photomedicine-and-laser-surgery" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-vancouver" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="medicine"/>
+    <issn>1549-5418</issn>
+    <eissn>2578-5478</eissn>
+    <updated>2022-03-05T12: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/population-health-management.csl b/buildres/csl/csl-styles/dependent/population-health-management.csl
new file mode 100644
index 00000000000..32b2900cbd3
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/population-health-management.csl
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Population Health Management</title>
+	  <title-short>POP</title-short>
+    <id>http://www.zotero.org/styles/population-health-management</id>
+    <link href="http://www.zotero.org/styles/population-health-management" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-vancouver" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="medicine"/>
+    <issn>1942-7891</issn>
+    <eissn>1942-7905</eissn>
+    <updated>2022-03-05T12: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/prifysgol-caerdydd-harvard.csl b/buildres/csl/csl-styles/dependent/prifysgol-caerdydd-harvard.csl
deleted file mode 100644
index f5e6a1ea157..00000000000
--- a/buildres/csl/csl-styles/dependent/prifysgol-caerdydd-harvard.csl
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="cy-GB">
-  <info>
-    <title>Prifysgol Caerdydd - hen Harvard (Cymraeg)</title>
-    <id>http://www.zotero.org/styles/prifysgol-caerdydd-harvard</id>
-    <link href="http://www.zotero.org/styles/prifysgol-caerdydd-harvard" rel="self"/>
-    <link href="http://www.zotero.org/styles/harvard-cardiff-university-old" rel="independent-parent"/>
-    <link href="https://github.com/citation-style-language/styles/pull/3676#issuecomment-420542651" rel="documentation"/>
-    <author>
-      <name>Zoe Young</name>
-      <email>youngz@cardiff.ac.uk</email>
-    </author>
-    <author>
-      <name>Lewys Peters</name>
-    </author>
-    <category citation-format="author-date"/>
-    <category field="generic-base"/>
-    <summary>The Harvard author-date style - adapted for Cardiff University</summary>
-    <updated>2020-07-14T08:48:51+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/regen-open.csl b/buildres/csl/csl-styles/dependent/regen-open.csl
new file mode 100644
index 00000000000..20a8e52d441
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/regen-open.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">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>ReGen Open</title>
+	  <title-short>REGEN</title-short>
+    <id>http://www.zotero.org/styles/regen-open</id>
+    <link href="http://www.zotero.org/styles/regen-open" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-vancouver" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="science"/>
+    <eissn>2766-2705</eissn>
+    <updated>2022-03-05T12: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/rejuvenation-research.csl b/buildres/csl/csl-styles/dependent/rejuvenation-research.csl
new file mode 100644
index 00000000000..346d5916ba6
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/rejuvenation-research.csl
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Rejuvenation Research</title>
+	  <title-short>REJ</title-short>
+    <id>http://www.zotero.org/styles/rejuvenation-research</id>
+    <link href="http://www.zotero.org/styles/rejuvenation-research" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-vancouver" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="biology"/>
+    <issn>1549-1684</issn>
+    <eissn>1557-8577</eissn>
+    <updated>2022-03-05T12: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/soft-robotics.csl b/buildres/csl/csl-styles/dependent/soft-robotics.csl
new file mode 100644
index 00000000000..330d7b976d0
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/soft-robotics.csl
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Soft Robotics</title>
+	  <title-short>SORO</title-short>
+    <id>http://www.zotero.org/styles/soft-robotics</id>
+    <link href="http://www.zotero.org/styles/soft-robotics" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-vancouver" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="engineering"/>
+    <issn>2169-5172</issn>
+    <eissn>2169-5180</eissn>
+    <updated>2022-03-05T12: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-cells-and-development.csl b/buildres/csl/csl-styles/dependent/stem-cells-and-development.csl
new file mode 100644
index 00000000000..7b050a6d9e2
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/stem-cells-and-development.csl
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Stem Cells and Development</title>
+	  <title-short>SCD</title-short>
+    <id>http://www.zotero.org/styles/stem-cells-and-development</id>
+    <link href="http://www.zotero.org/styles/stem-cells-and-development" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-vancouver" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="biology"/>
+    <issn>1547-3287</issn>
+    <eissn>1557-8534</eissn>
+    <updated>2022-03-05T12: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/surgical-infections.csl b/buildres/csl/csl-styles/dependent/surgical-infections.csl
new file mode 100644
index 00000000000..01733ecaab4
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/surgical-infections.csl
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Surgical Infections</title>
+	  <title-short>SUR</title-short>
+    <id>http://www.zotero.org/styles/surgical-infections</id>
+    <link href="http://www.zotero.org/styles/surgical-infections" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-vancouver" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="medicine"/>
+    <issn>1096-2964</issn>
+    <eissn>1557-8674</eissn>
+    <updated>2022-03-05T12: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/telemedicine-and-e-health.csl b/buildres/csl/csl-styles/dependent/telemedicine-and-e-health.csl
new file mode 100644
index 00000000000..201c55205b6
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/telemedicine-and-e-health.csl
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Telemedicine and e-Health</title>
+	  <title-short>TMJ</title-short>
+    <id>http://www.zotero.org/styles/telemedicine-and-e-health</id>
+    <link href="http://www.zotero.org/styles/telemedicine-and-e-health" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-vancouver" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="medicine"/>
+    <issn>1530-5627</issn>
+    <eissn>1556-3669</eissn>
+    <updated>2022-03-05T12: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/telemedicine-reports.csl b/buildres/csl/csl-styles/dependent/telemedicine-reports.csl
new file mode 100644
index 00000000000..613e0c40974
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/telemedicine-reports.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">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Telemedicine Reports</title>
+	  <title-short>TMR</title-short>
+    <id>http://www.zotero.org/styles/telemedicine-reports</id>
+    <link href="http://www.zotero.org/styles/telemedicine-reports" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-vancouver" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="medicine"/>
+    <eissn>2692-4366</eissn>
+    <updated>2022-03-05T12: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-crispr-journal.csl b/buildres/csl/csl-styles/dependent/the-crispr-journal.csl
new file mode 100644
index 00000000000..2885f2fc432
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/the-crispr-journal.csl
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>The CRISPR Journal</title>
+	  <title-short>CRISPR</title-short>
+    <id>http://www.zotero.org/styles/the-crispr-journal</id>
+    <link href="http://www.zotero.org/styles/the-crispr-journal" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-vancouver" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="biology"/>
+    <issn>2573-1599</issn>
+    <eissn>2573-1602</eissn>
+    <updated>2022-03-05T12: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/therapeutic-hypothermia-and-temperature-management.csl b/buildres/csl/csl-styles/dependent/therapeutic-hypothermia-and-temperature-management.csl
new file mode 100644
index 00000000000..e5078353b0e
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/therapeutic-hypothermia-and-temperature-management.csl
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Therapeutic Hypothermia and Temperature Management</title>
+	  <title-short>THER</title-short>
+    <id>http://www.zotero.org/styles/therapeutic-hypothermia-and-temperature-management</id>
+    <link href="http://www.zotero.org/styles/therapeutic-hypothermia-and-temperature-management" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-harvard" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
+    <category citation-format="author-date"/>
+    <category field="medicine"/>
+    <issn>2153-7658</issn>
+    <eissn>2153-7933</eissn>
+    <updated>2022-03-05T12: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/thyroid.csl b/buildres/csl/csl-styles/dependent/thyroid.csl
new file mode 100644
index 00000000000..f83896bcf26
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/thyroid.csl
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Thyroid</title>
+	  <title-short>THY</title-short>
+    <id>http://www.zotero.org/styles/thyroid</id>
+    <link href="http://www.zotero.org/styles/thyroid" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-vancouver" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="biology"/>
+    <issn>1050-7256</issn>
+    <eissn>1557-9077</eissn>
+    <updated>2022-03-05T12: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/tissue-engineering.csl b/buildres/csl/csl-styles/dependent/tissue-engineering.csl
new file mode 100644
index 00000000000..a81c9960afe
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/tissue-engineering.csl
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Tissue Engineering</title>
+	  <title-short>TEN (TEA, TEB, TEC)</title-short>
+    <id>http://www.zotero.org/styles/tissue-engineering</id>
+    <link href="http://www.zotero.org/styles/tissue-engineering" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-vancouver" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="biology"/>
+    <issn>2152-4947</issn>
+    <eissn>2152-4955</eissn>
+    <updated>2022-03-05T12: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/transgender-health.csl b/buildres/csl/csl-styles/dependent/transgender-health.csl
new file mode 100644
index 00000000000..56dc6169706
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/transgender-health.csl
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Transgender Health</title>
+	  <title-short>TRGH</title-short>
+    <id>http://www.zotero.org/styles/transgender-health</id>
+    <link href="http://www.zotero.org/styles/transgender-health" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-vancouver" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="medicine"/>
+    <issn>2688-4887</issn>
+    <eissn>2380-193X</eissn>
+    <updated>2022-03-05T12: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/vector-borne-and-zoonotic-diseases.csl b/buildres/csl/csl-styles/dependent/vector-borne-and-zoonotic-diseases.csl
new file mode 100644
index 00000000000..7ea25628fda
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/vector-borne-and-zoonotic-diseases.csl
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Vector-Borne and Zoonotic Diseases</title>
+	  <title-short>VBZ</title-short>
+    <id>http://www.zotero.org/styles/vector-borne-and-zoonotic-diseases</id>
+    <link href="http://www.zotero.org/styles/vector-borne-and-zoonotic-diseases" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-harvard" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
+    <category citation-format="author-date"/>
+    <category field="medicine"/>
+    <issn>1530-3667</issn>
+    <eissn>1557-7759</eissn>
+    <updated>2022-03-05T12: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/videoendocrinology.csl b/buildres/csl/csl-styles/dependent/videoendocrinology.csl
new file mode 100644
index 00000000000..dd7fc1a233f
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/videoendocrinology.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">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>VideoEndocrinology</title>
+	  <title-short>VE</title-short>
+    <id>http://www.zotero.org/styles/videoendocrinology</id>
+    <link href="http://www.zotero.org/styles/videoendocrinology" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-vancouver" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="biology"/>
+    <eissn>2329-9738</eissn>
+    <updated>2022-03-05T12: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/violence-and-gender.csl b/buildres/csl/csl-styles/dependent/violence-and-gender.csl
new file mode 100644
index 00000000000..6cb42e00e4c
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/violence-and-gender.csl
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Violence and Gender</title>
+	  <title-short>VIO</title-short>
+    <id>http://www.zotero.org/styles/violence-and-gender</id>
+    <link href="http://www.zotero.org/styles/violence-and-gender" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-harvard" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
+    <category citation-format="author-date"/>
+    <category field="medicine"/>
+    <issn>2326-7836</issn>
+    <eissn>2326-7852</eissn>
+    <updated>2022-03-05T12: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/viral-immunology.csl b/buildres/csl/csl-styles/dependent/viral-immunology.csl
new file mode 100644
index 00000000000..eaaaed41927
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/viral-immunology.csl
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Viral Immunology</title>
+	  <title-short>VIM</title-short>
+    <id>http://www.zotero.org/styles/viral-immunology</id>
+    <link href="http://www.zotero.org/styles/viral-immunology" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-harvard" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
+    <category citation-format="author-date"/>
+    <category field="biology"/>
+    <issn>0882-8245</issn>
+    <eissn>1557-8976</eissn>
+    <updated>2022-03-05T12: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/vox-sanguinis.csl b/buildres/csl/csl-styles/dependent/vox-sanguinis.csl
deleted file mode 100644
index 2da4c1c3fdd..00000000000
--- a/buildres/csl/csl-styles/dependent/vox-sanguinis.csl
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
-  <info>
-    <title>Vox Sanguinis</title>
-    <id>http://www.zotero.org/styles/vox-sanguinis</id>
-    <link href="http://www.zotero.org/styles/vox-sanguinis" rel="self"/>
-    <link href="http://www.zotero.org/styles/vancouver-brackets" rel="independent-parent"/>
-    <link href="http://onlinelibrary.wiley.com/journal/10.1111/(ISSN)1423-0410/homepage/ForAuthors.html" rel="documentation"/>
-    <category citation-format="numeric"/>
-    <category field="medicine"/>
-    <issn>0042-9007</issn>
-    <eissn>1423-0410</eissn>
-    <updated>2012-09-09T21:58:08+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/womens-health-reports.csl b/buildres/csl/csl-styles/dependent/womens-health-reports.csl
new file mode 100644
index 00000000000..cb4c96bc022
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/womens-health-reports.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">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Women?s Health Reports</title>
+	  <title-short>WHR</title-short>
+    <id>http://www.zotero.org/styles/womens-health-reports</id>
+    <link href="http://www.zotero.org/styles/womens-health-reports" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-vancouver" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="medicine"/>
+    <eissn>2688-4844</eissn>
+    <updated>2022-03-05T12: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/zebrafish.csl b/buildres/csl/csl-styles/dependent/zebrafish.csl
new file mode 100644
index 00000000000..027a88172e2
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/zebrafish.csl
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Mary Ann Liebert, Inc. (MAL), generated from "mal" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Zebrafish</title>
+	  <title-short>ZEB</title-short>
+    <id>http://www.zotero.org/styles/zebrafish</id>
+    <link href="http://www.zotero.org/styles/zebrafish" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-vancouver" rel="independent-parent"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="biology"/>
+    <issn>1545-8547</issn>
+    <eissn>1557-8542</eissn>
+    <updated>2022-03-05T12: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/deutsche-gesellschaft-fur-psychologie.csl b/buildres/csl/csl-styles/deutsche-gesellschaft-fur-psychologie.csl
index eb5279695fe..2f7e4e8243e 100644
--- a/buildres/csl/csl-styles/deutsche-gesellschaft-fur-psychologie.csl
+++ b/buildres/csl/csl-styles/deutsche-gesellschaft-fur-psychologie.csl
@@ -1,12 +1,12 @@
 <?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="de-DE">
   <info>
-    <title>Deutsche Gesellschaft für Psychologie (Deutsch)</title>
+    <title>Deutsche Gesellschaft für Psychologie 5. Auflage (Deutsch)</title>
+    <title-short>DGP 5. Auflage</title-short>
     <id>http://www.zotero.org/styles/deutsche-gesellschaft-fur-psychologie</id>
     <link href="http://www.zotero.org/styles/deutsche-gesellschaft-fur-psychologie" rel="self"/>
-    <link href="https://www.psychologie.uni-bonn.de/de/studium/richtlinien-zur-manuskriptgestaltung/view" rel="documentation"/>
     <link href="https://github.com/citation-style-language/styles/pull/432" rel="documentation"/>
-    <link href="https://www.hogrefe.de/shop/richtlinien-zur-manuskriptgestaltung-75884.html" rel="documentation"/>
+    <link href="https://doi.org/10.1026/02954-000" rel="documentation"/>
     <author>
       <name>Daniel Hirsbrunner</name>
       <email>dhirsbrunner@gmx.ch</email>
@@ -18,16 +18,22 @@
       <name>Patrick O'Brien</name>
       <email>obrienpat86@gmail.com</email>
     </contributor>
+    <contributor>
+      <name>Tobias Stocker</name>
+      <email>tobistocker@gmail.com</email>
+    </contributor>
     <category citation-format="author-date"/>
     <category field="psychology"/>
-    <summary>Style for the German society for psychology, based on the 4th style manual (Feb-2016).</summary>
-    <updated>2017-03-22T14:15:50+00:00</updated>
+    <summary>Style for the German society for psychology, based on the 5th style manual (2019).</summary>
+    <updated>2022-01-20T12:24:00+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <locale xml:lang="de">
     <terms>
       <term name="et-al">et al.</term>
       <term name="retrieved">Zugriff am</term>
+      <term name="original-work-published">Original erschienen</term>
+      <term name="no date" form="short">n. d.</term>
     </terms>
     <date form="text">
       <date-part name="year"/>
@@ -279,6 +285,59 @@
       <text variable="locator" prefix=" "/>
     </group>
   </macro>
+  <macro name="issued-citation">
+    <choose>
+      <if variable="issued">
+        <group delimiter="/">
+          <choose>
+            <if variable="original-date">
+              <date variable="original-date">
+                <date-part name="year"/>
+              </date>
+            </if>
+          </choose>
+          <text macro="issued-year"/>
+        </group>
+      </if>
+      <else>
+        <group delimiter="-">
+          <text term="no date" form="short"/>
+          <text variable="year-suffix"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="original-date">
+    <date variable="original-date">
+      <date-part name="year"/>
+    </date>
+  </macro>
+  <macro name="publication-history">
+    <group prefix="(" suffix=")">
+      <choose>
+        <if variable="references">
+          <text variable="references"/>
+        </if>
+        <else>
+          <choose>
+            <if variable="original-date">
+              <group delimiter=":">
+                <group delimiter=" ">
+                  <text term="original-work-published"/>
+                  <text macro="original-date" prefix=" "/>
+                </group>
+                <choose>
+                  <if variable="translator original-title" match="all">
+                    <text variable="original-title" prefix=" "/>
+                  </if>
+                </choose>
+              </group>
+            </if>
+          </choose>
+        </else>
+      </choose>
+    </group>
+  </macro>
   <citation et-al-min="6" et-al-use-first="1" et-al-subsequent-min="3" et-al-subsequent-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true" collapse="year">
     <sort>
       <key macro="author"/>
@@ -287,7 +346,7 @@
     <layout prefix="(" suffix=")" delimiter="; ">
       <group delimiter=", ">
         <text macro="author-short"/>
-        <text macro="issued-year"/>
+        <text macro="issued-citation"/>
         <text macro="citation-locator"/>
       </group>
     </layout>
@@ -318,6 +377,7 @@
         </group>
       </group>
       <text macro="access" prefix=" "/>
+      <text macro="publication-history" prefix=" "/>
     </layout>
   </bibliography>
 </style>
diff --git a/buildres/csl/csl-styles/developmental-dynamics.csl b/buildres/csl/csl-styles/developmental-dynamics.csl
new file mode 100644
index 00000000000..dd7aa32212e
--- /dev/null
+++ b/buildres/csl/csl-styles/developmental-dynamics.csl
@@ -0,0 +1,280 @@
+<?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>Developmental Dynamics</title>
+    <title-short>Dev Dyn</title-short>
+    <id>http://www.zotero.org/styles/developmental-dynamics</id>
+    <link href="http://www.zotero.org/styles/developmental-dynamics" rel="self"/>
+    <link href="http://www.zotero.org/styles/american-medical-association" rel="template"/>
+    <link href="https://anatomypubs.onlinelibrary.wiley.com/hub/journal/10970177/homepage/forauthors.html#refs" rel="documentation"/>
+    <author>
+      <name>Engin Ozkan</name>
+      <email>enozkan78@gmail.com</email>
+    </author>
+    <category citation-format="numeric"/>
+    <category field="biology"/>
+    <issn>1058-8388</issn>
+    <eissn>1097-0177</eissn>
+    <summary>The Developmental Dynamics journal style modified from American Medical Association style Version 11, as per June 2022.</summary>
+    <updated>2022-06-14T00:00:00+00:00</updated>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
+  </info>
+  <locale xml:lang="en">
+    <terms>
+      <term name="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 variable="DOI" prefix="https://doi.org/"/>
+          </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>
+              <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>
+              <text variable="URL"/>
+            </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">
+    <group delimiter=": ">
+      <text variable="publisher-place"/>
+      <text variable="publisher"/>
+    </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"/>
+      <group prefix="(" suffix=")">
+        <label variable="locator" form="short" strip-periods="true"/>
+        <text variable="locator"/>
+      </group>
+    </layout>
+  </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 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/digital-humanities-im-deutschsprachigen-raum.csl b/buildres/csl/csl-styles/digital-humanities-im-deutschsprachigen-raum.csl
new file mode 100644
index 00000000000..a3b11d51aa6
--- /dev/null
+++ b/buildres/csl/csl-styles/digital-humanities-im-deutschsprachigen-raum.csl
@@ -0,0 +1,182 @@
+<?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="de-DE">
+  <!-- This style was edited with the Visual CSL Editor (https://editor.citationstyles.org/visualEditor/) -->
+  <info>
+    <title>Digital Humanities im deutschsprachigen Raum (Deutsch)</title>
+    <title-short>DHd (Deutsch)</title-short>
+    <id>http://www.zotero.org/styles/digital-humanities-im-deutschsprachigen-raum</id>
+    <link href="http://www.zotero.org/styles/digital-humanities-im-deutschsprachigen-raum" rel="self"/>
+    <link href="http://www.zotero.org/styles/deutsche-sprache" rel="template"/>
+    <link xml:lang="de" href="https://www.dhd2022.de/wp-content/uploads/2021/07/Zitationsguidelines.pdf" rel="documentation"/>
+    <author>
+      <name>Simon Meier-Vieracker</name>
+      <uri>https://tu-dresden.de/gsw/slk/germanistik/al</uri>
+      <email>simon.meier-vieracker@tu-dresden.de</email>
+    </author>
+    <category citation-format="author-date"/>
+    <category field="humanities"/>
+    <summary>Zitierstil entsprechend den Vorgaben der Guidelines Digital Humanities im deutschsprachigen Raum</summary>
+    <updated>2022-02-22T13:40:08+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="de">
+    <terms>
+      <term name="et-al">et al.</term>
+      <term name="editor" form="short">
+        <single>ed.</single>
+        <multiple>eds.</multiple>
+      </term>
+    </terms>
+  </locale>
+  <macro name="creator-year-long">
+    <group delimiter=" ">
+      <names variable="author" font-weight="normal">
+        <name font-weight="bold" delimiter=" / " name-as-sort-order="all"/>
+        <label form="short" prefix=" (" suffix=")"/>
+        <substitute>
+          <names variable="editor"/>
+          <text term="anonymous" form="short"/>
+        </substitute>
+      </names>
+      <date date-parts="year" form="text" variable="issued" prefix="(" suffix=")"/>
+    </group>
+  </macro>
+  <macro name="editor-container-title">
+    <group delimiter=" " suffix=".">
+      <text term="in" suffix=": "/>
+      <group delimiter=" ">
+        <names variable="editor" suffix=":">
+          <name delimiter=" / " name-as-sort-order="all"/>
+          <label form="short" prefix=" (" suffix=")"/>
+        </names>
+        <text variable="container-title" font-style="italic"/>
+        <text macro="collection-title-number"/>
+      </group>
+    </group>
+  </macro>
+  <macro name="publication-place-publisher">
+    <group delimiter=": ">
+      <text variable="publisher-place"/>
+      <text variable="publisher"/>
+    </group>
+  </macro>
+  <macro name="creator-year-short">
+    <group delimiter=" ">
+      <text macro="creator-short"/>
+      <date date-parts="year" form="text" variable="issued"/>
+    </group>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if match="any" is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <text term="edition" form="short"/>
+        </group>
+      </if>
+      <else>
+        <text variable="edition"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="collection-title-number">
+    <group delimiter=" " prefix="(= " suffix=")">
+      <text variable="collection-title"/>
+      <text variable="collection-number"/>
+    </group>
+  </macro>
+  <macro name="page-range">
+    <group delimiter=" " suffix=".">
+      <text variable="page"/>
+    </group>
+  </macro>
+  <macro name="online-url">
+    <group delimiter=" ">
+      <text variable="URL"/>
+      <date form="text" variable="accessed" prefix="[letzter Zugriff " suffix="]"/>
+    </group>
+  </macro>
+  <macro name="container-title-volume">
+    <group delimiter=" " suffix=":">
+      <text variable="container-title" font-style="italic"/>
+      <text variable="volume"/>
+      <text variable="issue" prefix="(" suffix=")"/>
+    </group>
+  </macro>
+  <macro name="creator-short">
+    <names variable="author">
+      <name form="short" delimiter=" / "/>
+      <substitute>
+        <names variable="editor"/>
+      </substitute>
+    </names>
+  </macro>
+  <citation et-al-min="4" et-al-use-first="1" disambiguate-add-year-suffix="true" collapse="year-suffix">
+    <layout delimiter="; " prefix="(" suffix=")">
+      <group delimiter=": ">
+        <text macro="creator-year-short"/>
+        <group delimiter=" ">
+          <text variable="locator"/>
+        </group>
+      </group>
+    </layout>
+  </citation>
+  <bibliography et-al-min="9" et-al-use-first="1" entry-spacing="0" hanging-indent="true">
+    <sort>
+      <key macro="creator-short"/>
+      <key macro="creator-year-short"/>
+    </sort>
+    <layout>
+      <group delimiter=" " suffix=".">
+        <group delimiter=" ">
+          <text macro="creator-year-long" suffix=":"/>
+        </group>
+        <choose>
+          <if type="book" match="any">
+            <group delimiter=" ">
+              <text variable="title" font-style="italic" suffix="."/>
+              <text macro="collection-title-number"/>
+              <text macro="edition"/>
+              <text macro="publication-place-publisher"/>
+            </group>
+          </if>
+          <else-if type="article-journal article-magazine article-newspaper" match="any">
+            <text variable="title" prefix="&quot;" suffix="&quot;, "/>
+            <group delimiter=" ">
+              <group delimiter=": ">
+                <text term="in"/>
+                <text macro="container-title-volume"/>
+              </group>
+              <text macro="page-range"/>
+              <text variable="DOI" strip-periods="false"/>
+            </group>
+          </else-if>
+          <else-if type="chapter" match="any">
+            <group delimiter=" ">
+              <text variable="title" prefix="&quot;" suffix="&quot;"/>
+              <text macro="editor-container-title"/>
+              <text macro="edition"/>
+              <text macro="publication-place-publisher"/>
+              <text macro="page-range"/>
+              <text variable="DOI"/>
+            </group>
+          </else-if>
+          <else>
+            <group delimiter=". ">
+              <text variable="title" font-style="italic"/>
+              <choose>
+                <if match="any" variable="container-title">
+                  <text macro="editor-container-title"/>
+                </if>
+              </choose>
+              <text macro="publication-place-publisher"/>
+              <text macro="page-range"/>
+              <text macro="collection-title-number"/>
+              <text macro="online-url"/>
+            </group>
+          </else>
+        </choose>
+      </group>
+    </layout>
+  </bibliography>
+</style>
diff --git a/buildres/csl/csl-styles/economic-geology.csl b/buildres/csl/csl-styles/economic-geology.csl
index ec400f65765..e2395e92814 100644
--- a/buildres/csl/csl-styles/economic-geology.csl
+++ b/buildres/csl/csl-styles/economic-geology.csl
@@ -6,6 +6,7 @@
     <link href="http://www.zotero.org/styles/economic-geology" rel="self"/>
     <link href="http://www.zotero.org/styles/american-journal-of-science" rel="template"/>
     <link href="http://www.editorialmanager.com/seg/default.aspx" rel="documentation"/>
+    <link href="https://www.segweb.org//pdf/publications/economic-geology/Instructions-to-Authors.pdf" rel="documentation"/>
     <author>
       <name>Patrick O'Brien, PhD</name>
       <email>obrienpat86@gmail.com</email>
@@ -14,7 +15,7 @@
     <category field="geology"/>
     <issn>0361-0128</issn>
     <eissn>1554-0774</eissn>
-    <updated>2018-02-19T15:05:37+00:00</updated>
+    <updated>2022-07-06T08:50:29+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">
@@ -24,13 +25,13 @@
   </locale>
   <macro name="editor-translator">
     <names variable="editor translator" prefix="(" suffix=")" delimiter=", ">
-      <name and="symbol" initialize-with=". " delimiter=", "/>
+      <name and="symbol" initialize-with="."/>
       <label form="short" prefix=", " text-case="capitalize-first"/>
     </names>
   </macro>
   <macro name="author">
     <names variable="author">
-      <name and="text" delimiter-precedes-last="always" initialize-with=". " name-as-sort-order="all"/>
+      <name and="text" delimiter-precedes-last="always" initialize-with="." name-as-sort-order="all"/>
       <label form="short" prefix=", "/>
       <substitute>
         <names variable="editor"/>
@@ -155,7 +156,7 @@
           <group prefix=", ">
             <text term="in"/>
             <names variable="editor translator" prefix=" " suffix="," delimiter=", ">
-              <name and="text" initialize-with=". " name-as-sort-order="all"/>
+              <name and="text" initialize-with="." name-as-sort-order="all"/>
               <label form="short" prefix=" "/>
             </names>
             <text variable="event" prefix=" " suffix=" &#8211;"/>
@@ -203,6 +204,10 @@
               <label variable="volume" form="short"/>
               <text variable="volume"/>
             </group>
+            <group delimiter=" ">
+              <label variable="issue" form="short"/>
+              <text variable="issue"/>
+            </group>
             <group delimiter=" ">
               <label plural="never" variable="page" form="short"/>
               <text variable="page"/>
diff --git a/buildres/csl/csl-styles/economie-et-statistique.csl b/buildres/csl/csl-styles/economie-et-statistique.csl
index 3e77cb301d7..3bbcb4313ee 100644
--- a/buildres/csl/csl-styles/economie-et-statistique.csl
+++ b/buildres/csl/csl-styles/economie-et-statistique.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" default-locale="fr-FR" page-range-format="expanded">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" page-range-format="expanded" default-locale="fr-FR">
   <info>
     <title>Économie et Statistique (Français)</title>
     <title-short>Éco &amp; Stat</title-short>
@@ -15,7 +15,7 @@
     <category field="sociology"/>
     <issn>0336-1454</issn>
     <summary>Le style de la revue de l'INSEE Économie et Statistique.</summary>
-    <updated>2015-01-27T16:00:00+01:00</updated>
+    <updated>2022-05-27T11:00:00+02: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="fr">
@@ -26,7 +26,7 @@
   </locale>
   <macro name="editor">
     <names variable="editor" delimiter=" ">
-      <name and="text" delimiter=", " delimiter-precedes-last="never"/>
+      <name and="symbol" delimiter=", " delimiter-precedes-last="never"/>
       <label form="short" prefix=" (" suffix=")" text-case="lowercase"/>
       <substitute>
         <names variable="editorial-director"/>
@@ -35,11 +35,11 @@
   </macro>
   <macro name="author-last">
     <names variable="author">
-      <name and="text" name-as-sort-order="all" sort-separator=" " delimiter=", " delimiter-precedes-last="never" initialize-with="."/>
+      <name and="symbol" name-as-sort-order="all" sort-separator=", " delimiter=", " delimiter-precedes-last="never" initialize-with="."/>
       <label form="short" prefix=" " text-case="lowercase"/>
       <substitute>
         <names variable="editor">
-          <name and="text" name-as-sort-order="all" sort-separator=", " delimiter=", " delimiter-precedes-last="never" initialize-with="."/>
+          <name and="symbol" name-as-sort-order="all" sort-separator=", " delimiter=", " delimiter-precedes-last="never" initialize-with="."/>
           <label form="short" prefix=" (" suffix=")" text-case="lowercase"/>
           <substitute>
             <names variable="editorial-director"/>
@@ -51,11 +51,11 @@
   <!-- Same as author-last except that name is not initialized to sort on first name too -->
   <macro name="author-sort">
     <names variable="author">
-      <name and="text" name-as-sort-order="all" sort-separator=" " delimiter=", " delimiter-precedes-last="never"/>
+      <name and="symbol" name-as-sort-order="all" sort-separator=", " delimiter=", " delimiter-precedes-last="never"/>
       <label form="short" prefix=" " text-case="lowercase"/>
       <substitute>
         <names variable="editor">
-          <name and="text" name-as-sort-order="all" sort-separator=", " delimiter=", " delimiter-precedes-last="never"/>
+          <name and="symbol" name-as-sort-order="all" sort-separator=", " delimiter=", " delimiter-precedes-last="never"/>
           <label form="short" prefix=" (" suffix=")" text-case="lowercase"/>
           <substitute>
             <names variable="editorial-director"/>
@@ -66,7 +66,7 @@
   </macro>
   <macro name="author-short">
     <names variable="author">
-      <name form="short" and="text" delimiter=", " delimiter-precedes-last="never"/>
+      <name form="short" and="symbol" delimiter=", " delimiter-precedes-last="never"/>
       <substitute>
         <names variable="editor"/>
       </substitute>
@@ -75,7 +75,7 @@
   <macro name="translator">
     <text term="translator" form="verb" suffix=" "/>
     <names variable="translator">
-      <name and="text" name-as-sort-order="all" sort-separator=" " delimiter=", " delimiter-precedes-last="never" initialize-with="."/>
+      <name and="symbol" name-as-sort-order="all" sort-separator=" " delimiter=", " delimiter-precedes-last="never" initialize-with="."/>
     </names>
   </macro>
   <macro name="publisher-collection">
@@ -165,101 +165,104 @@
       <key macro="author-sort"/>
       <key variable="issued"/>
     </sort>
-    <layout suffix=".">
-      <group suffix=", ">
-        <text macro="author-last" font-weight="bold"/>
-        <text macro="year-date-short" prefix=" (" suffix=")" font-weight="bold"/>
-      </group>
-      <choose>
-        <if type="report">
-          <group delimiter=", ">
-            <text variable="title" quotes="true"/>
-            <text macro="translator"/>
-            <text variable="genre"/>
-            <text variable="collection-title" font-style="italic"/>
-            <text variable="number" prefix=" n°"/>
-            <text variable="publisher-place"/>
-            <text variable="publisher"/>
-          </group>
-        </if>
-        <else-if type="book">
-          <group delimiter=", ">
-            <text variable="title" font-style="italic"/>
-            <text macro="translator"/>
-            <text variable="genre"/>
-            <text macro="editor"/>
-            <text macro="edition"/>
-            <text macro="publisher-collection"/>
-            <text variable="medium"/>
-            <group delimiter=" ">
-              <text term="version"/>
-              <text variable="version"/>
+    <layout>
+      <group suffix=".">
+        <group suffix=", ">
+          <text macro="author-last" font-weight="bold"/>
+          <text macro="year-date-short" prefix=" (" suffix=")" font-weight="bold"/>
+        </group>
+        <choose>
+          <if type="report">
+            <group delimiter=", ">
+              <text variable="title" quotes="true"/>
+              <text macro="translator"/>
+              <text variable="genre"/>
+              <text variable="collection-title" font-style="italic"/>
+              <text variable="number" prefix=" n°"/>
+              <text variable="publisher-place"/>
+              <text variable="publisher"/>
             </group>
-            <text macro="number-of-pages"/>
-          </group>
-        </else-if>
-        <else-if type="thesis">
-          <group delimiter=", ">
-            <text variable="title" font-style="italic"/>
-            <text macro="translator"/>
-            <choose>
-              <if variable="genre">
-                <text variable="genre"/>
-              </if>
-              <else>
-                <text value="Thèse de doctorat"/>
-              </else>
-            </choose>
-            <text macro="edition"/>
-            <text macro="publisher-collection"/>
-            <text macro="number-of-pages"/>
-          </group>
-        </else-if>
-        <else-if type="chapter">
-          <text variable="title" quotes="true"/>
-          <group prefix=", ">
-            <text value="in" suffix=" " font-style="italic"/>
-            <text macro="editor" suffix=", "/>
+          </if>
+          <else-if type="book">
             <group delimiter=", ">
-              <text variable="container-title" font-style="italic"/>
+              <text variable="title" font-style="italic"/>
               <text macro="translator"/>
+              <text variable="genre"/>
+              <text macro="editor"/>
               <text macro="edition"/>
               <text macro="publisher-collection"/>
-              <text macro="page"/>
+              <text variable="medium"/>
+              <group delimiter=" ">
+                <text term="version"/>
+                <text variable="version"/>
+              </group>
+              <text macro="number-of-pages"/>
             </group>
-          </group>
-        </else-if>
-        <else-if type="speech">
-          <group delimiter=", ">
-            <text variable="title" quotes="true"/>
-            <text variable="event"/>
-            <text variable="event-place"/>
-            <text macro="full-date"/>
-            <text macro="translator"/>
-          </group>
-        </else-if>
-        <else-if type="article-newspaper article-magazine interview broadcast" match="any">
-          <group delimiter=", ">
-            <text variable="title" quotes="true"/>
-            <text variable="container-title" font-style="italic" prefix=" "/>
-            <text macro="full-date"/>
-            <text macro="translator"/>
-            <text macro="page"/>
-          </group>
-        </else-if>
-        <else>
-          <group delimiter=" " suffix=",">
+          </else-if>
+          <else-if type="thesis">
+            <group delimiter=", ">
+              <text variable="title" font-style="italic"/>
+              <text macro="translator"/>
+              <choose>
+                <if variable="genre">
+                  <text variable="genre"/>
+                </if>
+                <else>
+                  <text value="Thèse de doctorat"/>
+                </else>
+              </choose>
+              <text macro="edition"/>
+              <text macro="publisher-collection"/>
+              <text macro="number-of-pages"/>
+            </group>
+          </else-if>
+          <else-if type="chapter">
             <text variable="title" quotes="true"/>
-            <text macro="editor"/>
-          </group>
-          <group prefix=" " delimiter=", ">
-            <text variable="container-title" font-style="italic"/>
-            <text macro="issue"/>
-            <text macro="translator"/>
-            <text macro="page"/>
-          </group>
-        </else>
-      </choose>
+            <group prefix=", ">
+              <text value="in" suffix=" " font-style="italic"/>
+              <text macro="editor" suffix=", "/>
+              <group delimiter=", ">
+                <text variable="container-title" font-style="italic"/>
+                <text macro="translator"/>
+                <text macro="edition"/>
+                <text macro="publisher-collection"/>
+                <text macro="page"/>
+              </group>
+            </group>
+          </else-if>
+          <else-if type="speech">
+            <group delimiter=", ">
+              <text variable="title" quotes="true"/>
+              <text variable="event"/>
+              <text variable="event-place"/>
+              <text macro="full-date"/>
+              <text macro="translator"/>
+            </group>
+          </else-if>
+          <else-if type="article-newspaper article-magazine interview broadcast" match="any">
+            <group delimiter=", ">
+              <text variable="title" quotes="true"/>
+              <text variable="container-title" font-style="italic" prefix=" "/>
+              <text macro="full-date"/>
+              <text macro="translator"/>
+              <text macro="page"/>
+            </group>
+          </else-if>
+          <else>
+            <group delimiter=" " suffix=",">
+              <text variable="title" quotes="true"/>
+              <text macro="editor"/>
+            </group>
+            <group prefix=" " delimiter=", ">
+              <text variable="container-title" font-style="italic"/>
+              <text macro="issue"/>
+              <text macro="translator"/>
+              <text macro="page"/>
+            </group>
+          </else>
+        </choose>
+      </group>
+      <text variable="DOI" prefix=" https://doi.org/"/>
     </layout>
   </bibliography>
 </style>
diff --git a/buildres/csl/csl-styles/endocrine-journal.csl b/buildres/csl/csl-styles/endocrine-journal.csl
new file mode 100644
index 00000000000..1fc0df9739f
--- /dev/null
+++ b/buildres/csl/csl-styles/endocrine-journal.csl
@@ -0,0 +1,126 @@
+<?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-GB">
+  <info>
+    <title>Endocrine Journal</title>
+    <title-short>EJ</title-short>
+    <id>http://www.zotero.org/styles/endocrine-journal</id>
+    <link href="http://www.zotero.org/styles/endocrine-journal" rel="self"/>
+    <link href="http://www.zotero.org/styles/aims-press" rel="template"/>
+    <link href="https://s3-us-west-2.amazonaws.com/clarivate-scholarone-prod-us-west-2-s1m-public/wwwRoot/prod1/societyimages/endocrj/EJ%20Instructions%20to%20Authors_en.pdf" rel="documentation"/>
+    <author>
+      <name>Patrick O'Brien, PhD</name>
+    </author>
+    <category citation-format="numeric"/>
+    <category field="science"/>
+    <issn>0918-8959</issn>
+    <eissn>1348-4540</eissn>
+    <updated>2022-06-10T09:38:10+00:00</updated>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
+  </info>
+  <macro name="author">
+    <names variable="author">
+      <name initialize-with="" delimiter=", " name-as-sort-order="all" sort-separator=" " delimiter-precedes-last="always"/>
+      <et-al font-style="italic"/>
+      <label form="short" strip-periods="true" prefix=" (" suffix=")"/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <text variable="authority"/>
+        <text variable="title"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="editor">
+    <names variable="editor">
+      <name initialize-with="" delimiter=", " name-as-sort-order="all" sort-separator=" " delimiter-precedes-last="always"/>
+      <label form="short" strip-periods="true" prefix=" (" suffix=")"/>
+    </names>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+        <text variable="title"/>
+      </if>
+      <else>
+        <text variable="title"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=", ">
+      <text variable="publisher"/>
+      <text variable="publisher-place"/>
+    </group>
+  </macro>
+  <macro name="page">
+    <text variable="page"/>
+  </macro>
+  <citation collapse="citation-number">
+    <sort>
+      <key variable="citation-number"/>
+    </sort>
+    <layout prefix="[" suffix="]" delimiter=",">
+      <text variable="citation-number"/>
+    </layout>
+  </citation>
+  <bibliography et-al-min="6" et-al-use-first="5" second-field-align="flush" entry-spacing="0">
+    <layout suffix=".">
+      <text variable="citation-number" suffix=". "/>
+      <group delimiter=" ">
+        <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="publisher"/>
+            </group>
+          </if>
+          <else-if type="chapter paper-conference" match="any">
+            <group delimiter=". ">
+              <text macro="title" prefix=" "/>
+              <group delimiter=" ">
+                <group delimiter=": ">
+                  <text term="in" text-case="capitalize-first"/>
+                  <text macro="editor"/>
+                </group>
+                <text variable="container-title" font-style="normal"/>
+              </group>
+              <group delimiter=": ">
+                <text macro="publisher"/>
+                <text macro="page"/>
+              </group>
+            </group>
+          </else-if>
+          <else-if type="webpage post post-weblog" match="any">
+            <group delimiter=". ">
+              <group delimiter=", ">
+                <text variable="container-title"/>
+                <text macro="title"/>
+              </group>
+              <group delimiter=" ">
+                <text variable="URL"/>
+                <text term="accessed"/>
+                <date form="text" variable="accessed"/>
+              </group>
+            </group>
+          </else-if>
+          <else>
+            <group delimiter=". ">
+              <text macro="title"/>
+              <group delimiter=" ">
+                <text variable="container-title" font-style="italic" form="short" strip-periods="true"/>
+                <group delimiter=": ">
+                  <text variable="volume"/>
+                  <text macro="page"/>
+                </group>
+              </group>
+            </group>
+          </else>
+        </choose>
+      </group>
+    </layout>
+  </bibliography>
+</style>
diff --git a/buildres/csl/csl-styles/entomological-review.csl b/buildres/csl/csl-styles/entomological-review.csl
new file mode 100644
index 00000000000..7b078499259
--- /dev/null
+++ b/buildres/csl/csl-styles/entomological-review.csl
@@ -0,0 +1,231 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" page-range-format="minimal" class="in-text" version="1.0" demote-non-dropping-particle="sort-only" default-locale="en-US">
+  <info>
+    <title>Entomological Review</title>
+    <id>http://www.zotero.org/styles/entomological-review</id>
+    <link href="http://www.zotero.org/styles/entomological-review" rel="self"/>
+    <link href="http://www.zotero.org/styles/revista-brasileira-de-ciencia-do-solo" rel="template"/>
+    <link href="https://www.pleiades.online/en/journal/enteng/authors-instructions/" rel="documentation"/>
+    <author>
+      <name>Patrick O'Brien</name>
+    </author>
+    <category citation-format="author-date"/>
+    <category field="science"/>
+    <issn>0013-8738</issn>
+    <eissn>1555-6689</eissn>
+    <updated>2022-07-05T12:57:10+00:00</updated>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
+  </info>
+  <macro name="author">
+    <names variable="author">
+      <name and="text" delimiter-precedes-last="never" initialize-with="." name-as-sort-order="all"/>
+      <label form="short" text-case="capitalize-first" prefix=", "/>
+      <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" delimiter=", " initialize-with=". "/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <text variable="title" form="short"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="editor">
+    <names variable="editor">
+      <name and="text" delimiter-precedes-last="never" initialize-with="." name-as-sort-order="all"/>
+      <label form="short" text-case="capitalize-first" prefix=", "/>
+    </names>
+  </macro>
+  <macro name="year-date">
+    <choose>
+      <if variable="issued">
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
+      </if>
+      <else>
+        <text term="no date" form="short"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="event-year-month-day">
+    <choose>
+      <if variable="issued">
+        <date variable="issued" delimiter=" ">
+          <date-part name="year"/>
+          <date-part name="month" form="short"/>
+          <date-part name="day"/>
+        </date>
+      </if>
+      <else>
+        <text term="no date" form="short"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="accessed-year-month-day">
+    <group delimiter=" ">
+      <text term="accessed" text-case="capitalize-first"/>
+      <date form="text" variable="accessed"/>
+    </group>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=": ">
+      <text variable="publisher-place" text-case="title"/>
+      <text variable="publisher"/>
+    </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"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="event">
+    <group delimiter=" &#8211; ">
+      <text variable="event"/>
+      <text variable="container-title"/>
+    </group>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if variable="DOI">
+        <text variable="DOI" prefix="https://doi.org/"/>
+      </if>
+      <else-if type="webpage post-weblog post" match="any">
+        <group delimiter=". ">
+          <text variable="URL"/>
+          <text macro="accessed-year-month-day"/>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="book" match="any">
+        <text variable="title" font-style="italic"/>
+      </if>
+      <else>
+        <text variable="title"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="volume">
+    <group delimiter=" ">
+      <label variable="volume" form="short"/>
+      <text variable="volume"/>
+    </group>
+  </macro>
+  <citation et-al-min="3" et-al-use-first="1" disambiguate-add-givenname="true" disambiguate-add-year-suffix="true" collapse="year" cite-group-delimiter=", ">
+    <sort>
+      <key macro="year-date" sort="ascending"/>
+    </sort>
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <group delimiter=", ">
+        <text macro="author-short"/>
+        <text macro="year-date"/>
+        <group delimiter=" ">
+          <label variable="locator" form="short"/>
+          <text variable="locator"/>
+        </group>
+      </group>
+    </layout>
+  </citation>
+  <bibliography et-al-min="20" et-al-use-first="3" entry-spacing="0">
+    <sort>
+      <key macro="author" sort="ascending"/>
+      <key macro="year-date" sort="descending"/>
+    </sort>
+    <layout suffix="">
+      <group delimiter=", ">
+        <text macro="author"/>
+        <text macro="title" text-case="capitalize-first"/>
+        <choose>
+          <if type="bill graphic legal_case legislation motion_picture song book report" match="any">
+            <group delimiter=", " suffix=". ">
+              <text macro="volume"/>
+              <text macro="edition"/>
+              <text macro="publisher"/>
+              <text macro="year-date"/>
+            </group>
+          </if>
+          <else-if type="chapter">
+            <group delimiter=", " suffix=". ">
+              <group delimiter=" ">
+                <text term="in" font-style="italic"/>
+                <text variable="container-title" font-style="italic"/>
+              </group>
+              <text macro="volume"/>
+              <text macro="edition"/>
+              <text macro="editor"/>
+              <text macro="publisher"/>
+              <group delimiter=" ">
+                <label variable="page" form="short" plural="never"/>
+                <text variable="page-first"/>
+              </group>
+            </group>
+          </else-if>
+          <else-if type="paper-conference">
+            <group suffix=". " delimiter=". ">
+              <group>
+                <group suffix="; ">
+                  <text term="in" text-case="sentence" suffix=": "/>
+                  <text macro="event"/>
+                </group>
+                <text macro="event-year-month-day" suffix="; "/>
+                <text variable="publisher-place" suffix=". " text-case="title"/>
+                <text variable="publisher" suffix="; "/>
+                <text macro="year-date"/>
+              </group>
+              <group delimiter=" ">
+                <label variable="page" form="short" plural="never"/>
+                <text variable="page"/>
+              </group>
+            </group>
+          </else-if>
+          <else-if type="patent">
+            <group delimiter=", ">
+              <text variable="number"/>
+              <text macro="year-date"/>
+            </group>
+          </else-if>
+          <else-if type="thesis">
+            <group delimiter=", ">
+              <text variable="genre"/>
+              <text macro="publisher"/>
+              <text macro="year-date"/>
+            </group>
+          </else-if>
+          <else-if type="webpage post post-weblog" match="any">
+            <text variable="container-title"/>
+          </else-if>
+          <else>
+            <group delimiter=", ">
+              <text variable="container-title" form="short" text-case="title" strip-periods="false" font-style="italic"/>
+              <text macro="year-date"/>
+              <text macro="volume"/>
+              <group delimiter=" ">
+                <label plural="never" variable="page" form="short"/>
+                <text variable="page-first" form="short"/>
+              </group>
+            </group>
+          </else>
+        </choose>
+      </group>
+      <text macro="access" prefix=". "/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/buildres/csl/csl-styles/ethnobiology-letters.csl b/buildres/csl/csl-styles/ethnobiology-letters.csl
new file mode 100644
index 00000000000..6f4f470a12f
--- /dev/null
+++ b/buildres/csl/csl-styles/ethnobiology-letters.csl
@@ -0,0 +1,209 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" demote-non-dropping-particle="sort-only" sort-separator=";" et-al-use-first="2" version="1.0" default-locale="en-US">
+  <info>
+    <title>Ethnobiology Letters</title>
+    <id>http://www.zotero.org/styles/ethnobiology-letters</id>
+    <link href="http://www.zotero.org/styles/ethnobiology-letters" rel="self"/>
+    <link href="http://www.zotero.org/styles/avian-conservation-and-ecology" rel="template"/>
+    <link href="https://ojs.ethnobiology.org/index.php/ebl/about/submissions" rel="documentation"/>
+    <author>
+      <name>James R. Welch</name>
+    </author>
+    <category citation-format="author-date"/>
+    <category field="biology"/>
+    <category field="anthropology"/>
+    <issn>2159-8126</issn>
+    <updated>2022-03-27T04:53:24+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="container-contributors">
+    <choose>
+      <if match="any" type="chapter paper-conference">
+        <names delimiter=", " variable="editor translator">
+          <label suffix=" " form="verb"/>
+          <name delimiter=", " initialize-with=". " and="text"/>
+        </names>
+      </if>
+    </choose>
+  </macro>
+  <macro name="secondary-contributors">
+    <choose>
+      <if match="none" type="chapter paper-conference">
+        <names suffix=")" delimiter=", " variable="editor translator" prefix=" (">
+          <name delimiter=", " initialize-with=". " and="text"/>
+          <label prefix=", " form="short"/>
+        </names>
+      </if>
+    </choose>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name sort-separator=", " delimiter=", " initialize-with=". " and="text" delimiter-precedes-last="always" name-as-sort-order="first"/>
+      <label form="short" text-case="lowercase" prefix=", "/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <text macro="title"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="author-short">
+    <names variable="author" suffix=" ">
+      <name delimiter=", " initialize-with=". " and="text" form="short"/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <choose>
+          <if match="any" type="bill book graphic legal_case legislation motion_picture report song">
+            <text font-style="italic" variable="title" form="short"/>
+          </if>
+          <else>
+            <text variable="title" form="short" quotes="true" text-case="title"/>
+          </else>
+        </choose>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if match="any" type="book report thesis manuscript">
+        <text font-style="italic" variable="title" text-case="title"/>
+      </if>
+      <else>
+        <text variable="title" text-case="title"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if variable="DOI">
+        <text variable="DOI" prefix="DOI:"/>
+      </if>
+      <else-if type="webpage">
+        <group delimiter=". ">
+          <text variable="URL"/>
+          <group delimiter=" ">
+            <text term="accessed" text-case="capitalize-first"/>
+            <date variable="accessed" form="text"/>
+          </group>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <choose>
+      <if match="none" type="article-journal article-magazine">
+        <group delimiter=", ">
+          <text variable="genre"/>
+          <text variable="publisher"/>
+          <text variable="publisher-place"/>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="issued">
+    <choose>
+      <if variable="issued">
+        <group>
+          <date variable="issued">
+            <date-part name="year"/>
+          </date>
+        </group>
+      </if>
+      <else>
+        <text suffix=")" term="no date" prefix="(" form="short"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="issued-year">
+    <choose>
+      <if variable="issued">
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
+      </if>
+      <else>
+        <text term="no date" form="short"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if match="any" type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song">
+        <choose>
+          <if is-numeric="edition">
+            <number variable="edition" prefix=", " form="ordinal"/>
+            <text suffix="." term="edition" prefix=" " form="long"/>
+          </if>
+          <else>
+            <text suffix="." variable="edition" prefix=", "/>
+          </else>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="locators">
+    <choose>
+      <if match="any" type="article-journal article-magazine article-newspaper">
+        <text font-style="italic" variable="container-title"/>
+        <text variable="volume" prefix=" "/>
+        <text variable="page" prefix=":"/>
+      </if>
+      <else-if match="any" type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song">
+        <group delimiter=", ">
+          <group delimiter=" ">
+            <choose>
+              <if type="chapter" match="any">
+                <text term="in" text-case="capitalize-first"/>
+              </if>
+            </choose>
+            <text font-style="italic" variable="container-title" text-case="title"/>
+          </group>
+          <text macro="container-contributors"/>
+          <text macro="secondary-contributors"/>
+          <group delimiter=" ">
+            <label variable="page" form="short"/>
+            <text variable="page"/>
+          </group>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="citation-locator">
+    <group>
+      <text variable="locator" prefix=":"/>
+    </group>
+  </macro>
+  <citation et-al-min="3" et-al-use-first="1" collapse="year" disambiguate-add-year-suffix="true">
+    <sort>
+      <key variable="issued"/>
+      <key macro="author"/>
+    </sort>
+    <layout delimiter="; " prefix="(" suffix=")">
+      <group>
+        <text macro="author-short"/>
+        <text macro="issued-year"/>
+        <text macro="citation-locator"/>
+      </group>
+    </layout>
+  </citation>
+  <bibliography et-al-use-first="98" et-al-min="99" entry-spacing="0">
+    <sort>
+      <key macro="author"/>
+      <key variable="issued"/>
+    </sort>
+    <layout suffix=".">
+      <group delimiter=". ">
+        <text macro="author"/>
+        <text macro="issued"/>
+        <text macro="title"/>
+        <text macro="locators"/>
+      </group>
+      <text macro="edition"/>
+      <group delimiter=". " prefix=". ">
+        <text macro="publisher"/>
+        <text macro="access"/>
+      </group>
+    </layout>
+  </bibliography>
+</style>
diff --git a/buildres/csl/csl-styles/eunomia-revista-en-cultura-de-la-legalidad.csl b/buildres/csl/csl-styles/eunomia-revista-en-cultura-de-la-legalidad.csl
new file mode 100644
index 00000000000..2a97ffffe44
--- /dev/null
+++ b/buildres/csl/csl-styles/eunomia-revista-en-cultura-de-la-legalidad.csl
@@ -0,0 +1,197 @@
+<?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="es-ES">
+  <info>
+    <title>EUNOMÍA. Revista en Cultura de la Legalidad (Español)</title>
+    <id>http://www.zotero.org/styles/eunomia-revista-en-cultura-de-la-legalidad</id>
+    <link href="http://www.zotero.org/styles/eunomia-revista-en-cultura-de-la-legalidad" rel="self"/>
+    <link href="http://www.zotero.org/styles/ecosistemas" rel="template"/>
+    <link href="https://e-revistas.uc3m.es/index.php/EUNOM/information/authors" rel="documentation"/>
+    <link href="https://e-revistas.uc3m.es/index.php/EUNOM/article/view/6807/5361" rel="documentation"/>
+    <author>
+      <name>Patrick O'Brien</name>
+    </author>
+    <category citation-format="author-date"/>
+    <category field="biology"/>
+    <category field="botany"/>
+    <category field="science"/>
+    <issn>2253-6655</issn>
+    <updated>2022-06-20T08:24:18+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=". "/>
+      <label form="short" text-case="capitalize-first" strip-periods="false" prefix=", "/>
+    </names>
+  </macro>
+  <macro name="anon">
+    <text term="anonymous" form="short" text-case="capitalize-first" strip-periods="true"/>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name delimiter-precedes-et-al="never" delimiter-precedes-last="always" initialize-with=". " name-as-sort-order="all"/>
+      <label form="short" prefix=" "/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <text macro="anon"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="author-short">
+    <names variable="author">
+      <name form="short" and="text" delimiter=", " delimiter-precedes-last="never" initialize-with=". "/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <text macro="anon"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if variable="URL" type="webpage">
+        <text term="available at" text-case="capitalize-first" suffix=": "/>
+        <text variable="URL"/>
+        <group prefix=" [" suffix="]">
+          <text term="accessed" text-case="capitalize-first" suffix=" "/>
+          <date form="text" variable="accessed">
+            <date-part name="month"/>
+            <date-part name="day"/>
+            <date-part name="year"/>
+          </date>
+        </group>
+      </if>
+      <else-if type="article-journal" match="any">
+        <text variable="DOI" prefix="https://doi.org/"/>
+      </else-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"/>
+      </if>
+      <else>
+        <text variable="title"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <text variable="publisher"/>
+  </macro>
+  <macro name="year-date">
+    <choose>
+      <if variable="issued">
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
+      </if>
+      <else>
+        <text term="no date" form="short"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <text term="edition" form="short"/>
+        </group>
+      </if>
+      <else>
+        <text variable="edition" suffix="."/>
+      </else>
+    </choose>
+  </macro>
+  <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" collapse="year-suffix">
+    <sort>
+      <key macro="year-date"/>
+    </sort>
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <group delimiter=" ">
+        <group delimiter=", ">
+          <text macro="author-short"/>
+          <text macro="year-date"/>
+        </group>
+        <group>
+          <label variable="locator" suffix=" " form="short"/>
+          <text variable="locator"/>
+        </group>
+      </group>
+    </layout>
+  </citation>
+  <bibliography hanging-indent="true" et-al-min="9" et-al-use-first="7">
+    <sort>
+      <key macro="author"/>
+      <key variable="title"/>
+    </sort>
+    <layout>
+      <group delimiter=". ">
+        <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=". ">
+              <group delimiter=" ">
+                <text macro="title"/>
+                <group delimiter="; " prefix="(" suffix=")">
+                  <text macro="edition"/>
+                  <text macro="editor"/>
+                </group>
+              </group>
+              <text macro="publisher" suffix="."/>
+            </group>
+          </if>
+          <else-if type="chapter paper-conference" match="any">
+            <group delimiter=". ">
+              <text macro="title"/>
+              <group delimiter=", " prefix=" ">
+                <group delimiter=" ">
+                  <text term="in" text-case="capitalize-first" font-style="normal"/>
+                  <text macro="editor"/>
+                </group>
+                <group delimiter=" ">
+                  <text variable="container-title" font-style="italic"/>
+                  <group delimiter=" " prefix="(" suffix=")">
+                    <label variable="page" form="short"/>
+                    <text variable="page"/>
+                  </group>
+                </group>
+                <text variable="collection-title" suffix=","/>
+              </group>
+              <text macro="publisher" prefix=" "/>
+            </group>
+          </else-if>
+          <else-if type="thesis">
+            <group delimiter=". ">
+              <text macro="title"/>
+              <text variable="genre"/>
+              <text macro="publisher"/>
+            </group>
+          </else-if>
+          <else>
+            <group delimiter=". " prefix=" " suffix=".">
+              <group>
+                <text macro="title" prefix=" "/>
+                <text macro="editor" prefix=" "/>
+              </group>
+              <group delimiter=", ">
+                <text variable="container-title" font-style="italic"/>
+                <group>
+                  <text variable="volume" font-style="italic"/>
+                  <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/european-journal-of-anaesthesiology.csl b/buildres/csl/csl-styles/european-journal-of-anaesthesiology.csl
index 5c884d28135..632c0b5acbb 100644
--- a/buildres/csl/csl-styles/european-journal-of-anaesthesiology.csl
+++ b/buildres/csl/csl-styles/european-journal-of-anaesthesiology.csl
@@ -5,7 +5,7 @@
     <title-short>EJA</title-short>
     <id>http://www.zotero.org/styles/european-journal-of-anaesthesiology</id>
     <link href="http://www.zotero.org/styles/european-journal-of-anaesthesiology" rel="self"/>
-    <link href="http://www.zotero.org/styles/cyberpsychology-behavior-and-social-networking" rel="template"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-vancouver" rel="template"/>
     <link href="http://edmgr.ovid.com/eja/accounts/ifauth.htm" rel="documentation"/>
     <author>
       <name>Patrick O'Brien</name>
diff --git a/buildres/csl/csl-styles/expert-reviews-in-molecular-medicine.csl b/buildres/csl/csl-styles/expert-reviews-in-molecular-medicine.csl
new file mode 100644
index 00000000000..2c7945917e0
--- /dev/null
+++ b/buildres/csl/csl-styles/expert-reviews-in-molecular-medicine.csl
@@ -0,0 +1,201 @@
+<?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>Expert Reviews in Molecular Medicine</title>
+    <id>http://www.zotero.org/styles/expert-reviews-in-molecular-medicine</id>
+    <link href="http://www.zotero.org/styles/expert-reviews-in-molecular-medicine" rel="self"/>
+    <link href="http://www.zotero.org/styles/database" rel="template"/>
+    <link href="https://www.cambridge.org/core/journals/expert-reviews-in-molecular-medicine/information/instructions-contributors" rel="documentation"/>
+    <author>
+      <name>Patrick O'Brien</name>
+    </author>
+    <category citation-format="numeric"/>
+    <category field="biology"/>
+    <eissn>1462-3994</eissn>
+    <updated>2022-03-11T08:12:47+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 delimiter-precedes-last="always" initialize-with=". " name-as-sort-order="all"/>
+      <label form="short" prefix=" (" suffix=")"/>
+    </names>
+  </macro>
+  <macro name="author">
+    <names variable="author" font-weight="bold">
+      <name and="text" delimiter-precedes-last="never" initialize-with="" name-as-sort-order="all" sort-separator=" "/>
+      <label form="short" prefix=" (" suffix=")"/>
+      <et-al font-style="italic"/>
+      <substitute>
+        <names variable="editor"/>
+        <text variable="title"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=", ">
+      <text variable="publisher"/>
+      <text variable="publisher-place"/>
+    </group>
+  </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">
+    <label variable="page" form="short" suffix=" "/>
+    <text variable="page"/>
+  </macro>
+  <macro name="book-container">
+    <group delimiter=" ">
+      <text term="in" text-case="capitalize-first"/>
+      <text macro="editor"/>
+    </group>
+  </macro>
+  <macro name="issued">
+    <date date-parts="year" form="text" variable="issued"/>
+  </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>
+  <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="4" et-al-use-first="3" second-field-align="flush" entry-spacing="0">
+    <layout suffix=".">
+      <text variable="citation-number" suffix="."/>
+      <group delimiter=". ">
+        <group delimiter=" ">
+          <text macro="author"/>
+          <text macro="issued" prefix="(" suffix=")"/>
+          <text variable="title"/>
+        </group>
+        <choose>
+          <if type="article-magazine">
+            <group delimiter=" ">
+              <text variable="container-title" font-style="italic" suffix="."/>
+              <text macro="edition"/>
+              <text macro="publisher"/>
+              <text macro="full-issued" suffix=","/>
+              <text macro="pages"/>
+            </group>
+          </if>
+          <else-if type="thesis">
+            <group delimiter=", ">
+              <group delimiter=". ">
+                <text variable="genre"/>
+              </group>
+              <text macro="publisher"/>
+              <text macro="volume"/>
+              <text macro="pages"/>
+            </group>
+          </else-if>
+          <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+            <group delimiter="; ">
+              <text variable="title" font-style="italic"/>
+              <text macro="editor"/>
+              <text macro="series"/>
+              <text macro="edition"/>
+              <choose>
+                <if type="report">
+                  <group delimiter=" ">
+                    <text variable="genre"/>
+                    <text variable="number"/>
+                  </group>
+                </if>
+              </choose>
+              <text macro="volume"/>
+              <group delimiter=", ">
+                <text macro="publisher"/>
+                <text macro="issued"/>
+              </group>
+              <group delimiter=", ">
+                <text macro="pages"/>
+              </group>
+            </group>
+          </else-if>
+          <else-if type="patent">
+            <group delimiter=", ">
+              <group delimiter=". ">
+                <text variable="title"/>
+                <text variable="number"/>
+              </group>
+              <date variable="issued" form="text"/>
+            </group>
+          </else-if>
+          <else-if type="chapter paper-conference" match="any">
+            <group delimiter=", ">
+              <text macro="book-container"/>
+              <text variable="container-title" font-style="italic"/>
+              <text macro="series"/>
+              <text macro="publisher"/>
+              <group delimiter=", ">
+                <text macro="volume"/>
+                <text macro="pages"/>
+              </group>
+            </group>
+          </else-if>
+          <else-if type="webpage post post-weblog" match="any">
+            <group delimiter=". ">
+              <text variable="title"/>
+              <group delimiter=" ">
+                <text variable="URL"/>
+                <text term="accessed" text-case="capitalize-first"/>
+                <date form="text" variable="accessed"/>
+              </group>
+            </group>
+          </else-if>
+          <else-if type="article-journal">
+            <group delimiter=" ">
+              <text variable="container-title" font-style="italic"/>
+              <group delimiter=", ">
+                <text variable="volume" font-weight="bold"/>
+                <text variable="page"/>
+              </group>
+            </group>
+          </else-if>
+          <else>
+            <group delimiter=" ">
+              <group delimiter=". ">
+                <text variable="title"/>
+                <text variable="container-title" font-style="italic" form="short"/>
+              </group>
+              <group delimiter=", ">
+                <text macro="issued" font-weight="bold"/>
+                <text variable="volume" font-style="italic"/>
+                <text variable="page"/>
+              </group>
+            </group>
+          </else>
+        </choose>
+      </group>
+    </layout>
+  </bibliography>
+</style>
diff --git a/buildres/csl/csl-styles/extracellular-vesicles-and-circulating-nucleic-acids.csl b/buildres/csl/csl-styles/extracellular-vesicles-and-circulating-nucleic-acids.csl
new file mode 100644
index 00000000000..ebc9867911c
--- /dev/null
+++ b/buildres/csl/csl-styles/extracellular-vesicles-and-circulating-nucleic-acids.csl
@@ -0,0 +1,218 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" page-range-format="minimal" demote-non-dropping-particle="sort-only" default-locale="en-US">
+  <info>
+    <title>Extracellular Vesicles and Circulating Nucleic Acids</title>
+    <title-short>EVCNA</title-short>
+    <id>http://www.zotero.org/styles/extracellular-vesicles-and-circulating-nucleic-acids</id>
+    <link href="http://www.zotero.org/styles/extracellular-vesicles-and-circulating-nucleic-acids" rel="self"/>
+    <link href="http://www.zotero.org/styles/american-journal-of-sonography" rel="template"/>
+    <link href="https://evcna.com/pages/view/author_instructions" rel="documentation"/>
+    <author>
+      <name>Patrick O'Brien</name>
+    </author>
+    <category citation-format="numeric"/>
+    <category field="medicine"/>
+    <eissn>2767-6641</eissn>
+    <updated>2022-03-22T13:35: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>
+  <locale xml:lang="en">
+    <terms>
+      <term name="available at">available from</term>
+      <term name="accessed">last accessed on</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 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"/>
+        <et-al font-style="italic"/>
+        <label prefix=", "/>
+        <substitute>
+          <names variable="editor"/>
+          <text macro="title"/>
+        </substitute>
+      </names>
+    </group>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if type="article-journal">
+        <group delimiter=" " prefix="[" suffix="]">
+          <text variable="PMID" prefix="PMID: "/>
+          <text variable="DOI" prefix="DOI: "/>
+        </group>
+      </if>
+      <else-if type="webpage post-weblog" match="any">
+        <group delimiter=". ">
+          <group delimiter=": ">
+            <text term="available at" text-case="capitalize-first"/>
+            <text variable="URL"/>
+          </group>
+          <group delimiter=" " prefix="[" suffix="]">
+            <text term="accessed" text-case="capitalize-first"/>
+            <date variable="accessed">
+              <date-part name="month" suffix=" "/>
+              <date-part name="day" suffix=", "/>
+              <date-part name="year"/>
+            </date>
+          </group>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="title">
+    <text variable="title" font-style="normal"/>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=": ">
+      <text variable="publisher-place"/>
+      <text variable="publisher"/>
+    </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" prefix="[" suffix="]">
+      <text variable="citation-number"/>
+    </layout>
+  </citation>
+  <bibliography et-al-min="7" et-al-use-first="3" second-field-align="flush">
+    <layout>
+      <text variable="citation-number" suffix=". "/>
+      <group delimiter=". ">
+        <text macro="author"/>
+        <text macro="title" prefix=" " suffix="."/>
+        <choose>
+          <if type="bill book graphic legislation motion_picture report song" match="any">
+            <group delimiter=" " suffix=".">
+              <text macro="edition"/>
+              <text macro="editor" prefix="(" suffix=")"/>
+            </group>
+            <group delimiter="; " suffix=".">
+              <text prefix=" " macro="publisher"/>
+              <date variable="issued">
+                <date-part name="year"/>
+              </date>
+              <text variable="page" prefix=":"/>
+            </group>
+          </if>
+          <else-if type="chapter paper-conference" match="any">
+            <group delimiter=". ">
+              <group delimiter=": ">
+                <text term="in" text-case="capitalize-first"/>
+                <text macro="editor"/>
+              </group>
+              <group prefix=" " delimiter=", " suffix=".">
+                <text variable="container-title" font-style="normal" prefix=" "/>
+                <text variable="volume" prefix="Vol "/>
+                <text macro="edition" prefix=" "/>
+              </group>
+              <group delimiter="; " suffix=".">
+                <text macro="publisher" prefix=" "/>
+                <group delimiter=". " suffix=".">
+                  <date variable="issued">
+                    <date-part name="year"/>
+                  </date>
+                  <group delimiter=" ">
+                    <label variable="page" form="short"/>
+                    <text variable="page"/>
+                  </group>
+                </group>
+              </group>
+            </group>
+          </else-if>
+          <else-if type="article-newspaper">
+            <text variable="container-title" font-style="italic" 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 delimiter=" " suffix=",">
+              <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>
+            <text macro="editor" suffix="."/>
+            <group delimiter=" " prefix=" " suffix=".">
+              <text variable="container-title" form="short" strip-periods="true" font-style="italic"/>
+              <group delimiter=":">
+                <group delimiter=";">
+                  <date variable="issued">
+                    <date-part name="year"/>
+                  </date>
+                  <text variable="volume"/>
+                </group>
+                <text variable="page"/>
+              </group>
+            </group>
+          </else>
+        </choose>
+      </group>
+      <text prefix=" " macro="access" suffix="."/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/buildres/csl/csl-styles/food-and-agriculture-organization-of-the-united-nations.csl b/buildres/csl/csl-styles/food-and-agriculture-organization-of-the-united-nations.csl
index a8d56d3c5f7..0941c0564b0 100644
--- a/buildres/csl/csl-styles/food-and-agriculture-organization-of-the-united-nations.csl
+++ b/buildres/csl/csl-styles/food-and-agriculture-organization-of-the-united-nations.csl
@@ -6,7 +6,7 @@
     <title-short>FAO</title-short>
     <id>http://www.zotero.org/styles/food-and-agriculture-organization-of-the-united-nations</id>
     <link href="http://www.zotero.org/styles/food-and-agriculture-organization-of-the-united-nations" rel="self"/>
-    <link href="http://www.fao.org/3/a-ac339e.pdf" rel="documentation"/>
+    <link href="https://www.fao.org/3/cb8081en/cb8081en.pdf" rel="documentation"/>
     <author>
       <name>Bin Liu</name>
       <email>lieubean@gmail.com</email>
@@ -15,12 +15,23 @@
     <contributor>
       <name>Julian Plummer</name>
       <email>julian.plummer@gmail.com</email>
+      <uri>https://www.linkedin.com/in/julian-plummer/</uri>
+    </contributor>
+    <contributor>
+      <name>Amy Knauff</name>
+      <email/>
+      <uri>https://www.linkedin.com/in/amy-knauff-92655442/</uri>
+    </contributor>
+    <contributor>
+      <name>Stephanie Wright</name>
+      <email/>
+      <uri>https://www.linkedin.com/in/piriet/</uri>
     </contributor>
     <category citation-format="author-date"/>
     <category field="science"/>
     <category field="social_science"/>
-    <summary>This style is created to meet the citation and bibliographical requirements of FAOSTYLE, and has been tested with Zotero and Mendeley. Last update: March 2017.</summary>
-    <updated>2021-06-07T23:29:39+02:00</updated>
+    <summary>This style is created to meet the citation and bibliographical requirements of FAOSTYLE, and has been tested with Zotero and Mendeley. Last update: February 2022.</summary>
+    <updated>2022-08-02T08:28:31+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 settings for English. Settings for other languages could be added later to this section. -->
@@ -28,8 +39,8 @@
     <style-options punctuation-in-quote="false"/>
     <terms>
       <term name="no date">undated</term>
-      <term name="available at">also available at</term>
-      <term name="presented at">Paper presented at</term>
+      <term name="presented at">Presentation at</term>
+      <term name="by">Adopted</term>
     </terms>
     <date delimiter=" " form="text">
       <date-part name="day"/>
@@ -42,7 +53,7 @@
     <text term="anonymous" text-case="capitalize-first"/>
   </macro>
   <macro name="editor">
-    <!-- XX ed. / XX & XX eds. -->
+    <!-- Outputs "XX ed. / XX & XX eds." -->
     <names variable="editor">
       <name and="symbol" delimiter-precedes-last="never" initialize-with="."/>
       <label form="short" strip-periods="true" prefix=", "/>
@@ -80,7 +91,7 @@
     </names>
   </macro>
   <macro name="date">
-    <!-- date format: year / undated / put "forthcoming" or else in "Date" field when needed.-->
+    <!-- date format: year / undated / put "forthcoming" or else in "Date" field when needed. -->
     <choose>
       <if match="none" variable="issued">
         <text term="no date"/>
@@ -90,60 +101,104 @@
       </else>
     </choose>
   </macro>
-  <macro name="publisher-and-place">
-    <!-- place, publisher -->
-    <group delimiter=", ">
-      <text variable="publisher-place"/>
-      <text variable="publisher"/>
+  <macro name="title-and-genre">
+    <!-- For book, song, audio recording, etc.: Outputs "Title (italic) [Medium/Genre]". -->
+    <group delimiter=" ">
+      <text variable="title" font-style="italic"/>
+      <text variable="medium" prefix="[" suffix="]"/>
+      <text variable="genre" prefix="[" suffix="]"/>
+    </group>
+  </macro>
+  <macro name="periodical">
+    <!-- For journal and magazine: Outputs "Journal/Magazine title (italic), Vol(Issue): Page." Suffix is added because this can appear at the end of a reference. -->
+    <group suffix=".">
+      <text variable="container-title" form="long" font-style="italic"/>
+      <text variable="volume" prefix=", "/>
+      <text variable="issue" prefix="(" suffix=")"/>
+      <text variable="page" prefix=": "/>
     </group>
   </macro>
   <macro name="edition">
-    <!-- Second edition -->
+    <!-- Outputs edition info like "Second edition". -->
     <number text-case="capitalize-first" variable="edition" form="long-ordinal"/>
     <text term="edition" prefix=" "/>
   </macro>
+  <macro name="vol">
+    <!-- Vol. xx -->
+    <group delimiter=" ">
+      <text term="volume" form="short" text-case="capitalize-first"/>
+      <text variable="volume"/>
+    </group>
+  </macro>
+  <macro name="in-and-container">
+    <!-- Outputs "In: XX ed. Container-title (italic)" if container-title exists. "XX ed. " will be omited if there's no editor. -->
+    <choose>
+      <if variable="container-title">
+        <group delimiter=" ">
+          <text term="in" text-case="capitalize-first" suffix=":"/>
+          <text macro="editor" suffix="."/>
+          <text variable="container-title" font-style="italic"/>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="series-and-number">
+    <!-- Outputs "Series-Title No. xxx" for various types.-->
+    <group delimiter=" ">
+      <text variable="collection-title"/>
+      <text variable="collection-number"/>
+      <!-- "Series Number" field for book section in Zotero. -->
+      <text variable="number"/>
+      <!-- "Report Number" field for report in Zotero. -->
+      <!-- "No. " must be entered in "Series Number" and "Report Number" in Zotero. -->
+      <!-- Mendeley doesn't offer a "Series Number / Report Number" field. "No. xxx" must be put in "Series" field. -->
+    </group>
+  </macro>
+  <macro name="publisher-and-place">
+    <!-- Outputs "place, publisher." Suffix is added because this can appear at the end of a reference. -->
+    <group delimiter=", " suffix=".">
+      <text variable="publisher-place"/>
+      <text variable="publisher"/>
+    </group>
+  </macro>
   <macro name="Cite-and-URL">
-    <!-- [Cited day month year]. URL -->
-    <group delimiter=" " prefix="[" suffix="]. ">
+    <!-- Output "Cited day month year. URL" -->
+    <group delimiter=" " suffix=". ">
       <text term="cited" text-case="capitalize-first"/>
       <date form="text" variable="accessed"/>
     </group>
     <text variable="URL"/>
   </macro>
-  <macro name="Available-at">
-    <!-- (also available at URL). -->
-    <group delimiter=" " prefix="(" suffix=").">
-      <text term="available at"/>
-      <text variable="URL"/>
-    </group>
-  </macro>
-  <macro name="DOI-or-available-at">
-    <!-- If DOI exists, then DOI is shown as: https://doi.org/DOI. If DOI doesn't exist, then "also available at URL" is shown. -->
+  <macro name="DOI-or-URL">
+    <!-- If DOI exists, outputs "https://doi.org/DOI". If DOI doesn't exist, then outputs URL. -->
     <choose>
       <if variable="DOI">
         <text variable="DOI" prefix="https://doi.org/"/>
       </if>
       <else>
-        <group delimiter=" " prefix="(" suffix=").">
-          <text term="available at"/>
-          <text variable="URL"/>
-        </group>
+        <text variable="URL"/>
       </else>
     </choose>
   </macro>
-  <macro name="number_of_pages-label">
-    <!-- 1 p. / x pp. -->
-    <group delimiter=" ">
-      <text variable="number-of-pages"/>
-      <label variable="number-of-pages" form="short"/>
-    </group>
+  <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>
   <!-- in-line citation: (author, date) -->
   <citation disambiguate-add-year-suffix="true" collapse="year" et-al-min="4" et-al-use-first="1">
     <sort>
       <key variable="author"/>
       <key variable="issued"/>
-      <key variable="accessed"/>
     </sort>
     <layout prefix="(" suffix=")" delimiter="; ">
       <text macro="author-short" suffix=", "/>
@@ -151,220 +206,195 @@
     </layout>
   </citation>
   <!-- bibliography -->
-  <bibliography entry-spacing="0" et-al-min="8" et-al-use-first="7">
+  <bibliography entry-spacing="0" hanging-indent="true" line-spacing="1" et-al-min="10" et-al-use-first="7">
     <sort>
       <key macro="author"/>
       <key variable="issued"/>
-      <key variable="accessed"/>
     </sort>
     <layout>
       <choose>
-        <if match="none" type="legal_case">
-          <!-- Every item type except legal case uses "Anonymous" as author if there's no author. So legal case is singled out here. -->
+        <if type="legal_case bill legislation" match="none">
+          <!-- Every item type except legal ones (case, bill and statute) uses "Anonymous" as author if there's no author. -->
           <group delimiter=". ">
             <text macro="author" font-weight="bold"/>
             <text macro="date"/>
             <choose>
               <if type="book">
-                <!-- book and computer program in Zotero; book in Mendeley.  -->
-                <group>
-                  <text variable="title" font-style="italic"/>
-                  <text variable="medium" prefix=" [" suffix="]"/>
-                  <!-- For computer program in Zotero. Can put "CD&#8211;ROM / DVD&#8211;ROM" in "System" field. -->
-                  <text variable="genre" prefix=" [" suffix="]"/>
-                  <!-- For eBook in Mendeley, put "Kindle edition" in "Genre" field. For eBook in Zotero, put "genre:Kindle edition" in "Extra" field. -->
-                  <text macro="edition" prefix=". "/>
-                </group>
+                <!-- book and computer program in Zotero; book in Mendeley. -->
+                <text macro="title-and-genre"/>
+                <!-- For Computer Program in Zotero, put "CD-ROM"/ "DVD-ROM" etc. in "System" field. -->
+                <!-- For eBook in Mendeley, put "CD-ROM", "Kindle edition" etc. in "Genre" field. -->
+                <!-- For eBook in Zotero, put "Medium: CD-ROM", "Genre: Kindle edition" etc. in "Extra" field. -->
+                <text macro="edition"/>
                 <text macro="editor"/>
-                <group>
-                  <text variable="collection-title"/>
-                  <text variable="collection-number" prefix=" "/>
-                  <!-- Mendeley doesn't offer a "Series Number / Report Number" field. "No. xxx" must be put in "Series" field. -->
-                </group>
-                <text macro="publisher-and-place" suffix="."/>
-                <text macro="number_of_pages-label"/>
-                <text macro="DOI-or-available-at"/>
+                <text macro="vol"/>
+                <text macro="series-and-number"/>
+                <text macro="publisher-and-place"/>
+                <text macro="DOI-or-URL"/>
               </if>
-              <else-if type="chapter report" match="any">
-                <!-- book section and report -->
+              <else-if type="chapter">
+                <!-- book section -->
                 <text variable="title"/>
+                <text macro="in-and-container"/>
                 <group delimiter=" ">
-                  <text term="in" text-case="capitalize-first" font-style="italic"/>
-                  <text macro="editor"/>
-                </group>
-                <group>
-                  <text variable="container-title" font-style="italic"/>
-                  <text macro="edition" prefix=". "/>
-                  <label variable="page" prefix=", " form="short"/>
-                  <!-- pp. xx&#8211;xx -->
-                  <text variable="page" prefix=" "/>
-                </group>
-                <group>
-                  <text variable="collection-title"/>
-                  <text variable="collection-number" prefix=" "/>
-                  <!-- "Series Number" field for book section in Zotero. -->
-                  <text variable="number" prefix=" "/>
-                  <!-- "Report Number" field for report in Zotero. -->
-                  <!-- Mendeley doesn't offer a "Series Number / Report Number" field. "No. xxx" must be put in "Series" field. -->
-                </group>
-                <group suffix=".">
-                  <text macro="publisher-and-place"/>
-                  <text macro="number_of_pages-label"/>
+                  <text macro="edition" suffix=","/>
+                  <label variable="page" form="short"/>
+                  <text variable="page"/>
                 </group>
-                <text macro="DOI-or-available-at"/>
+                <text macro="vol"/>
+                <text macro="series-and-number"/>
+                <text macro="publisher-and-place"/>
+                <text macro="DOI-or-URL"/>
               </else-if>
               <else-if type="article-journal">
-                <!-- paper journal article -->
+                <!-- journal article -->
                 <text variable="title"/>
-                <group suffix=".">
-                  <text variable="container-title" form="long" font-style="italic"/>
-                  <text variable="volume" prefix=", "/>
-                  <text variable="issue" prefix="(" suffix=")"/>
-                  <text variable="page" prefix=": "/>
-                </group>
-                <text macro="DOI-or-available-at"/>
+                <text macro="periodical"/>
+                <text macro="DOI-or-URL"/>
               </else-if>
               <else-if type="article-magazine">
-                <!-- magazine and online-only journal article -->
+                <!-- magazine article -->
                 <text variable="title"/>
-                <group suffix=".">
-                  <text variable="container-title" form="long" font-style="italic"/>
-                  <text variable="volume" prefix=", "/>
-                  <text variable="issue" prefix="(" suffix=")"/>
-                  <text variable="page" prefix=": "/>
-                  <choose>
-                    <if variable="URL">
-                      <!-- If URL exists, use "[online]" and Cite-and-URL macro.  -->
-                      <text term="online" prefix=" [" suffix="]"/>
-                    </if>
-                  </choose>
-                </group>
+                <text macro="periodical"/>
                 <text macro="Cite-and-URL"/>
               </else-if>
               <else-if type="article-newspaper">
                 <!-- newspaper article -->
                 <text variable="title"/>
-                <group>
+                <group delimiter=", " suffix=".">
                   <text variable="container-title" font-style="italic"/>
-                  <date form="text" variable="issued" prefix=", "/>
+                  <date form="text" variable="issued"/>
                 </group>
-                <text macro="Available-at"/>
+                <text macro="Cite-and-URL"/>
               </else-if>
               <else-if type="webpage post-weblog" match="any">
-                <!-- web page, online monographs, and blog post -->
-                <choose>
-                  <if variable="container-title">
-                    <group>
-                      <text variable="title"/>
-                      <text term="in" text-case="capitalize-first" prefix=". "/>
-                      <text variable="container-title" font-style="italic" prefix=": "/>
-                      <text term="online" prefix=" [" suffix="]"/>
-                    </group>
-                  </if>
-                  <else>
-                    <group>
-                      <text variable="title" font-style="italic"/>
-                      <text term="online" prefix=" [" suffix="]"/>
-                    </group>
-                  </else>
-                </choose>
-                <text variable="note"/>
-                <!-- Put place and other information in "Extra" field in Zotero and in Notes in Mendeley. -->
+                <!-- web page and blog post -->
+                <text variable="title"/>
+                <text macro="in-and-container"/>
+                <text variable="publisher-place"/>
+                <!-- Put place in "Extra" field in Zotero, e.g. "Place: Rome". -->
                 <text macro="Cite-and-URL"/>
               </else-if>
               <else-if type="thesis">
                 <!-- thesis -->
                 <text variable="title" font-style="italic"/>
                 <text macro="publisher-and-place"/>
-                <text variable="genre" prefix=" (" suffix=")"/>
-                <text macro="DOI-or-available-at"/>
+                <text variable="genre" suffix="."/>
+                <!-- Suffix is added because this can appear at the end of a reference, i.e. when the thesis doesn't have DOI/URL. -->
+                <text macro="DOI-or-URL"/>
               </else-if>
-              <else-if type="song motion_picture article" match="any">
-                <!-- audio recording, film, and video recording in Zotero; film and computer program in Mendeley -->
-                <choose>
-                  <if match="any" variable="medium genre">
-                    <group>
-                      <text variable="title" font-style="italic"/>
-                      <text variable="medium" prefix=" [" suffix="]"/>
-                      <!-- Can put "audio / video" in "Format" field in Zotero. -->
-                      <text variable="genre" prefix=" [" suffix="]"/>
-                      <!-- Can put "audio / video / CD&#8211;ROM" in "Genre" field in Mendeley. -->
-                    </group>
-                  </if>
-                  <else>
-                    <text variable="title"/>
-                  </else>
-                </choose>
-                <text macro="publisher-and-place" suffix="."/>
+              <else-if type="song motion_picture" match="any">
+                <!-- audio recording, film and video recording in Zotero; film and computer program in Mendeley -->
+                <text macro="title-and-genre"/>
+                <!-- Can put "audio recording", "video" etc. in "Format" field in Zotero. -->
+                <!-- Can put "audio recording", "video" etc. in "Genre" field in Mendeley. -->
+                <text macro="publisher-and-place"/>
                 <text macro="Cite-and-URL"/>
               </else-if>
-              <else-if type="manuscript">
-                <!-- manuscript -->
-                <text variable="title"/>
-                <text variable="genre" suffix="."/>
-                <text variable="publisher-place" suffix="."/>
-                <text macro="number_of_pages-label"/>
-                <text macro="Available-at"/>
+              <else-if type="manuscript report" match="any">
+                <!-- manuscript and report -->
+                <text variable="title" font-style="italic"/>
+                <text variable="genre"/>
+                <text macro="series-and-number"/>
+                <text macro="publisher-and-place"/>
+                <text macro="DOI-or-URL"/>
               </else-if>
-              <else-if type="speech" match="any">
+              <else-if type="article">
+                <!-- document, can be used for e.g. monograph -->
+                <text variable="title" font-style="italic"/>
+                <text variable="genre"/>
+                <text macro="series-and-number"/>
+                <text macro="publisher-and-place"/>
+                <text macro="Cite-and-URL"/>
+              </else-if>
+              <else-if type="speech">
                 <!-- presentation -->
                 <text variable="title"/>
-                <group suffix=".">
+                <group delimiter=" ">
                   <text term="presented at"/>
-                  <text variable="event" prefix=" "/>
-                  <date form="text" variable="issued" prefix=", "/>
-                  <text variable="publisher-place" prefix=", "/>
+                  <text macro="event-title" suffix=","/>
+                  <date form="text" variable="issued" suffix=","/>
+                  <text macro="publisher-and-place"/>
                 </group>
                 <text macro="Cite-and-URL"/>
               </else-if>
               <else-if type="paper-conference">
                 <!-- conference paper -->
-                <text variable="title"/>
-                <group>
-                  <text term="in" text-case="capitalize-first" font-style="italic"/>
-                  <text macro="editor" prefix=" "/>
-                </group>
-                <text variable="container-title" font-style="italic"/>
-                <group suffix=".">
-                  <label suffix=" " variable="page" form="short"/>
-                  <text variable="page"/>
-                </group>
+                <text variable="title" font-style="italic"/>
+                <text macro="in-and-container"/>
                 <text variable="collection-title"/>
-                <group suffix=".">
-                  <text term="presented at"/>
-                  <text variable="event" prefix=" "/>
-                  <date form="text" variable="issued" prefix=", "/>
-                  <text variable="publisher-place" prefix=", "/>
+                <group delimiter=", " suffix=".">
+                  <text macro="event-title"/>
+                  <text variable="publisher-place"/>
+                  <text variable="publisher"/>
+                  <!-- Not using macro "publisher-and-place" here because event date needs to be appended and the suffix "." of the macro would appear. -->
+                  <date form="text" variable="issued"/>
                 </group>
-                <text macro="DOI-or-available-at"/>
+                <text macro="DOI-or-URL"/>
               </else-if>
               <else>
                 <!-- other item types -->
-                <text variable="title" suffix="."/>
-                <text macro="publisher-and-place" suffix="."/>
+                <text variable="title"/>
+                <text variable="genre"/>
+                <text macro="publisher-and-place"/>
                 <text macro="Cite-and-URL"/>
               </else>
             </choose>
           </group>
         </if>
-        <else>
+        <else-if type="legal_case">
           <!-- case -->
           <group delimiter=" ">
-            <group>
-              <text variable="title"/>
-              <text variable="volume" prefix=", "/>
-            </group>
-            <text variable="container-title"/>
-            <text variable="page"/>
-            <group delimiter=" " prefix="(" suffix=")">
-              <text variable="authority"/>
-              <!-- "Court" field in Zotero -->
-              <text variable="publisher"/>
-              <!-- "Publisher" field in Mendeley -->
-              <text macro="date"/>
+            <text variable="title" font-style="italic" suffix="."/>
+            <text variable="authority" suffix=","/>
+            <!-- "Court" field in Zotero -->
+            <text variable="number" suffix="."/>
+            <!-- "Docket Number" field in Zotero -->
+            <date form="text" variable="issued" suffix="."/>
+            <text variable="note" suffix="."/>
+            <!-- "Extra" field in Zotero. Can be used to put any additional information. -->
+          </group>
+        </else-if>
+        <else-if type="bill">
+          <!-- legal instruments -->
+          <choose>
+            <if variable="title-short">
+              <text variable="title" form="short" font-style="italic" suffix=" "/>
+              <text variable="title" font-style="italic" prefix="(" suffix="). "/>
+            </if>
+            <else>
+              <text variable="title" font-style="italic" suffix=". "/>
+            </else>
+          </choose>
+          <group delimiter=" ">
+            <text term="by" suffix=":"/>
+            <text variable="publisher-place" suffix=","/>
+            <!-- Put "Place: xxxxx" in "Extra" field in Zotero -->
+            <date form="text" variable="issued" suffix="."/>
+            <group delimiter=", " suffix=".">
+              <text variable="number"/>
+              <!-- "Bill Number" field in Zotero -->
+              <group delimiter=" ">
+                <text variable="volume"/>
+                <!-- "Code Volume" field in Zotero -->
+                <text variable="container-title"/>
+                <!-- "Code" field in Zotero -->
+                <text variable="page"/>
+                <!-- "Code Pages" field in Zotero -->
+              </group>
             </group>
           </group>
-        </else>
+        </else-if>
+        <else-if type="legislation">
+          <!-- Type "statute" in Zotero, used for legislation -->
+          <group delimiter=" ">
+            <text macro="author" font-weight="bold" suffix="."/>
+            <text variable="title" font-style="italic" suffix=","/>
+            <text variable="number" suffix=","/>
+            <!-- "Public Law Number" field in Zotero -->
+            <text macro="date" suffix="."/>
+          </group>
+        </else-if>
       </choose>
     </layout>
   </bibliography>
diff --git a/buildres/csl/csl-styles/food-science-and-biotechnology.csl b/buildres/csl/csl-styles/food-science-and-biotechnology.csl
new file mode 100644
index 00000000000..e980c7cd026
--- /dev/null
+++ b/buildres/csl/csl-styles/food-science-and-biotechnology.csl
@@ -0,0 +1,194 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" and="text" demote-non-dropping-particle="sort-only" default-locale="en-GB">
+  <info>
+    <title>Food Science and Biotechnology</title>
+    <title-short>FSB</title-short>
+    <id>http://www.zotero.org/styles/food-science-and-biotechnology</id>
+    <link href="http://www.zotero.org/styles/food-science-and-biotechnology" rel="self"/>
+    <link href="http://www.zotero.org/styles/animal" rel="template"/>
+    <link href="http://www.fsnb.or.kr/" rel="documentation"/>
+    <author>
+      <name>Patrick O'Brien</name>
+    </author>
+    <category citation-format="author-date"/>
+    <category field="biology"/>
+    <issn>1226-7708</issn>
+    <eissn>2092-6456</eissn>
+    <updated>2022-07-08T12:59: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">
+    <terms>
+      <term name="available at">available from</term>
+    </terms>
+  </locale>
+  <macro name="editor">
+    <names variable="editor" delimiter=", ">
+      <name delimiter-precedes-last="never" initialize-with="." name-as-sort-order="all" sort-separator=" "/>
+      <label form="short" prefix="(" suffix=")"/>
+    </names>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <label variable="edition" form="short"/>
+        </group>
+      </if>
+      <else>
+        <text variable="edition"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="volume-booklike">
+    <group delimiter=" ">
+      <label variable="volume" form="short" text-case="capitalize-first"/>
+      <number variable="volume" form="numeric"/>
+    </group>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter-precedes-last="never" delimiter=", "/>
+      <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" initialize-with=". "/>
+      <et-al font-style="normal"/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <choose>
+          <if type="bill book graphic legal_case legislation motion_picture report song thesis" match="any">
+            <text variable="title" form="short" font-style="italic"/>
+          </if>
+          <else>
+            <text variable="title" form="short" quotes="true"/>
+          </else>
+        </choose>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=" ">
+      <group delimiter=", ">
+        <text variable="publisher"/>
+        <text variable="publisher-place"/>
+      </group>
+      <text macro="issued" prefix="(" suffix=")"/>
+    </group>
+  </macro>
+  <macro name="issued">
+    <date variable="issued">
+      <date-part name="year"/>
+    </date>
+  </macro>
+  <macro name="pages">
+    <group delimiter=" ">
+      <label variable="page" form="short"/>
+      <text variable="page"/>
+    </group>
+  </macro>
+  <citation delimiter-precedes-last="never" et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" collapse="year-suffix" year-suffix-delimiter="; ">
+    <sort>
+      <key variable="author"/>
+      <key variable="issued"/>
+    </sort>
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <group delimiter=", ">
+        <text macro="author-short"/>
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
+        <group>
+          <label variable="locator" form="short"/>
+          <text variable="locator" prefix=" "/>
+        </group>
+      </group>
+    </layout>
+  </citation>
+  <bibliography sort-separator="" entry-spacing="0" line-spacing="2" hanging-indent="true">
+    <sort>
+      <key macro="author-short"/>
+      <key variable="issued"/>
+    </sort>
+    <layout suffix=".">
+      <group delimiter=". ">
+        <text macro="author"/>
+        <text variable="title" prefix=" "/>
+        <choose>
+          <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+            <group delimiter=". ">
+              <text macro="edition"/>
+              <text macro="volume-booklike"/>
+              <group delimiter=" ">
+                <text macro="publisher"/>
+              </group>
+            </group>
+          </if>
+          <else-if type="thesis" match="any">
+            <group delimiter=", ">
+              <text variable="genre"/>
+              <text macro="publisher" prefix=" "/>
+            </group>
+          </else-if>
+          <else-if type="chapter paper-conference" match="any">
+            <group delimiter=". ">
+              <group delimiter=", ">
+                <text macro="volume-booklike"/>
+                <text macro="pages"/>
+              </group>
+              <group delimiter=": ">
+                <text term="in" text-case="capitalize-first"/>
+                <text variable="container-title" prefix=" "/>
+              </group>
+              <group delimiter=", ">
+                <text macro="editor"/>
+                <text variable="collection-title" prefix=" "/>
+              </group>
+              <text macro="publisher" prefix=" "/>
+            </group>
+          </else-if>
+          <else-if type="post-weblog webpage post" match="any">
+            <group delimiter=". ">
+              <text variable="container-title"/>
+              <group delimiter=". ">
+                <group delimiter=": ">
+                  <text term="available at" text-case="capitalize-first"/>
+                  <text variable="URL" font-style="italic"/>
+                </group>
+                <group>
+                  <text term="accessed" text-case="capitalize-first" font-style="normal" suffix=" "/>
+                  <date variable="accessed">
+                    <date-part name="month" suffix=" "/>
+                    <date-part name="day" suffix=", "/>
+                    <date-part name="year"/>
+                  </date>
+                </group>
+              </group>
+            </group>
+          </else-if>
+          <else>
+            <group delimiter=": " prefix=" ">
+              <group delimiter=". ">
+                <text variable="container-title"/>
+                <text variable="volume"/>
+              </group>
+              <group delimiter=" ">
+                <text variable="page"/>
+                <text macro="issued" prefix="(" suffix=")"/>
+              </group>
+            </group>
+          </else>
+        </choose>
+      </group>
+    </layout>
+  </bibliography>
+</style>
diff --git a/buildres/csl/csl-styles/foodborne-pathogens-and-disease.csl b/buildres/csl/csl-styles/foodborne-pathogens-and-disease.csl
deleted file mode 100644
index 5016e943fb1..00000000000
--- a/buildres/csl/csl-styles/foodborne-pathogens-and-disease.csl
+++ /dev/null
@@ -1,195 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" page-range-format="minimal" class="in-text" version="1.0" demote-non-dropping-particle="sort-only" default-locale="en-US">
-  <info>
-    <title>Foodborne Pathogens and Disease</title>
-    <id>http://www.zotero.org/styles/foodborne-pathogens-and-disease</id>
-    <link href="http://www.zotero.org/styles/foodborne-pathogens-and-disease" rel="self"/>
-    <link href="http://www.zotero.org/styles/elsevier-vancouver-author-date" rel="template"/>
-    <link href="https://home.liebertpub.com/publications/foodborne-pathogens-and-disease/108/for-authors" rel="documentation"/>
-    <author>
-      <name>Patrick O'Brien</name>
-      <email>obrienpat86@gmail.com</email>
-    </author>
-    <category citation-format="author-date"/>
-    <category field="medicine"/>
-    <category field="biology"/>
-    <issn>1535-3141</issn>
-    <eissn>1556-7125</eissn>
-    <updated>2019-04-04T10:53:09+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">
-      <name initialize-with="" delimiter=", " delimiter-precedes-last="always" name-as-sort-order="all" sort-separator=" "/>
-      <label form="short" 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" delimiter=", " initialize-with=". "/>
-      <substitute>
-        <names variable="editor"/>
-        <names variable="translator"/>
-        <text variable="title" form="short"/>
-      </substitute>
-    </names>
-  </macro>
-  <macro name="editor">
-    <names variable="editor">
-      <name initialize-with="" delimiter=", " delimiter-precedes-last="always" name-as-sort-order="all" sort-separator=" "/>
-      <label form="short" prefix=" (" 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" form="short"/>
-      </else>
-    </choose>
-  </macro>
-  <macro name="publisher">
-    <group delimiter=", ">
-      <group delimiter=": ">
-        <text variable="publisher-place"/>
-        <text variable="publisher"/>
-      </group>
-      <text macro="year-date"/>
-    </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"/>
-      </else>
-    </choose>
-  </macro>
-  <macro name="access">
-    <choose>
-      <if type="webpage post post-weblog">
-        <choose>
-          <if variable="URL">
-            <text variable="URL"/>
-            <group prefix=" (" suffix=")" delimiter=" ">
-              <text term="accessed"/>
-              <date variable="accessed" form="text"/>
-            </group>
-          </if>
-        </choose>
-      </if>
-    </choose>
-  </macro>
-  <citation et-al-min="3" et-al-use-first="1" disambiguate-add-givenname="true" disambiguate-add-year-suffix="true" collapse="year" cite-group-delimiter=", ">
-    <sort>
-      <key macro="author"/>
-      <key macro="year-date" sort="descending"/>
-    </sort>
-    <layout prefix="(" suffix=")" delimiter="; ">
-      <group delimiter=", ">
-        <text macro="author-short"/>
-        <text macro="year-date"/>
-        <group delimiter=" ">
-          <label variable="locator" form="short"/>
-          <text variable="locator"/>
-        </group>
-      </group>
-    </layout>
-  </citation>
-  <bibliography entry-spacing="0" et-al-min="7" et-al-use-first="6">
-    <sort>
-      <key macro="author"/>
-      <key macro="year-date" sort="descending"/>
-    </sort>
-    <layout suffix=".">
-      <text macro="author" suffix=". "/>
-      <choose>
-        <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
-          <group delimiter=". ">
-            <text variable="title"/>
-            <text variable="volume" prefix="vol. "/>
-            <text macro="edition"/>
-            <text macro="publisher"/>
-          </group>
-        </if>
-        <else-if type="chapter paper-conference" match="any">
-          <group delimiter=". ">
-            <group delimiter=". ">
-              <text variable="title"/>
-              <group delimiter=". ">
-                <group delimiter=": ">
-                  <text term="in" text-case="sentence"/>
-                  <group delimiter=", ">
-                    <text variable="container-title" form="short"/>
-                    <group delimiter=" ">
-                      <label text-case="capitalize-first" variable="volume"/>
-                      <text variable="volume"/>
-                    </group>
-                  </group>
-                </group>
-                <text macro="editor"/>
-              </group>
-              <text macro="edition"/>
-              <group delimiter=", ">
-                <text macro="publisher"/>
-                <group delimiter=" ">
-                  <label variable="page" form="short"/>
-                  <text variable="page"/>
-                </group>
-              </group>
-            </group>
-          </group>
-        </else-if>
-        <else-if type="patent">
-          <group delimiter=", ">
-            <group delimiter=". ">
-              <text variable="title"/>
-              <text variable="number"/>
-            </group>
-            <text macro="year-date"/>
-          </group>
-        </else-if>
-        <else-if type="thesis">
-          <group delimiter=". ">
-            <text variable="title"/>
-            <text variable="genre"/>
-            <group delimiter=", ">
-              <text variable="publisher"/>
-              <text macro="year-date"/>
-            </group>
-          </group>
-        </else-if>
-        <else>
-          <group delimiter=":">
-            <group delimiter=" ">
-              <group delimiter=". ">
-                <text variable="title"/>
-                <text variable="container-title" form="short" text-case="title" strip-periods="true"/>
-              </group>
-              <group delimiter="; ">
-                <text macro="year-date"/>
-                <text variable="volume"/>
-              </group>
-            </group>
-            <text variable="page" form="short"/>
-          </group>
-        </else>
-      </choose>
-      <text macro="access" prefix=". "/>
-    </layout>
-  </bibliography>
-</style>
diff --git a/buildres/csl/csl-styles/frattura-ed-integrita-strutturale-fracture-and-structural-integrity.csl b/buildres/csl/csl-styles/frattura-ed-integrita-strutturale-fracture-and-structural-integrity.csl
new file mode 100644
index 00000000000..cb9348db1fa
--- /dev/null
+++ b/buildres/csl/csl-styles/frattura-ed-integrita-strutturale-fracture-and-structural-integrity.csl
@@ -0,0 +1,183 @@
+<?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>Frattura ed Integrità Strutturale - Fracture and Structural Integrity</title>
+    <id>http://www.zotero.org/styles/frattura-ed-integrita-strutturale-fracture-and-structural-integrity</id>
+    <link href="http://www.zotero.org/styles/frattura-ed-integrita-strutturale-fracture-and-structural-integrity" rel="self"/>
+    <link href="http://www.zotero.org/styles/systematic-and-applied-microbiology" rel="template"/>
+    <link href="https://www.fracturae.com/index.php/fis/guidelines" rel="documentation"/>
+    <author>
+      <name>Patrick O'Brien</name>
+    </author>
+    <category citation-format="numeric"/>
+    <category field="engineering"/>
+    <issn>1971-8993</issn>
+    <summary>A style for some Elsevier journals, resembles Vancouver style</summary>
+    <updated>2022-01-31T16:04:56+00:00</updated>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
+  </info>
+  <macro name="access">
+    <choose>
+      <if variable="DOI">
+        <text variable="DOI" prefix="DOI: "/>
+      </if>
+      <else-if type="webpage post-weblog post" match="any">
+        <group delimiter=": ">
+          <text term="available at" text-case="capitalize-first"/>
+          <text variable="URL"/>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name suffix="." delimiter-precedes-et-al="always" initialize-with="." name-as-sort-order="all"/>
+      <label form="short" prefix=" "/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <text variable="title"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="editor">
+    <names variable="editor">
+      <name delimiter-precedes-et-al="never" delimiter-precedes-last="always" initialize-with="." name-as-sort-order="all"/>
+      <label form="short" prefix=" "/>
+    </names>
+  </macro>
+  <macro name="year-date">
+    <choose>
+      <if variable="issued">
+        <date variable="issued">
+          <date-part name="year" form="long" range-delimiter="&#8211;"/>
+        </date>
+      </if>
+      <else>
+        <text term="no date" form="short"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="journal-location">
+    <choose>
+      <if type="article-journal article-magazine" match="any">
+        <text variable="volume" form="long"/>
+        <text variable="issue" prefix="(" suffix=")"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=", ">
+      <text variable="publisher-place"/>
+      <text variable="publisher"/>
+    </group>
+  </macro>
+  <macro name="publisher_thesis">
+    <group delimiter=", ">
+      <text variable="publisher" form="long"/>
+      <text variable="publisher-place" form="long"/>
+    </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"/>
+      </else>
+    </choose>
+  </macro>
+  <citation collapse="citation-number">
+    <sort>
+      <key variable="citation-number" sort="ascending"/>
+    </sort>
+    <layout delimiter="," prefix="[" suffix="]">
+      <text variable="citation-number"/>
+    </layout>
+  </citation>
+  <bibliography entry-spacing="0" second-field-align="flush">
+    <sort>
+      <key macro="author"/>
+    </sort>
+    <layout suffix=".">
+      <text variable="citation-number" prefix="[" suffix="]"/>
+      <group delimiter=". ">
+        <text macro="author"/>
+        <text macro="year-date" prefix="(" suffix=")"/>
+        <choose>
+          <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+            <group delimiter=", ">
+              <text variable="title" form="long"/>
+              <text variable="volume" prefix="vol. " form="long"/>
+              <text macro="edition"/>
+              <text macro="publisher"/>
+              <text macro="access"/>
+            </group>
+          </if>
+          <else-if type="chapter paper-conference" match="any">
+            <group delimiter=", ">
+              <text variable="title" form="long" suffix="."/>
+              <group delimiter=": ">
+                <text term="in" form="short" text-case="capitalize-first"/>
+                <text macro="editor" suffix=","/>
+              </group>
+              <text variable="container-title"/>
+              <group delimiter=" ">
+                <label variable="volume" form="short"/>
+                <text variable="volume" prefix="vol. "/>
+              </group>
+              <text macro="edition"/>
+              <text macro="publisher"/>
+              <group delimiter=" ">
+                <label variable="page" form="short" plural="contextual"/>
+                <text variable="page" form="long"/>
+              </group>
+            </group>
+          </else-if>
+          <else-if type="patent">
+            <group delimiter=", ">
+              <group delimiter=". ">
+                <text variable="title" form="long"/>
+                <text variable="number" form="long"/>
+              </group>
+              <text macro="year-date"/>
+            </group>
+          </else-if>
+          <else-if type="thesis">
+            <group delimiter=" ">
+              <text variable="title" form="long" suffix="."/>
+              <text variable="genre" form="long" suffix=","/>
+              <text macro="publisher_thesis" suffix="," text-case="title"/>
+              <text macro="year-date"/>
+            </group>
+          </else-if>
+          <else-if type="webpage post post-weblog" match="any">
+            <group delimiter=" ">
+              <text variable="title" form="long" suffix="."/>
+              <text variable="container-title" form="long" suffix="." text-case="title"/>
+              <text macro="access"/>
+            </group>
+          </else-if>
+          <else>
+            <group delimiter=". ">
+              <group delimiter=", ">
+                <text variable="title" form="long"/>
+                <text variable="container-title" form="short" text-case="title"/>
+                <text macro="journal-location"/>
+                <group delimiter=" ">
+                  <label variable="page" form="short"/>
+                  <text variable="page" form="long"/>
+                </group>
+              </group>
+              <text macro="access"/>
+            </group>
+          </else>
+        </choose>
+      </group>
+    </layout>
+  </bibliography>
+</style>
diff --git a/buildres/csl/csl-styles/frontiers-in-ecology-and-the-environment.csl b/buildres/csl/csl-styles/frontiers-in-ecology-and-the-environment.csl
index b8a24308b08..ed858f24304 100644
--- a/buildres/csl/csl-styles/frontiers-in-ecology-and-the-environment.csl
+++ b/buildres/csl/csl-styles/frontiers-in-ecology-and-the-environment.csl
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" default-locale="en-US" page-range-format="minimal">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" page-range-format="minimal" default-locale="en-US">
   <info>
     <title>Frontiers in Ecology and the Environment</title>
     <id>http://www.zotero.org/styles/frontiers-in-ecology-and-the-environment</id>
     <link href="http://www.zotero.org/styles/frontiers-in-ecology-and-the-environment" rel="self"/>
     <link href="http://www.zotero.org/styles/elsevier-harvard" rel="template"/>
-    <link href="http://www.frontiersinecology.org/instructions-to-authors/research-communications/" rel="documentation"/>
+    <link href="https://www.esa.org/frontiers-in-ecology-and-the-environment/instructions-to-authors/research-communications/" rel="documentation"/>
     <author>
       <name>Ben Gilna</name>
       <email>bengilna@gmail.com</email>
@@ -13,14 +13,22 @@
     <contributor>
       <name>Sebastian Karcher</name>
     </contributor>
+    <contributor>
+      <name>Patrick O'Brien</name>
+    </contributor>
     <category citation-format="author-date"/>
     <category field="biology"/>
     <issn>1540-9295</issn>
     <eissn>1540-9309</eissn>
     <summary>ESA Journal Frontiers in Ecology and the Environment. Originally based on Fungal Ecology, which is now dependent</summary>
-    <updated>2012-04-10T13:46:03+00:00</updated>
+    <updated>2022-05-22T17:07:30+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
+  <locale xml:lang="en">
+    <terms>
+      <term name="accessed">viewed</term>
+    </terms>
+  </locale>
   <macro name="editor-translator">
     <names variable="editor translator" prefix="(" suffix=")" delimiter=", ">
       <name and="text" initialize-with="" delimiter=", "/>
@@ -60,6 +68,11 @@
   </macro>
   <macro name="title">
     <text variable="title"/>
+    <choose>
+      <if type="thesis" match="any">
+        <text variable="genre" prefix=" (" suffix=")"/>
+      </if>
+    </choose>
   </macro>
   <macro name="publisher">
     <group delimiter=": ">
@@ -90,59 +103,58 @@
       <key macro="author-short"/>
       <key variable="issued"/>
     </sort>
-    <layout>
-      <text macro="author" suffix="."/>
-      <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 suffix=".">
-            <text macro="title" prefix=" "/>
-            <text macro="editor-translator" prefix=" "/>
-          </group>
-          <text prefix=" " suffix="." macro="publisher"/>
-        </if>
-        <else-if type="chapter paper-conference" match="any">
-          <text macro="title" prefix=" "/>
-          <group prefix=".">
-            <group prefix=" In:">
-              <names variable="editor translator">
-                <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always" prefix=" "/>
-                <et-al font-style="italic"/>
-                <label form="short" prefix=" (" suffix="). " text-case="capitalize-first" strip-periods="true"/>
-              </names>
+    <layout suffix=".">
+      <group delimiter=". ">
+        <text macro="author" suffix="."/>
+        <date variable="issued" prefix=" " suffix=".">
+          <date-part name="year"/>
+        </date>
+        <text macro="title" prefix=" "/>
+        <choose>
+          <if type="bill book graphic legal_case legislation motion_picture report song thesis" match="any">
+            <group delimiter=". ">
+              <text macro="editor-translator" prefix=" "/>
+              <text macro="publisher"/>
+            </group>
+          </if>
+          <else-if type="chapter paper-conference" match="any">
+            <group>
+              <group delimiter=": ">
+                <text term="in" text-case="capitalize-first"/>
+                <names variable="editor translator">
+                  <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always" prefix=" "/>
+                  <et-al font-style="italic"/>
+                  <label form="short" prefix=" (" suffix="). " text-case="capitalize-first" strip-periods="true"/>
+                </names>
+              </group>
               <text variable="container-title" prefix=" " suffix="."/>
-              <group suffix=".">
-                <text macro="publisher" prefix=" "/>
+              <text macro="publisher" prefix=" "/>
+            </group>
+          </else-if>
+          <else-if type="webpage post post-weblog" match="any">
+            <group delimiter=". " prefix=" ">
+              <text variable="URL"/>
+              <group delimiter=" ">
+                <text term="accessed" text-case="capitalize-first"/>
+                <date delimiter=" " variable="accessed">
+                  <date-part name="day"/>
+                  <date-part name="month" form="short" strip-periods="true"/>
+                  <date-part name="year"/>
+                </date>
               </group>
             </group>
-          </group>
-        </else-if>
-        <else-if type="webpage">
-          <text macro="title" prefix=" "/>
-          <text variable="URL" suffix="."/>
-          <text value="Viewed" prefix=" "/>
-          <date variable="accessed" prefix=" " suffix="." delimiter=" ">
-            <date-part name="day"/>
-            <date-part name="month" form="short" strip-periods="true"/>
-            <date-part name="year"/>
-          </date>
-        </else-if>
-        <else>
-          <group suffix=".">
-            <text macro="title" prefix=" "/>
-            <text macro="editor-translator" prefix=" "/>
-          </group>
-          <group prefix=" " suffix=".">
-            <text variable="container-title" form="short" font-style="italic" strip-periods="true"/>
-            <group prefix=" ">
-              <text variable="volume" font-weight="bold"/>
+          </else-if>
+          <else>
+            <group delimiter=" ">
+              <text variable="container-title" form="short" font-style="italic" strip-periods="true"/>
+              <group delimiter=": ">
+                <text variable="volume" font-weight="bold"/>
+                <text variable="page"/>
+              </group>
             </group>
-            <text variable="page" prefix=": "/>
-          </group>
-        </else>
-      </choose>
+          </else>
+        </choose>
+      </group>
     </layout>
   </bibliography>
 </style>
diff --git a/buildres/csl/csl-styles/frontiers-medical-journals.csl b/buildres/csl/csl-styles/frontiers-medical-journals.csl
index 7961301b6fb..59ab7340abc 100644
--- a/buildres/csl/csl-styles/frontiers-medical-journals.csl
+++ b/buildres/csl/csl-styles/frontiers-medical-journals.csl
@@ -3,7 +3,7 @@
   <info>
     <title>Frontiers medical journals</title>
     <id>http://www.zotero.org/styles/frontiers-medical-journals</id>
-    <!-- The 'Frontiers in...' series of medical (now called "Health" journals use different citation and bibliography styles 
+    <!-- The 'Frontiers in...' series of medical (now called "Health" journals use different citation and bibliography styles
          than the 'Frontiers in...' series of engineering and science (except Physics) journals. -->
     <link href="http://www.zotero.org/styles/frontiers-medical-journals" rel="self"/>
     <link href="http://www.zotero.org/styles/frontiers" rel="template"/>
@@ -141,7 +141,7 @@
             <date variable="issued" prefix=" (" suffix=")">
               <date-part name="year"/>
             </date>
-            <text variable="volume" font-weight="bold" suffix=":"/>
+            <text variable="volume" suffix=":"/>
           </group>
           <text variable="page" suffix="."/>
         </else>
diff --git a/buildres/csl/csl-styles/frontiers-of-biogeography.csl b/buildres/csl/csl-styles/frontiers-of-biogeography.csl
index 876cf75fa0c..03f2743fc15 100644
--- a/buildres/csl/csl-styles/frontiers-of-biogeography.csl
+++ b/buildres/csl/csl-styles/frontiers-of-biogeography.csl
@@ -10,18 +10,21 @@
       <name>KSupriya</name>
       <email>supriyaknair@gmail.com</email>
     </author>
+    <contributor>
+      <name>Patrick O'Brien</name>
+    </contributor>
     <category citation-format="author-date"/>
     <category field="geography"/>
     <category field="biology"/>
     <eissn>1948-6596</eissn>
     <summary>Frontiers of Biogeography author-date style based on Harvard</summary>
-    <updated>2019-03-12T17:24:59+00:00</updated>
+    <updated>2022-04-07T08:33:56+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <macro name="editor">
     <names variable="editor" delimiter=", ">
-      <name and="symbol" initialize-with="."/>
-      <label form="short" text-case="lowercase" prefix=" (" suffix=")"/>
+      <label form="verb-short"/>
+      <name prefix=" " and="text" initialize-with="."/>
     </names>
   </macro>
   <macro name="anon">
@@ -58,9 +61,9 @@
     </choose>
   </macro>
   <macro name="publisher">
-    <group delimiter=": ">
-      <text variable="publisher-place"/>
+    <group delimiter=", ">
       <text variable="publisher"/>
+      <text variable="publisher-place"/>
     </group>
   </macro>
   <macro name="year-date">
@@ -88,7 +91,21 @@
       </else>
     </choose>
   </macro>
+  <macro name="access">
+    <choose>
+      <if type="webpage post post-weblog" match="any">
+        <text variable="URL"/>
+      </if>
+      <else>
+        <text variable="DOI" prefix="https://doi.org/"/>
+      </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">
+    <sort>
+      <key macro="year-date"/>
+      <key macro="author"/>
+    </sort>
     <layout delimiter=", " prefix="(" suffix=")">
       <group delimiter=", ">
         <group delimiter=" ">
@@ -108,75 +125,80 @@
       <key variable="title"/>
     </sort>
     <layout>
-      <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 prefix=" " delimiter=" " suffix=",">
-            <text macro="title"/>
-            <text macro="edition"/>
-            <text macro="editor"/>
-          </group>
-          <text prefix=" " suffix="." macro="publisher"/>
-        </if>
-        <else-if type="chapter paper-conference" match="any">
+      <group delimiter=". ">
+        <group delimiter=" ">
+          <text macro="author"/>
+          <date variable="issued" prefix="(" suffix=")">
+            <date-part name="year"/>
+          </date>
           <text macro="title" prefix=" " suffix="."/>
-          <group prefix=" " delimiter=" ">
-            <text term="in" text-case="capitalize-first" suffix=":"/>
-            <text macro="editor"/>
-            <text variable="container-title" font-style="normal" suffix="."/>
-            <text variable="collection-title" suffix="."/>
-            <text variable="event" suffix="."/>
+        </group>
+        <choose>
+          <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+            <group delimiter=" " suffix=",">
+              <text macro="edition"/>
+              <text macro="editor"/>
+            </group>
+            <text prefix=" " suffix="." macro="publisher"/>
+          </if>
+          <else-if type="chapter paper-conference" match="any">
+            <group delimiter=", " prefix=" ">
+              <group delimiter=" ">
+                <group delimiter=": ">
+                  <text term="in" text-case="capitalize-first" suffix=":"/>
+                  <text variable="container-title" font-style="normal" suffix="."/>
+                </group>
+                <text macro="editor" prefix="(" suffix=")"/>
+              </group>
+              <text variable="collection-title" suffix="."/>
+              <text variable="event" suffix="."/>
+              <group delimiter=" ">
+                <label variable="page" form="short"/>
+                <text variable="page"/>
+              </group>
+              <text macro="publisher"/>
+            </group>
+          </else-if>
+          <else-if type="article-newspaper" match="any">
+            <group prefix=" " delimiter=", ">
+              <text variable="container-title" form="short" suffix=","/>
+              <text variable="collection-title"/>
+            </group>
+            <group prefix=" " suffix=":">
+              <date variable="issued">
+                <date-part name="day" suffix=" " range-delimiter="-"/>
+                <date-part name="month"/>
+              </date>
+            </group>
             <group suffix="." delimiter=" ">
               <text macro="publisher" prefix=" " suffix=","/>
-              <label variable="page" form="short" suffix=" "/>
+              <label variable="page" form="short"/>
               <text variable="page"/>
             </group>
-          </group>
-        </else-if>
-        <else-if type="article-newspaper" match="any">
-          <text macro="title" prefix=" " suffix="."/>
-          <group prefix=" " delimiter=", ">
-            <text variable="container-title" form="short" suffix=","/>
-            <text variable="collection-title"/>
-          </group>
-          <group prefix=" " suffix=":">
-            <date variable="issued">
-              <date-part name="day" suffix=" " range-delimiter="-"/>
-              <date-part name="month"/>
-            </date>
-          </group>
-          <group suffix="." delimiter=" ">
-            <text macro="publisher" prefix=" " suffix=","/>
-            <label variable="page" form="short"/>
-            <text variable="page"/>
-          </group>
-        </else-if>
-        <else-if type="thesis">
-          <group prefix=" " suffix="." delimiter=". ">
-            <text macro="title"/>
-            <text variable="genre"/>
-            <text macro="publisher"/>
-          </group>
-        </else-if>
-        <else>
-          <group suffix=".">
-            <text macro="title" prefix=" "/>
-            <text macro="editor" prefix=" "/>
-          </group>
-          <group prefix=" " suffix=".">
-            <text variable="container-title" font-style="normal"/>
-            <group prefix=" ">
-              <text variable="volume"/>
+          </else-if>
+          <else-if type="thesis">
+            <group prefix=" " suffix="." delimiter=". ">
+              <text variable="genre"/>
+              <text macro="publisher"/>
             </group>
-            <group prefix=", ">
-              <text variable="page"/>
+          </else-if>
+          <else>
+            <group delimiter=". ">
+              <text macro="editor" prefix=" "/>
+              <group prefix=" " suffix=".">
+                <text variable="container-title" font-style="normal"/>
+                <group prefix=" ">
+                  <text variable="volume"/>
+                </group>
+                <group prefix=", ">
+                  <text variable="page"/>
+                </group>
+              </group>
             </group>
-          </group>
-        </else>
-      </choose>
+          </else>
+        </choose>
+      </group>
+      <text macro="access" prefix=". "/>
     </layout>
   </bibliography>
 </style>
diff --git a/buildres/csl/csl-styles/frontiers.csl b/buildres/csl/csl-styles/frontiers.csl
index 0978de4edbd..c00ab8c9c30 100644
--- a/buildres/csl/csl-styles/frontiers.csl
+++ b/buildres/csl/csl-styles/frontiers.csl
@@ -12,10 +12,13 @@
       <name>Julian Onions</name>
       <email>julian.onions@gmail.com</email>
     </contributor>
+    <contributor>
+      <name>Patrick O'Brien</name>
+    </contributor>
     <category citation-format="author-date"/>
     <category field="generic-base"/>
     <summary>Style for the Open Access Frontiers in ... Journals</summary>
-    <updated>2012-09-27T22:06:38+00:00</updated>
+    <updated>2022-04-12T22: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="editor">
@@ -47,7 +50,7 @@
   <macro name="access">
     <choose>
       <if variable="DOI">
-        <text variable="DOI" prefix="doi:"/>
+        <text variable="DOI" prefix="doi: "/>
       </if>
       <else-if variable="URL">
         <text value="Available at:" suffix=" "/>
diff --git a/buildres/csl/csl-styles/glossa.csl b/buildres/csl/csl-styles/glossa.csl
index 60a489bbcc1..a5db572f78d 100644
--- a/buildres/csl/csl-styles/glossa.csl
+++ b/buildres/csl/csl-styles/glossa.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" default-locale="en-GB" demote-non-dropping-particle="never">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="never" default-locale="en-GB">
   <info>
     <title>Glossa</title>
     <id>http://www.zotero.org/styles/glossa</id>
@@ -14,11 +14,15 @@
       <name>Brenton M. Wiernik</name>
       <email>zotero@wiernik.org</email>
     </contributor>
+    <contributor>
+      <name>Lisa Levinson</name>
+      <email>lisa.levinson@gmail.com</email>
+    </contributor>
     <category citation-format="author-date"/>
     <category field="linguistics"/>
     <eissn>2397-1835</eissn>
     <summary>Citation style for Glossa based on APA 6th edition.</summary>
-    <updated>2017-09-30T02:59:26+00:00</updated>
+    <updated>2022-05-24T20:26:54+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">
@@ -35,11 +39,11 @@
       <if type="chapter paper-conference entry-dictionary entry-encyclopedia" match="any">
         <group delimiter=", ">
           <names variable="container-author" delimiter=", ">
-            <name and="symbol" initialize-with=". " delimiter=", "/>
+            <name initialize-with=". " delimiter=" &amp; " delimiter-precedes-last="always"/>
             <label form="short" prefix=" (" text-case="title" suffix=")"/>
           </names>
           <names variable="editor translator" delimiter=", ">
-            <name and="symbol" delimiter=", "/>
+            <name delimiter=" &amp; " delimiter-precedes-last="always"/>
             <label form="short" prefix=" (" suffix=")"/>
           </names>
         </group>
@@ -51,11 +55,11 @@
       <if type="article-journal chapter paper-conference entry-dictionary entry-encyclopedia" match="none">
         <group delimiter=", " prefix=" (" suffix=")">
           <names variable="container-author" delimiter=", ">
-            <name and="symbol" initialize-with=". " delimiter=", "/>
+            <name initialize-with=". " delimiter=" &amp; " delimiter-precedes-last="always"/>
             <label form="short" prefix=", " text-case="title"/>
           </names>
           <names variable="editor translator" delimiter=", ">
-            <name and="symbol" initialize-with=". " delimiter=", "/>
+            <name initialize-with=". " delimiter=" &amp; " delimiter-precedes-last="always"/>
             <label form="short" prefix=", " text-case="title"/>
           </names>
         </group>
@@ -64,7 +68,7 @@
   </macro>
   <macro name="author">
     <names variable="author" suffix=".">
-      <name and="symbol" delimiter-precedes-last="never" initialize="false" initialize-with="." name-as-sort-order="first"/>
+      <name delimiter=" &amp; " delimiter-precedes-last="always" initialize="false" initialize-with="." name-as-sort-order="all"/>
       <label form="short" prefix=" (" suffix=")"/>
       <substitute>
         <names variable="editor"/>
@@ -83,7 +87,7 @@
   </macro>
   <macro name="author-short">
     <names variable="author">
-      <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
+      <name form="short" delimiter=" &amp; " delimiter-precedes-last="always" initialize-with=". "/>
       <substitute>
         <names variable="editor"/>
         <names variable="translator"/>
diff --git a/buildres/csl/csl-styles/guide-des-citations-references-et-abreviations-juridiques.csl b/buildres/csl/csl-styles/guide-des-citations-references-et-abreviations-juridiques.csl
index 2ed45f153bf..5cc3e1ce95b 100644
--- a/buildres/csl/csl-styles/guide-des-citations-references-et-abreviations-juridiques.csl
+++ b/buildres/csl/csl-styles/guide-des-citations-references-et-abreviations-juridiques.csl
@@ -14,7 +14,7 @@
     </author>
     <category citation-format="note"/>
     <category field="law"/>
-    <updated>2020-12-04T23:56:21+00:00</updated>
+    <updated>2022-04-05T19:59:30+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <locale xml:lang="fr">
@@ -57,7 +57,8 @@
   </macro>
   <macro name="translator">
     <names variable="translator">
-      <name form="long" and="text" delimiter-precedes-last="never" sort-separator=" " font-style="normal" prefix=" traduit par ">
+      <label form="verb-short" suffix=" "/>
+      <name font-style="normal" and="text" delimiter-precedes-last="never" sort-separator=" ">
         <name-part name="family" font-variant="small-caps"/>
       </name>
     </names>
diff --git a/buildres/csl/csl-styles/haffner-style-manual.csl b/buildres/csl/csl-styles/haffner-style-manual.csl
new file mode 100644
index 00000000000..279bbd8156a
--- /dev/null
+++ b/buildres/csl/csl-styles/haffner-style-manual.csl
@@ -0,0 +1,512 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.0" demote-non-dropping-particle="sort-only" page-range-format="minimal" default-locale="en-GB">
+  <!-- This style was edited with the Visual CSL Editor (https://editor.citationstyles.org/visualEditor/) -->
+  <info>
+    <title>Haffner Style Manual</title>
+    <title-short>Haffner</title-short>
+    <id>http://www.zotero.org/styles/haffner-style-manual</id>
+    <link href="http://www.zotero.org/styles/haffner-style-manual" rel="self"/>
+    <link href="http://www.zotero.org/styles/manchester-university-press" rel="template"/>
+    <link href="https://www.jeanhaffner.co.uk/style-style-manual-for-essays-and-theses.html" rel="documentation"/>
+    <author>
+      <name>Paul Haffner</name>
+      <email>paul@jeanhaffner.co.uk</email>
+    </author>
+    <category citation-format="note"/>
+    <category field="generic-base"/>
+    <summary>Haffner style with full notes and bibliography</summary>
+    <updated>2022-05-09T10:00:01+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="short">
+        <single>ed.</single>
+        <multiple>eds</multiple>
+      </term>
+      <term name="edition" form="short">edn</term>
+      <term name="translator" form="short">trans.</term>
+      <term name="folio">
+        <single>fol.</single>
+        <multiple>fols</multiple>
+      </term>
+    </terms>
+  </locale>
+  <macro name="author">
+    <group delimiter=". ">
+      <names variable="author">
+        <name and="text" delimiter-precedes-last="always" initialize-with=". " name-as-sort-order="all"/>
+        <label form="short" prefix=" (" suffix=")"/>
+        <substitute>
+          <names variable="editor"/>
+          <names variable="translator"/>
+          <text macro="title-note"/>
+        </substitute>
+      </names>
+      <text macro="recipient"/>
+    </group>
+  </macro>
+  <macro name="recipient">
+    <group delimiter=" ">
+      <choose>
+        <if type="personal_communication">
+          <choose>
+            <if variable="genre">
+              <text variable="genre" text-case="capitalize-first"/>
+            </if>
+            <else>
+              <text term="letter" text-case="capitalize-first"/>
+            </else>
+          </choose>
+        </if>
+      </choose>
+      <text macro="recipient-note"/>
+    </group>
+  </macro>
+  <macro name="contributors-note">
+    <names variable="author">
+      <name and="text" initialize-with=". " sort-separator=", " delimiter=", "/>
+      <label form="short" prefix=" (" suffix=")"/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <text macro="title-note"/>
+      </substitute>
+    </names>
+    <text macro="recipient-note"/>
+  </macro>
+  <macro name="title-note">
+    <choose>
+      <if variable="title" match="none">
+        <text variable="genre"/>
+      </if>
+      <else-if type="bill book graphic legislation motion_picture report song" match="any">
+        <text variable="title" text-case="title" font-style="italic"/>
+        <group delimiter=" " prefix=", ">
+          <text term="version"/>
+          <text variable="version"/>
+        </group>
+      </else-if>
+      <else-if type="legal_case interview" match="any">
+        <text variable="title"/>
+      </else-if>
+      <else-if variable="reviewed-author">
+        <text variable="title" font-style="italic" prefix="review of "/>
+      </else-if>
+      <else>
+        <text variable="title" text-case="capitalize-first" quotes="true"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="title-short">
+    <choose>
+      <if type="thesis">
+        <text variable="title" form="short" quotes="true"/>
+      </if>
+      <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+        <text variable="title" form="short" font-style="italic" text-case="title"/>
+      </else-if>
+      <else>
+        <text variable="title" form="short" quotes="true"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="title-sort-substitute">
+    <choose>
+      <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+        <text variable="title" font-style="italic" text-case="title" form="short"/>
+      </if>
+      <else>
+        <text variable="title" quotes="true" text-case="title" form="short"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="editor-translator">
+    <group delimiter=", ">
+      <group delimiter=" ">
+        <choose>
+          <if variable="container-author reviewed-author" match="any">
+            <group>
+              <names variable="container-author reviewed-author">
+                <label form="short" text-case="lowercase" suffix=" "/>
+                <name and="text" initialize-with=". " delimiter=", "/>
+              </names>
+            </group>
+          </if>
+        </choose>
+      </group>
+      <names variable="editor translator" delimiter=", ">
+        <label form="short" text-case="lowercase" suffix=" "/>
+        <name and="text" initialize-with=". " delimiter=", "/>
+      </names>
+    </group>
+  </macro>
+  <macro name="secondary-contributors-note">
+    <choose>
+      <if type="chapter paper-conference" match="none">
+        <text macro="editor-translator"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="container-contributors-note">
+    <choose>
+      <if type="chapter paper-conference" match="any">
+        <names variable="editor translator" prefix="in " delimiter=", ">
+          <name and="text" initialize-with=". " delimiter=", "/>
+          <label form="short" prefix=" (" suffix=")"/>
+        </names>
+      </if>
+    </choose>
+  </macro>
+  <macro name="collection-title">
+    <group delimiter=", ">
+      <choose>
+        <if type="article-journal">
+          <text variable="collection-title"/>
+          <text variable="collection-number"/>
+        </if>
+      </choose>
+    </group>
+  </macro>
+  <macro name="locators-note">
+    <choose>
+      <if type="article-journal">
+        <group delimiter=":">
+          <text variable="volume"/>
+          <text variable="issue"/>
+        </group>
+      </if>
+      <else-if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="any">
+        <group delimiter=", ">
+          <text macro="edition-note"/>
+          <group>
+            <number variable="number-of-volumes" form="numeric"/>
+            <text term="volume" form="short" prefix=" " plural="true"/>
+          </group>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="volume">
+    <choose>
+      <if type="article-journal">
+        <group delimiter=":">
+          <text variable="volume"/>
+          <text variable="issue"/>
+        </group>
+      </if>
+      <else-if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="any">
+        <group delimiter=", ">
+          <text macro="edition-note"/>
+          <group>
+            <number variable="number-of-volumes" form="numeric"/>
+            <text term="volume" form="short" prefix=" " plural="true"/>
+          </group>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="issue-note">
+    <choose>
+      <if type="article-journal">
+        <choose>
+          <if variable="volume">
+            <text macro="issued" prefix=" (" suffix=")"/>
+          </if>
+          <else>
+            <text macro="issued" prefix=", "/>
+          </else>
+        </choose>
+      </if>
+      <else-if variable="publisher-place publisher" match="any">
+        <group prefix=" (" suffix=")" delimiter=", ">
+          <group delimiter=" ">
+            <choose>
+              <if variable="title" match="none"/>
+              <else-if type="thesis speech" match="any">
+                <text variable="genre"/>
+              </else-if>
+            </choose>
+            <text macro="event"/>
+          </group>
+          <text macro="publisher"/>
+          <text macro="issued"/>
+        </group>
+      </else-if>
+      <else>
+        <text macro="issued" prefix=", "/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="locators-specific-note">
+    <choose>
+      <if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="any">
+        <choose>
+          <if is-numeric="volume">
+            <number variable="volume" form="roman" font-variant="small-caps"/>
+          </if>
+          <else>
+            <text variable="volume" font-variant="small-caps"/>
+          </else>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="container-title-note">
+    <group delimiter=" ">
+      <choose>
+        <if type="chapter">
+          <choose>
+            <if variable="editor translator" match="none">
+              <text term="in"/>
+            </if>
+          </choose>
+        </if>
+      </choose>
+      <text variable="container-title" text-case="title" font-style="italic"/>
+    </group>
+  </macro>
+  <macro name="edition-note">
+    <choose>
+      <if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="any">
+        <choose>
+          <if is-numeric="edition">
+            <group delimiter=" ">
+              <number variable="edition" form="ordinal"/>
+              <text term="edition" form="short"/>
+            </group>
+          </if>
+          <else>
+            <text variable="edition"/>
+          </else>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="recipient-note">
+    <names variable="recipient" delimiter=", ">
+      <label form="verb" prefix=" " suffix=" "/>
+      <name and="text" delimiter=", "/>
+    </names>
+  </macro>
+  <macro name="recipient-short">
+    <names variable="recipient">
+      <label form="verb" prefix=" " suffix=" "/>
+      <name form="short" and="text" delimiter=", "/>
+    </names>
+  </macro>
+  <macro name="contributors-short">
+    <names variable="author">
+      <name form="short" and="text" sort-separator=", " delimiter=", "/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <text macro="title-sort-substitute"/>
+      </substitute>
+    </names>
+    <text macro="recipient-short"/>
+  </macro>
+  <macro name="locators-newspaper">
+    <choose>
+      <if type="article-newspaper">
+        <group delimiter=", ">
+          <group delimiter=" ">
+            <text variable="edition"/>
+            <text term="edition"/>
+          </group>
+          <group delimiter=" ">
+            <text term="section"/>
+            <text variable="section"/>
+          </group>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="event">
+    <group delimiter=" ">
+      <text term="presented at"/>
+      <text variable="event"/>
+    </group>
+  </macro>
+  <macro name="publisher">
+    <choose>
+      <if type="thesis">
+        <text variable="publisher"/>
+      </if>
+      <else>
+        <group delimiter=": ">
+          <text variable="publisher-place"/>
+          <text variable="publisher"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="issued">
+    <choose>
+      <if type="report article-newspaper article-magazine personal_communication" match="any">
+        <date variable="issued">
+          <date-part name="day" suffix=" "/>
+          <date-part name="month" suffix=" "/>
+          <date-part name="year"/>
+        </date>
+      </if>
+      <else>
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
+      </else>
+    </choose>
+  </macro>
+  <macro name="pages">
+    <choose>
+      <if type="article-journal">
+        <text variable="page" prefix=", "/>
+      </if>
+      <else>
+        <choose>
+          <if variable="volume">
+            <text variable="page" prefix=", "/>
+          </if>
+          <else>
+            <group delimiter=" " prefix=", ">
+              <label variable="page" form="short"/>
+              <text variable="page"/>
+            </group>
+          </else>
+        </choose>
+      </else>
+    </choose>
+  </macro>
+  <macro name="point-locators">
+    <text macro="pages"/>
+    <choose>
+      <if variable="page">
+        <group prefix=" (" suffix=")" delimiter=" ">
+          <label variable="locator" form="short"/>
+          <text variable="locator"/>
+        </group>
+      </if>
+      <else>
+        <group delimiter=" " prefix=", ">
+          <label variable="locator" form="short"/>
+          <text variable="locator"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="point-locators-subsequent">
+    <group prefix=", " delimiter=" ">
+      <label variable="locator" form="short"/>
+      <text variable="locator"/>
+    </group>
+  </macro>
+  <macro name="archive-note">
+    <group delimiter=", ">
+      <text variable="archive-place"/>
+      <text variable="archive"/>
+      <text variable="archive_location"/>
+    </group>
+  </macro>
+  <macro name="access-note">
+    <group delimiter=", ">
+      <choose>
+        <if type="article-journal bill chapter legal_case legislation paper-conference" match="none">
+          <text macro="archive-note" prefix=", "/>
+        </if>
+      </choose>
+    </group>
+    <choose>
+      <if variable="DOI">
+        <text variable="DOI" prefix=", doi: "/>
+      </if>
+      <else>
+        <choose>
+          <if variable="URL">
+            <text variable="URL" prefix=", "/>
+            <group prefix=" [" suffix="]">
+              <text term="accessed"/>
+              <date variable="accessed">
+                <date-part name="day" prefix=" "/>
+                <date-part name="month" prefix=" "/>
+                <date-part name="year" prefix=" "/>
+              </date>
+            </group>
+          </if>
+        </choose>
+      </else>
+    </choose>
+  </macro>
+  <macro name="artwork">
+    <choose>
+      <if type="graphic" match="any">
+        <group delimiter=", " prefix=", ">
+          <text variable="medium"/>
+          <text variable="dimensions"/>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <citation et-al-min="4" et-al-use-first="1" disambiguate-add-names="true" disambiguate-add-givenname="true">
+    <layout suffix="." delimiter="; ">
+      <choose>
+        <if position="ibid-with-locator">
+          <group delimiter=", ">
+            <text term="ibid" font-style="italic"/>
+            <text macro="point-locators-subsequent"/>
+          </group>
+        </if>
+        <else-if position="ibid">
+          <text term="ibid" font-style="italic"/>
+        </else-if>
+        <else-if position="subsequent">
+          <group delimiter=", ">
+            <text macro="contributors-short"/>
+            <text macro="title-short"/>
+            <text macro="locators-specific-note"/>
+          </group>
+          <text macro="point-locators-subsequent"/>
+        </else-if>
+        <else>
+          <group delimiter=", ">
+            <text macro="contributors-note"/>
+            <text macro="title-note"/>
+            <text macro="secondary-contributors-note"/>
+            <text macro="container-contributors-note"/>
+            <text macro="container-title-note"/>
+            <text macro="collection-title"/>
+            <text macro="locators-note"/>
+          </group>
+          <text macro="issue-note"/>
+          <text macro="locators-specific-note" prefix=", "/>
+          <text macro="locators-newspaper" prefix=", "/>
+          <text macro="point-locators"/>
+          <text macro="access-note"/>
+        </else>
+      </choose>
+    </layout>
+  </citation>
+  <bibliography hanging-indent="true" et-al-min="7" et-al-use-first="6" subsequent-author-substitute="&#8212;&#8212;&#8212;">
+    <sort>
+      <key macro="author"/>
+      <key variable="issued"/>
+      <key variable="title"/>
+    </sort>
+    <layout suffix=".">
+      <group delimiter=", ">
+        <text macro="author"/>
+        <text macro="title-note"/>
+        <text macro="secondary-contributors-note"/>
+        <text macro="container-contributors-note"/>
+        <text macro="container-title-note"/>
+        <text macro="collection-title"/>
+        <text macro="volume"/>
+      </group>
+      <text macro="issue-note"/>
+      <text macro="locators-specific-note" prefix=", "/>
+      <text macro="artwork" prefix=", "/>
+      <text macro="locators-newspaper" prefix=", "/>
+      <text macro="pages"/>
+      <text macro="access-note"/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/buildres/csl/csl-styles/harvard-anglia-ruskin-university.csl b/buildres/csl/csl-styles/harvard-anglia-ruskin-university.csl
index 16c56d2a5b0..a482dbfd51f 100644
--- a/buildres/csl/csl-styles/harvard-anglia-ruskin-university.csl
+++ b/buildres/csl/csl-styles/harvard-anglia-ruskin-university.csl
@@ -10,10 +10,13 @@
       <name>Steven Singleton</name>
       <email>stvn@gmx.ie</email>
     </author>
+    <contributor>
+      <name>Patrick O'Brien</name>
+    </contributor>
     <category citation-format="author-date"/>
     <category field="generic-base"/>
     <summary>Anglia Ruskin University Harvard style</summary>
-    <updated>2021-03-08T09:06:46+00:00</updated>
+    <updated>2022-08-22T08:06:04+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="cite-author">
@@ -40,7 +43,7 @@
     </choose>
   </macro>
   <macro name="anon">
-    <text term="anonymous" form="short" text-case="capitalize-first" strip-periods="true"/>
+    <text term="anonymous" form="short" text-case="capitalize-first" strip-periods="false"/>
   </macro>
   <macro name="year-date">
     <choose>
@@ -141,7 +144,8 @@
   </macro>
   <macro name="translator">
     <names variable="translator">
-      <name and="text" initialize-with="." delimiter=". " prefix="Translated by " suffix="."/>
+      <label form="verb" text-case="capitalize-first" suffix=" "/>
+      <name and="text" delimiter-precedes-last="never" initialize-with="."/>
     </names>
   </macro>
   <macro name="bill-detail">
@@ -290,7 +294,7 @@
       <else-if type="book chapter paper-conference manuscript entry-dictionary entry-encyclopedia thesis motion_picture song report" match="any">
         <group suffix=".">
           <text variable="event" suffix=". "/>
-          <group delimiter=".">
+          <group delimiter=". ">
             <text macro="publisher"/>
             <group>
               <label variable="page" form="short"/>
@@ -326,7 +330,7 @@
             <text term="accessed" text-case="capitalize-first" suffix=" "/>
             <date variable="accessed" delimiter=" ">
               <date-part name="day"/>
-              <date-part name="month" form="short"/>
+              <date-part name="month"/>
               <date-part name="year"/>
             </date>
           </group>
@@ -344,13 +348,17 @@
           <name form="short" and="text" sort-separator=", " initialize-with="." delimiter-precedes-last="never" delimiter=", "/>
           <substitute>
             <names variable="editor"/>
-            <text variable="title"/>
+            <text macro="anon" text-case="capitalize-first"/>
           </substitute>
         </names>
       </else>
     </choose>
   </macro>
-  <citation et-al-min="4" et-al-use-first="1" disambiguate-add-year-suffix="true" collapse="year-suffix">
+  <citation et-al-min="4" et-al-use-first="1" disambiguate-add-year-suffix="true" collapse="year" cite-group-delimiter="; ">
+    <sort>
+      <key macro="year-date"/>
+      <key macro="cite-author"/>
+    </sort>
     <layout prefix="(" suffix=")" delimiter="; ">
       <group delimiter=", ">
         <group delimiter=", ">
diff --git a/buildres/csl/csl-styles/harvard-cardiff-university-old.csl b/buildres/csl/csl-styles/harvard-cardiff-university-old.csl
deleted file mode 100644
index 31cc6f69ea3..00000000000
--- a/buildres/csl/csl-styles/harvard-cardiff-university-old.csl
+++ /dev/null
@@ -1,257 +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-GB">
-  <info>
-    <title>Cardiff University - (old) Harvard</title>
-    <id>http://www.zotero.org/styles/harvard-cardiff-university-old</id>
-    <link href="http://www.zotero.org/styles/harvard-cardiff-university-old" rel="self"/>
-    <link href="https://github.com/citation-style-language/styles/pull/3676#issuecomment-420542651" rel="documentation"/>
-    <author>
-      <name>Zoe Young</name>
-      <email>youngz@cardiff.ac.uk</email>
-    </author>
-    <author>
-      <name>Lewys Peters</name>
-    </author>
-    <category citation-format="author-date"/>
-    <category field="generic-base"/>
-    <summary>The Harvard author-date style - adapted for Cardiff University</summary>
-    <updated>2017-05-10T15:33:29+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 name-as-sort-order="all" and="text" sort-separator=", " 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-precedes-last="never" delimiter=", "/>
-      <label form="short" prefix=" "/>
-      <substitute>
-        <names variable="editor"/>
-        <choose>
-          <if type="article-newspaper article-magazine" match="any">
-            <text variable="container-title"/>
-          </if>
-          <else>
-            <text macro="title"/>
-          </else>
-        </choose>
-      </substitute>
-    </names>
-  </macro>
-  <macro name="author-short">
-    <names variable="author">
-      <name form="short" and="text" delimiter=", " delimiter-precedes-last="never" initialize-with=". "/>
-      <substitute>
-        <names variable="editor"/>
-        <names variable="translator"/>
-        <choose>
-          <if type="article-newspaper article-magazine" match="any">
-            <text variable="container-title" text-case="title" font-style="italic"/>
-          </if>
-          <else>
-            <text macro="title"/>
-          </else>
-        </choose>
-      </substitute>
-    </names>
-  </macro>
-  <macro name="access">
-    <choose>
-      <if variable="URL" match="all">
-        <group delimiter=" ">
-          <group delimiter=": ">
-            <text term="available at" text-case="capitalize-first"/>
-            <text variable="URL"/>
-          </group>
-          <group prefix="[" suffix="]" delimiter=": ">
-            <text term="accessed" text-case="capitalize-first"/>
-            <date variable="accessed">
-              <date-part name="day" suffix=" "/>
-              <date-part name="month" suffix=" "/>
-              <date-part name="year"/>
-            </date>
-          </group>
-        </group>
-      </if>
-      <else-if match="all" variable="DOI">
-        <text variable="DOI" prefix="doi: "/>
-      </else-if>
-    </choose>
-  </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" suffix="."/>
-      </else>
-    </choose>
-  </macro>
-  <macro name="publisher">
-    <group delimiter=": " suffix="">
-      <text variable="publisher-place"/>
-      <text variable="publisher"/>
-    </group>
-  </macro>
-  <macro name="year-date">
-    <choose>
-      <if type="bill legislation" match="none">
-        <choose>
-          <if variable="issued">
-            <date variable="issued">
-              <date-part name="year"/>
-            </date>
-            <text variable="year-suffix"/>
-          </if>
-          <else>
-            <text term="no date" prefix="[" suffix="]"/>
-            <text variable="year-suffix" prefix="[" suffix="]"/>
-          </else>
-        </choose>
-      </if>
-    </choose>
-  </macro>
-  <macro name="published-date">
-    <choose>
-      <if type="article-newspaper article-magazine post-weblog speech" match="any">
-        <date variable="issued">
-          <date-part name="day" prefix=" " suffix=" "/>
-          <date-part name="month" form="long"/>
-        </date>
-      </if>
-    </choose>
-  </macro>
-  <macro name="edition">
-    <choose>
-      <if is-numeric="edition">
-        <group delimiter=" ">
-          <number variable="edition" form="ordinal"/>
-          <text term="edition" form="short"/>
-        </group>
-      </if>
-      <else>
-        <text variable="edition" suffix="."/>
-      </else>
-    </choose>
-  </macro>
-  <macro name="pages">
-    <choose>
-      <if type="chapter paper-conference article article-journal article-magazine article-newspaper book review review-book report" match="any">
-        <group>
-          <label variable="page" form="short" suffix=" "/>
-          <text variable="page" suffix="."/>
-        </group>
-      </if>
-    </choose>
-  </macro>
-  <macro name="bill-detail">
-    <choose>
-      <if type="bill legislation" match="any">
-        <group>
-          <text variable="section"/>
-          <text variable="volume"/>
-        </group>
-      </if>
-    </choose>
-  </macro>
-  <macro name="patent">
-    <text variable="number" suffix=" [Patent]."/>
-  </macro>
-  <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true">
-    <sort>
-      <key macro="year-date"/>
-      <key variable="author"/>
-    </sort>
-    <layout prefix="(" suffix=")" delimiter="; ">
-      <group delimiter=", ">
-        <group delimiter=" ">
-          <text macro="author-short"/>
-          <text macro="year-date"/>
-        </group>
-        <group>
-          <label variable="locator" form="short"/>
-          <text variable="locator"/>
-        </group>
-      </group>
-    </layout>
-  </citation>
-  <bibliography et-al-min="3" et-al-use-first="1" hanging-indent="false">
-    <sort>
-      <key macro="author"/>
-      <key macro="year-date"/>
-      <key variable="title"/>
-    </sort>
-    <layout>
-      <text macro="author"/>
-      <text macro="year-date" prefix=" " suffix="."/>
-      <choose>
-        <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
-          <group delimiter=". " prefix=" " suffix=".">
-            <text macro="title"/>
-            <text macro="edition"/>
-            <text macro="editor"/>
-            <text macro="publisher"/>
-            <text macro="bill-detail"/>
-          </group>
-        </if>
-        <else-if type="chapter paper-conference" match="any">
-          <text macro="title" prefix=" " suffix="."/>
-          <group prefix=" " delimiter=" ">
-            <text term="in" text-case="capitalize-first" suffix=":"/>
-            <text macro="editor"/>
-            <text variable="container-title" font-style="italic" suffix="."/>
-            <text variable="collection-title" suffix="."/>
-          </group>
-          <group prefix=" " delimiter=" ">
-            <text macro="edition"/>
-            <group suffix="" delimiter=", ">
-              <text macro="publisher"/>
-            </group>
-          </group>
-        </else-if>
-        <else-if type="thesis">
-          <group prefix=" " delimiter=". " suffix=".">
-            <text macro="title"/>
-            <text macro="edition"/>
-          </group>
-          <group prefix=" " delimiter=", " suffix=".">
-            <text variable="genre"/>
-            <text macro="publisher"/>
-          </group>
-        </else-if>
-        <else-if type="webpage">
-          <group prefix=" " delimiter=" " suffix=".">
-            <text macro="title"/>
-            <text macro="edition"/>
-          </group>
-        </else-if>
-        <else-if type="patent" match="any">
-          <group delimiter=" " prefix=" " suffix=".">
-            <text macro="title"/>
-            <text macro="patent"/>
-          </group>
-        </else-if>
-        <else>
-          <group suffix=".">
-            <text macro="title" prefix=" "/>
-            <text macro="editor" prefix=" "/>
-          </group>
-          <group prefix=" ">
-            <text variable="container-title" font-style="italic" suffix=" "/>
-            <text variable="volume"/>
-            <text variable="issue" prefix="(" suffix=")"/>
-          </group>
-        </else>
-      </choose>
-      <group>
-        <text macro="published-date"/>
-        <text macro="pages" prefix=", "/>
-        <text prefix=". " macro="access" suffix="."/>
-      </group>
-    </layout>
-  </bibliography>
-</style>
diff --git a/buildres/csl/csl-styles/harvard-cite-them-right-11th-edition.csl b/buildres/csl/csl-styles/harvard-cite-them-right-11th-edition.csl
new file mode 100644
index 00000000000..0ca2c27dd81
--- /dev/null
+++ b/buildres/csl/csl-styles/harvard-cite-them-right-11th-edition.csl
@@ -0,0 +1,318 @@
+<?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-GB">
+  <info>
+    <title>Cite Them Right 11th edition - Harvard</title>
+    <id>http://www.zotero.org/styles/harvard-cite-them-right-11th-edition</id>
+    <link href="http://www.zotero.org/styles/harvard-cite-them-right-11th-edition" rel="self"/>
+    <link href="http://www.zotero.org/styles/harvard-cite-them-right-10th-edition" rel="template"/>
+    <link href="http://www.citethemrightonline.com/" rel="documentation"/>
+    <author>
+      <name>Patrick O'Brien</name>
+    </author>
+    <category citation-format="author-date"/>
+    <category field="generic-base"/>
+    <summary>Harvard according to Cite Them Right, 11th edition.</summary>
+    <updated>2022-06-27T07:43:59+00:00</updated>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
+  </info>
+  <locale xml:lang="en-GB">
+    <terms>
+      <term name="editor" form="short">
+        <single>ed.</single>
+        <multiple>eds</multiple>
+      </term>
+      <term name="editortranslator" form="verb">edited and translated by</term>
+      <term name="edition" form="short">edn.</term>
+    </terms>
+  </locale>
+  <macro name="editor">
+    <choose>
+      <if type="chapter paper-conference" match="any">
+        <names variable="container-author" delimiter=", " suffix=", ">
+          <name and="text" initialize-with=". " delimiter=", " sort-separator=", " name-as-sort-order="all"/>
+        </names>
+        <choose>
+          <if variable="container-author" match="none">
+            <names variable="editor translator" delimiter=", ">
+              <name and="text" initialize-with="." name-as-sort-order="all"/>
+              <label form="short" prefix=" (" suffix=")"/>
+            </names>
+          </if>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <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" initialize-with="."/>
+        </names>
+      </if>
+      <else-if variable="container-author" match="any">
+        <names variable="editor translator" delimiter=". ">
+          <label form="verb" text-case="capitalize-first" suffix=" "/>
+          <name and="text" initialize-with=". " delimiter=", "/>
+        </names>
+      </else-if>
+    </choose>
+  </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=" (" suffix=")"/>
+      <et-al font-style="italic"/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <choose>
+          <if type="article-newspaper article-magazine" match="any">
+            <text variable="container-title" text-case="title" font-style="italic"/>
+          </if>
+          <else>
+            <text macro="title"/>
+          </else>
+        </choose>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="author-short">
+    <names variable="author">
+      <name form="short" and="text" delimiter=", " delimiter-precedes-last="never" initialize-with=". "/>
+      <et-al font-style="italic"/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <choose>
+          <if type="article-newspaper article-magazine" match="any">
+            <text variable="container-title" text-case="title" font-style="italic"/>
+          </if>
+          <else>
+            <text macro="title"/>
+          </else>
+        </choose>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if variable="DOI">
+        <text variable="DOI" prefix="doi:"/>
+      </if>
+      <else-if variable="URL">
+        <text term="available at" suffix=": " text-case="capitalize-first"/>
+        <text variable="URL"/>
+        <group prefix=" (" delimiter=": " suffix=")">
+          <text term="accessed" text-case="capitalize-first"/>
+          <date form="text" variable="accessed">
+            <date-part name="day"/>
+            <date-part name="month"/>
+            <date-part name="year"/>
+          </date>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="number-volumes">
+    <choose>
+      <if variable="volume" match="none">
+        <group delimiter=" " prefix="(" suffix=")">
+          <text variable="number-of-volumes"/>
+          <label variable="volume" form="short" strip-periods="true"/>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="bill book legal_case legislation motion_picture report song thesis webpage graphic" match="any">
+        <group delimiter=". ">
+          <group delimiter=" ">
+            <group delimiter=" ">
+              <text variable="title" font-style="italic"/>
+              <text variable="medium" prefix="[" suffix="]"/>
+            </group>
+            <text macro="number-volumes"/>
+          </group>
+          <text macro="edition"/>
+        </group>
+      </if>
+      <else>
+        <text variable="title" form="long" quotes="true"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <choose>
+      <if type="thesis">
+        <group delimiter=". ">
+          <text variable="genre"/>
+          <text variable="publisher"/>
+        </group>
+      </if>
+      <else-if type="report">
+        <group delimiter=". ">
+          <group delimiter=" ">
+            <text variable="genre"/>
+            <text variable="number"/>
+          </group>
+          <group delimiter=": ">
+            <text variable="publisher-place"/>
+            <text variable="publisher"/>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="article-journal article-newspaper article-magazine" match="none">
+        <group delimiter=" ">
+          <group delimiter=", ">
+            <choose>
+              <if type="speech" variable="event" match="any">
+                <text variable="event" font-style="italic"/>
+              </if>
+            </choose>
+            <group delimiter=": ">
+              <text variable="publisher-place"/>
+              <text variable="publisher"/>
+            </group>
+          </group>
+          <group prefix="(" suffix=")" delimiter=", ">
+            <text variable="collection-title"/>
+            <text variable="collection-number"/>
+          </group>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="year-date">
+    <choose>
+      <if variable="issued">
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
+        <text variable="year-suffix"/>
+      </if>
+      <else>
+        <text term="no date"/>
+        <text variable="year-suffix" prefix=" "/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="locator">
+    <choose>
+      <if type="article-journal">
+        <text variable="volume"/>
+        <text variable="issue" prefix="(" suffix=")"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="published-date">
+    <choose>
+      <if type="article-newspaper article-magazine post-weblog speech" match="any">
+        <date variable="issued">
+          <date-part name="day" suffix=" "/>
+          <date-part name="month" form="long"/>
+        </date>
+      </if>
+    </choose>
+  </macro>
+  <macro name="pages">
+    <choose>
+      <if type="chapter paper-conference article-journal article article-magazine article-newspaper book review review-book report" match="any">
+        <group delimiter=" ">
+          <label variable="page" form="short"/>
+          <text variable="page"/>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="container-title">
+    <choose>
+      <if variable="container-title">
+        <group delimiter=". ">
+          <group delimiter=" ">
+            <text variable="container-title" font-style="italic"/>
+            <choose>
+              <if type="article article-journal" match="any">
+                <choose>
+                  <if match="none" variable="page volume">
+                    <text value="Preprint" prefix="[" suffix="]"/>
+                  </if>
+                </choose>
+              </if>
+            </choose>
+          </group>
+          <text macro="edition"/>
+        </group>
+      </if>
+    </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="container-prefix">
+    <choose>
+      <if type="chapter paper-conference" match="any">
+        <text term="in"/>
+      </if>
+    </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" collapse="year">
+    <sort>
+      <key macro="year-date"/>
+    </sort>
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <group delimiter=", ">
+        <group delimiter=", ">
+          <text macro="author-short"/>
+          <text macro="year-date"/>
+        </group>
+        <group>
+          <label variable="locator" form="short" suffix=" "/>
+          <text variable="locator"/>
+        </group>
+      </group>
+    </layout>
+  </citation>
+  <bibliography and="text" et-al-min="4" et-al-use-first="1">
+    <sort>
+      <key macro="author"/>
+      <key macro="year-date"/>
+      <key variable="title"/>
+    </sort>
+    <layout suffix=".">
+      <group delimiter=". ">
+        <group delimiter=" ">
+          <text macro="author"/>
+          <text macro="year-date" prefix="(" suffix=")"/>
+          <group delimiter=", ">
+            <text macro="title"/>
+            <group delimiter=" ">
+              <text macro="container-prefix"/>
+              <text macro="editor"/>
+              <text macro="container-title"/>
+            </group>
+          </group>
+        </group>
+        <text macro="secondary-contributors"/>
+        <text macro="publisher"/>
+      </group>
+      <group delimiter=", " prefix=", ">
+        <text macro="locator"/>
+        <text macro="published-date"/>
+        <text macro="pages"/>
+      </group>
+      <text macro="access" prefix=". "/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/buildres/csl/csl-styles/harvard-cite-them-right-no-et-al.csl b/buildres/csl/csl-styles/harvard-cite-them-right-no-et-al.csl
index 17572921f28..9ce005a34ac 100644
--- a/buildres/csl/csl-styles/harvard-cite-them-right-no-et-al.csl
+++ b/buildres/csl/csl-styles/harvard-cite-them-right-no-et-al.csl
@@ -1,7 +1,7 @@
 <?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-GB">
   <info>
-    <title>Cite Them Right 11th edition - Harvard (no "et al.")</title>
+    <title>Cite Them Right 12th edition - Harvard (no "et al.")</title>
     <id>http://www.zotero.org/styles/harvard-cite-them-right-no-et-al</id>
     <link href="http://www.zotero.org/styles/harvard-cite-them-right-no-et-al" rel="self"/>
     <link href="http://www.zotero.org/styles/harvard-cite-them-right" rel="template"/>
@@ -11,8 +11,8 @@
     </author>
     <category citation-format="author-date"/>
     <category field="generic-base"/>
-    <summary>Harvard according to Cite Them Right, 11th edition.</summary>
-    <updated>2021-09-02T07:43:59+00:00</updated>
+    <summary>Harvard according to Cite Them Right, 12th edition.</summary>
+    <updated>2022-06-28T11:12: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>
   <locale xml:lang="en-GB">
@@ -29,12 +29,12 @@
     <choose>
       <if type="chapter paper-conference" match="any">
         <names variable="container-author" delimiter=", " suffix=", ">
-          <name and="text" initialize-with=". " delimiter=", " sort-separator=", " name-as-sort-order="all"/>
+          <name and="text" initialize-with=". "/>
         </names>
         <choose>
           <if variable="container-author" match="none">
             <names variable="editor translator" delimiter=", ">
-              <name and="text" initialize-with="." name-as-sort-order="all"/>
+              <name and="text" initialize-with="."/>
               <label form="short" prefix=" (" suffix=")"/>
             </names>
           </if>
@@ -98,7 +98,10 @@
   <macro name="access">
     <choose>
       <if variable="DOI">
-        <text variable="DOI" prefix="doi:"/>
+        <group delimiter=": ">
+          <text term="available at" text-case="capitalize-first"/>
+          <text variable="DOI" prefix="https://doi.org/"/>
+        </group>
       </if>
       <else-if variable="URL">
         <text term="available at" suffix=": " text-case="capitalize-first"/>
diff --git a/buildres/csl/csl-styles/harvard-cite-them-right.csl b/buildres/csl/csl-styles/harvard-cite-them-right.csl
index 2800678205e..8f01ed8d967 100644
--- a/buildres/csl/csl-styles/harvard-cite-them-right.csl
+++ b/buildres/csl/csl-styles/harvard-cite-them-right.csl
@@ -1,10 +1,10 @@
 <?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-GB">
   <info>
-    <title>Cite Them Right 11th edition - Harvard</title>
+    <title>Cite Them Right 12th edition - Harvard</title>
     <id>http://www.zotero.org/styles/harvard-cite-them-right</id>
     <link href="http://www.zotero.org/styles/harvard-cite-them-right" rel="self"/>
-    <link href="http://www.zotero.org/styles/harvard-cite-them-right-10th-edition" rel="template"/>
+    <link href="http://www.zotero.org/styles/harvard-cite-them-right-11th-edition" rel="template"/>
     <link href="http://www.citethemrightonline.com/" rel="documentation"/>
     <author>
       <name>Patrick O'Brien</name>
@@ -12,7 +12,7 @@
     <category citation-format="author-date"/>
     <category field="generic-base"/>
     <summary>Harvard according to Cite Them Right, 11th edition.</summary>
-    <updated>2021-09-01T07:43:59+00:00</updated>
+    <updated>2022-06-27T11:10:37+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <locale xml:lang="en-GB">
@@ -34,7 +34,7 @@
         <choose>
           <if variable="container-author" match="none">
             <names variable="editor translator" delimiter=", ">
-              <name and="text" initialize-with="." name-as-sort-order="all"/>
+              <name and="text" initialize-with="."/>
               <label form="short" prefix=" (" suffix=")"/>
             </names>
           </if>
@@ -98,7 +98,10 @@
   <macro name="access">
     <choose>
       <if variable="DOI">
-        <text variable="DOI" prefix="doi:"/>
+        <group delimiter=": ">
+          <text term="available at" text-case="capitalize-first"/>
+          <text variable="DOI" prefix="https://doi.org/"/>
+        </group>
       </if>
       <else-if variable="URL">
         <text term="available at" suffix=": " text-case="capitalize-first"/>
diff --git a/buildres/csl/csl-styles/harvard-limerick.csl b/buildres/csl/csl-styles/harvard-limerick.csl
index 28b1e57004c..cc980b97da6 100644
--- a/buildres/csl/csl-styles/harvard-limerick.csl
+++ b/buildres/csl/csl-styles/harvard-limerick.csl
@@ -5,16 +5,22 @@
     <id>http://www.zotero.org/styles/harvard-limerick</id>
     <link href="http://www.zotero.org/styles/harvard-limerick" rel="self"/>
     <link href="http://www.zotero.org/styles/elsevier-harvard" rel="template"/>
-    <link href="http://www3.ul.ie/~library/pdf/citeitright.pdf" rel="documentation"/>
+    <link href="https://libguides.ul.ie/citeitright" rel="documentation"/>
+    <link href="https://libguides.ul.ie/ld.php?content_id=23581826" rel="documentation"/>
     <author>
       <name>Sebastian Karcher</name>
     </author>
     <category citation-format="author-date"/>
     <category field="generic-base"/>
-    <summary>Style based on the University of Limerick's Cite it Right guide, 2nd edition. Currently covers the most typical item types (books, chapters, webpages, articles in journals, magazines, newspapers (online and print), theses and reports. Doesn't cover legal citations and artworks.</summary>
-    <updated>2013-02-14T12:00:00+00:00</updated>
+    <summary>Style based on the University of Limerick's Cite it Right guide, 4th edition from 2016. Currently covers the most typical item types (books, chapters, webpages, articles in journals, magazines, newspapers (online and print), theses and reports. Doesn't cover legal citations and artworks.</summary>
+    <updated>2022-03-05T17:26:49+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="available at">available</term>
+    </terms>
+  </locale>
   <macro name="container">
     <choose>
       <if type="chapter paper-conference" match="any">
@@ -46,7 +52,7 @@
   </macro>
   <macro name="author">
     <names variable="author">
-      <name name-as-sort-order="all" sort-separator=", " initialize-with="." delimiter=", " delimiter-precedes-last="always"/>
+      <name initialize-with="." name-as-sort-order="all"/>
       <label form="short" prefix=" (" suffix=")" text-case="capitalize-first"/>
       <substitute>
         <names variable="editor"/>
@@ -75,9 +81,18 @@
   </macro>
   <macro name="access">
     <choose>
-      <if variable="URL">
+      <if variable="DOI">
+        <group delimiter=": ">
+          <text term="available at"/>
+          <text variable="DOI" prefix="https://doi.org/"/>
+        </group>
+      </if>
+      <else-if match="any" variable="URL">
         <group delimiter=" ">
-          <text variable="URL" prefix="available: "/>
+          <group delimiter=": ">
+            <text term="available at"/>
+            <text variable="URL"/>
+          </group>
           <group prefix="[" suffix="]" delimiter=" ">
             <text term="accessed"/>
             <date variable="accessed" delimiter=" ">
@@ -87,7 +102,7 @@
             </date>
           </group>
         </group>
-      </if>
+      </else-if>
     </choose>
   </macro>
   <macro name="title">
@@ -129,8 +144,8 @@
       </if>
       <else>
         <group delimiter=": ">
-          <text variable="publisher"/>
           <text variable="publisher-place"/>
+          <text variable="publisher"/>
         </group>
       </else>
     </choose>
@@ -209,9 +224,7 @@
         <group delimiter=", ">
           <text macro="event"/>
           <text macro="publisher"/>
-          <group>
-            <text variable="page"/>
-          </group>
+          <text variable="page"/>
         </group>
       </else-if>
     </choose>
@@ -222,19 +235,23 @@
       <key macro="author"/>
     </sort>
     <layout prefix="(" suffix=")" delimiter="; ">
-      <group delimiter=", ">
+      <group delimiter=":">
         <group delimiter=" ">
           <text macro="author-short"/>
           <text macro="issued"/>
         </group>
         <group>
-          <label variable="locator" form="short"/>
+          <choose>
+            <if match="none" locator="page">
+              <label variable="locator" form="short"/>
+            </if>
+          </choose>
           <text variable="locator"/>
         </group>
       </group>
     </layout>
   </citation>
-  <bibliography hanging-indent="true" entry-spacing="0" line-spacing="1">
+  <bibliography and="text" entry-spacing="0" hanging-indent="true">
     <sort>
       <key macro="author"/>
       <key macro="issued" sort="ascending"/>
@@ -243,12 +260,12 @@
       <group delimiter=" ">
         <text macro="author"/>
         <text macro="issued" prefix="(" suffix=")"/>
-      </group>
-      <group delimiter=", " prefix=" ">
-        <text macro="title"/>
-        <text macro="container"/>
-        <text macro="locators"/>
-        <text macro="access"/>
+        <group delimiter=", ">
+          <text macro="title"/>
+          <text macro="container"/>
+          <text macro="locators"/>
+          <text macro="access"/>
+        </group>
       </group>
     </layout>
   </bibliography>
diff --git a/buildres/csl/csl-styles/harvard-oxford-brookes-university-faculty-of-health-and-life-sciences.csl b/buildres/csl/csl-styles/harvard-oxford-brookes-university-faculty-of-health-and-life-sciences.csl
deleted file mode 100644
index abd139694c5..00000000000
--- a/buildres/csl/csl-styles/harvard-oxford-brookes-university-faculty-of-health-and-life-sciences.csl
+++ /dev/null
@@ -1,196 +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-GB">
-  <info>
-    <title>Oxford Brookes University - Faculty of Health and Life Sciences - Harvard</title>
-    <id>http://www.zotero.org/styles/harvard-oxford-brookes-university-faculty-of-health-and-life-sciences</id>
-    <link href="http://www.zotero.org/styles/harvard-oxford-brookes-university-faculty-of-health-and-life-sciences" rel="self"/>
-    <link href="https://shsc-int.brookes.ac.uk/documents/browse.php?fFolderId=53" rel="documentation"/>
-    <author>
-      <name>Vincent Paramanandam</name>
-      <email>vinsu24@gmail.com</email>
-    </author>
-    <category citation-format="author-date"/>
-    <category field="generic-base"/>
-    <summary>Harvard (author-date style) for Faculty of Health and Life Sciences, Oxford Brookes University</summary>
-    <updated>2012-09-27T22: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>
-  <locale xml:lang="en-GB">
-    <terms>
-      <term name="et-al">et al</term>
-    </terms>
-  </locale>
-  <macro name="anon">
-    <text term="anonymous" form="short" text-case="capitalize-first" strip-periods="true"/>
-  </macro>
-  <macro name="author">
-    <names variable="author">
-      <name and="text" name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter-precedes-last="never" delimiter=", "/>
-      <label form="short" prefix=" "/>
-      <substitute>
-        <text macro="anon"/>
-      </substitute>
-    </names>
-  </macro>
-  <macro name="author-short">
-    <names variable="author">
-      <name form="short" and="text" delimiter=", " delimiter-precedes-last="never"/>
-      <substitute>
-        <names variable="translator"/>
-        <text macro="anon"/>
-      </substitute>
-    </names>
-  </macro>
-  <macro name="container-contributors">
-    <choose>
-      <if type="chapter paper-conference" match="any">
-        <text term="in" text-case="capitalize-first" suffix=": "/>
-        <names variable="editor translator" delimiter=", " suffix=" ">
-          <name and="text" initialize-with="" delimiter=", " sort-separator=" " name-as-sort-order="all" delimiter-precedes-last="never"/>
-          <label form="short" prefix=" (" suffix=")" strip-periods="true"/>
-        </names>
-      </if>
-    </choose>
-  </macro>
-  <macro name="access">
-    <choose>
-      <if variable="URL">
-        <group>
-          <text value="Available at" suffix=": "/>
-          <text variable="URL"/>
-          <date variable="accessed" prefix=" (accessed " suffix=")">
-            <date-part name="day" form="numeric-leading-zeros" suffix="/"/>
-            <date-part name="month" form="numeric-leading-zeros" suffix="/"/>
-            <date-part name="year" form="short"/>
-          </date>
-        </group>
-      </if>
-    </choose>
-  </macro>
-  <macro name="title">
-    <choose>
-      <if type="bill book webpage graphic legal_case motion_picture report song" match="any">
-        <text variable="title" font-style="italic"/>
-      </if>
-      <else>
-        <text variable="title"/>
-      </else>
-    </choose>
-  </macro>
-  <macro name="publisher">
-    <choose>
-      <if type="thesis">
-        <group delimiter=", ">
-          <text variable="genre"/>
-          <text variable="publisher-place"/>
-          <text variable="publisher"/>
-        </group>
-      </if>
-      <else>
-        <text variable="genre" suffix=". "/>
-        <group delimiter=": ">
-          <text variable="publisher-place"/>
-          <text variable="publisher"/>
-        </group>
-      </else>
-    </choose>
-  </macro>
-  <macro name="event">
-    <choose>
-      <if variable="event">
-        <text term="presented at" prefix="paper " suffix=" "/>
-        <text variable="event"/>
-      </if>
-    </choose>
-  </macro>
-  <macro name="year-date">
-    <choose>
-      <if variable="issued">
-        <group>
-          <date variable="issued">
-            <date-part name="year"/>
-          </date>
-        </group>
-      </if>
-      <else>
-        <text prefix=" (" term="no date" suffix=")" form="short"/>
-      </else>
-    </choose>
-  </macro>
-  <macro name="edition">
-    <choose>
-      <if is-numeric="edition">
-        <group delimiter=" ">
-          <number variable="edition" form="ordinal"/>
-          <text term="edition" strip-periods="true"/>
-        </group>
-      </if>
-      <else>
-        <text variable="edition" suffix="."/>
-      </else>
-    </choose>
-  </macro>
-  <macro name="locators">
-    <choose>
-      <if type="article-journal article-magazine" match="any">
-        <group prefix=" " delimiter=": ">
-          <group>
-            <text variable="volume"/>
-            <text variable="issue" prefix="(" suffix=")"/>
-          </group>
-          <text variable="page"/>
-        </group>
-      </if>
-      <else-if type="article-newspaper">
-        <group delimiter=", " prefix=", ">
-          <date variable="issued">
-            <date-part name="day"/>
-            <date-part name="month" form="long" prefix=" "/>
-          </date>
-          <group delimiter=" ">
-            <label variable="page"/>
-            <text variable="page"/>
-          </group>
-        </group>
-      </else-if>
-      <else>
-        <text variable="page" prefix=", "/>
-      </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" givenname-disambiguation-rule="primary-name" collapse="year-suffix">
-    <sort>
-      <key macro="author"/>
-      <key macro="year-date"/>
-    </sort>
-    <layout prefix="(" suffix=")" delimiter=", ">
-      <group delimiter=" ">
-        <text macro="author-short"/>
-        <text macro="year-date"/>
-      </group>
-      <text variable="locator" prefix=":"/>
-    </layout>
-  </citation>
-  <bibliography entry-spacing="1" line-spacing="2">
-    <sort>
-      <key macro="author"/>
-      <key macro="year-date"/>
-    </sort>
-    <layout suffix=".">
-      <group delimiter=" " suffix=". ">
-        <text macro="author"/>
-        <text macro="year-date" prefix="(" suffix=")"/>
-        <text macro="title"/>
-        <text macro="edition" prefix="(" suffix=")"/>
-      </group>
-      <text macro="container-contributors"/>
-      <group delimiter=". ">
-        <text variable="container-title" font-style="italic"/>
-        <text macro="event"/>
-        <text macro="publisher"/>
-      </group>
-      <text macro="locators"/>
-      <text macro="access" prefix=". "/>
-    </layout>
-  </bibliography>
-</style>
diff --git a/buildres/csl/csl-styles/harvard-university-for-the-creative-arts.csl b/buildres/csl/csl-styles/harvard-university-for-the-creative-arts.csl
index d84f8d4e6d9..dade8feb696 100644
--- a/buildres/csl/csl-styles/harvard-university-for-the-creative-arts.csl
+++ b/buildres/csl/csl-styles/harvard-university-for-the-creative-arts.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" and="text" et-al-min="3" et-al-use-first="1" demote-non-dropping-particle="sort-only" default-locale="en-GB">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" and="text" demote-non-dropping-particle="sort-only" default-locale="en-GB">
   <info>
     <title>University for the Creative Arts - Harvard</title>
     <title-short>UCA</title-short>
@@ -14,7 +14,7 @@
     <category citation-format="author-date"/>
     <category field="generic-base"/>
     <summary>University for the Creative Arts Harvard style</summary>
-    <updated>2020-04-02T11:12:33+00:00</updated>
+    <updated>2022-06-22T13:41: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>
   <locale>
@@ -30,7 +30,7 @@
       </if>
       <else>
         <names variable="author">
-          <name and="text" delimiter-precedes-last="never" et-al-min="3" et-al-use-first="1" initialize-with=". " name-as-sort-order="all"/>
+          <name and="text" delimiter-precedes-last="never" initialize-with=". " name-as-sort-order="all"/>
           <label form="short" prefix=" "/>
           <et-al font-style="italic"/>
           <substitute>
@@ -156,11 +156,8 @@
         </group>
         <text variable="archive" prefix=": " suffix="."/>
       </else-if>
-      <else-if type="speech personal_communication" match="any">
-        <group delimiter=" " prefix="[" suffix="].">
-          <names variable="recipient" prefix="Email sent to ">
-            <name and="text" delimiter-precedes-last="never" et-al-min="3" et-al-use-first="1" initialize-with="." name-as-sort-order="all"/>
-          </names>
+      <else-if type="personal_communication" match="any">
+        <group delimiter=" " suffix=".">
           <text variable="genre" suffix=" "/>
           <text variable="event-place"/>
           <date delimiter="/" variable="issued">
@@ -170,6 +167,17 @@
           </date>
         </group>
       </else-if>
+      <else-if type="speech" match="any">
+        <group delimiter=" " prefix="[" suffix="].">
+          <text variable="genre"/>
+          <text variable="event-place"/>
+          <date delimiter="/" variable="issued">
+            <date-part name="day" form="numeric-leading-zeros"/>
+            <date-part name="month" form="numeric-leading-zeros"/>
+            <date-part name="year"/>
+          </date>
+        </group>
+      </else-if>
     </choose>
   </macro>
   <macro name="edition-no">
@@ -188,8 +196,7 @@
   <macro name="translator">
     <names variable="translator">
       <label form="verb" text-case="capitalize-first"/>
-      <name delimiter=". " prefix=" " suffix="." and="text" delimiter-precedes-last="never" et-al-min="3" et-al-use-first="1" initialize-with="." name-as-sort-order="all"/>
-      <et-al font-style="italic"/>
+      <name delimiter=". " prefix=" " and="text" delimiter-precedes-last="never" initialize-with=". " name-as-sort-order="all"/>
     </names>
   </macro>
   <macro name="bill-detail">
@@ -272,8 +279,7 @@
           </if>
         </choose>
         <names variable="author" prefix="Directed by ">
-          <name suffix="." and="text" delimiter-precedes-last="never" et-al-min="3" et-al-use-first="1" initialize-with="." name-as-sort-order="all"/>
-          <et-al font-style="italic"/>
+          <name suffix="." and="text" delimiter-precedes-last="never" initialize-with="." name-as-sort-order="all"/>
         </names>
         <text variable="medium" prefix=" [" suffix="] "/>
       </else-if>
@@ -426,9 +432,8 @@
   </macro>
   <macro name="editor">
     <names variable="editor" delimiter="," suffix=" ">
-      <name and="text" delimiter-precedes-last="never" et-al-min="3" et-al-use-first="1" initialize-with="." name-as-sort-order="all"/>
+      <name and="text" delimiter-precedes-last="never" initialize-with=". " name-as-sort-order="all"/>
       <label form="short" prefix=" (" suffix=")"/>
-      <et-al font-style="italic"/>
     </names>
   </macro>
   <citation disambiguate-add-year-suffix="true" collapse="year-suffix" et-al-min="3" et-al-use-first="1">
@@ -463,7 +468,7 @@
       <group delimiter=" ">
         <text macro="primary-title"/>
         <text macro="genre-online-marker"/>
-        <group delimiter=". " prefix=" ">
+        <group delimiter=" " prefix=" ">
           <text macro="translator"/>
           <text macro="bill-detail"/>
           <text macro="container"/>
diff --git a/buildres/csl/csl-styles/harvard-university-of-bath.csl b/buildres/csl/csl-styles/harvard-university-of-bath.csl
index b1ca7fcfaa8..05ded4eba1a 100644
--- a/buildres/csl/csl-styles/harvard-university-of-bath.csl
+++ b/buildres/csl/csl-styles/harvard-university-of-bath.csl
@@ -11,14 +11,14 @@
       <name>Alex Ball</name>
       <email>ab318@bath.ac.uk</email>
     </author>
-    <author>
+    <contributor>
       <name>Rob Fuller</name>
       <email>rob.fuller1@gmail.com</email>
-    </author>
+    </contributor>
     <category citation-format="author-date"/>
     <category field="generic-base"/>
     <summary>Adaptation of Harvard referencing style used at the University of Bath.</summary>
-    <updated>2021-10-05T08:20:00+00:00</updated>
+    <updated>2022-05-05T12:00:00+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <locale xml:lang="en">
@@ -38,33 +38,81 @@
       <term name="version" form="short">v.</term>
     </terms>
   </locale>
-  <macro name="editor">
-    <names variable="editor">
-      <name and="text" delimiter-precedes-last="never" initialize-with="."/>
-      <label form="short" prefix=", " text-case="lowercase"/>
-    </names>
+  <macro name="access">
+    <choose>
+      <if variable="URL DOI accessed" match="any">
+        <text term="available at" text-case="capitalize-first" suffix=": "/>
+        <choose>
+          <if variable="DOI">
+            <text variable="DOI" prefix="https://doi.org/"/>
+          </if>
+          <else-if variable="URL">
+            <text variable="URL"/>
+          </else-if>
+          <else>
+            <text variable="archive"/>
+          </else>
+        </choose>
+        <group prefix=" [" suffix="]">
+          <text term="accessed" text-case="capitalize-first" suffix=" "/>
+          <date variable="accessed">
+            <date-part name="day" suffix=" "/>
+            <date-part name="month" suffix=" "/>
+            <date-part name="year"/>
+          </date>
+        </group>
+      </if>
+    </choose>
   </macro>
-  <macro name="byeditor">
-    <names variable="editor">
-      <label form="verb-short" text-case="capitalize-first" suffix=" "/>
-      <name and="text" delimiter-precedes-last="never" initialize-with="."/>
-    </names>
+  <macro name="archive">
+    <choose>
+      <if variable="archive">
+        <choose>
+          <if type="graphic manuscript map pamphlet" match="any">
+            <group delimiter=". ">
+              <group delimiter=", ">
+                <text variable="archive_collection"/>
+                <text variable="archive_location"/>
+              </group>
+              <group delimiter=", ">
+                <text variable="archive"/>
+                <text variable="archive-place"/>
+              </group>
+            </group>
+          </if>
+          <else-if type="broadcast motion_picture song" match="any"/>
+          <else>
+            <group delimiter=" ">
+              <text variable="archive" font-style="italic"/>
+              <choose>
+                <if type="bill report standard webpage" match="any">
+                  <text macro="online"/>
+                </if>
+              </choose>
+            </group>
+          </else>
+        </choose>
+      </if>
+    </choose>
   </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="lowercase"/>
       <substitute>
         <choose>
-          <if type="entry"/>
-          <else>
+          <if type="entry" variable="title container-title">
+            <text variable="container-title"/>
+          </if>
+          <else-if variable="editor">
             <names variable="editor">
               <name and="text" delimiter-precedes-last="never" initialize-with="." name-as-sort-order="all"/>
               <label form="short" prefix=", " text-case="lowercase"/>
             </names>
+          </else-if>
+          <else>
+            <text macro="title-label"/>
           </else>
         </choose>
-        <text macro="title-label"/>
       </substitute>
     </names>
   </macro>
@@ -82,42 +130,152 @@
       </substitute>
     </names>
   </macro>
-  <macro name="access">
+  <macro name="broadcast">
+    <group delimiter=". ">
+      <group delimiter=" ">
+        <group delimiter=", ">
+          <text variable="container-title" font-style="italic"/>
+          <text variable="number" font-style="italic"/>
+        </group>
+        <text macro="online"/>
+      </group>
+      <text variable="genre"/>
+      <group delimiter=", ">
+        <text variable="publisher"/>
+        <date variable="issued">
+          <date-part name="day" suffix=" "/>
+          <date-part name="month"/>
+        </date>
+      </group>
+    </group>
+  </macro>
+  <macro name="case-law">
     <choose>
-      <if variable="URL DOI" match="any">
-        <text term="available at" text-case="capitalize-first" suffix=": "/>
-        <choose>
-          <if variable="DOI">
-            <text variable="DOI" prefix="https://doi.org/"/>
-          </if>
-          <else>
-            <text variable="URL"/>
-          </else>
-        </choose>
-        <group prefix=" [" suffix="]">
-          <text term="accessed" text-case="capitalize-first" suffix=" "/>
-          <date variable="accessed">
-            <date-part name="day" suffix=" "/>
-            <date-part name="month" suffix=" "/>
-            <date-part name="year"/>
-          </date>
+      <if variable="number">
+        <group suffix="." delimiter=" ">
+          <text macro="author"/>
+          <text variable="number" prefix="(" suffix=")"/>
+          <text macro="year-date" prefix="[" suffix="]"/>
+          <text macro="title"/>
+          <choose>
+            <if variable="container-title">
+              <text variable="container-title" font-style="italic"/>
+              <group>
+                <text variable="collection-title"/>
+                <group delimiter="/">
+                  <text variable="volume"/>
+                  <text variable="page"/>
+                </group>
+              </group>
+            </if>
+            <else>
+              <text variable="collection-title"/>
+              <group delimiter="&#8211;">
+                <text variable="volume"/>
+                <text variable="page"/>
+              </group>
+            </else>
+          </choose>
         </group>
       </if>
+      <else>
+        <group suffix="." delimiter=". ">
+          <text macro="author"/>
+          <choose>
+            <if variable="volume">
+              <text macro="year-date" prefix="(" suffix=")"/>
+            </if>
+            <else>
+              <text macro="year-date" prefix="[" suffix="]"/>
+            </else>
+          </choose>
+          <text macro="title"/>
+          <choose>
+            <if variable="container-title">
+              <group delimiter=" ">
+                <text variable="container-title" font-style="italic"/>
+                <group>
+                  <text variable="collection-title"/>
+                  <group delimiter="/">
+                    <text variable="volume"/>
+                    <text variable="page"/>
+                  </group>
+                </group>
+              </group>
+            </if>
+            <else>
+              <text variable="volume"/>
+              <group delimiter=" ">
+                <text variable="collection-title"/>
+                <text variable="page"/>
+              </group>
+            </else>
+          </choose>
+        </group>
+      </else>
     </choose>
   </macro>
-  <macro name="archive">
+  <macro name="container">
     <choose>
-      <if type="graphic">
-        <text variable="archive-place" prefix="At: " suffix=". "/>
-        <text variable="archive"/>
+      <if variable="container-title">
+        <group delimiter=", ">
+          <group delimiter=" ">
+            <choose>
+              <if type="bill book chapter musical_score paper-conference report speech standard webpage" match="any">
+                <choose>
+                  <if variable="editor">
+                    <text term="in" text-case="capitalize-first" suffix=":"/>
+                    <names variable="editor">
+                      <name and="text" delimiter-precedes-last="never" initialize-with="."/>
+                      <label form="short" prefix=", " suffix="." text-case="lowercase"/>
+                    </names>
+                  </if>
+                </choose>
+              </if>
+            </choose>
+            <text variable="container-title" font-style="italic"/>
+            <choose>
+              <if type="entry" variable="title"/>
+              <else>
+                <text macro="online"/>
+              </else>
+            </choose>
+          </group>
+          <choose>
+            <if type="paper-conference">
+              <text variable="event"/>
+              <date variable="event-date" form="text"/>
+              <text variable="event-place"/>
+            </if>
+          </choose>
+          <group>
+            <text variable="volume"/>
+            <text variable="issue" prefix="(" suffix=")"/>
+          </group>
+        </group>
       </if>
-      <else>
-        <text variable="archive" font-style="italic"/>
-      </else>
     </choose>
   </macro>
   <macro name="credits">
     <group delimiter=". ">
+      <choose>
+        <if type="bill book chapter musical_score paper-conference report speech standard webpage" match="any">
+          <choose>
+            <if variable="container-title" match="none">
+              <names variable="editor">
+                <label form="verb-short" text-case="capitalize-first" suffix=" "/>
+                <name and="text" delimiter-precedes-last="never" initialize-with="."/>
+              </names>
+            </if>
+          </choose>
+        </if>
+        <else>
+          <names variable="editor">
+            <label form="verb-short" text-case="capitalize-first" suffix=" "/>
+            <name and="text" delimiter-precedes-last="never" initialize-with="."/>
+          </names>
+        </else>
+      </choose>
       <names variable="composer">
         <label form="verb" text-case="capitalize-first" suffix=" "/>
         <name and="text" delimiter-precedes-last="never" initialize="false" initialize-with="."/>
@@ -136,568 +294,530 @@
       </names>
     </group>
   </macro>
-  <macro name="title">
+  <macro name="edition">
     <choose>
-      <if type="bill broadcast book dataset graphic legal_case map motion_picture musical_score patent report song speech webpage thesis" match="any">
-        <text variable="title" font-style="italic"/>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <text term="edition" form="short"/>
+        </group>
       </if>
-      <else-if type="legislation legal_case" match="any">
-        <choose>
-          <if variable="container-title">
-            <text variable="title"/>
-          </if>
-          <else>
-            <text variable="title" font-style="italic"/>
-          </else>
-        </choose>
-      </else-if>
       <else>
-        <text variable="title"/>
+        <text variable="edition"/>
       </else>
     </choose>
-    <text variable="original-title" prefix=" [" suffix="]"/>
-    <group prefix=" (" suffix=")">
-      <text term="version" form="short"/>
-      <text variable="version"/>
+  </macro>
+  <macro name="journal">
+    <group delimiter=", ">
+      <group delimiter=" ">
+        <text variable="container-title" font-style="italic"/>
+        <text macro="online"/>
+      </group>
+      <group>
+        <text variable="volume"/>
+        <text variable="issue" prefix="(" suffix=")"/>
+      </group>
+      <choose>
+        <if type="article-magazine article-newspaper" match="any">
+          <date variable="issued">
+            <date-part name="day" suffix=" "/>
+            <date-part name="month"/>
+          </date>
+        </if>
+      </choose>
+      <group>
+        <label variable="page" form="short"/>
+        <text variable="page"/>
+      </group>
     </group>
-    <choose>
-      <if type="thesis motion_picture broadcast" match="any"/>
-      <else-if type="report" variable="number"/>
-      <else-if type="patent" variable="number"/>
-      <else-if type="bill" variable="number"/>
-      <else>
-        <text variable="genre" prefix=" [" suffix="]"/>
-      </else>
-    </choose>
   </macro>
-  <macro name="title-short">
+  <macro name="online">
     <choose>
-      <if type="bill broadcast dataset graphic map motion_picture musical_score patent report song webpage thesis" match="any">
-        <text variable="title" form="short" font-style="italic"/>
+      <if variable="URL DOI accessed" match="any">
+        <text term="online" text-case="capitalize-first" prefix="[" suffix="]"/>
       </if>
-      <else-if type="legislation legal_case" match="any">
-        <choose>
-          <if variable="container-title">
-            <text variable="title" form="short"/>
-          </if>
-          <else>
-            <text variable="title" form="short" font-style="italic"/>
-          </else>
-        </choose>
-      </else-if>
-      <else-if type="entry">
-        <text variable="container-title" form="short"/>
-      </else-if>
-      <else>
-        <text variable="title" form="short"/>
-      </else>
     </choose>
   </macro>
-  <macro name="title-label">
+  <macro name="publication">
     <choose>
-      <if type="entry">
-        <text variable="container-title"/>
+      <if type="article article-journal article-magazine article-newspaper" match="any">
+        <text macro="journal"/>
       </if>
-      <else-if type="bill broadcast dataset graphic legal_case map motion_picture musical_score patent report song speech webpage thesis" match="any">
-        <text variable="title" font-style="italic"/>
-      </else-if>
-      <else-if type="legislation legal_case" match="any">
-        <choose>
-          <if variable="container-title">
-            <text variable="title"/>
-          </if>
-          <else>
-            <text variable="title" font-style="italic"/>
-          </else>
-        </choose>
+      <else-if type="broadcast">
+        <text macro="broadcast"/>
       </else-if>
       <else>
-        <text variable="title"/>
+        <group delimiter=". ">
+          <text macro="container"/>
+          <choose>
+            <if type="motion_picture song" match="any">
+              <choose>
+                <if variable="medium">
+                  <text variable="medium"/>
+                </if>
+                <else>
+                  <text variable="genre"/>
+                </else>
+              </choose>
+            </if>
+          </choose>
+          <text macro="credits"/>
+          <choose>
+            <if type="entry" match="none">
+              <text macro="edition"/>
+            </if>
+          </choose>
+          <choose>
+            <if variable="container-title" match="none">
+              <group>
+                <text variable="volume"/>
+                <text variable="issue" prefix="(" suffix=")"/>
+              </group>
+            </if>
+          </choose>
+          <choose>
+            <if type="report bill" match="any">
+              <text macro="series-genre" prefix="(" suffix=")"/>
+            </if>
+            <else-if type="thesis patent" match="any">
+              <text macro="series-genre"/>
+            </else-if>
+            <else>
+              <text macro="series"/>
+            </else>
+          </choose>
+          <text macro="status"/>
+          <text macro="publisher"/>
+        </group>
       </else>
     </choose>
   </macro>
-  <macro name="translator">
-    <names variable="translator" prefix="(" suffix=")">
-      <name and="text" delimiter-precedes-last="never" initialize-with="."/>
-      <label form="short" prefix=", " text-case="capitalize-first"/>
-    </names>
+  <macro name="publisher">
+    <group delimiter=", ">
+      <group delimiter=": ">
+        <text variable="publisher-place"/>
+        <text variable="publisher"/>
+      </group>
+      <group>
+        <label variable="page" form="short"/>
+        <text variable="page"/>
+      </group>
+    </group>
   </macro>
-  <macro name="online">
+  <macro name="series">
     <choose>
-      <if variable="URL DOI" match="any">
-        <text term="online" text-case="capitalize-first" prefix="[" suffix="]"/>
+      <if variable="collection-title">
+        <text variable="collection-title"/>
+        <text variable="number" prefix=", "/>
       </if>
     </choose>
   </macro>
-  <macro name="publisher">
-    <group delimiter=": ">
-      <text variable="publisher-place"/>
-      <text variable="publisher"/>
-    </group>
-  </macro>
-  <macro name="year-date">
+  <macro name="series-genre">
     <choose>
-      <if variable="issued">
-        <choose>
-          <if type="post">
-            <date variable="issued">
-              <date-part name="day" suffix=" "/>
-              <date-part name="month" suffix=" "/>
-              <date-part name="year"/>
-            </date>
-          </if>
-          <else>
-            <date variable="issued">
-              <date-part name="year"/>
-            </date>
-          </else>
-        </choose>
+      <if variable="collection-title genre number" match="any">
+        <group delimiter=", ">
+          <text variable="collection-title"/>
+          <group delimiter=" ">
+            <text variable="genre"/>
+            <text variable="number"/>
+          </group>
+        </group>
       </if>
-      <else>
-        <text term="no date" form="short"/>
-      </else>
-    </choose>
-  </macro>
-  <macro name="edition">
-    <choose>
-      <if is-numeric="edition">
-        <group delimiter=" ">
-          <number variable="edition" form="ordinal"/>
-          <text term="edition" form="short"/>
-        </group>
-      </if>
-      <else>
-        <text variable="edition"/>
-      </else>
     </choose>
   </macro>
   <macro name="status">
     <text variable="status"/>
   </macro>
-  <macro name="series">
-    <choose>
-      <if variable="collection-title">
-        <text variable="collection-title"/>
-        <text variable="number" prefix=", "/>
-      </if>
-    </choose>
-  </macro>
-  <macro name="series-genre">
+  <macro name="statute-law">
+    <group delimiter=" ">
+      <text macro="author"/>
+      <choose>
+        <if variable="container-title">
+          <text macro="year-date" prefix="[" suffix="]"/>
+        </if>
+        <else>
+          <text macro="year-date" font-style="italic"/>
+        </else>
+      </choose>
+      <text macro="title"/>
+      <choose>
+        <if type="regulation">
+          <text macro="online"/>
+        </if>
+      </choose>
+    </group>
     <choose>
-      <if variable="collection-title genre number" match="any">
-        <group delimiter=", ">
-          <text variable="collection-title"/>
-          <group delimiter=" ">
-            <text variable="genre"/>
-            <text variable="number"/>
+      <if variable="container-title">
+        <group prefix=" " delimiter=" ">
+          <text variable="container-title" font-style="italic"/>
+          <group>
+            <text variable="collection-title"/>
+            <group delimiter="/">
+              <number variable="volume"/>
+              <text variable="page"/>
+            </group>
           </group>
         </group>
       </if>
+      <else>
+        <choose>
+          <if variable="collection-title">
+            <group prefix=" (" suffix=")" delimiter=", ">
+              <text variable="collection-title"/>
+              <group>
+                <text term="chapter" form="short"/>
+                <number variable="chapter-number"/>
+              </group>
+            </group>
+          </if>
+          <else>
+            <group prefix=", ">
+              <text term="chapter" form="short"/>
+              <number variable="chapter-number"/>
+            </group>
+          </else>
+        </choose>
+        <choose>
+          <if variable="number">
+            <group prefix=", " delimiter=", ">
+              <group>
+                <text term="number" form="short" text-case="capitalize-first"/>
+                <number variable="number"/>
+              </group>
+              <text macro="publisher"/>
+            </group>
+          </if>
+          <else>
+            <text prefix=". " macro="publisher"/>
+          </else>
+        </choose>
+      </else>
     </choose>
   </macro>
-  <macro name="pages">
-    <group>
-      <label variable="page" form="short"/>
-      <text variable="page"/>
-    </group>
-  </macro>
-  <citation et-al-min="4" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true">
-    <layout prefix="(" suffix=")" delimiter="; ">
-      <group delimiter=", ">
-        <text macro="author-short"/>
-        <text macro="year-date"/>
-        <group>
-          <label variable="locator" form="short"/>
-          <text variable="locator"/>
-        </group>
-      </group>
-    </layout>
-  </citation>
-  <bibliography entry-spacing="0" hanging-indent="true">
-    <sort>
-      <key macro="author"/>
-      <key variable="issued"/>
-      <key variable="title"/>
-    </sort>
-    <layout>
+  <macro name="title">
+    <group delimiter=" ">
       <choose>
-        <if type="legislation">
-          <group suffix=".">
-            <group delimiter=" ">
-              <text macro="author"/>
+        <if type="entry">
+          <text variable="title" font-style="italic"/>
+        </if>
+        <else>
+          <choose>
+            <if type="bill book dataset graphic legal_case map motion_picture musical_score patent report software song speech standard webpage thesis" match="any">
+              <text variable="title" font-style="italic"/>
+            </if>
+            <else>
               <choose>
                 <if variable="container-title">
-                  <text macro="year-date" prefix="[" suffix="]"/>
+                  <text variable="title"/>
                 </if>
                 <else>
-                  <text macro="year-date" font-style="italic"/>
+                  <text variable="title" font-style="italic"/>
                 </else>
               </choose>
-            </group>
-            <text macro="title" prefix=", "/>
-            <text macro="online" prefix=" "/>
-            <choose>
-              <if variable="container-title">
-                <group prefix=" " delimiter=" ">
-                  <text variable="container-title" font-style="italic"/>
-                  <group>
-                    <text variable="collection-title"/>
-                    <group delimiter="/">
-                      <number variable="volume"/>
-                      <text variable="page"/>
-                    </group>
-                  </group>
-                </group>
-              </if>
-              <else>
-                <choose>
-                  <if variable="collection-title">
-                    <group prefix=" (" suffix=")" delimiter=", ">
-                      <text variable="collection-title"/>
-                      <group>
-                        <text term="chapter" form="short"/>
-                        <number variable="chapter-number"/>
-                      </group>
-                    </group>
-                  </if>
-                  <else>
-                    <group prefix=", ">
-                      <text term="chapter" form="short"/>
-                      <number variable="chapter-number"/>
-                    </group>
-                  </else>
-                </choose>
-                <group prefix=", ">
-                  <text term="number" form="short" text-case="capitalize-first"/>
-                  <number variable="number"/>
-                </group>
-                <choose>
-                  <if variable="number">
-                    <text prefix=", " macro="publisher"/>
-                  </if>
-                  <else>
-                    <text prefix=". " macro="publisher"/>
-                  </else>
-                </choose>
-              </else>
-            </choose>
-          </group>
+            </else>
+          </choose>
+        </else>
+      </choose>
+      <text variable="original-title" prefix="[" suffix="]"/>
+      <group prefix="(" suffix=")">
+        <text term="version" form="short"/>
+        <text variable="version"/>
+      </group>
+      <choose>
+        <if type="bill broadcast graphic motion_picture patent report song standard thesis" match="any">
+          <choose>
+            <if type="graphic song" match="any">
+              <choose>
+                <if variable="medium">
+                  <text variable="medium" prefix="[" suffix="]"/>
+                </if>
+                <else-if variable="URL DOI accessed" match="any">
+                  <text term="online" text-case="capitalize-first" prefix="[" suffix="]"/>
+                </else-if>
+              </choose>
+            </if>
+            <else-if type="motion_picture" match="any">
+              <choose>
+                <if variable="URL DOI accessed" match="any">
+                  <text term="online" text-case="capitalize-first" prefix="[" suffix="]"/>
+                </if>
+              </choose>
+            </else-if>
+            <else-if variable="archive" match="none">
+              <choose>
+                <if variable="URL DOI accessed" match="any">
+                  <text term="online" text-case="capitalize-first" prefix="[" suffix="]"/>
+                </if>
+              </choose>
+            </else-if>
+          </choose>
         </if>
-        <else-if type="legal_case">
+        <else-if type="regulation"/>
+        <else-if type="entry" variable="title">
           <choose>
-            <if variable="number">
-              <group suffix="." delimiter=" ">
-                <text macro="author"/>
-                <text variable="number" prefix="(" suffix=")"/>
-                <text macro="year-date" prefix="[" suffix="]"/>
-                <text macro="title"/>
-                <text macro="online"/>
-                <choose>
-                  <if variable="container-title">
-                    <text variable="container-title" font-style="italic"/>
-                    <group>
-                      <text variable="collection-title"/>
-                      <group delimiter="/">
-                        <text variable="volume"/>
-                        <text variable="page"/>
-                      </group>
-                    </group>
-                  </if>
-                  <else>
-                    <text variable="collection-title"/>
-                    <group delimiter="&#8211;">
-                      <text variable="volume"/>
-                      <text variable="page"/>
-                    </group>
-                  </else>
-                </choose>
-              </group>
+            <if variable="genre">
+              <text variable="genre" prefix="[" suffix="]"/>
             </if>
             <else>
-              <group suffix="." delimiter=". ">
-                <text macro="author"/>
-                <choose>
-                  <if variable="volume">
-                    <text macro="year-date" prefix="(" suffix=")"/>
-                  </if>
-                  <else>
-                    <text macro="year-date" prefix="[" suffix="]"/>
-                  </else>
-                </choose>
-                <group delimiter=" ">
-                  <text macro="title"/>
-                  <text macro="online"/>
-                </group>
-                <choose>
-                  <if variable="container-title">
-                    <group delimiter=" ">
-                      <text variable="container-title" font-style="italic"/>
-                      <group>
-                        <text variable="collection-title"/>
-                        <group delimiter="/">
-                          <text variable="volume"/>
-                          <text variable="page"/>
-                        </group>
-                      </group>
-                    </group>
-                  </if>
-                  <else>
-                    <text variable="volume"/>
-                    <group delimiter=" ">
-                      <text variable="collection-title"/>
-                      <text variable="page"/>
-                    </group>
-                  </else>
-                </choose>
-              </group>
+              <choose>
+                <if variable="URL DOI accessed" match="any">
+                  <text term="online" text-case="capitalize-first" prefix="[" suffix="]"/>
+                </if>
+              </choose>
             </else>
           </choose>
         </else-if>
-        <else>
-          <text macro="author" suffix=","/>
-          <text macro="year-date" prefix=" " suffix="."/>
-        </else>
-      </choose>
-      <choose>
-        <if type="legislation legal_case" match="any"/>
-        <else-if type="book motion_picture musical_score song speech" match="any">
-          <group prefix=" " suffix="." delimiter=" ">
-            <text macro="title"/>
-            <choose>
-              <if variable="author editor" match="any">
-                <text macro="online"/>
-              </if>
-            </choose>
-            <text macro="translator"/>
-          </group>
-          <group prefix=" " suffix="." delimiter=". ">
-            <text macro="edition"/>
-            <text macro="series"/>
-            <choose>
-              <if type="motion_picture">
-                <group delimiter=" ">
-                  <text variable="genre"/>
-                  <choose>
-                    <if variable="author editor" match="none">
-                      <text macro="online"/>
-                    </if>
-                  </choose>
-                </group>
-              </if>
-            </choose>
-            <text macro="editor"/>
-            <text macro="credits"/>
-          </group>
-          <text prefix=" " suffix="." macro="publisher"/>
-        </else-if>
-        <else-if type="entry">
-          <group prefix=" " suffix="." delimiter=". ">
-            <text macro="byeditor"/>
-            <text macro="edition"/>
-            <group delimiter=" ">
-              <text variable="title" font-style="italic"/>
-              <text macro="online"/>
-            </group>
-            <text macro="series"/>
-            <text macro="status"/>
-            <text macro="publisher"/>
-          </group>
-        </else-if>
-        <else-if type="article-journal" match="any">
-          <group prefix=" " suffix="." delimiter=". ">
-            <text macro="title"/>
-          </group>
-          <group prefix=" " suffix="." delimiter=", ">
-            <group delimiter=" ">
-              <text variable="container-title" font-style="italic"/>
-              <text macro="online"/>
-            </group>
-            <group>
-              <text variable="volume"/>
-              <text variable="issue" prefix="(" suffix=")"/>
-            </group>
-            <group>
-              <label variable="page" form="short"/>
-              <text variable="page"/>
-            </group>
-          </group>
-        </else-if>
-        <else-if type="article-magazine article-newspaper" match="any">
-          <group prefix=" " suffix="." delimiter=". ">
-            <text macro="title"/>
-          </group>
-          <group prefix=" " suffix=".">
-            <text variable="container-title" font-style="italic"/>
-            <text prefix=" " macro="online"/>
-            <group prefix=", ">
-              <text variable="volume"/>
-              <text variable="issue" prefix="(" suffix=")"/>
-            </group>
-            <date variable="issued" prefix=", ">
-              <date-part name="day" suffix=" "/>
-              <date-part name="month"/>
-            </date>
-            <group prefix=", ">
-              <label variable="page" form="short"/>
-              <text variable="page"/>
-            </group>
-          </group>
-        </else-if>
-        <else-if type="bill report webpage" match="any">
-          <group prefix=" " suffix="." delimiter=" ">
-            <text macro="title"/>
-            <choose>
-              <if variable="archive" match="none">
-                <text macro="online"/>
-              </if>
-            </choose>
-          </group>
-          <group prefix=" " suffix="." delimiter=". ">
-            <text macro="edition"/>
-            <choose>
-              <if variable="number" match="none">
-                <text macro="series"/>
-              </if>
-            </choose>
-            <text macro="editor"/>
-            <choose>
-              <if variable="number">
-                <text macro="series-genre" prefix="(" suffix=")"/>
-              </if>
-            </choose>
-            <text macro="publisher"/>
-          </group>
+        <else-if variable="container-title" match="none">
           <choose>
-            <if variable="archive">
-              <group prefix=" " suffix="." delimiter=" ">
-                <text macro="archive"/>
-                <text macro="online"/>
-              </group>
+            <if variable="genre">
+              <text variable="genre" prefix="[" suffix="]"/>
             </if>
+            <else-if variable="container-title" match="none">
+              <choose>
+                <if variable="URL DOI accessed" match="any">
+                  <text term="online" text-case="capitalize-first" prefix="[" suffix="]"/>
+                </if>
+              </choose>
+            </else-if>
           </choose>
         </else-if>
-        <else-if type="patent" match="any">
-          <group prefix=" " suffix="." delimiter=" ">
-            <text macro="title"/>
-            <text macro="online"/>
-          </group>
-          <text macro="series-genre" prefix=" " suffix="."/>
-          <text macro="publisher" prefix=" " suffix="."/>
-        </else-if>
-        <else-if type="chapter paper-conference" match="any">
-          <text macro="title" prefix=" " suffix="."/>
-          <group prefix=" " delimiter=" ">
-            <choose>
-              <if variable="editor">
-                <text term="in" text-case="capitalize-first" suffix=":"/>
-                <text macro="editor" suffix="."/>
-              </if>
-            </choose>
-            <group suffix="." delimiter=", ">
-              <text variable="container-title" font-style="italic"/>
-              <text macro="online" prefix=" "/>
-              <text variable="event"/>
-              <date variable="event-date">
+      </choose>
+    </group>
+  </macro>
+  <macro name="title-block">
+    <choose>
+      <if type="entry">
+        <group delimiter=". ">
+          <text macro="edition"/>
+          <text macro="title"/>
+        </group>
+      </if>
+      <else-if type="graphic map" match="any">
+        <group delimiter=", ">
+          <text macro="title"/>
+          <text variable="scale"/>
+        </group>
+      </else-if>
+      <else-if type="book motion_picture musical_score song speech" match="any">
+        <group delimiter=" ">
+          <text macro="title"/>
+          <text macro="translator"/>
+        </group>
+      </else-if>
+      <else-if type="post">
+        <choose>
+          <if variable="container-title" match="none">
+            <group delimiter=", ">
+              <text macro="title"/>
+              <date variable="issued">
                 <date-part name="day" suffix=" "/>
-                <date-part name="month" suffix=" "/>
-                <date-part name="year"/>
+                <date-part name="month"/>
               </date>
-              <text variable="event-place"/>
             </group>
-            <text variable="collection-title" suffix="."/>
-            <group suffix="." delimiter=", ">
-              <text macro="publisher" prefix=" "/>
-              <text macro="pages"/>
-            </group>
-          </group>
-        </else-if>
-        <else-if type="thesis">
-          <group prefix=" " suffix="." delimiter=". ">
+          </if>
+          <else>
             <text macro="title"/>
-            <text variable="genre"/>
-            <text macro="publisher"/>
-          </group>
-        </else-if>
-        <else-if type="graphic map" match="any">
-          <group prefix=" " suffix="." delimiter=", ">
-            <group delimiter=" ">
-              <text macro="title"/>
-              <text macro="online"/>
-            </group>
-            <text variable="scale"/>
-          </group>
-          <group prefix=" " suffix="." delimiter=". ">
-            <text macro="edition"/>
-            <text macro="series"/>
-            <text macro="editor"/>
-            <text macro="publisher"/>
-            <text macro="archive"/>
-          </group>
+          </else>
+        </choose>
+      </else-if>
+      <else>
+        <text macro="title"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="title-label">
+    <group delimiter=" ">
+      <choose>
+        <if type="book broadcast" match="any">
+          <text variable="title"/>
+        </if>
+        <else>
+          <choose>
+            <if type="bill dataset graphic legal_case map motion_picture musical_score patent report software song speech standard webpage thesis" match="any">
+              <text variable="title" font-style="italic"/>
+            </if>
+            <else>
+              <choose>
+                <if variable="container-title">
+                  <text variable="title"/>
+                </if>
+                <else>
+                  <text variable="title" font-style="italic"/>
+                </else>
+              </choose>
+            </else>
+          </choose>
+        </else>
+      </choose>
+      <text variable="original-title" prefix="[" suffix="]"/>
+      <group prefix="(" suffix=")">
+        <text term="version" form="short"/>
+        <text variable="version"/>
+      </group>
+      <choose>
+        <if type="bill broadcast graphic motion_picture patent report song standard thesis" match="any">
+          <choose>
+            <if type="graphic song" match="any">
+              <choose>
+                <if variable="medium">
+                  <text variable="medium" prefix="[" suffix="]"/>
+                </if>
+                <else-if variable="URL DOI accessed" match="any">
+                  <text term="online" text-case="capitalize-first" prefix="[" suffix="]"/>
+                </else-if>
+              </choose>
+            </if>
+            <else-if type="motion_picture" match="any">
+              <choose>
+                <if variable="URL DOI accessed" match="any">
+                  <text term="online" text-case="capitalize-first" prefix="[" suffix="]"/>
+                </if>
+              </choose>
+            </else-if>
+            <else-if variable="archive" match="none">
+              <choose>
+                <if variable="URL DOI accessed" match="any">
+                  <text term="online" text-case="capitalize-first" prefix="[" suffix="]"/>
+                </if>
+              </choose>
+            </else-if>
+          </choose>
+        </if>
+        <else-if type="regulation"/>
+        <else-if variable="container-title" match="none">
+          <choose>
+            <if variable="genre">
+              <text variable="genre" prefix="[" suffix="]"/>
+            </if>
+            <else-if variable="container-title" match="none">
+              <choose>
+                <if variable="URL DOI accessed" match="any">
+                  <text term="online" text-case="capitalize-first" prefix="[" suffix="]"/>
+                </if>
+              </choose>
+            </else-if>
+          </choose>
         </else-if>
-        <else-if type="broadcast">
-          <group prefix=" " suffix="." delimiter=" ">
-            <text macro="title"/>
-            <choose>
-              <if variable="author editor" match="any">
-                <text macro="online"/>
-              </if>
-            </choose>
-          </group>
-          <text macro="series-genre" prefix=" " suffix="."/>
-          <group prefix=" " suffix="." delimiter=" ">
-            <text variable="medium"/>
+      </choose>
+    </group>
+  </macro>
+  <macro name="title-short">
+    <choose>
+      <if type="entry" variable="title container-title">
+        <text variable="container-title" form="short"/>
+      </if>
+      <else-if type="bill dataset entry graphic legal_case map motion_picture musical_score patent report software song speech standard webpage thesis" match="any">
+        <text variable="title" form="short" font-style="italic"/>
+      </else-if>
+      <else-if type="legislation pamphlet post regulation" match="any">
+        <choose>
+          <if variable="container-title">
+            <text variable="title" form="short"/>
+          </if>
+          <else>
+            <text variable="title" form="short" font-style="italic"/>
+          </else>
+        </choose>
+      </else-if>
+      <else>
+        <text variable="title" form="short"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="translator">
+    <names variable="translator" prefix="(" suffix=")">
+      <name and="text" delimiter-precedes-last="never" initialize-with="."/>
+      <label form="short" prefix=", " text-case="capitalize-first"/>
+    </names>
+  </macro>
+  <macro name="year">
+    <choose>
+      <if variable="issued">
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
+      </if>
+      <else>
+        <text term="no date" form="short"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="year-date">
+    <choose>
+      <if variable="issued">
+        <choose>
+          <if type="post">
             <choose>
-              <if variable="author editor" match="none">
-                <text macro="online"/>
+              <if variable="container-title">
+                <date variable="issued">
+                  <date-part name="day" suffix=" "/>
+                  <date-part name="month" suffix=" "/>
+                  <date-part name="year"/>
+                </date>
               </if>
+              <else>
+                <date variable="issued">
+                  <date-part name="year"/>
+                </date>
+              </else>
             </choose>
-          </group>
-          <group prefix=" " suffix="." delimiter=", ">
-            <text macro="publisher"/>
+          </if>
+          <else>
             <date variable="issued">
-              <date-part name="day" suffix=" "/>
-              <date-part name="month"/>
+              <date-part name="year"/>
             </date>
-          </group>
-        </else-if>
-        <else>
-          <group prefix=" " suffix="." delimiter=" ">
-            <text macro="title"/>
-            <choose>
-              <if variable="container-title" match="none">
-                <text macro="online"/>
-              </if>
-            </choose>
-          </group>
-          <group prefix=" " suffix="." delimiter=". ">
-            <text macro="editor"/>
-            <text macro="edition"/>
-            <text macro="series"/>
-            <text macro="status"/>
-          </group>
-          <group prefix=" " suffix="." delimiter=", ">
-            <choose>
-              <if variable="container-title">
-                <group delimiter=" ">
-                  <text variable="container-title" font-style="italic"/>
-                  <text macro="online"/>
-                </group>
-              </if>
-            </choose>
-            <group>
-              <text variable="volume"/>
-              <text variable="issue" prefix="(" suffix=")"/>
-            </group>
-            <group>
-              <label variable="page" form="short"/>
-              <text variable="page"/>
+          </else>
+        </choose>
+      </if>
+      <else>
+        <text term="no date" form="short"/>
+      </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">
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <group delimiter=", ">
+        <text macro="author-short"/>
+        <text macro="year"/>
+        <group>
+          <label variable="locator" form="short"/>
+          <text variable="locator"/>
+        </group>
+      </group>
+    </layout>
+  </citation>
+  <bibliography entry-spacing="1" hanging-indent="false">
+    <sort>
+      <key macro="author"/>
+      <key variable="issued"/>
+      <key variable="title"/>
+    </sort>
+    <layout>
+      <group delimiter=" ">
+        <choose>
+          <if type="legislation regulation" match="any">
+            <text macro="statute-law" suffix="."/>
+          </if>
+          <else-if type="legal_case">
+            <text macro="case-law" suffix="."/>
+          </else-if>
+          <else>
+            <group delimiter=". " suffix=".">
+              <group delimiter=", ">
+                <text macro="author"/>
+                <text macro="year-date"/>
+              </group>
+              <text macro="title-block"/>
+              <text macro="publication"/>
+              <text macro="archive"/>
             </group>
-          </group>
-          <text prefix=" " suffix="." macro="publisher"/>
-        </else>
-      </choose>
-      <text variable="annote" prefix=" " suffix="."/>
-      <text macro="access" prefix=" " suffix="."/>
+          </else>
+        </choose>
+        <group delimiter=". " suffix=".">
+          <text variable="annote"/>
+          <text macro="access"/>
+        </group>
+      </group>
     </layout>
   </bibliography>
 </style>
diff --git a/buildres/csl/csl-styles/harvard-university-of-the-west-of-england.csl b/buildres/csl/csl-styles/harvard-university-of-the-west-of-england.csl
index 7eb02e21a91..e5bdfcb075c 100644
--- a/buildres/csl/csl-styles/harvard-university-of-the-west-of-england.csl
+++ b/buildres/csl/csl-styles/harvard-university-of-the-west-of-england.csl
@@ -11,8 +11,8 @@
       <name>Emma Delaney</name>
     </contributor>
     <category citation-format="author-date"/>
-    <summary>Harvard author-date style edited for University of the West of England (UWE)</summary>
-    <updated>2021-04-07T03:48:18+00:00</updated>
+    <summary>Harvard author-date style updated for University of the West of England (UWE) (et-al format updated to comply with UWE Harvard Referencing</summary>
+    <updated>2022-04-10T15:09:45+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">
@@ -22,18 +22,19 @@
     </names>
   </macro>
   <macro name="author">
-    <names variable="author">
-      <name and="text" delimiter-precedes-et-al="never" delimiter-precedes-last="never" initialize-with="." name-as-sort-order="all"/>
-      <label form="short" prefix=" "/>
+    <names variable="author" font-style="normal">
+      <name font-style="normal" and="text" delimiter-precedes-et-al="never" delimiter-precedes-last="never" et-al-min="10" et-al-use-first="1" initialize-with="." name-as-sort-order="all"/>
+      <et-al font-style="italic"/>
+      <label form="short" font-style="normal" prefix=" "/>
       <substitute>
-        <text macro="substitute-author"/>
+        <text macro="substitute-author" font-style="normal"/>
       </substitute>
     </names>
   </macro>
   <macro name="author-short">
     <names variable="author">
-      <name form="short" and="text" delimiter-precedes-last="never"/>
-      <et-al font-style="normal"/>
+      <name form="short" and="text" delimiter-precedes-last="never" et-al-min="4"/>
+      <et-al font-style="italic"/>
       <substitute>
         <names variable="translator"/>
         <text macro="substitute-author"/>
@@ -261,7 +262,7 @@
   </macro>
   <citation et-al-min="4" et-al-use-first="1" sort-separator="," disambiguate-add-year-suffix="true" collapse="year">
     <sort>
-      <key macro="author" names-use-last="true"/>
+      <key macro="year-date-citation" names-use-last="true" sort="descending"/>
     </sort>
     <layout suffix=")" delimiter="; " prefix="(">
       <group delimiter=", ">
@@ -274,13 +275,13 @@
       </group>
     </layout>
   </citation>
-  <bibliography et-al-min="4" et-al-use-first="1" hanging-indent="false">
+  <bibliography et-al-min="10" et-al-use-first="1">
     <sort>
       <key macro="author"/>
       <key variable="title"/>
     </sort>
     <layout>
-      <text macro="author"/>
+      <text macro="author" font-style="normal"/>
       <text macro="year-date-bibliography" prefix=" (" suffix=")"/>
       <choose>
         <if match="all" variable="author collection-title">
diff --git a/buildres/csl/csl-styles/haute-ecole-de-gestion-de-geneve-iso-690.csl b/buildres/csl/csl-styles/haute-ecole-de-gestion-de-geneve-iso-690.csl
index bb3208d81f0..4698051bdad 100644
--- a/buildres/csl/csl-styles/haute-ecole-de-gestion-de-geneve-iso-690.csl
+++ b/buildres/csl/csl-styles/haute-ecole-de-gestion-de-geneve-iso-690.csl
@@ -6,20 +6,37 @@
     <id>http://www.zotero.org/styles/haute-ecole-de-gestion-de-geneve-iso-690</id>
     <link href="http://www.zotero.org/styles/haute-ecole-de-gestion-de-geneve-iso-690" rel="self"/>
     <link href="http://www.zotero.org/styles/iso690-author-date-en" rel="template"/>
-    <link href="https://www.hesge.ch/heg/infotheque/citations-et-references-bibliographiques" rel="documentation"/>
+    <link href="https://www.hesge.ch/heg/campus/infotheque/citations-et-references-bibliographiques" rel="documentation"/>
     <author>
       <name>Melissa Paez</name>
       <email>paez.melissa@gmail.com</email>
     </author>
-    <contributor>
+    <author>
       <name>Raphael Grolimund</name>
       <email>grolimur@protonmail.ch</email>
-    </contributor>
+    </author>
     <category citation-format="author-date"/>
     <category field="generic-base"/>
-    <updated>2021-10-16T18:00:00+00:00</updated>
+    <updated>2022-03-21T10:00:00+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
+  <locale xml:lang="fr-FR">
+    <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>
+  <locale xml:lang="en-US">
+    <terms>
+      <term name="online">Online</term>
+    </terms>
+  </locale>
   <macro name="editor">
     <names variable="editor">
       <name and="text" name-as-sort-order="all" sort-separator=", " delimiter=", " delimiter-precedes-last="never">
@@ -100,7 +117,7 @@
       <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"/>
+            <text variable="title" font-style="italic" suffix="."/>
           </if>
           <else>
             <text variable="title" font-style="italic" suffix=", "/>
@@ -135,10 +152,10 @@
         </choose>
         <choose>
           <if variable="container-title">
-            <text variable="container-title" font-style="italic"/>
+            <text variable="container-title" font-style="italic" suffix="."/>
           </if>
           <else>
-            <text variable="event" font-style="italic"/>
+            <text variable="event" font-style="italic" suffix="."/>
           </else>
         </choose>
       </else-if>
@@ -168,7 +185,7 @@
       <else>
         <choose>
           <if variable="author editor translator" match="any">
-            <text variable="title" font-style="italic"/>
+            <text variable="title" font-style="italic" suffix=". "/>
           </if>
           <else>
             <text variable="title" font-style="italic" suffix=", "/>
@@ -179,7 +196,7 @@
     </choose>
     <choose>
       <if variable="URL">
-        <text term="online" prefix=" [" suffix="]"/>
+        <text term="online" prefix=" "/>
       </if>
     </choose>
   </macro>
@@ -201,10 +218,6 @@
           </else>
         </choose>
       </if>
-      <else>
-        <text variable="genre"/>
-        <text variable="number" prefix=", "/>
-      </else>
     </choose>
   </macro>
   <macro name="date">
@@ -233,14 +246,14 @@
       <choose>
         <if variable="volume">
           <text variable="issue" prefix="no.&#160;"/>
-          <text variable="page" prefix="p.&#160;"/>
+          <text variable="page" prefix="pp.&#160;"/>
         </if>
         <else-if variable="issue">
           <text variable="issue" prefix="No.&#160;"/>
-          <text variable="page" prefix="p.&#160;"/>
+          <text variable="page" prefix="pp.&#160;"/>
         </else-if>
         <else>
-          <text variable="page" prefix="P.&#160;"/>
+          <text variable="page" prefix="pp.&#160;"/>
         </else>
       </choose>
     </group>
@@ -271,7 +284,7 @@
         <text variable="number-of-pages" suffix="&#160;p"/>
       </if>
       <else-if type="chapter paper-conference article-newspaper" match="any">
-        <text variable="page" prefix="p.&#160;"/>
+        <text variable="page" prefix="pp.&#160;"/>
       </else-if>
       <else-if type="report patent" match="any">
         <text variable="page" suffix="&#160;p"/>
@@ -286,12 +299,16 @@
   </macro>
   <macro name="url">
     <choose>
-      <if variable="URL">
-        <group>
-          <text term="retrieved" suffix=" " text-case="capitalize-first"/>
-          <text term="from" suffix=": "/>
-          <text variable="URL"/>
-        </group>
+      <if variable="DOI" match="none">
+        <choose>
+          <if variable="URL">
+            <group>
+              <text term="retrieved" suffix=" " text-case="capitalize-first"/>
+              <text term="from" suffix=": "/>
+              <text variable="URL"/>
+            </group>
+          </if>
+        </choose>
       </if>
     </choose>
   </macro>
@@ -339,6 +356,8 @@
               <text macro="title" suffix=". "/>
             </if>
           </choose>
+          <text variable="version" prefix="version " suffix=". "/>
+          <!-- used for software until type="software" is implemented -->
           <text macro="genre" suffix=". "/>
           <text macro="edition" suffix=". "/>
           <text macro="publisher-group" suffix=". "/>
@@ -418,6 +437,7 @@
           <text macro="accessed" suffix=". "/>
           <text macro="collection" suffix=". "/>
           <text macro="isbn" suffix=". "/>
+          <text macro="doi" suffix=". "/>
           <text macro="url"/>
         </else-if>
         <else-if type="thesis">
@@ -500,6 +520,19 @@
           <text macro="collection" suffix=". "/>
           <text macro="url"/>
         </else-if>
+        <else-if type="software">
+          <text macro="responsability" suffix=". "/>
+          <choose>
+            <if variable="author editor translator" match="any">
+              <text macro="title" suffix=". "/>
+            </if>
+          </choose>
+          <text variable="version" prefix="version " suffix=". "/>
+          <text macro="date" suffix=". "/>
+          <text macro="publisher-group" suffix=". "/>
+          <text macro="accessed" suffix=". "/>
+          <text macro="url"/>
+        </else-if>
         <else>
           <text macro="responsability" suffix=". "/>
           <choose>
@@ -520,6 +553,7 @@
           <text macro="url"/>
         </else>
       </choose>
+      <text variable="note"/>
       <group display="right-inline">
         <text macro="archive"/>
       </group>
diff --git a/buildres/csl/csl-styles/journal-of-child-and-adolescent-psychopharmacology.csl b/buildres/csl/csl-styles/health-physics.csl
similarity index 52%
rename from buildres/csl/csl-styles/journal-of-child-and-adolescent-psychopharmacology.csl
rename to buildres/csl/csl-styles/health-physics.csl
index 1bbfaca4164..dc69ba1cefe 100644
--- a/buildres/csl/csl-styles/journal-of-child-and-adolescent-psychopharmacology.csl
+++ b/buildres/csl/csl-styles/health-physics.csl
@@ -1,18 +1,21 @@
 <?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="en-US">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="never" default-locale="en-GB">
   <info>
-    <title>Journal of Child and Adolescent Psychopharmacology</title>
-    <id>http://www.zotero.org/styles/journal-of-child-and-adolescent-psychopharmacology</id>
-    <link href="http://www.zotero.org/styles/journal-of-child-and-adolescent-psychopharmacology" rel="self"/>
-    <link href="http://www.liebertpub.com/manuscript/cap" rel="documentation"/>
+    <title>Health Physics</title>
+    <title-short>HPS</title-short>
+    <id>http://www.zotero.org/styles/health-physics</id>
+    <link href="http://www.zotero.org/styles/health-physics" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-harvard" rel="template"/>
+    <link href="https://www.editorialmanager.com/hpj/default1.aspx" rel="documentation"/>
+    <link href="https://hps.org/documents/HPS_publications_style_guide.pdf" rel="documentation"/>
     <author>
-      <name>Sebastian Karcher</name>
+      <name>Patrick O'Brien</name>
     </author>
     <category citation-format="author-date"/>
     <category field="medicine"/>
-    <issn>1044-5463</issn>
-    <eissn>1557-8992</eissn>
-    <updated>2013-05-05T08:01:47+00:00</updated>
+    <issn>0017-9078</issn>
+    <eissn>1538-5159</eissn>
+    <updated>2022-04-27T09:02:03+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">
@@ -46,30 +49,38 @@
               <text term="in" text-case="capitalize-first" suffix=": "/>
             </if>
           </choose>
+          <text macro="editors"/>
           <text variable="container-title" suffix=". "/>
-          <names variable="editor translator" delimiter=", " suffix=".">
-            <label form="verb" text-case="capitalize-first"/>
-            <name and="text" sort-separator=" " initialize-with="" name-as-sort-order="all" prefix=" "/>
-          </names>
-          <group delimiter=", ">
-            <text variable="publisher-place"/>
-            <text variable="publisher"/>
-            <date variable="issued">
-              <date-part name="year"/>
-            </date>
+          <text macro="edition"/>
+          <group delimiter=":">
+            <group delimiter="; ">
+              <group delimiter=": ">
+                <text variable="publisher-place"/>
+                <text variable="publisher"/>
+              </group>
+              <choose>
+                <if type="report" match="any">
+                  <group delimiter=" ">
+                    <text variable="genre"/>
+                    <label text-case="capitalize-first" variable="issue" form="short"/>
+                    <text variable="number"/>
+                  </group>
+                </if>
+              </choose>
+              <date variable="issued">
+                <date-part name="year"/>
+              </date>
+            </group>
             <choose>
               <if type="chapter paper-conference" match="any">
-                <group delimiter=" ">
-                  <label variable="page" form="short" strip-periods="true"/>
-                  <text variable="page"/>
-                </group>
+                <text variable="page"/>
               </if>
             </choose>
           </group>
         </group>
       </if>
       <else>
-        <group delimiter=", ">
+        <group delimiter="; ">
           <group delimiter=" ">
             <text variable="container-title" form="short" strip-periods="true"/>
             <group delimiter=":">
@@ -84,10 +95,45 @@
       </else>
     </choose>
   </macro>
+  <macro name="editors">
+    <names variable="editor translator" delimiter=", " suffix=".">
+      <name and="text" sort-separator=" " initialize-with="" name-as-sort-order="all" prefix=" "/>
+      <label form="short" prefix=", "/>
+    </names>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <label variable="edition" form="short"/>
+        </group>
+      </if>
+      <else>
+        <text variable="edition"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if type="webpage post post-weblog" match="any">
+        <group delimiter=". ">
+          <group delimiter=" ">
+            <text term="available at" text-case="capitalize-first"/>
+            <text variable="URL"/>
+          </group>
+          <group delimiter=" ">
+            <text term="accessed" text-case="capitalize-first"/>
+            <date form="text" variable="accessed"/>
+          </group>
+        </group>
+      </if>
+    </choose>
+  </macro>
   <citation disambiguate-add-year-suffix="true" cite-group-delimiter=", " collapse="year" et-al-min="3" et-al-use-first="1">
     <sort>
-      <key macro="author"/>
       <key variable="issued"/>
+      <key macro="author"/>
     </sort>
     <layout prefix="(" suffix=")" delimiter="; ">
       <group delimiter=" ">
@@ -105,11 +151,10 @@
     </sort>
     <layout>
       <group delimiter=". " suffix=".">
-        <group delimiter=": ">
-          <text macro="author"/>
-          <text macro="title"/>
-        </group>
+        <text macro="author"/>
+        <text macro="title"/>
         <text macro="container"/>
+        <text macro="access"/>
       </group>
     </layout>
   </bibliography>
diff --git a/buildres/csl/csl-styles/heidelberg-university-faculty-of-medicine.csl b/buildres/csl/csl-styles/heidelberg-university-faculty-of-medicine.csl
index c139ba4f733..b94b05d77d5 100644
--- a/buildres/csl/csl-styles/heidelberg-university-faculty-of-medicine.csl
+++ b/buildres/csl/csl-styles/heidelberg-university-faculty-of-medicine.csl
@@ -14,7 +14,7 @@
     <category citation-format="author-date"/>
     <category field="medicine"/>
     <summary>Style for dissertations at the Faculty of Medicine at the University of Heidelberg.</summary>
-    <updated>2017-02-19T19:17:48+00:00</updated>
+    <updated>2022-02-28T19:17:48+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">
@@ -75,25 +75,21 @@
   </macro>
   <macro name="access">
     <choose>
-      <if variable="URL">
-        <choose>
-          <if variable="DOI">
-            <text variable="DOI" prefix="doi:"/>
-          </if>
-          <else>
-            <group delimiter=" ">
-              <text variable="URL" prefix="URL: "/>
-              <group prefix="[" suffix="]">
-                <text term="accessed" text-case="capitalize-first"/>
-                <date variable="accessed" prefix=" ">
-                  <date-part name="month" suffix=" "/>
-                  <date-part name="year"/>
-                </date>
-              </group>
-            </group>
-          </else>
-        </choose>
+      <if variable="DOI">
+        <text variable="DOI" prefix="doi:"/>
       </if>
+      <else>
+        <group delimiter=" ">
+          <text variable="URL" prefix="URL: "/>
+          <group prefix="[" suffix="]">
+            <text term="accessed" text-case="capitalize-first"/>
+            <date variable="accessed" prefix=" ">
+              <date-part name="month" suffix=" "/>
+              <date-part name="year"/>
+            </date>
+          </group>
+        </group>
+      </else>
     </choose>
   </macro>
   <macro name="title">
diff --git a/buildres/csl/csl-styles/assay-and-drug-development-technologies.csl b/buildres/csl/csl-styles/hemijska-industrija.csl
similarity index 55%
rename from buildres/csl/csl-styles/assay-and-drug-development-technologies.csl
rename to buildres/csl/csl-styles/hemijska-industrija.csl
index 71213898ee5..6987ceb3682 100644
--- a/buildres/csl/csl-styles/assay-and-drug-development-technologies.csl
+++ b/buildres/csl/csl-styles/hemijska-industrija.csl
@@ -1,31 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" page-range-format="minimal" class="in-text" version="1.0" demote-non-dropping-particle="sort-only" default-locale="en-US">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" page-range-format="minimal" demote-non-dropping-particle="sort-only" default-locale="en-US">
+  <!-- This style was edited with the Visual CSL Editor (https://editor.citationstyles.org/visualEditor/) -->
   <info>
-    <title>ASSAY and Drug Development Technologies</title>
-    <id>http://www.zotero.org/styles/assay-and-drug-development-technologies</id>
-    <link href="http://www.zotero.org/styles/assay-and-drug-development-technologies" rel="self"/>
-    <link href="http://www.zotero.org/styles/elsevier-vancouver" rel="template"/>
-    <link href="https://home.liebertpub.com/publications/assay-and-drug-development-technologies/118/for-authors" rel="documentation"/>
+    <title>Hemijska industrija</title>
+    <title-short>HemInd</title-short>
+    <id>http://www.zotero.org/styles/hemijska-industrija</id>
+    <link href="http://www.zotero.org/styles/hemijska-industrija" rel="self"/>
+    <link href="https://www.ache-pub.org.rs/index.php/HemInd/Instructions" rel="documentation"/>
     <author>
-      <name>Patrick O'Brien, PhD</name>
-      <email>obrienpat86@gmail.com</email>
+      <name>Aleksandar Dekanski</name>
+      <email>aleksandar@dekanski.com</email>
+      <uri>www.dekanski.com</uri>
     </author>
     <category citation-format="numeric"/>
-    <category field="medicine"/>
-    <issn>1540-658X</issn>
-    <eissn>1557-8127</eissn>
-    <updated>2018-05-23T14:23:25+00:00</updated>
+    <category field="chemistry"/>
+    <issn>0367-598X</issn>
+    <eissn>2217-7426</eissn>
+    <updated>2022-02-02T10:05:37+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
-  <locale xml:lang="en">
-    <terms>
-      <term name="accessed">last accessed on</term>
-    </terms>
-  </locale>
   <macro name="author">
     <names variable="author">
       <name initialize-with="" delimiter=", " delimiter-precedes-last="always" name-as-sort-order="all" sort-separator=" "/>
-      <et-al font-style="italic"/>
       <label form="long" prefix=", "/>
       <substitute>
         <names variable="editor"/>
@@ -36,20 +32,25 @@
   <macro name="editor">
     <names variable="editor">
       <name initialize-with="" delimiter=", " delimiter-precedes-last="always" name-as-sort-order="all" sort-separator=" "/>
-      <label form="short" prefix=", "/>
+      <label form="short" prefix=", " suffix="."/>
     </names>
   </macro>
   <macro name="year-date">
-    <date variable="issued">
-      <date-part name="year"/>
-    </date>
+    <choose>
+      <if variable="issued">
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
+      </if>
+      <else>
+        <text term="no date" form="short"/>
+      </else>
+    </choose>
   </macro>
   <macro name="publisher">
-    <group delimiter=", ">
-      <text variable="publisher-place" text-case="title"/>
-      <text variable="publisher"/>
-      <text macro="year-date"/>
-    </group>
+    <text variable="publisher-place" suffix=": " text-case="title"/>
+    <text variable="publisher" suffix="; "/>
+    <text macro="year-date"/>
   </macro>
   <macro name="edition">
     <choose>
@@ -66,59 +67,60 @@
   </macro>
   <macro name="access">
     <choose>
-      <if type="webpage post-weblog" match="any">
-        <group delimiter=". ">
-          <group delimiter=": ">
-            <text term="available at" text-case="capitalize-first"/>
-            <text variable="URL"/>
-          </group>
-          <group delimiter=" ">
-            <text term="accessed" text-case="capitalize-first"/>
-            <date variable="accessed" form="text"/>
-          </group>
-        </group>
+      <if variable="DOI">
+        <text variable="DOI" prefix="https://doi.org/"/>
       </if>
+      <else-if type="webpage post-weblog" match="any">
+        <choose>
+          <if variable="URL">
+            <text variable="URL"/>
+            <group prefix=" (" suffix=")" delimiter=" ">
+              <text term="accessed"/>
+              <date variable="accessed" form="text"/>
+            </group>
+          </if>
+        </choose>
+      </else-if>
     </choose>
   </macro>
   <citation collapse="citation-number">
     <sort>
       <key variable="citation-number"/>
+      <key variable="author"/>
     </sort>
-    <layout vertical-align="sup" delimiter=",">
-      <text variable="citation-number"/>
+    <layout delimiter=",">
+      <text variable="citation-number" prefix="[" suffix="]"/>
     </layout>
   </citation>
-  <bibliography et-al-min="7" et-al-use-first="3" second-field-align="flush" entry-spacing="0">
-    <layout suffix=".">
-      <text variable="citation-number" suffix="."/>
-      <text macro="author" suffix=": "/>
+  <bibliography second-field-align="flush" entry-spacing="0">
+    <layout>
+      <text variable="citation-number" prefix="[" suffix="]"/>
+      <text macro="author" suffix=". "/>
       <choose>
         <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
           <group delimiter=". ">
-            <text variable="title" font-style="italic"/>
+            <text variable="title"/>
             <text variable="volume" prefix="vol. "/>
             <text macro="edition"/>
             <text macro="publisher"/>
           </group>
         </if>
         <else-if type="chapter paper-conference" match="any">
-          <group delimiter=". ">
-            <text variable="title"/>
-            <group delimiter=", ">
-              <group delimiter=": ">
-                <text term="in" text-case="sentence"/>
-                <group delimiter=" ">
-                  <text variable="container-title" form="short" font-style="italic"/>
-                  <text macro="editor" prefix="(" suffix=")"/>
-                </group>
+          <group>
+            <group>
+              <text variable="title" suffix=". "/>
+              <group>
+                <text term="in" text-case="sentence" suffix=": "/>
+                <text macro="editor" suffix=". "/>
               </group>
-              <group delimiter=" ">
-                <label variable="page" form="short"/>
-                <text variable="page"/>
+              <group delimiter=", " suffix=". ">
+                <text variable="container-title" form="short"/>
+                <text variable="volume" prefix="vol. "/>
               </group>
+              <text macro="edition"/>
             </group>
-            <text macro="edition"/>
-            <text macro="publisher"/>
+            <text macro="publisher" suffix=";"/>
+            <text variable="page"/>
           </group>
         </else-if>
         <else-if type="patent">
@@ -149,7 +151,10 @@
               </group>
               <group delimiter=";">
                 <text macro="year-date"/>
-                <text variable="volume"/>
+                <group>
+                  <text variable="volume"/>
+                  <text variable="issue" prefix="(" suffix=")"/>
+                </group>
               </group>
             </group>
             <text variable="page" form="short"/>
diff --git a/buildres/csl/csl-styles/high-altitude-medicine-and-biology.csl b/buildres/csl/csl-styles/high-altitude-medicine-and-biology.csl
deleted file mode 100644
index 251c805f43d..00000000000
--- a/buildres/csl/csl-styles/high-altitude-medicine-and-biology.csl
+++ /dev/null
@@ -1,140 +0,0 @@
-<?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">
-  <info>
-    <title>High Altitude Medicine &amp; Biology</title>
-    <id>http://www.zotero.org/styles/high-altitude-medicine-and-biology</id>
-    <link href="http://www.zotero.org/styles/high-altitude-medicine-and-biology" rel="self"/>
-    <link href="http://www.zotero.org/styles/cell" rel="template"/>
-    <link href="http://www.liebertpub.com/forauthors/high-altitude-medicine-and-biology/65/" rel="documentation"/>
-    <author>
-      <email>obrienpat86@gmail.com</email>
-      <name>Patrick O'Brien</name>
-    </author>
-    <category citation-format="author-date"/>
-    <category field="biology"/>
-    <category field="medicine"/>
-    <issn>1527-0297</issn>
-    <eissn>1557-8682</eissn>
-    <summary>Style for High Altitude Medicine &amp; Biology based on the Cell journal style.</summary>
-    <updated>2017-02-06T23:31:47+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"/>
-      <substitute>
-        <names variable="editor"/>
-        <names variable="translator"/>
-        <choose>
-          <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
-            <text variable="title" form="short" font-style="italic"/>
-          </if>
-          <else>
-            <text variable="title" form="short" quotes="false"/>
-          </else>
-        </choose>
-      </substitute>
-    </names>
-  </macro>
-  <macro name="author-count">
-    <names variable="author">
-      <name form="count"/>
-    </names>
-  </macro>
-  <macro name="author">
-    <names variable="author">
-      <name and="text" initialize-with="" name-as-sort-order="all"/>
-    </names>
-  </macro>
-  <macro name="issued">
-    <date variable="issued">
-      <date-part name="year"/>
-    </date>
-  </macro>
-  <macro name="publisher">
-    <group delimiter=": ">
-      <text variable="publisher"/>
-      <text variable="publisher-place"/>
-    </group>
-  </macro>
-  <macro name="editor">
-    <names variable="editor">
-      <name and="text" initialize-with=""/>
-      <label form="short" prefix=", "/>
-    </names>
-  </macro>
-  <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" collapse="year">
-    <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"/>
-    </sort>
-    <layout prefix="(" suffix=")" delimiter="; ">
-      <group delimiter=", ">
-        <text macro="author-short"/>
-        <text macro="issued"/>
-      </group>
-    </layout>
-  </citation>
-  <bibliography sort-separator=" ">
-    <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"/>
-    </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" strip-periods="true"/>
-            <group delimiter=":">
-              <text variable="volume" font-style="normal"/>
-              <text variable="page"/>
-            </group>
-          </if>
-          <else-if type="chapter paper-conference" match="any">
-            <text variable="title" suffix="."/>
-            <text term="in" text-case="capitalize-first" suffix=":"/>
-            <text variable="container-title" text-case="title" suffix="."/>
-            <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-if type="webpage post-weblog" match="any">
-            <text variable="title" suffix="."/>
-            <text variable="container-title" suffix="."/>
-            <date variable="issued">
-              <date-part name="year"/>
-            </date>
-            <choose>
-              <if variable="URL">
-                <text term="available at" text-case="capitalize-first"/>
-                <text variable="URL"/>
-                <group prefix="(" suffix=")" delimiter=" ">
-                  <text term="accessed" text-case="lowercase"/>
-                  <date variable="accessed" form="text"/>
-                </group>
-              </if>
-            </choose>
-          </else-if>
-          <else>
-            <text variable="title" suffix="."/>
-            <text macro="publisher"/>
-          </else>
-        </choose>
-      </group>
-    </layout>
-  </bibliography>
-</style>
diff --git a/buildres/csl/csl-styles/hospital-a-domicilio.csl b/buildres/csl/csl-styles/hospital-a-domicilio.csl
new file mode 100644
index 00000000000..98ccd48df1a
--- /dev/null
+++ b/buildres/csl/csl-styles/hospital-a-domicilio.csl
@@ -0,0 +1,565 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" page-range-format="minimal" demote-non-dropping-particle="sort-only">
+  <!-- Polyglot; journal publishes in English, and Spanish -->
+  <info>
+    <title>Hospital a Domicilio</title>
+    <title-short>HAD</title-short>
+    <id>http://www.zotero.org/styles/hospital-a-domicilio</id>
+    <link href="http://www.zotero.org/styles/hospital-a-domicilio" rel="self"/>
+    <link href="http://www.zotero.org/styles/bibliotheque-universitaire-de-medecine-vancouver" rel="template"/>
+    <link href="https://www.revistahad.eu/index.php/revistahad/about/submissions" rel="documentation"/>
+    <author>
+      <name>Patrick O'Brien</name>
+    </author>
+    <category citation-format="numeric"/>
+    <category field="medicine"/>
+    <issn>2530-5115</issn>
+    <updated>2022-02-23T16:10:00+00:00</updated>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
+  </info>
+  <locale xml:lang="es">
+    <terms>
+      <term name="accessed">consultado</term>
+    </terms>
+  </locale>
+  <macro name="author">
+    <names variable="author">
+      <name sort-separator=" " initialize-with="" name-as-sort-order="all" delimiter=", " delimiter-precedes-last="always"/>
+      <label form="long" prefix=", "/>
+      <substitute>
+        <choose>
+          <if type="chapter" match="none">
+            <names variable="editor collection-editor">
+              <name sort-separator=" " initialize-with="" name-as-sort-order="all" delimiter=", " delimiter-precedes-last="always"/>
+              <label form="long" prefix=", "/>
+            </names>
+          </if>
+        </choose>
+      </substitute>
+    </names>
+    <choose>
+      <if type="patent">
+        <text term="original-author" prefix=", "/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="editor">
+    <names variable="editor collection-editor" suffix=".">
+      <name sort-separator=" " initialize-with="" name-as-sort-order="all" delimiter=", " delimiter-precedes-last="always"/>
+      <label form="long" prefix=", "/>
+      <substitute>
+        <names variable="container-author" suffix=".">
+          <name sort-separator=" " initialize-with="" name-as-sort-order="all" delimiter=", " delimiter-precedes-last="always"/>
+          <label form="long" prefix=", "/>
+        </names>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="publisher">
+    <choose>
+      <if type="entry-encyclopedia" match="all"/>
+      <else-if type="chapter" match="all">
+        <choose>
+          <if match="none" variable="issued">
+            <group delimiter=": " suffix=".">
+              <text variable="publisher-place"/>
+              <text variable="publisher"/>
+            </group>
+          </if>
+          <else-if match="all" variable="issued">
+            <group delimiter=": " suffix=";">
+              <text variable="publisher-place"/>
+              <text variable="publisher"/>
+            </group>
+          </else-if>
+        </choose>
+      </else-if>
+      <else-if match="none" variable="issued">
+        <group delimiter=": ">
+          <text variable="publisher-place"/>
+          <text variable="publisher"/>
+        </group>
+      </else-if>
+      <else-if match="all" variable="issued">
+        <group delimiter=": " suffix=";">
+          <text variable="publisher-place"/>
+          <text variable="publisher"/>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if type="article-journal" match="all" variable="DOI">
+        <text variable="DOI" prefix="DOI: "/>
+      </if>
+      <else-if type="article-journal" match="all" variable="URL">
+        <text term="retrieved" text-case="capitalize-first" suffix=": "/>
+        <text variable="URL"/>
+      </else-if>
+      <else-if type="book" match="all" variable="DOI">
+        <text variable="DOI" prefix="DOI: "/>
+      </else-if>
+      <else-if type="book" match="all" variable="URL">
+        <text term="retrieved" text-case="capitalize-first" suffix=": "/>
+        <text variable="URL"/>
+      </else-if>
+      <else-if type="chapter" match="all" variable="DOI">
+        <text variable="DOI" prefix="DOI: "/>
+      </else-if>
+      <else-if type="chapter" match="all" variable="URL">
+        <text term="retrieved" text-case="capitalize-first" suffix=": "/>
+        <text variable="URL"/>
+      </else-if>
+      <else-if type="entry-encyclopedia" match="all" variable="URL">
+        <text term="retrieved" text-case="capitalize-first" suffix=": "/>
+        <text variable="URL"/>
+      </else-if>
+      <else-if type="article-newspaper" match="all" variable="URL">
+        <text term="retrieved" text-case="capitalize-first" suffix=": "/>
+        <text variable="URL"/>
+      </else-if>
+      <else-if type="report" match="all" variable="URL">
+        <text term="retrieved" text-case="capitalize-first" suffix=": "/>
+        <text variable="URL"/>
+      </else-if>
+      <else-if type="motion_picture" match="all" variable="URL">
+        <text term="retrieved" text-case="capitalize-first" prefix=" " suffix=": "/>
+        <text variable="URL"/>
+      </else-if>
+      <else-if type="song" match="all" variable="URL">
+        <text term="retrieved" text-case="capitalize-first" suffix=": "/>
+        <text variable="URL"/>
+      </else-if>
+      <else-if type="thesis" match="all" variable="URL">
+        <text term="retrieved" text-case="capitalize-first" suffix=": "/>
+        <text variable="URL"/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="accessed-date">
+    <choose>
+      <if match="any" variable="DOI" type="entry-encyclopedia"/>
+      <else-if match="any" variable="URL">
+        <group prefix="[" suffix="]">
+          <text term="cited" suffix=" "/>
+          <date form="text" variable="accessed"/>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="container-title">
+    <choose>
+      <if type="article-journal article-magazine paper-conference article-newspaper review review-book entry-dictionary entry-encyclopedia" match="any">
+        <group suffix=".">
+          <choose>
+            <if type="article-journal review review-book" match="any">
+              <text variable="container-title" form="short" strip-periods="true"/>
+            </if>
+            <else>
+              <text variable="container-title" strip-periods="true"/>
+            </else>
+          </choose>
+          <text macro="edition" prefix=". "/>
+          <choose>
+            <if match="all" variable="DOI"/>
+            <else-if match="any" variable="URL">
+              <text term="internet" text-case="capitalize-first" prefix=" [" suffix="]."/>
+              <choose>
+                <if type="entry-encyclopedia" match="all">
+                  <group delimiter=" : " prefix=" " suffix=".">
+                    <text variable="publisher-place"/>
+                    <text variable="publisher"/>
+                  </group>
+                  <date form="text" variable="issued" prefix=" "/>
+                  <text term="cited" prefix=" ["/>
+                  <date form="text" variable="accessed" prefix=" " suffix="]."/>
+                </if>
+              </choose>
+            </else-if>
+          </choose>
+        </group>
+      </if>
+      <else-if type="chapter" match="all">
+        <text variable="container-title" suffix=". "/>
+        <choose>
+          <if match="all" variable="DOI">
+            <choose>
+              <if match="none" variable="edition"/>
+              <else>
+                <number variable="edition" form="ordinal"/>
+                <text term="edition" form="short" suffix="."/>
+              </else>
+            </choose>
+          </if>
+          <else-if match="all" variable="URL">
+            <choose>
+              <if match="none" variable="edition">
+                <text term="internet" text-case="capitalize-first" prefix="[" suffix="]."/>
+              </if>
+              <else>
+                <text term="internet" text-case="capitalize-first" prefix="[" suffix="]. "/>
+                <number suffix=" " variable="edition" form="ordinal"/>
+                <text term="edition" form="short"/>
+              </else>
+            </choose>
+          </else-if>
+          <else-if match="none" variable="URL DOI">
+            <group>
+              <number suffix=" " variable="edition" form="ordinal"/>
+              <text term="edition" form="short"/>
+            </group>
+          </else-if>
+        </choose>
+      </else-if>
+      <else-if type="bill legislation" match="any">
+        <group delimiter=", ">
+          <group delimiter=". ">
+            <text variable="container-title"/>
+            <group delimiter=" ">
+              <text term="section" form="short" text-case="capitalize-first"/>
+              <text variable="section"/>
+            </group>
+          </group>
+          <text variable="number"/>
+        </group>
+      </else-if>
+      <else>
+        <group delimiter=", " suffix=" ">
+          <choose>
+            <if variable="collection-title" match="none">
+              <group delimiter=" ">
+                <label variable="volume" form="short" text-case="capitalize-first"/>
+                <text variable="volume"/>
+              </group>
+            </if>
+          </choose>
+          <text variable="container-title"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="report" match="all" variable="URL">
+        <text variable="title"/>
+      </if>
+      <else-if type="motion_picture" match="all">
+        <text variable="title"/>
+        <text variable="medium" prefix=" [" suffix="]"/>
+      </else-if>
+      <else-if type="song" match="all">
+        <text variable="title"/>
+      </else-if>
+      <else-if type="thesis" match="all">
+        <text variable="title"/>
+      </else-if>
+      <else-if type="book" match="all">
+        <text variable="title"/>
+      </else-if>
+      <else>
+        <text variable="title" suffix="."/>
+      </else>
+    </choose>
+    <choose>
+      <if type="thesis">
+        <choose>
+          <if variable="URL">
+            <group prefix=" [" suffix="]" delimiter=" ">
+              <text variable="genre"/>
+              <text term="internet"/>
+            </group>
+          </if>
+          <else>
+            <text variable="genre" prefix=" [" suffix="]"/>
+          </else>
+        </choose>
+      </if>
+      <else-if type="graphic">
+        <choose>
+          <if variable="URL">
+            <group prefix=" [" suffix="]" delimiter=" ">
+              <text variable="medium"/>
+              <text term="internet"/>
+            </group>
+          </if>
+          <else>
+            <text variable="medium" prefix=" [" suffix="]"/>
+          </else>
+        </choose>
+      </else-if>
+    </choose>
+    <choose>
+      <if type="article-journal article-magazine chapter paper-conference article-newspaper thesis graphic review review-book entry-dictionary entry-encyclopedia" match="none">
+        <choose>
+          <if match="all" variable="DOI"/>
+          <else-if variable="URL">
+            <text term="internet" prefix=" [" suffix="]" text-case="capitalize-first"/>
+          </else-if>
+        </choose>
+        <text macro="edition" prefix=". "/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <text term="edition" form="short"/>
+        </group>
+      </if>
+      <else>
+        <text variable="edition" suffix="."/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="date">
+    <choose>
+      <if type="article-journal article-magazine webpage review review-book" match="any">
+        <group suffix=";" delimiter=" ">
+          <date date-parts="year" form="text" variable="issued"/>
+          <text macro="accessed-date"/>
+        </group>
+      </if>
+      <else-if type="bill legislation" match="any">
+        <group delimiter=", ">
+          <date variable="issued" form="text"/>
+        </group>
+      </else-if>
+      <else-if type="report">
+        <choose>
+          <if match="all" variable="URL">
+            <group>
+              <date form="text" variable="issued"/>
+              <text term="cited" prefix=" ["/>
+              <date form="text" variable="accessed" prefix=" " suffix="]"/>
+            </group>
+          </if>
+          <else>
+            <group>
+              <date form="text" date-parts="year-month-day" variable="issued"/>
+            </group>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="patent">
+        <group suffix=".">
+          <group delimiter=", ">
+            <text variable="number"/>
+            <date variable="issued" form="text"/>
+          </group>
+          <text macro="accessed-date" prefix=" "/>
+        </group>
+      </else-if>
+      <else-if type="book" match="all" variable="DOI">
+        <date form="text" date-parts="year-month-day" variable="issued"/>
+      </else-if>
+      <else-if type="book" match="all" variable="URL">
+        <group delimiter=" ">
+          <date date-parts="year" form="text" variable="issued"/>
+          <text term="cited" prefix="["/>
+          <date form="text" variable="accessed" suffix="]"/>
+        </group>
+      </else-if>
+      <else-if type="article-newspaper" match="all">
+        <choose>
+          <if match="all" variable="URL">
+            <group>
+              <date form="text" variable="issued"/>
+              <group prefix=" [" suffix="]" delimiter=" ">
+                <text term="cited"/>
+                <date form="text" variable="accessed"/>
+              </group>
+            </group>
+          </if>
+          <else>
+            <date form="text" date-parts="year-month-day" variable="issued"/>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="entry-encyclopedia" match="all"/>
+      <else>
+        <group suffix=".">
+          <date variable="issued">
+            <date-part name="year"/>
+          </date>
+          <text macro="accessed-date" prefix=" "/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="pages">
+    <choose>
+      <if type="article-journal article-magazine article-newspaper" match="any">
+        <text variable="page" prefix=":"/>
+      </if>
+      <else-if type="chapter" match="all" variable="DOI"/>
+      <else-if type="chapter" match="all" variable="URL"/>
+      <else>
+        <group prefix=" " delimiter=" ">
+          <label variable="page" form="short" plural="never"/>
+          <text variable="page"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="journal-location">
+    <choose>
+      <if type="article-journal article-magazine review review-book" match="any">
+        <text variable="volume"/>
+        <text variable="issue" prefix="(" suffix=")"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="collection-details">
+    <choose>
+      <if type="article-journal article-magazine article-newspaper review review-book" match="none">
+        <choose>
+          <if variable="collection-title">
+            <group delimiter=" " prefix="(" suffix=")">
+              <names variable="collection-editor" suffix=".">
+                <name sort-separator=" " initialize-with="" name-as-sort-order="all" delimiter=", " delimiter-precedes-last="always"/>
+                <label form="long" prefix=", "/>
+              </names>
+              <group delimiter="; ">
+                <text variable="collection-title"/>
+                <group delimiter=" ">
+                  <label variable="volume" form="short"/>
+                  <text variable="volume"/>
+                </group>
+              </group>
+            </group>
+          </if>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="report-details">
+    <choose>
+      <if type="report">
+        <text variable="number" prefix="Rapport no "/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="media-details">
+    <choose>
+      <if type="motion_picture"/>
+      <else-if variable="dimensions">
+        <text variable="dimensions" prefix="Podcast audio: " suffix=" min."/>
+      </else-if>
+    </choose>
+  </macro>
+  <citation collapse="citation-number">
+    <sort>
+      <key variable="citation-number"/>
+    </sort>
+    <layout vertical-align="sup" delimiter="," prefix="(" suffix=")">
+      <text variable="citation-number"/>
+    </layout>
+  </citation>
+  <bibliography et-al-min="7" et-al-use-first="6" second-field-align="flush">
+    <layout>
+      <text variable="citation-number" suffix=". "/>
+      <choose>
+        <if type="webpage post post-weblog" match="any">
+          <text macro="author" suffix=". "/>
+          <text macro="container-title"/>
+          <choose>
+            <if match="none" variable="title">
+              <text term="internet" text-case="capitalize-first" prefix="[" suffix="]. "/>
+              <text variable="title" suffix="; "/>
+              <date date-parts="year" form="text" variable="issued" suffix=" "/>
+              <group prefix="[" suffix="]. " delimiter=" ">
+                <text term="cited"/>
+                <date form="text" variable="accessed"/>
+              </group>
+            </if>
+            <else-if type="webpage" match="all" variable="note title">
+              <choose>
+                <if match="all" variable="issued">
+                  <text term="internet" text-case="capitalize-first" prefix="[" suffix="]. "/>
+                  <date form="text" variable="issued" suffix=". "/>
+                  <text variable="title" suffix=" "/>
+                  <group prefix="[" suffix="]. " delimiter=" ">
+                    <text term="cited"/>
+                    <date form="text" variable="accessed"/>
+                  </group>
+                </if>
+                <else-if match="none" variable="issued">
+                  <text term="internet" text-case="capitalize-first" prefix="[" suffix="]. "/>
+                  <text variable="title" suffix=" "/>
+                  <group prefix="[" suffix="]. " delimiter=" ">
+                    <text term="cited"/>
+                    <date form="text" variable="accessed"/>
+                  </group>
+                </else-if>
+              </choose>
+            </else-if>
+            <else-if type="webpage" match="all" variable="title">
+              <choose>
+                <if match="all" variable="issued">
+                  <text term="internet" text-case="capitalize-first" prefix="[" suffix="]. "/>
+                  <date form="text" variable="issued" suffix=". "/>
+                  <text variable="title"/>
+                </if>
+                <else-if match="none" variable="issued">
+                  <text term="internet" text-case="capitalize-first" prefix="[" suffix="]. "/>
+                  <text variable="title"/>
+                </else-if>
+              </choose>
+              <group prefix=" [" suffix="]. " delimiter=" ">
+                <text term="accessed"/>
+                <date form="text" variable="accessed"/>
+              </group>
+            </else-if>
+            <else-if match="all" variable="title">
+              <text term="internet" text-case="capitalize-first" prefix="[" suffix="]. "/>
+              <date form="text" variable="issued" suffix=". "/>
+              <text variable="title" suffix="; "/>
+              <text variable="note" suffix=" "/>
+              <group prefix="[" suffix="]. " delimiter=" ">
+                <text term="cited"/>
+                <date form="text" variable="accessed"/>
+              </group>
+            </else-if>
+          </choose>
+          <group>
+            <text term="available at" text-case="capitalize-first" suffix=": "/>
+            <text variable="URL"/>
+          </group>
+        </if>
+        <else>
+          <group delimiter=". " suffix=". ">
+            <text macro="author"/>
+            <text macro="title"/>
+          </group>
+          <group delimiter=" " suffix=". ">
+            <choose>
+              <if type="chapter paper-conference entry-dictionary entry-encyclopedia" match="any">
+                <text term="in" text-case="capitalize-first" suffix=": "/>
+              </if>
+            </choose>
+            <text macro="editor"/>
+            <text macro="container-title"/>
+            <text macro="publisher"/>
+            <group>
+              <text macro="date"/>
+              <text macro="journal-location"/>
+              <text macro="pages"/>
+            </group>
+          </group>
+          <text macro="collection-details" suffix=". "/>
+          <text macro="report-details" suffix=". "/>
+          <text macro="media-details" suffix=". "/>
+          <choose>
+            <if type="motion_picture" match="all" variable="URL">
+              <text variable="dimensions" prefix="Vidéo: " suffix=" min."/>
+            </if>
+          </choose>
+        </else>
+      </choose>
+      <text macro="access"/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/buildres/csl/csl-styles/ieee.csl b/buildres/csl/csl-styles/ieee.csl
index 8dccec4707a..bff5b9197ed 100644
--- a/buildres/csl/csl-styles/ieee.csl
+++ b/buildres/csl/csl-styles/ieee.csl
@@ -246,7 +246,7 @@
           </group>
         </group>
         <!-- Available: https://URL.com/ -->
-        <group delimiter=": ">
+        <group delimiter=": " prefix=" ">
           <text term="available at" text-case="capitalize-first"/>
           <text variable="URL"/>
         </group>
diff --git a/buildres/csl/csl-styles/incontext-studies-in-translation-and-interculturalism.csl b/buildres/csl/csl-styles/incontext-studies-in-translation-and-interculturalism.csl
new file mode 100644
index 00000000000..4eef7ace27c
--- /dev/null
+++ b/buildres/csl/csl-styles/incontext-studies-in-translation-and-interculturalism.csl
@@ -0,0 +1,1436 @@
+<?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="en-GB">
+  <info>
+    <title>INContext: Studies in Translation and Interculturalism</title>
+    <id>http://www.zotero.org/styles/incontext-studies-in-translation-and-interculturalism</id>
+    <link href="http://www.zotero.org/styles/incontext-studies-in-translation-and-interculturalism" rel="self"/>
+    <link href="http://www.zotero.org/styles/ergo" rel="template"/>
+    <link href="https://incontextjournal.org/index.php/incontext/about/submissions" rel="documentation"/>
+    <link href="https://docs.google.com/document/d/12G9OIB1T27mA_3g0D8UXNaIrEUprWYWd/edit?usp=sharing&amp;ouid=113565603576432831289&amp;rtpof=true&amp;sd=true" rel="documentation"/>
+    <author>
+      <name>Patrick O'Brien</name>
+    </author>
+    <category citation-format="author-date"/>
+    <category field="humanities"/>
+    <issn>2799-6190</issn>
+    <updated>2022-02-13T18:27:12+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. &amp; trans.</single>
+        <multiple>eds. &amp; trans.</multiple>
+      </term>
+      <term name="translator" form="short">trans.</term>
+      <term name="interviewer" form="short">interviewer</term>
+      <term name="circa" form="short">ca.</term>
+      <term name="collection-editor" form="short">series ed.</term>
+    </terms>
+  </locale>
+  <macro name="container-contributors-booklike">
+    <choose>
+      <if variable="container-title">
+        <names variable="editor translator" delimiter=", &amp; ">
+          <name and="symbol"/>
+          <label form="short" prefix=" (" text-case="title" suffix=")"/>
+          <substitute>
+            <names variable="editorial-director"/>
+            <names variable="collection-editor"/>
+            <names variable="container-author"/>
+          </substitute>
+        </names>
+      </if>
+    </choose>
+  </macro>
+  <macro name="container-contributors">
+    <choose>
+      <if type="book broadcast chapter entry entry-dictionary entry-encyclopedia graphic map personal_communication report speech" match="any">
+        <text macro="container-contributors-booklike"/>
+      </if>
+      <else-if type="paper-conference">
+        <choose>
+          <if variable="collection-editor container-author editor" match="any">
+            <text macro="container-contributors-booklike"/>
+          </if>
+        </choose>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="secondary-contributors-booklike">
+    <group delimiter="; ">
+      <choose>
+        <if variable="title">
+          <names variable="interviewer">
+            <name and="symbol" initialize-with=". " delimiter=", "/>
+            <label form="short" prefix=", " text-case="title"/>
+          </names>
+        </if>
+      </choose>
+      <choose>
+        <if variable="container-title" match="none">
+          <group delimiter="; ">
+            <names variable="container-author">
+              <label form="verb-short" suffix=" " text-case="title"/>
+              <name and="symbol" initialize-with=". " delimiter=", "/>
+            </names>
+            <names variable="editor translator" delimiter="; ">
+              <name and="symbol" delimiter-precedes-last="never"/>
+              <label form="short" prefix=", " text-case="title"/>
+            </names>
+          </group>
+        </if>
+      </choose>
+    </group>
+  </macro>
+  <macro name="secondary-contributors">
+    <choose>
+      <if type="book broadcast chapter entry entry-dictionary entry-encyclopedia graphic map report" match="any">
+        <text macro="secondary-contributors-booklike"/>
+      </if>
+      <else-if type="personal_communication">
+        <group delimiter="; ">
+          <group delimiter=" ">
+            <choose>
+              <if variable="genre" match="any">
+                <text variable="genre" text-case="capitalize-first"/>
+              </if>
+              <else>
+                <text term="letter" text-case="capitalize-first"/>
+              </else>
+            </choose>
+            <names variable="recipient" delimiter=", ">
+              <label form="verb" suffix=" "/>
+              <name and="symbol" delimiter=", "/>
+            </names>
+          </group>
+          <text variable="medium" text-case="capitalize-first"/>
+          <choose>
+            <if variable="container-title" match="none">
+              <names variable="editor translator" delimiter="; ">
+                <name and="symbol" initialize-with=". " delimiter=", "/>
+                <label form="short" prefix=", " text-case="title"/>
+              </names>
+            </if>
+          </choose>
+        </group>
+      </else-if>
+      <else-if type="song">
+        <choose>
+          <if variable="original-author composer" match="any">
+            <group delimiter="; ">
+              <names variable="author" prefix="Recorded by ">
+                <label form="verb" text-case="title"/>
+                <name and="symbol" initialize-with=". " delimiter=", "/>
+              </names>
+              <names variable="translator">
+                <name and="symbol" initialize-with=". " delimiter=", "/>
+                <label form="short" prefix=", " text-case="title"/>
+              </names>
+            </group>
+          </if>
+        </choose>
+      </else-if>
+      <else-if type="article-journal article-magazine article-newspaper" match="any">
+        <group delimiter="; ">
+          <choose>
+            <if variable="title">
+              <names variable="interviewer" delimiter="; ">
+                <name and="symbol" initialize-with=". " delimiter=", "/>
+                <label form="short" prefix=", " text-case="title"/>
+              </names>
+            </if>
+          </choose>
+          <names variable="translator" delimiter="; ">
+            <name and="symbol" initialize-with=". " delimiter=", "/>
+            <label form="short" prefix=", " text-case="title"/>
+          </names>
+        </group>
+      </else-if>
+      <else-if type="paper-conference">
+        <choose>
+          <if variable="collection-editor editor" match="any">
+            <text macro="secondary-contributors-booklike"/>
+          </if>
+          <else>
+            <group delimiter="; ">
+              <choose>
+                <if variable="title">
+                  <names variable="interviewer" delimiter="; ">
+                    <name and="symbol" initialize-with=". " delimiter=", "/>
+                    <label form="short" prefix=", " text-case="title"/>
+                  </names>
+                </if>
+              </choose>
+              <names variable="translator" delimiter="; ">
+                <name and="symbol" initialize-with=". " delimiter=", "/>
+                <label form="short" prefix=", " text-case="title"/>
+              </names>
+            </group>
+          </else>
+        </choose>
+      </else-if>
+      <else>
+        <group delimiter="; ">
+          <choose>
+            <if variable="title">
+              <names variable="interviewer">
+                <name and="symbol" initialize-with=". " delimiter="; "/>
+                <label form="short" prefix=", " text-case="title"/>
+              </names>
+            </if>
+          </choose>
+          <names variable="editor translator" delimiter="; ">
+            <name and="symbol" initialize-with=". " delimiter=", "/>
+            <label form="short" prefix=", " text-case="title"/>
+          </names>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="author">
+    <choose>
+      <if type="song">
+        <names variable="composer" delimiter=", ">
+          <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+          <substitute>
+            <names variable="original-author"/>
+            <names variable="author"/>
+            <names variable="translator">
+              <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+              <label form="short" prefix=" (" suffix=")" text-case="title"/>
+            </names>
+            <group delimiter=" ">
+              <text macro="title"/>
+              <text macro="description"/>
+              <text macro="format"/>
+            </group>
+          </substitute>
+        </names>
+      </if>
+      <else-if type="treaty"/>
+      <else>
+        <names variable="author" delimiter=", ">
+          <name and="text" delimiter-precedes-last="never" name-as-sort-order="first"/>
+          <label form="short" text-case="capitalize-first" prefix=" (" suffix=")"/>
+          <substitute>
+            <names variable="illustrator"/>
+            <names variable="composer"/>
+            <names variable="director">
+              <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+              <label form="long" prefix=" (" suffix=")" text-case="title"/>
+            </names>
+            <choose>
+              <if variable="container-title">
+                <choose>
+                  <if type="book entry entry-dictionary entry-encyclopedia">
+                    <text macro="title"/>
+                  </if>
+                  <else>
+                    <names variable="translator"/>
+                  </else>
+                </choose>
+                <names variable="translator">
+                  <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+                  <label form="short" prefix=" (" suffix=")" text-case="title"/>
+                </names>
+              </if>
+            </choose>
+            <names variable="editor translator" delimiter=", ">
+              <name and="text" delimiter-precedes-last="never" name-as-sort-order="all"/>
+              <label form="short" prefix=" (" suffix=")" text-case="title"/>
+            </names>
+            <names variable="editorial-director">
+              <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+              <label form="short" prefix=" (" suffix=")" text-case="title"/>
+            </names>
+            <names variable="collection-editor">
+              <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+              <label form="short" prefix=" (" suffix=")" text-case="title"/>
+            </names>
+            <choose>
+              <if type="report">
+                <text variable="publisher"/>
+              </if>
+            </choose>
+            <group delimiter=" ">
+              <text macro="title"/>
+              <text macro="description"/>
+              <text macro="format"/>
+            </group>
+          </substitute>
+        </names>
+      </else>
+    </choose>
+  </macro>
+  <macro name="author-short">
+    <choose>
+      <if type="patent" variable="number" match="all">
+        <text macro="patent-number"/>
+      </if>
+      <else-if type="treaty">
+        <text variable="title" form="short"/>
+      </else-if>
+      <else-if type="personal_communication">
+        <choose>
+          <if variable="archive DOI publisher URL" match="none">
+            <group delimiter=", ">
+              <names variable="author">
+                <name and="symbol" delimiter=", " initialize-with=". "/>
+                <substitute>
+                  <text variable="title" form="short" quotes="true"/>
+                </substitute>
+              </names>
+              <text value="personal communication"/>
+            </group>
+          </if>
+          <else>
+            <names variable="author" delimiter=", ">
+              <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
+              <substitute>
+                <names variable="editor"/>
+                <names variable="translator"/>
+                <choose>
+                  <if variable="container-title">
+                    <text variable="title" form="short" quotes="true"/>
+                  </if>
+                  <else>
+                    <text variable="title" form="short" font-style="italic"/>
+                  </else>
+                </choose>
+                <text macro="format-short" prefix="[" suffix="]"/>
+              </substitute>
+            </names>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="song">
+        <names variable="composer" delimiter=", ">
+          <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
+          <substitute>
+            <names variable="original-author"/>
+            <names variable="author"/>
+            <names variable="translator"/>
+            <choose>
+              <if variable="container-title">
+                <text variable="title" form="short" quotes="true"/>
+              </if>
+              <else>
+                <text variable="title" form="short" font-style="italic"/>
+              </else>
+            </choose>
+            <text macro="format-short" prefix="[" suffix="]"/>
+          </substitute>
+        </names>
+      </else-if>
+      <else>
+        <names variable="author" delimiter=", ">
+          <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
+          <substitute>
+            <names variable="illustrator"/>
+            <names variable="composer"/>
+            <names variable="director"/>
+            <choose>
+              <if variable="container-title">
+                <choose>
+                  <if type="book entry entry-dictionary entry-encyclopedia">
+                    <text variable="title" form="short" quotes="true"/>
+                  </if>
+                  <else>
+                    <names variable="translator"/>
+                  </else>
+                </choose>
+              </if>
+            </choose>
+            <names variable="editor"/>
+            <names variable="editorial-director"/>
+            <names variable="translator"/>
+            <choose>
+              <if type="report" variable="publisher" match="all">
+                <text variable="publisher"/>
+              </if>
+              <else-if type="legal_case">
+                <text variable="title" font-style="italic"/>
+              </else-if>
+              <else-if type="bill legislation" match="any">
+                <text variable="title" form="short"/>
+              </else-if>
+              <else-if variable="reviewed-author" type="review review-book" match="any">
+                <text macro="format-short" prefix="[" suffix="]"/>
+              </else-if>
+              <else-if type="post post-weblog webpage" variable="container-title" match="any">
+                <text variable="title" form="short" quotes="true"/>
+              </else-if>
+              <else>
+                <text variable="title" form="short" font-style="italic"/>
+              </else>
+            </choose>
+            <text macro="format-short" prefix="[" suffix="]"/>
+          </substitute>
+        </names>
+      </else>
+    </choose>
+  </macro>
+  <macro name="patent-number">
+    <group delimiter=" ">
+      <text variable="authority"/>
+      <choose>
+        <if variable="genre">
+          <text variable="genre" text-case="capitalize-first"/>
+        </if>
+        <else>
+          <text value="patent" text-case="capitalize-first"/>
+        </else>
+      </choose>
+      <group delimiter=" ">
+        <text term="issue" form="short" text-case="capitalize-first"/>
+        <text variable="number"/>
+      </group>
+    </group>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if type="bill legal_case legislation" match="any"/>
+      <else-if variable="DOI" match="any">
+        <text variable="DOI" prefix="https://doi.org/"/>
+      </else-if>
+      <else-if variable="URL">
+        <group delimiter=" ">
+          <choose>
+            <if type="post post-weblog webpage" match="any">
+              <date variable="accessed" form="text" suffix=","/>
+            </if>
+          </choose>
+          <choose>
+            <if type="report">
+              <choose>
+                <if variable="author editor translator" match="any">
+                  <text variable="publisher" suffix=" website:"/>
+                </if>
+              </choose>
+            </if>
+            <else-if type="post post-weblog webpage" match="any">
+              <text variable="container-title" suffix=" website:"/>
+            </else-if>
+          </choose>
+          <text variable="URL"/>
+        </group>
+      </else-if>
+      <else-if variable="archive">
+        <choose>
+          <if type="article article-journal article-magazine article-newspaper dataset paper-conference report speech thesis" match="any">
+            <choose>
+              <if variable="archive-place" match="none">
+                <group delimiter=" ">
+                  <text term="retrieved" text-case="capitalize-first"/>
+                  <text term="from"/>
+                  <text variable="archive" suffix="."/>
+                  <text variable="archive_location" prefix="(" suffix=")"/>
+                </group>
+              </if>
+              <else>
+                <text macro="publisher" suffix="."/>
+              </else>
+            </choose>
+          </if>
+          <else>
+            <text macro="publisher" suffix="."/>
+          </else>
+        </choose>
+      </else-if>
+      <else>
+        <text macro="publisher" suffix="."/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="treaty">
+        <group delimiter=", ">
+          <text variable="title" text-case="title"/>
+          <names variable="author">
+            <name initialize-with="." form="short" delimiter="-"/>
+          </names>
+        </group>
+      </if>
+      <else-if type="patent" variable="number" match="all">
+        <text macro="patent-number" font-style="italic"/>
+      </else-if>
+      <else-if variable="title">
+        <choose>
+          <if variable="version" type="book" match="all">
+            <text variable="title"/>
+          </if>
+          <else-if variable="reviewed-author reviewed-title" type="review review-book" match="any">
+            <choose>
+              <if variable="reviewed-title">
+                <choose>
+                  <if type="post post-weblog webpage" variable="container-title" match="any">
+                    <text variable="title"/>
+                  </if>
+                  <else>
+                    <text variable="title" font-style="italic"/>
+                  </else>
+                </choose>
+              </if>
+            </choose>
+          </else-if>
+          <else-if variable="container-title" match="any">
+            <text variable="title"/>
+          </else-if>
+          <else>
+            <text variable="title" font-style="italic"/>
+          </else>
+        </choose>
+      </else-if>
+      <else-if variable="interviewer" type="interview" match="any">
+        <names variable="interviewer">
+          <label form="verb-short" suffix=" " text-case="capitalize-first"/>
+          <name and="symbol" initialize-with=". " delimiter=", "/>
+        </names>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="description">
+    <group prefix="[" suffix="]">
+      <choose>
+        <if type="book report" match="any">
+          <choose>
+            <if variable="container-title">
+              <text macro="secondary-contributors"/>
+            </if>
+            <else>
+              <group delimiter="; ">
+                <text macro="description-report"/>
+                <text macro="secondary-contributors"/>
+              </group>
+            </else>
+          </choose>
+        </if>
+        <else-if type="thesis">
+          <group delimiter="; ">
+            <group delimiter=", ">
+              <text variable="genre" text-case="capitalize-first"/>
+              <choose>
+                <if variable="DOI URL archive" match="any">
+                  <text variable="publisher"/>
+                </if>
+              </choose>
+            </group>
+            <text macro="locators"/>
+            <text macro="secondary-contributors"/>
+          </group>
+        </else-if>
+        <else-if type="book interview manuscript motion_picture musical_score pamphlet post-weblog speech webpage" match="any">
+          <group delimiter="; ">
+            <text macro="locators"/>
+            <text macro="secondary-contributors"/>
+          </group>
+        </else-if>
+        <else-if type="song">
+          <choose>
+            <if variable="container-title" match="none">
+              <text macro="locators"/>
+            </if>
+          </choose>
+        </else-if>
+        <else-if type="article dataset figure" match="any">
+          <choose>
+            <if variable="container-title">
+              <text macro="secondary-contributors"/>
+            </if>
+            <else>
+              <group delimiter="; ">
+                <text macro="locators"/>
+                <text macro="secondary-contributors"/>
+              </group>
+            </else>
+          </choose>
+        </else-if>
+        <else-if type="bill legislation legal_case patent treaty personal_communication" match="none">
+          <text macro="secondary-contributors"/>
+        </else-if>
+      </choose>
+    </group>
+  </macro>
+  <macro name="format">
+    <group prefix="[" suffix="]">
+      <choose>
+        <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
+          <group delimiter=", ">
+            <choose>
+              <if variable="genre">
+                <group delimiter=", ">
+                  <text variable="genre" text-case="capitalize-first"/>
+                  <choose>
+                    <if variable="reviewed-title">
+                      <text variable="reviewed-title" font-style="italic"/>
+                    </if>
+                    <else>
+                      <text variable="title" font-style="italic"/>
+                    </else>
+                  </choose>
+                </group>
+              </if>
+              <else>
+                <group delimiter=" ">
+                  <text value="Review of"/>
+                  <choose>
+                    <if variable="reviewed-title">
+                      <text variable="reviewed-title" font-style="italic"/>
+                    </if>
+                    <else>
+                      <text variable="title" font-style="italic"/>
+                    </else>
+                  </choose>
+                </group>
+              </else>
+            </choose>
+            <names variable="reviewed-author">
+              <label form="verb-short" suffix=" "/>
+              <name and="symbol" initialize-with=". " delimiter=", "/>
+            </names>
+          </group>
+        </if>
+        <else>
+          <text macro="format-short"/>
+        </else>
+      </choose>
+    </group>
+  </macro>
+  <macro name="format-short">
+    <choose>
+      <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
+        <choose>
+          <if variable="reviewed-title" match="none">
+            <choose>
+              <if variable="genre">
+                <group delimiter=", ">
+                  <text variable="genre" text-case="capitalize-first"/>
+                  <text variable="title" form="short" font-style="italic"/>
+                </group>
+              </if>
+              <else>
+                <group delimiter=" ">
+                  <text value="Review of"/>
+                  <text variable="title" form="short" font-style="italic"/>
+                </group>
+              </else>
+            </choose>
+          </if>
+          <else>
+            <text variable="title" form="short" quotes="true"/>
+          </else>
+        </choose>
+      </if>
+      <else-if type="speech thesis" match="any">
+        <text variable="medium" text-case="capitalize-first"/>
+      </else-if>
+      <else-if type="book report" match="any">
+        <choose>
+          <if variable="container-title" match="none">
+            <text macro="format-report"/>
+          </if>
+        </choose>
+      </else-if>
+      <else-if type="manuscript pamphlet" match="any">
+        <text variable="medium" text-case="capitalize-first"/>
+      </else-if>
+      <else-if type="personal_communication">
+        <text macro="secondary-contributors"/>
+      </else-if>
+      <else-if type="song">
+        <group delimiter="; ">
+          <text macro="secondary-contributors"/>
+          <choose>
+            <if variable="container-title" match="none">
+              <group delimiter=", ">
+                <text variable="genre" text-case="capitalize-first"/>
+                <text variable="medium" text-case="capitalize-first"/>
+              </group>
+            </if>
+          </choose>
+        </group>
+      </else-if>
+      <else-if type="paper-conference">
+        <group delimiter=", ">
+          <choose>
+            <if variable="collection-editor editor issue page volume" match="any">
+              <text variable="genre" text-case="capitalize-first"/>
+            </if>
+          </choose>
+          <text variable="medium" text-case="capitalize-first"/>
+        </group>
+      </else-if>
+      <else-if type="bill legislation legal_case patent treaty" match="none">
+        <choose>
+          <if variable="genre medium" match="any">
+            <group delimiter=", ">
+              <text variable="genre" text-case="capitalize-first"/>
+              <text variable="medium" text-case="capitalize-first"/>
+            </group>
+          </if>
+          <else-if type="dataset">
+            <text value="Data set"/>
+          </else-if>
+        </choose>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="description-report">
+    <choose>
+      <if variable="number">
+        <group delimiter="; ">
+          <group delimiter=" ">
+            <text variable="genre" text-case="title"/>
+            <text term="issue" form="short" text-case="capitalize-first"/>
+            <text variable="number"/>
+          </group>
+          <text macro="locators"/>
+        </group>
+      </if>
+      <else>
+        <text macro="locators"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="format-report">
+    <choose>
+      <if variable="number">
+        <text variable="medium" text-case="capitalize-first"/>
+      </if>
+      <else>
+        <group delimiter=", ">
+          <text variable="genre" text-case="capitalize-first"/>
+          <text variable="medium" text-case="capitalize-first"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="archive">
+    <group delimiter=". ">
+      <group delimiter=", ">
+        <choose>
+          <if type="manuscript">
+            <text variable="genre"/>
+          </if>
+        </choose>
+        <group delimiter=" ">
+          <text variable="archive"/>
+          <text variable="archive_location" prefix="(" suffix=")"/>
+        </group>
+      </group>
+      <group delimiter=", ">
+        <text variable="archive-place"/>
+      </group>
+    </group>
+  </macro>
+  <macro name="publisher">
+    <choose>
+      <if type="manuscript pamphlet" match="any">
+        <choose>
+          <if variable="archive archive_location archive-place" match="any">
+            <group delimiter=". ">
+              <group delimiter=": ">
+                <text variable="publisher-place"/>
+                <text variable="publisher"/>
+              </group>
+              <text macro="archive"/>
+            </group>
+          </if>
+          <else>
+            <group delimiter=", ">
+              <text variable="genre"/>
+              <text variable="publisher"/>
+              <text variable="publisher-place"/>
+            </group>
+          </else>
+        </choose>
+      </if>
+      <else-if type="thesis" match="any">
+        <group delimiter=". ">
+          <group delimiter=", ">
+            <text variable="publisher"/>
+            <text variable="publisher-place"/>
+          </group>
+          <text macro="archive"/>
+        </group>
+      </else-if>
+      <else-if type="patent">
+        <group delimiter=". ">
+          <group delimiter=": ">
+            <text variable="publisher-place"/>
+            <text variable="publisher"/>
+          </group>
+          <text macro="archive"/>
+        </group>
+      </else-if>
+      <else-if type="article-journal article-magazine article-newspaper" match="any">
+        <text macro="archive"/>
+      </else-if>
+      <else-if type="post post-weblog webpage" match="none">
+        <group delimiter=". ">
+          <choose>
+            <if variable="event">
+              <choose>
+                <if variable="collection-editor editor issue page volume" match="any">
+                  <group delimiter=": ">
+                    <text variable="publisher-place"/>
+                    <text variable="publisher"/>
+                  </group>
+                </if>
+              </choose>
+            </if>
+            <else>
+              <group delimiter=": ">
+                <choose>
+                  <if type="book chapter" match="none">
+                    <text variable="publisher-place"/>
+                  </if>
+                </choose>
+                <text variable="publisher"/>
+              </group>
+            </else>
+          </choose>
+          <text macro="archive"/>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="event">
+    <choose>
+      <if variable="event" type="speech paper-conference" match="any">
+        <choose>
+          <if variable="collection-editor editor issue page volume" match="none">
+            <group delimiter=" ">
+              <text variable="genre" text-case="capitalize-first"/>
+              <group delimiter=" ">
+                <choose>
+                  <if variable="genre">
+                    <text term="presented at"/>
+                  </if>
+                  <else>
+                    <text term="presented at" text-case="capitalize-first"/>
+                  </else>
+                </choose>
+                <group delimiter=", ">
+                  <text variable="event"/>
+                  <text variable="event-place"/>
+                </group>
+              </group>
+            </group>
+          </if>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="issued">
+    <choose>
+      <if type="bill legal_case legislation" match="any"/>
+      <else-if variable="issued">
+        <group>
+          <date variable="issued">
+            <date-part name="year"/>
+          </date>
+          <text variable="year-suffix"/>
+          <choose>
+            <if type="speech">
+              <date variable="issued" delimiter=" ">
+                <date-part prefix=", " name="month"/>
+              </date>
+            </if>
+            <else-if type="article article-magazine article-newspaper broadcast interview pamphlet personal_communication post post-weblog treaty webpage" match="any">
+              <date variable="issued">
+                <date-part prefix=", " name="month"/>
+                <date-part prefix=" " name="day"/>
+              </date>
+            </else-if>
+            <else-if type="paper-conference">
+              <choose>
+                <if variable="container-title" match="none">
+                  <date variable="issued">
+                    <date-part prefix=", " name="month"/>
+                    <date-part prefix=" " name="day"/>
+                  </date>
+                </if>
+              </choose>
+            </else-if>
+          </choose>
+        </group>
+      </else-if>
+      <else-if variable="status">
+        <group>
+          <text variable="status" text-case="lowercase"/>
+          <text variable="year-suffix" prefix="-"/>
+        </group>
+      </else-if>
+      <else>
+        <group>
+          <text term="no date" form="short"/>
+          <text variable="year-suffix" prefix="-"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="issued-sort">
+    <choose>
+      <if type="article article-magazine article-newspaper broadcast interview pamphlet personal_communication post post-weblog speech treaty webpage" match="any">
+        <date variable="issued">
+          <date-part name="year"/>
+          <date-part name="month"/>
+          <date-part name="day"/>
+        </date>
+      </if>
+      <else>
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
+      </else>
+    </choose>
+  </macro>
+  <macro name="issued-year">
+    <group>
+      <choose>
+        <if type="personal_communication">
+          <choose>
+            <if variable="archive DOI publisher URL" match="none">
+              <date variable="issued" form="text"/>
+            </if>
+            <else>
+              <date variable="issued">
+                <date-part name="year"/>
+              </date>
+            </else>
+          </choose>
+        </if>
+        <else>
+          <date variable="issued">
+            <date-part name="year"/>
+          </date>
+        </else>
+      </choose>
+      <text variable="year-suffix"/>
+    </group>
+  </macro>
+  <macro name="issued-citation">
+    <choose>
+      <if variable="issued">
+        <group delimiter="/">
+          <choose>
+            <if is-uncertain-date="original-date">
+              <group prefix="[" suffix="]" delimiter=" ">
+                <text term="circa" form="short"/>
+                <date variable="original-date">
+                  <date-part name="year"/>
+                </date>
+              </group>
+            </if>
+            <else>
+              <date variable="original-date">
+                <date-part name="year"/>
+              </date>
+            </else>
+          </choose>
+          <choose>
+            <if is-uncertain-date="issued">
+              <group prefix="[" suffix="]" delimiter=" ">
+                <text term="circa" form="short"/>
+                <text macro="issued-year"/>
+              </group>
+            </if>
+            <else>
+              <text macro="issued-year"/>
+            </else>
+          </choose>
+        </group>
+      </if>
+      <else-if variable="status">
+        <text variable="status" text-case="lowercase"/>
+        <text variable="year-suffix" prefix="-"/>
+      </else-if>
+      <else>
+        <text term="no date" form="short"/>
+        <text variable="year-suffix" prefix="-"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="original-date">
+    <choose>
+      <if type="bill legal_case legislation" match="any"/>
+      <else-if type="speech">
+        <date variable="original-date" delimiter=" ">
+          <date-part name="month"/>
+          <date-part name="year"/>
+        </date>
+      </else-if>
+      <else-if type="article article-magazine article-newspaper broadcast interview pamphlet personal_communication post post-weblog treaty webpage" match="any">
+        <date variable="original-date" form="text"/>
+      </else-if>
+      <else>
+        <date variable="original-date">
+          <date-part name="year"/>
+        </date>
+      </else>
+    </choose>
+  </macro>
+  <macro name="original-published">
+    <choose>
+      <if type="bill legal_case legislation" match="any"/>
+      <else-if type="interview motion_picture song" match="any">
+        <text value="Original work recorded"/>
+      </else-if>
+      <else-if type="broadcast">
+        <text value="Original work broadcast"/>
+      </else-if>
+      <else>
+        <text value="Original work published"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <text term="edition" form="short"/>
+        </group>
+      </if>
+      <else>
+        <text variable="edition"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="locators">
+    <choose>
+      <if type="article-journal article-magazine figure review review-book" match="any">
+        <group delimiter=", ">
+          <group>
+            <text variable="volume" font-style="italic"/>
+            <text variable="issue" prefix="(" suffix=")"/>
+          </group>
+          <text variable="page"/>
+        </group>
+      </if>
+      <else-if type="article-newspaper">
+        <group delimiter=" ">
+          <label variable="page" form="short"/>
+          <text variable="page"/>
+        </group>
+      </else-if>
+      <else-if type="paper-conference">
+        <choose>
+          <if variable="collection-editor editor" match="any">
+            <text macro="locators-booklike"/>
+          </if>
+          <else>
+            <group delimiter=", ">
+              <group>
+                <text variable="volume" font-style="italic"/>
+                <text variable="issue" prefix="(" suffix=")"/>
+              </group>
+              <text variable="page"/>
+            </group>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="bill broadcast interview legal_case legislation patent post post-weblog speech treaty webpage" match="none">
+        <text macro="locators-booklike"/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="locators-booklike">
+    <group delimiter=", ">
+      <text macro="edition"/>
+      <group delimiter=" ">
+        <text term="version" text-case="capitalize-first"/>
+        <text variable="version"/>
+      </group>
+      <choose>
+        <if variable="volume" match="any">
+          <choose>
+            <if is-numeric="volume" match="none"/>
+            <else-if variable="collection-title">
+              <choose>
+                <if variable="editor translator" match="none">
+                  <choose>
+                    <if variable="collection-number">
+                      <group>
+                        <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+                        <number variable="volume" form="numeric"/>
+                      </group>
+                    </if>
+                  </choose>
+                </if>
+              </choose>
+            </else-if>
+            <else>
+              <group>
+                <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+                <number variable="volume" form="numeric"/>
+              </group>
+            </else>
+          </choose>
+        </if>
+        <else>
+          <group>
+            <text term="volume" form="short" plural="true" text-case="capitalize-first" suffix=" "/>
+            <number variable="number-of-volumes" form="numeric" prefix="1&#8211;"/>
+          </group>
+        </else>
+      </choose>
+      <group delimiter=" ">
+        <label variable="page" form="short"/>
+        <text variable="page"/>
+      </group>
+    </group>
+  </macro>
+  <macro name="citation-locator">
+    <text variable="locator" prefix=" "/>
+  </macro>
+  <macro name="container">
+    <choose>
+      <if type="article article-journal article-magazine article-newspaper review review-book" match="any">
+        <group delimiter=", ">
+          <text macro="container-title"/>
+          <text macro="locators"/>
+        </group>
+        <choose>
+          <if variable="issued">
+            <choose>
+              <if variable="page issue" match="none">
+                <text variable="status" text-case="capitalize-first" prefix=". "/>
+              </if>
+            </choose>
+          </if>
+        </choose>
+      </if>
+      <else-if type="article dataset figure" match="any">
+        <choose>
+          <if variable="container-title">
+            <group delimiter=", ">
+              <text macro="container-title"/>
+              <text macro="locators"/>
+            </group>
+            <choose>
+              <if variable="issued">
+                <choose>
+                  <if variable="page issue" match="none">
+                    <text variable="status" text-case="capitalize-first" prefix=". "/>
+                  </if>
+                </choose>
+              </if>
+            </choose>
+          </if>
+        </choose>
+      </else-if>
+      <else-if type="book" variable="container-title" match="all">
+        <group delimiter=" ">
+          <text term="in" text-case="capitalize-first" suffix=" "/>
+          <group delimiter=", ">
+            <text macro="container-contributors"/>
+            <group delimiter=" ">
+              <text macro="container-title"/>
+              <text macro="description-report" prefix="(" suffix=")"/>
+              <text macro="format-report" prefix="[" suffix="]"/>
+            </group>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="report" variable="container-title" match="all">
+        <group delimiter=" ">
+          <text term="in" text-case="capitalize-first" suffix=" "/>
+          <group delimiter=", ">
+            <text macro="container-contributors"/>
+            <group delimiter=" ">
+              <text macro="container-title"/>
+              <text macro="description-report" prefix="(" suffix=")"/>
+              <text macro="format-report" prefix="[" suffix="]"/>
+            </group>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="song" variable="container-title" match="all">
+        <group delimiter=" ">
+          <text term="in" text-case="capitalize-first" suffix=" "/>
+          <group delimiter=", ">
+            <text macro="container-contributors"/>
+            <group delimiter=" ">
+              <text macro="container-title"/>
+              <text macro="locators" prefix="(" suffix=")"/>
+              <group delimiter=", " prefix="[" suffix="]">
+                <text variable="genre" text-case="capitalize-first"/>
+                <text variable="medium" text-case="capitalize-first"/>
+              </group>
+            </group>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="paper-conference">
+        <choose>
+          <if variable="editor collection-editor container-author" match="any">
+            <text macro="container-booklike"/>
+          </if>
+          <else>
+            <group delimiter=", ">
+              <text macro="container-title"/>
+              <text macro="locators"/>
+            </group>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="book">
+        <choose>
+          <if variable="container-title">
+            <text macro="container-booklike"/>
+          </if>
+        </choose>
+      </else-if>
+      <else-if type="broadcast chapter entry entry-dictionary entry-encyclopedia graphic map speech" match="any">
+        <text macro="container-booklike"/>
+      </else-if>
+      <else-if type="bill legal_case legislation treaty" match="any">
+        <text macro="legal-cites"/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="container-booklike">
+    <choose>
+      <if variable="container-title collection-title" match="any">
+        <group delimiter=" ">
+          <text term="in" text-case="capitalize-first"/>
+          <group delimiter=", ">
+            <text macro="container-contributors"/>
+            <choose>
+              <if variable="container-author editor translator" match="none">
+                <group delimiter=". ">
+                  <group delimiter=": ">
+                    <text variable="collection-title" font-style="italic" text-case="title"/>
+                    <choose>
+                      <if variable="collection-title">
+                        <group delimiter=" ">
+                          <text term="volume" form="short" font-style="italic" text-case="capitalize-first"/>
+                          <number variable="collection-number" font-style="italic" form="numeric"/>
+                          <choose>
+                            <if variable="collection-number" match="none">
+                              <number variable="volume" font-style="italic" form="numeric"/>
+                            </if>
+                          </choose>
+                        </group>
+                      </if>
+                    </choose>
+                  </group>
+                  <group delimiter=": ">
+                    <text macro="container-title"/>
+                    <choose>
+                      <if variable="collection-title" is-numeric="volume" match="none">
+                        <group delimiter=" ">
+                          <text term="volume" form="short" font-style="italic" text-case="capitalize-first"/>
+                          <text variable="volume" font-style="italic"/>
+                        </group>
+                      </if>
+                    </choose>
+                  </group>
+                </group>
+              </if>
+              <else>
+                <group delimiter=": ">
+                  <text macro="container-title"/>
+                  <choose>
+                    <if is-numeric="volume" match="none">
+                      <group delimiter=" ">
+                        <text term="volume" form="short" font-style="italic" text-case="capitalize-first"/>
+                        <text variable="volume" font-style="italic"/>
+                      </group>
+                    </if>
+                  </choose>
+                </group>
+              </else>
+            </choose>
+          </group>
+          <group delimiter="; " prefix="(" suffix=")">
+            <text macro="locators"/>
+            <names variable="container-author">
+              <label form="verb-short" suffix=" " text-case="title"/>
+              <name and="symbol" initialize-with=". " delimiter=", "/>
+            </names>
+          </group>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="container-title">
+    <choose>
+      <if type="article article-journal article-magazine article-newspaper dataset" match="any">
+        <text variable="container-title" font-style="italic" text-case="title"/>
+      </if>
+      <else-if type="paper-conference speech">
+        <choose>
+          <if variable="collection-editor container-author editor" match="any">
+            <text variable="container-title" font-style="italic"/>
+          </if>
+          <else>
+            <text variable="container-title" font-style="italic" text-case="title"/>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="bill legal_case legislation post-weblog webpage" match="none">
+        <text variable="container-title" font-style="italic"/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="legal-cites">
+    <choose>
+      <if type="legal_case">
+        <group prefix=", " delimiter=" ">
+          <group delimiter=" ">
+            <choose>
+              <if variable="container-title">
+                <text variable="volume"/>
+                <text variable="container-title"/>
+                <group delimiter=" ">
+                  <text term="section" form="symbol"/>
+                  <text variable="section"/>
+                </group>
+                <text variable="page"/>
+              </if>
+              <else>
+                <group delimiter=" ">
+                  <choose>
+                    <if is-numeric="number">
+                      <text term="issue" form="short" text-case="capitalize-first"/>
+                    </if>
+                  </choose>
+                  <text variable="number"/>
+                </group>
+              </else>
+            </choose>
+          </group>
+          <group prefix="(" suffix=")" delimiter=" ">
+            <text variable="authority"/>
+            <choose>
+              <if variable="container-title" match="any">
+                <date variable="issued" form="numeric" date-parts="year"/>
+              </if>
+              <else>
+                <date variable="issued" form="text"/>
+              </else>
+            </choose>
+          </group>
+        </group>
+      </if>
+      <else-if type="bill legislation" match="any">
+        <group prefix=", " delimiter=" ">
+          <group delimiter=", ">
+            <choose>
+              <if variable="number">
+                <text variable="number" prefix="Pub. L. No. "/>
+                <group delimiter=" ">
+                  <text term="section" form="symbol"/>
+                  <text variable="section"/>
+                </group>
+                <group delimiter=" ">
+                  <text variable="volume"/>
+                  <text variable="container-title"/>
+                  <text variable="page-first"/>
+                </group>
+              </if>
+              <else>
+                <group delimiter=" ">
+                  <text variable="volume"/>
+                  <text variable="container-title"/>
+                  <text term="section" form="symbol"/>
+                  <text variable="section"/>
+                </group>
+              </else>
+            </choose>
+          </group>
+          <date variable="issued" prefix="(" suffix=")">
+            <date-part name="year"/>
+          </date>
+        </group>
+      </else-if>
+      <else-if type="treaty">
+        <group delimiter=" ">
+          <number variable="volume"/>
+          <text variable="container-title"/>
+          <text variable="page"/>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <citation et-al-min="6" et-al-use-first="1" et-al-subsequent-min="3" et-al-subsequent-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true" collapse="year" givenname-disambiguation-rule="primary-name">
+    <sort>
+      <key macro="author" names-min="8" names-use-first="6"/>
+      <key macro="issued-sort"/>
+    </sort>
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <group delimiter=": ">
+        <group delimiter=", ">
+          <text macro="author-short"/>
+          <text macro="issued-citation"/>
+        </group>
+        <text macro="citation-locator"/>
+      </group>
+    </layout>
+  </citation>
+  <bibliography et-al-min="8" et-al-use-first="6" et-al-use-last="true" entry-spacing="0" line-spacing="2" hanging-indent="true">
+    <sort>
+      <key macro="author"/>
+      <key macro="issued-sort" sort="ascending"/>
+      <key macro="title"/>
+    </sort>
+    <layout>
+      <group suffix=".">
+        <group delimiter=". ">
+          <text macro="author"/>
+          <choose>
+            <if is-uncertain-date="issued">
+              <group prefix=" [" suffix="]" delimiter=" ">
+                <text term="circa" form="short"/>
+                <text macro="issued"/>
+              </group>
+            </if>
+            <else>
+              <text macro="issued" prefix=" (" suffix=")"/>
+            </else>
+          </choose>
+          <group delimiter=" ">
+            <text macro="title"/>
+            <choose>
+              <if variable="title interviewer" type="interview" match="any">
+                <group delimiter=" ">
+                  <text macro="description"/>
+                  <text macro="format"/>
+                </group>
+              </if>
+              <else>
+                <group delimiter=" ">
+                  <text macro="format"/>
+                  <text macro="description"/>
+                </group>
+              </else>
+            </choose>
+          </group>
+          <text macro="container"/>
+        </group>
+        <text macro="event" prefix=". "/>
+      </group>
+      <text macro="access" prefix=" "/>
+      <choose>
+        <if is-uncertain-date="original-date">
+          <group prefix=" [" suffix="]" delimiter=" ">
+            <text macro="original-published"/>
+            <text term="circa" form="short"/>
+            <text macro="original-date"/>
+          </group>
+        </if>
+        <else-if variable="original-date">
+          <group prefix=" (" suffix=")" delimiter=" ">
+            <text macro="original-published"/>
+            <text macro="original-date"/>
+          </group>
+        </else-if>
+      </choose>
+    </layout>
+  </bibliography>
+</style>
diff --git a/buildres/csl/csl-styles/innovations-therapeutiques-en-oncologie.csl b/buildres/csl/csl-styles/innovations-therapeutiques-en-oncologie.csl
new file mode 100644
index 00000000000..613aaae8019
--- /dev/null
+++ b/buildres/csl/csl-styles/innovations-therapeutiques-en-oncologie.csl
@@ -0,0 +1,332 @@
+<?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>Innovations &amp; Thérapeutiques en Oncologie</title>
+    <id>http://www.zotero.org/styles/innovations-therapeutiques-en-oncologie</id>
+    <link href="http://www.zotero.org/styles/innovations-therapeutiques-en-oncologie" rel="self"/>
+    <link href="http://www.zotero.org/styles/pain-medicine" rel="template"/>
+    <link href="https://www.jle.com/fr/revues/ito/contenu_libre.phtml?code_contenu=espace_auteur" rel="documentation"/>
+    <author>
+      <name>Patrick O'Brien</name>
+    </author>
+    <category citation-format="numeric"/>
+    <category field="medicine"/>
+    <issn>2431-3203</issn>
+    <eissn>2491-7028</eissn>
+    <updated>2022-04-21T13:14:09+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">
+    <date form="text" delimiter=" ">
+      <date-part name="year"/>
+      <date-part name="month" form="short" strip-periods="true"/>
+      <date-part name="day"/>
+    </date>
+    <terms>
+      <term name="collection-editor" form="long">
+        <single>editor</single>
+        <multiple>editors</multiple>
+      </term>
+      <term name="presented at">presented at</term>
+      <term name="available at">available from</term>
+      <term name="section" form="short">sect.</term>
+      <term name="edition" form="short">edn</term>
+    </terms>
+  </locale>
+  <macro name="author">
+    <names variable="author">
+      <name sort-separator=" " initialize-with="" name-as-sort-order="all" delimiter=", " delimiter-precedes-last="always"/>
+      <label form="short" prefix=", "/>
+      <et-al font-style="italic"/>
+      <substitute>
+        <names variable="editor"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="editor">
+    <names variable="editor" suffix=".">
+      <name sort-separator=" " initialize-with="" name-as-sort-order="all" delimiter=", " delimiter-precedes-last="always"/>
+      <label form="short" prefix=", "/>
+    </names>
+  </macro>
+  <macro name="chapter-marker">
+    <choose>
+      <if type="chapter paper-conference entry-dictionary entry-encyclopedia" match="any">
+        <text term="in" text-case="capitalize-first"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <choose>
+      <if type="article-journal article-magazine article-newspaper" match="none">
+        <group delimiter=" : " suffix=" , ">
+          <choose>
+            <if type="thesis">
+              <text variable="publisher-place" prefix="[" suffix="]"/>
+            </if>
+            <else-if type="speech"/>
+            <else>
+              <text variable="publisher-place"/>
+            </else>
+          </choose>
+          <text variable="publisher"/>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if match="any" type="webpage post post-weblog">
+        <group delimiter=": ">
+          <text term="available at" text-case="capitalize-first"/>
+          <text variable="URL"/>
+        </group>
+      </if>
+      <else-if type="article-journal" match="any">
+        <text variable="DOI" prefix="doi:"/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="accessed-date">
+    <choose>
+      <if variable="URL" type="webpage">
+        <group prefix="[" suffix="]" delimiter=" ">
+          <text term="cited" text-case="lowercase"/>
+          <date variable="accessed" form="text"/>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="container-title">
+    <choose>
+      <if type="article-journal article-magazine article-newspaper review review-book entry-dictionary entry-encyclopedia" match="any">
+        <group delimiter=" ">
+          <choose>
+            <if type="article-journal review review-book" match="any">
+              <text variable="container-title" form="short" strip-periods="true" font-style="italic" suffix=" "/>
+            </if>
+            <else>
+              <text variable="container-title" strip-periods="true"/>
+            </else>
+          </choose>
+          <choose>
+            <if variable="URL" type="webpage">
+              <text term="internet" prefix="[" suffix="]" text-case="capitalize-first"/>
+            </if>
+          </choose>
+        </group>
+        <text macro="edition" prefix=" "/>
+      </if>
+      <else-if type="bill legislation" match="any">
+        <group delimiter=", ">
+          <group delimiter=". ">
+            <text variable="container-title"/>
+            <group delimiter=" ">
+              <text term="section" form="short" text-case="capitalize-first"/>
+              <text variable="section"/>
+            </group>
+          </group>
+          <text variable="number"/>
+        </group>
+      </else-if>
+      <else-if type="speech">
+        <group delimiter=": " suffix=";">
+          <group delimiter=" ">
+            <text variable="genre" text-case="capitalize-first"/>
+            <text term="presented at"/>
+          </group>
+          <text variable="event"/>
+        </group>
+      </else-if>
+      <else-if type="chapter paper-conference" match="any">
+        <text variable="container-title" font-style="italic" suffix="."/>
+      </else-if>
+      <else>
+        <group delimiter=", " suffix=".">
+          <choose>
+            <if variable="collection-title" match="none">
+              <group delimiter=" ">
+                <label variable="volume" form="short" text-case="capitalize-first"/>
+                <text variable="volume"/>
+              </group>
+            </if>
+          </choose>
+          <text variable="container-title"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="title">
+    <text variable="title"/>
+    <choose>
+      <if type="article-journal article-magazine chapter paper-conference article-newspaper review review-book entry-dictionary entry-encyclopedia" match="none">
+        <choose>
+          <if variable="URL">
+            <text term="internet" prefix=" [" suffix="]" text-case="capitalize-first"/>
+          </if>
+        </choose>
+        <text macro="edition" prefix=", "/>
+      </if>
+    </choose>
+    <choose>
+      <if type="thesis">
+        <text variable="genre" prefix=" [" suffix="]"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <text term="edition" form="short"/>
+        </group>
+      </if>
+      <else>
+        <text variable="edition" suffix="."/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="date">
+    <choose>
+      <if type="article-journal article-magazine article-newspaper review review-book" match="any">
+        <group delimiter=" " suffix=" ; ">
+          <date date-parts="year" form="text" variable="issued"/>
+          <text macro="accessed-date"/>
+        </group>
+      </if>
+      <else-if type="bill legislation" match="any">
+        <group delimiter=", ">
+          <date variable="issued" delimiter=" ">
+            <date-part name="month" form="short" strip-periods="true"/>
+            <date-part name="day"/>
+          </date>
+          <date variable="issued">
+            <date-part name="year"/>
+          </date>
+        </group>
+      </else-if>
+      <else-if type="report">
+        <date variable="issued" delimiter=" ">
+          <date-part name="year"/>
+          <date-part name="month" form="short" strip-periods="true"/>
+        </date>
+        <text macro="accessed-date" prefix=" "/>
+      </else-if>
+      <else-if type="patent">
+        <group suffix=".">
+          <group delimiter=", ">
+            <text variable="number"/>
+            <date variable="issued">
+              <date-part name="year"/>
+            </date>
+          </group>
+          <text macro="accessed-date" prefix=" "/>
+        </group>
+      </else-if>
+      <else-if type="speech">
+        <group delimiter="; ">
+          <group delimiter=" ">
+            <date variable="issued" delimiter=" ">
+              <date-part name="year"/>
+              <date-part name="month" form="short" strip-periods="true"/>
+              <date-part name="day"/>
+            </date>
+            <text macro="accessed-date"/>
+          </group>
+          <text variable="event-place"/>
+        </group>
+      </else-if>
+      <else>
+        <group>
+          <date variable="issued">
+            <date-part name="year"/>
+          </date>
+          <text macro="accessed-date" prefix=" "/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="pages">
+    <choose>
+      <if type="article-journal article-magazine article-newspaper review review-book chapter paper-conference" match="any">
+        <text variable="page" prefix=" : "/>
+      </if>
+      <else>
+        <text variable="page"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="journal-location">
+    <choose>
+      <if type="article-journal article-magazine review review-book" match="any">
+        <text variable="volume"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="collection-details">
+    <choose>
+      <if type="article-journal article-magazine article-newspaper review review-book" match="none">
+        <choose>
+          <if variable="collection-title">
+            <group delimiter=" " prefix="(" suffix=")">
+              <names variable="collection-editor" suffix=".">
+                <name sort-separator=" " initialize-with="" name-as-sort-order="all" delimiter=", " delimiter-precedes-last="always"/>
+                <label form="long" prefix=", "/>
+              </names>
+              <group delimiter="; ">
+                <text variable="collection-title"/>
+                <group delimiter=" ">
+                  <label variable="volume" form="short"/>
+                  <text variable="volume"/>
+                </group>
+              </group>
+            </group>
+          </if>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="report-details">
+    <choose>
+      <if type="report">
+        <text variable="number" prefix="Report No.: "/>
+      </if>
+    </choose>
+  </macro>
+  <citation collapse="citation-number">
+    <sort>
+      <key variable="citation-number"/>
+    </sort>
+    <layout delimiter="," prefix="[" suffix="]">
+      <text variable="citation-number"/>
+    </layout>
+  </citation>
+  <bibliography et-al-min="7" et-al-use-first="3">
+    <layout>
+      <text variable="citation-number" font-weight="bold" suffix=". "/>
+      <group delimiter=". " suffix=". ">
+        <text macro="author"/>
+        <text macro="title"/>
+      </group>
+      <group delimiter=" " suffix=". ">
+        <group delimiter=" : ">
+          <text macro="chapter-marker"/>
+          <group delimiter=" ">
+            <text macro="editor"/>
+            <text macro="container-title"/>
+          </group>
+        </group>
+        <text macro="publisher"/>
+        <group>
+          <text macro="date"/>
+          <text macro="journal-location"/>
+          <text macro="pages"/>
+        </group>
+      </group>
+      <text macro="collection-details" suffix=". "/>
+      <text macro="report-details" suffix=". "/>
+      <text macro="access"/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/buildres/csl/csl-styles/institut-francais-darcheologie-orientale-arab-studies.csl b/buildres/csl/csl-styles/institut-francais-darcheologie-orientale-arab-studies.csl
index 05065bbb727..7504bbe9a12 100644
--- a/buildres/csl/csl-styles/institut-francais-darcheologie-orientale-arab-studies.csl
+++ b/buildres/csl/csl-styles/institut-francais-darcheologie-orientale-arab-studies.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.0" initialize-with="." page-range-format="expanded" demote-non-dropping-particle="sort-only" default-locale="en-GB">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.0" initialize-with="." page-range-format="expanded" demote-non-dropping-particle="sort-only">
   <!-- This style was edited with the Visual CSL Editor (https://editor.citationstyles.org/visualEditor/) -->
   <info>
     <title>Institut français d'archéologie orientale - Arab Studies (English)</title>
@@ -8,7 +8,7 @@
     <link href="http://www.zotero.org/styles/institut-francais-darcheologie-orientale-arab-studies" rel="self"/>
     <link href="http://www.zotero.org/styles/institut-francais-darcheologie-orientale" rel="template"/>
     <link href="https://www.ifao.egnet.net/publications/publier/normes-ed/" rel="documentation"/>
-    <link href="https://www.ifao.egnet.net/uploads/publications/normes/IFAO_publications_normes_bibliographiques_pub_arabisantes_2021_angl.pdf" rel="documentation"/>
+    <link href="https://www.ifao.egnet.net/uploads/publications/normes/IFAO_publications_normes_bibliographiques_pub_arabisantes_2022_angl.pdf" rel="documentation"/>
     <author>
       <name>Nicolas Souchon</name>
       <email>souchon.nicolas.ns@gmail.com</email>
@@ -16,7 +16,7 @@
     <category citation-format="note"/>
     <category field="history"/>
     <summary>Style sheet for the arabic studies publications of the Institut français d'archéologie orientale</summary>
-    <updated>2021-07-11T17:51:15+00:00</updated>
+    <updated>2022-03-15T16:11:06+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">
@@ -50,15 +50,13 @@
   <macro name="container-title">
     <text variable="container-title" form="short" font-style="italic"/>
   </macro>
-  <macro name="collection-title">
-    <text variable="collection-title" form="short"/>
-  </macro>
   <macro name="author">
     <names variable="author">
-      <name and="symbol" delimiter-precedes-last="never" initialize="false" name-as-sort-order="all">
+      <name delimiter-precedes-et-al="never" delimiter-precedes-last="never" et-al-min="5" et-al-use-first="1" initialize-with=".">
         <name-part name="family"/>
         <name-part name="given"/>
       </name>
+      <et-al font-style="normal"/>
     </names>
   </macro>
   <macro name="author-short">
@@ -71,10 +69,11 @@
   </macro>
   <macro name="editor">
     <names variable="editor" font-variant="normal" text-decoration="none">
-      <name font-variant="normal" and="symbol" delimiter-precedes-last="never" initialize="false" name-as-sort-order="all">
+      <name font-variant="normal" delimiter-precedes-et-al="never" delimiter-precedes-last="never" et-al-min="5" et-al-use-first="1" initialize-with=".">
         <name-part name="family" font-variant="normal"/>
         <name-part name="given"/>
       </name>
+      <et-al/>
       <label form="short" prefix=" (" suffix=")"/>
       <substitute>
         <text macro="container-author"/>
@@ -83,10 +82,11 @@
   </macro>
   <macro name="translator">
     <names variable="translator">
-      <name and="symbol" delimiter-precedes-last="never" initialize="false">
+      <name delimiter-precedes-et-al="never" delimiter-precedes-last="never" et-al-min="5" et-al-use-first="1" initialize-with=".">
         <name-part name="given" font-variant="normal"/>
         <name-part name="family" font-variant="normal"/>
       </name>
+      <et-al/>
       <label form="short" prefix=" (" suffix=")"/>
     </names>
   </macro>
@@ -109,9 +109,6 @@
   <macro name="archive-location">
     <text variable="archive_location"/>
   </macro>
-  <macro name="collection-number">
-    <number variable="collection-number"/>
-  </macro>
   <macro name="volume">
     <choose>
       <if match="any" is-numeric="volume">
@@ -135,16 +132,14 @@
       <text variable="page"/>
     </group>
   </macro>
-  <macro name="accessed">
-    <group delimiter="&#160;">
-      <text term="accessed" text-case="lowercase"/>
-      <date form="text" variable="accessed"/>
-    </group>
-  </macro>
   <macro name="issued-year-month-day">
     <choose>
       <if match="any" variable="issued">
-        <date form="text" date-parts="year-month-day" variable="issued"/>
+        <date delimiter=" " variable="issued">
+          <date-part name="day" range-delimiter="&#8211;"/>
+          <date-part name="month" range-delimiter="&#8211;"/>
+          <date-part name="year" range-delimiter="&#8211;"/>
+        </date>
       </if>
       <else>
         <text term="no date" form="short" text-case="lowercase" prefix="[" suffix="]"/>
@@ -154,7 +149,9 @@
   <macro name="issued-year">
     <choose>
       <if match="any" variable="issued">
-        <date date-parts="year" form="text" variable="issued"/>
+        <date delimiter="" variable="issued">
+          <date-part name="year" range-delimiter="&#8211;"/>
+        </date>
       </if>
       <else>
         <text term="no date" form="short" prefix="[" suffix="]"/>
@@ -162,16 +159,12 @@
     </choose>
   </macro>
   <macro name="original-date">
-    <date date-parts="year" form="text" variable="original-date"/>
+    <date date-parts="year" form="text" variable="original-date">
+      <date-part name="year" range-delimiter="&#8211;"/>
+    </date>
   </macro>
   <macro name="URL">
-    <text variable="URL" prefix="&lt;" suffix="&gt;"/>
-  </macro>
-  <macro name="edition">
-    <group delimiter="&#160;">
-      <number variable="edition" form="ordinal"/>
-      <label variable="edition" form="short"/>
-    </group>
+    <text variable="URL"/>
   </macro>
   <macro name="sort">
     <choose>
@@ -212,69 +205,48 @@
   </macro>
   <macro name="event-date">
     <date delimiter="" variable="event-date">
-      <date-part name="day" suffix=" "/>
-      <date-part name="month" prefix=" " suffix=" "/>
-      <date-part name="year" range-delimiter="-" prefix=" "/>
+      <date-part name="day" range-delimiter="&#8211;" suffix=" "/>
+      <date-part name="month" range-delimiter="&#8211;" prefix=" " suffix=" "/>
+      <date-part name="year" range-delimiter="&#8211;" prefix=" "/>
     </date>
   </macro>
   <macro name="citation">
     <choose>
       <if match="any" variable="author editor">
-        <group delimiter=",&#160;">
-          <choose>
-            <if match="any" variable="author">
-              <text macro="author-short"/>
-            </if>
-            <else>
-              <text macro="editor-short"/>
-            </else>
-          </choose>
-          <choose>
-            <if type="entry-dictionary" match="any">
-              <text macro="title"/>
-            </if>
-          </choose>
-          <group>
+        <group delimiter="&#160;">
+          <group delimiter=", ">
+            <choose>
+              <if match="any" variable="author">
+                <text macro="author-short"/>
+              </if>
+              <else>
+                <text macro="editor-short"/>
+              </else>
+            </choose>
             <choose>
               <if type="entry-dictionary entry-encyclopedia" match="any">
-                <choose>
-                  <if match="any" variable="status">
-                    <text macro="status"/>
-                  </if>
-                  <else>
-                    <text macro="issued-year"/>
-                  </else>
-                </choose>
+                <text macro="title"/>
+                <group suffix=",">
+                  <text macro="container-title"/>
+                  <number vertical-align="sup" variable="edition"/>
+                </group>
+              </if>
+            </choose>
+          </group>
+          <group>
+            <choose>
+              <if match="any" variable="status">
+                <text macro="status"/>
               </if>
               <else>
-                <choose>
-                  <if match="any" variable="original-date">
-                    <group delimiter="&#160;">
-                      <text macro="original-date"/>
-                      <group delimiter="&#160;" prefix="(" suffix=")">
-                        <text term="edition" form="short"/>
-                        <text macro="issued-year"/>
-                      </group>
-                    </group>
-                  </if>
-                  <else-if match="any" variable="status">
-                    <group>
-                      <text macro="status"/>
-                    </group>
-                  </else-if>
-                  <else>
-                    <group>
-                      <text macro="issued-year"/>
-                    </group>
-                  </else>
-                </choose>
+                <text macro="issued-year"/>
               </else>
             </choose>
             <text macro="year-suffix"/>
           </group>
         </group>
       </if>
-      <else-if type="entry-dictionary entry-encyclopedia" match="any">
+      <else-if type="entry-encyclopedia entry-dictionary" match="any">
         <group delimiter=",&#160;">
           <text macro="container-title"/>
           <text macro="title"/>
@@ -294,7 +266,10 @@
       <else>
         <choose>
           <if type="webpage" match="any">
-            <text macro="container-title"/>
+            <group delimiter=", ">
+              <text macro="container-title"/>
+              <text macro="issued-year"/>
+            </group>
           </if>
           <else>
             <group delimiter=", ">
@@ -307,24 +282,11 @@
                 </else>
               </choose>
               <choose>
-                <if match="any" variable="original-date">
-                  <group delimiter=" ">
-                    <text macro="original-date"/>
-                    <group delimiter=" " prefix="(" suffix=")">
-                      <text term="edition"/>
-                      <text macro="issued-year"/>
-                    </group>
-                  </group>
+                <if match="any" variable="status">
+                  <text macro="status"/>
                 </if>
-                <else-if match="any" variable="status">
-                  <group>
-                    <text macro="status"/>
-                  </group>
-                </else-if>
                 <else>
-                  <group>
-                    <text macro="issued-year"/>
-                  </group>
+                  <text macro="issued-year"/>
                 </else>
               </choose>
               <text macro="year-suffix"/>
@@ -336,10 +298,11 @@
   </macro>
   <macro name="container-author">
     <names variable="container-author">
-      <name and="symbol" delimiter-precedes-last="never" initialize="false" initialize-with="">
+      <name delimiter-precedes-et-al="never" delimiter-precedes-last="never" et-al-min="5" et-al-use-first="1" initialize-with=".">
         <name-part name="given" font-variant="normal"/>
         <name-part name="family" font-variant="normal"/>
       </name>
+      <et-al/>
     </names>
   </macro>
   <macro name="year-suffix">
@@ -348,32 +311,33 @@
   <macro name="note">
     <text variable="note"/>
   </macro>
-  <macro name="editor-name-first">
-    <names variable="editor">
-      <name and="symbol" delimiter-precedes-last="never" initialize="false">
-        <name-part name="given"/>
-        <name-part name="family"/>
-      </name>
-      <label form="short" prefix=" (" suffix=")"/>
-      <substitute>
-        <text macro="container-author-name-first"/>
-      </substitute>
-    </names>
-  </macro>
-  <macro name="container-author-name-first">
-    <names variable="container-author">
-      <name and="symbol" initialize="false">
-        <name-part name="given"/>
-        <name-part name="family"/>
-      </name>
-    </names>
-  </macro>
   <macro name="number-of-volumes">
     <group delimiter=" ">
       <number variable="number-of-volumes"/>
-      <text term="volume" form="short"/>
+      <text term="volume" form="short" plural="true"/>
+    </group>
+  </macro>
+  <macro name="first-edition">
+    <group delimiter=" " prefix=" (" suffix=")">
+      <text value="1st"/>
+      <text term="edition" form="short"/>
+      <text macro="original-date"/>
     </group>
   </macro>
+  <macro name="issued-year-month-day-short">
+    <choose>
+      <if match="any" variable="issued">
+        <date delimiter=" " variable="issued">
+          <date-part name="day"/>
+          <date-part name="month" form="short"/>
+          <date-part name="year"/>
+        </date>
+      </if>
+      <else>
+        <text term="no date" form="short"/>
+      </else>
+    </choose>
+  </macro>
   <citation name-delimiter=", " initialize="false" near-note-distance="1" disambiguate-add-givenname="true" disambiguate-add-year-suffix="true" givenname-disambiguation-rule="all-names" collapse="citation-number">
     <sort>
       <key macro="sort"/>
@@ -383,7 +347,7 @@
       <text macro="locator" prefix=", "/>
     </layout>
   </citation>
-  <bibliography initialize="false" subsequent-author-substitute="&#8212;">
+  <bibliography initialize-with=".">
     <sort>
       <key macro="sort"/>
       <key variable="issued"/>
@@ -404,7 +368,6 @@
               <group delimiter="&#160;">
                 <text macro="title" font-style="normal"/>
                 <text macro="volume"/>
-                <text macro="original-date" prefix="(" suffix=")"/>
               </group>
               <text macro="translator"/>
               <choose>
@@ -417,35 +380,29 @@
                 </if>
               </choose>
               <text macro="note"/>
-              <group delimiter="&#160;">
-                <text macro="collection-title"/>
-                <text macro="collection-number"/>
-              </group>
-              <group>
-                <choose>
-                  <if match="none" variable="publisher-place issued">
-                    <text value="n.p., n.d." prefix="[" suffix="]"/>
-                  </if>
-                  <else>
-                    <group delimiter=", ">
-                      <text macro="publisher"/>
-                      <text macro="publisher-place"/>
-                      <choose>
-                        <if match="any" variable="status">
-                          <text macro="status"/>
-                        </if>
-                        <else>
-                          <group delimiter="&#160;">
-                            <text macro="issued-year"/>
-                            <text macro="edition" prefix="(" suffix=")"/>
-                          </group>
-                        </else>
-                      </choose>
-                    </group>
-                  </else>
-                </choose>
-                <text macro="year-suffix"/>
-              </group>
+              <choose>
+                <if match="none" variable="publisher-place issued">
+                  <text value="n.p., n.d." prefix="[" suffix="]"/>
+                </if>
+                <else>
+                  <text macro="publisher-place"/>
+                  <group delimiter=" ">
+                    <choose>
+                      <if match="any" variable="status">
+                        <text macro="status"/>
+                      </if>
+                      <else>
+                        <text macro="issued-year"/>
+                      </else>
+                    </choose>
+                    <choose>
+                      <if match="any" variable="edition">
+                        <text macro="first-edition"/>
+                      </if>
+                    </choose>
+                  </group>
+                </else>
+              </choose>
             </group>
           </if>
           <else-if type="article-journal article-magazine article-newspaper article" match="any">
@@ -459,17 +416,14 @@
                   <number variable="issue"/>
                 </group>
               </group>
-              <group>
-                <choose>
-                  <if match="any" variable="status">
-                    <text macro="status"/>
-                  </if>
-                  <else>
-                    <text macro="issued-year-month-day"/>
-                  </else>
-                </choose>
-                <text macro="year-suffix"/>
-              </group>
+              <choose>
+                <if match="any" variable="status">
+                  <text macro="status"/>
+                </if>
+                <else>
+                  <text macro="issued-year-month-day"/>
+                </else>
+              </choose>
               <text macro="pages"/>
             </group>
           </else-if>
@@ -479,10 +433,9 @@
               <text macro="title" quotes="false"/>
               <group delimiter="&#160;">
                 <text term="in" font-style="normal"/>
-                <text macro="editor-name-first" suffix=","/>
+                <text macro="editor" suffix=","/>
                 <text macro="container-title"/>
                 <text macro="volume"/>
-                <text macro="original-date" prefix="(" suffix=")"/>
               </group>
               <choose>
                 <if match="any" variable="genre">
@@ -494,32 +447,26 @@
                 </if>
               </choose>
               <text macro="note"/>
-              <group delimiter="&#160;">
-                <text macro="collection-title"/>
-                <text macro="collection-number"/>
-              </group>
               <choose>
                 <if match="none" variable="publisher-place issued">
                   <text value="n.p., n.d." prefix="[" suffix="]"/>
                 </if>
                 <else>
-                  <group delimiter=", ">
-                    <text macro="publisher"/>
-                    <text macro="publisher-place"/>
-                    <group>
-                      <choose>
-                        <if match="any" variable="status">
-                          <text macro="status"/>
-                        </if>
-                        <else>
-                          <group delimiter="&#160;">
-                            <text macro="issued-year"/>
-                            <text macro="edition"/>
-                          </group>
-                        </else>
-                      </choose>
-                      <text macro="year-suffix"/>
-                    </group>
+                  <text macro="publisher-place"/>
+                  <group delimiter=" ">
+                    <choose>
+                      <if match="any" variable="status">
+                        <text macro="status"/>
+                      </if>
+                      <else>
+                        <text macro="issued-year"/>
+                      </else>
+                    </choose>
+                    <choose>
+                      <if match="any" variable="edition">
+                        <text macro="first-edition"/>
+                      </if>
+                    </choose>
                   </group>
                 </else>
               </choose>
@@ -539,7 +486,6 @@
           <else-if type="entry-dictionary" match="any">
             <group delimiter=", ">
               <text macro="author"/>
-              <text macro="title"/>
               <text macro="container-title"/>
               <text macro="number-of-volumes"/>
               <choose>
@@ -548,7 +494,6 @@
                 </if>
                 <else>
                   <group delimiter=", ">
-                    <text macro="publisher"/>
                     <text macro="publisher-place"/>
                     <choose>
                       <if match="any" variable="status">
@@ -561,37 +506,19 @@
                   </group>
                 </else>
               </choose>
-              <text macro="volume"/>
-              <text macro="pages"/>
             </group>
           </else-if>
           <else-if type="entry-encyclopedia" match="any">
             <group delimiter=", ">
               <text macro="author"/>
               <text macro="title"/>
-              <text macro="container-title"/>
-              <text macro="edition" vertical-align="baseline"/>
               <text macro="volume"/>
               <choose>
-                <if match="none" variable="publisher-place issued">
-                  <text value="n.p., n.d." prefix="[" suffix="]"/>
+                <if match="any" variable="status">
+                  <text macro="status"/>
                 </if>
                 <else>
-                  <group delimiter=", ">
-                    <text macro="publisher"/>
-                    <text macro="publisher-place"/>
-                  </group>
-                  <group>
-                    <choose>
-                      <if match="any" variable="status">
-                        <text macro="status"/>
-                      </if>
-                      <else>
-                        <text macro="issued-year"/>
-                      </else>
-                    </choose>
-                    <text macro="year-suffix"/>
-                  </group>
+                  <text macro="issued-year"/>
                 </else>
               </choose>
               <text macro="pages"/>
@@ -620,26 +547,23 @@
             <group delimiter=", ">
               <text macro="author"/>
               <text macro="container-title"/>
-              <group delimiter="&#160;">
-                <text macro="genre"/>
-              </group>
+              <text macro="genre"/>
               <text macro="URL"/>
               <choose>
                 <if match="any" variable="issued">
                   <group delimiter="&#160;">
                     <text value="version"/>
-                    <text macro="issued-year-month-day"/>
+                    <text macro="issued-year-month-day-short"/>
                   </group>
                 </if>
               </choose>
-              <text macro="accessed"/>
             </group>
           </else-if>
           <else-if type="post-weblog" match="any">
             <group delimiter=", ">
               <text macro="author"/>
+              <text macro="title" quotes="false"/>
               <group delimiter="&#160;">
-                <text macro="title" quotes="false"/>
                 <text term="in" font-style="normal"/>
                 <text macro="container-title"/>
               </group>
@@ -649,10 +573,9 @@
               </group>
               <text macro="URL"/>
               <group delimiter="&#160;">
-                <text value="publié le"/>
-                <text macro="issued-year-month-day"/>
+                <text value="published on"/>
+                <text macro="issued-year-month-day-short"/>
               </group>
-              <text macro="accessed"/>
             </group>
           </else-if>
         </choose>
@@ -661,7 +584,6 @@
             <choose>
               <if type="webpage post-weblog" match="none">
                 <text macro="URL"/>
-                <text macro="accessed"/>
               </if>
             </choose>
           </if>
diff --git a/buildres/csl/csl-styles/institut-francais-darcheologie-orientale-en.csl b/buildres/csl/csl-styles/institut-francais-darcheologie-orientale-en.csl
index 72d3cf84be9..30f23994569 100644
--- a/buildres/csl/csl-styles/institut-francais-darcheologie-orientale-en.csl
+++ b/buildres/csl/csl-styles/institut-francais-darcheologie-orientale-en.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.0" initialize-with="." page-range-format="expanded" demote-non-dropping-particle="sort-only" default-locale="en-GB">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.0" initialize-with="." page-range-format="expanded" demote-non-dropping-particle="sort-only">
   <!-- This style was edited with the Visual CSL Editor (https://editor.citationstyles.org/visualEditor/) -->
   <info>
     <title>Institut français d'archéologie orientale - Egyptology (English)</title>
@@ -8,7 +8,7 @@
     <link href="http://www.zotero.org/styles/institut-francais-darcheologie-orientale-en" rel="self"/>
     <link href="http://www.zotero.org/styles/institut-francais-darcheologie-orientale" rel="template"/>
     <link href="https://www.ifao.egnet.net/publications/publier/normes-ed/" rel="documentation"/>
-    <link href="https://www.ifao.egnet.net/uploads/publications/normes/IFAO_publications_normes_bibliographiques_pub_egypto_2021_angl.pdf" rel="documentation"/>
+    <link href="https://www.ifao.egnet.net/uploads/publications/normes/IFAO_publications_normes_bibliographiques_pub_egypto_2022_angl.pdf" rel="documentation"/>
     <author>
       <name>Nicolas Souchon</name>
       <email>souchon.nicolas.ns@gmail.com</email>
@@ -16,7 +16,7 @@
     <category citation-format="note"/>
     <category field="history"/>
     <summary>Style sheet for the archeological and egyptological publications of the Institut français d'archéologie orientale</summary>
-    <updated>2021-07-11T09:27:26+00:00</updated>
+    <updated>2022-03-15T14:37:59+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">
@@ -50,10 +50,11 @@
   </macro>
   <macro name="author">
     <names variable="author">
-      <name delimiter=", " initialize-with="." name-as-sort-order="all">
+      <name delimiter-precedes-et-al="never" delimiter-precedes-last="never" et-al-min="5" et-al-use-first="1" initialize-with=".">
         <name-part name="given"/>
         <name-part name="family"/>
       </name>
+      <et-al/>
     </names>
   </macro>
   <macro name="author-short">
@@ -66,19 +67,24 @@
   </macro>
   <macro name="editor">
     <names variable="editor">
-      <name delimiter=", " initialize-with="." name-as-sort-order="all">
+      <name delimiter-precedes-et-al="never" delimiter-precedes-last="never" et-al-min="5" et-al-use-first="1" initialize-with=".">
         <name-part name="given"/>
         <name-part name="family"/>
       </name>
+      <et-al/>
       <label form="short" prefix=" (" suffix=")"/>
+      <substitute>
+        <text macro="container-author"/>
+      </substitute>
     </names>
   </macro>
   <macro name="translator">
     <names variable="translator">
-      <name delimiter=", " initialize-with=".">
+      <name delimiter-precedes-et-al="never" delimiter-precedes-last="never" et-al-min="5" et-al-use-first="1" initialize-with=".">
         <name-part name="given" font-variant="small-caps"/>
         <name-part name="family" font-variant="small-caps"/>
       </name>
+      <et-al/>
       <label form="short" prefix=" (" suffix=")"/>
     </names>
   </macro>
@@ -121,29 +127,19 @@
     <group delimiter="&#160;">
       <choose>
         <if match="any" is-numeric="page">
-          <label variable="page" form="short"/>
+          <text term="page" form="short" plural="true"/>
         </if>
       </choose>
       <text variable="page"/>
     </group>
   </macro>
-  <macro name="accessed">
-    <group delimiter="&#160;">
-      <text term="accessed" text-case="lowercase"/>
-      <date delimiter="&#160;" variable="accessed">
-        <date-part name="day"/>
-        <date-part name="month" form="short"/>
-        <date-part name="year"/>
-      </date>
-    </group>
-  </macro>
   <macro name="issued-year-month-day">
     <choose>
       <if match="any" variable="issued">
         <date delimiter="&#160;" variable="issued">
-          <date-part name="day"/>
-          <date-part name="month" form="short"/>
-          <date-part name="year"/>
+          <date-part name="day" range-delimiter="&#8211;"/>
+          <date-part name="month" range-delimiter="&#8211;"/>
+          <date-part name="year" range-delimiter="&#8211;"/>
         </date>
       </if>
       <else>
@@ -155,7 +151,7 @@
     <choose>
       <if match="any" variable="issued">
         <date date-parts="year" form="text" variable="issued">
-          <date-part name="year"/>
+          <date-part name="year" range-delimiter="&#8211;"/>
         </date>
       </if>
       <else>
@@ -164,10 +160,12 @@
     </choose>
   </macro>
   <macro name="original-date">
-    <date date-parts="year" form="text" variable="original-date"/>
+    <date delimiter="" variable="original-date">
+      <date-part name="year" range-delimiter="&#8211;"/>
+    </date>
   </macro>
   <macro name="URL">
-    <text variable="URL" prefix="&lt;" suffix="&gt;"/>
+    <text variable="URL"/>
   </macro>
   <macro name="edition">
     <group delimiter="&#160;" prefix="(" suffix=")">
@@ -206,18 +204,6 @@
       <label form="short" prefix=" (" suffix=")"/>
     </names>
   </macro>
-  <macro name="editor-name-first">
-    <names variable="editor">
-      <name initialize-with=".">
-        <name-part name="given"/>
-        <name-part name="family"/>
-      </name>
-      <label form="short" prefix=" (" suffix=")"/>
-      <substitute>
-        <text macro="container-author"/>
-      </substitute>
-    </names>
-  </macro>
   <macro name="citation">
     <choose>
       <if match="any" variable="title-short">
@@ -302,18 +288,19 @@
     <text variable="event-place"/>
   </macro>
   <macro name="event-date">
-    <date delimiter="" variable="event-date">
-      <date-part name="day"/>
-      <date-part name="month" form="short" prefix=" "/>
-      <date-part name="year" range-delimiter="-" prefix=" "/>
+    <date delimiter=" " variable="event-date">
+      <date-part name="day" range-delimiter="&#8211;"/>
+      <date-part name="month" form="short" range-delimiter="&#8211;"/>
+      <date-part name="year" range-delimiter="&#8211;"/>
     </date>
   </macro>
   <macro name="container-author">
     <names variable="container-author">
-      <name initialize-with=".">
+      <name delimiter-precedes-et-al="never" delimiter-precedes-last="never" et-al-min="5" et-al-use-first="1" initialize-with=".">
         <name-part name="given"/>
         <name-part name="family"/>
       </name>
+      <et-al/>
     </names>
   </macro>
   <macro name="year-suffix">
@@ -322,6 +309,17 @@
   <macro name="note">
     <text variable="note"/>
   </macro>
+  <macro name="issued-year-month-day-short">
+    <choose>
+      <if match="any" variable="issued">
+        <date delimiter=" " variable="issued">
+          <date-part name="day" range-delimiter="&#8211;"/>
+          <date-part name="month" form="short" range-delimiter="&#8211;"/>
+          <date-part name="year" range-delimiter="&#8211;"/>
+        </date>
+      </if>
+    </choose>
+  </macro>
   <citation name-delimiter=", " disambiguate-add-givenname="true" disambiguate-add-year-suffix="true" givenname-disambiguation-rule="all-names">
     <sort>
       <key macro="sort"/>
@@ -340,7 +338,7 @@
       <group display="block">
         <text macro="citation"/>
       </group>
-      <group display="left-margin" delimiter="&#160;" suffix=".">
+      <group display="left-margin" delimiter=", " suffix=".">
         <choose>
           <if type="book" match="any">
             <group delimiter=", ">
@@ -423,7 +421,7 @@
               <text macro="title"/>
               <group delimiter="&#160;">
                 <text term="in" font-style="normal"/>
-                <text macro="editor-name-first" suffix=","/>
+                <text macro="editor" suffix=","/>
                 <text macro="container-title"/>
                 <text macro="volume"/>
                 <text macro="original-date" prefix="(" suffix=")"/>
@@ -527,11 +525,10 @@
                 <if match="any" variable="issued">
                   <group delimiter="&#160;">
                     <text value="version"/>
-                    <text macro="issued-year-month-day"/>
+                    <text macro="issued-year-month-day-short"/>
                   </group>
                 </if>
               </choose>
-              <text macro="accessed"/>
             </group>
           </else-if>
           <else-if type="post-weblog" match="any">
@@ -549,9 +546,8 @@
               <text macro="URL"/>
               <group delimiter="&#160;">
                 <text value="published"/>
-                <text macro="issued-year-month-day"/>
+                <text macro="issued-year-month-day-short"/>
               </group>
-              <text macro="accessed"/>
             </group>
           </else-if>
         </choose>
@@ -561,7 +557,6 @@
               <if type="webpage post-weblog" match="none">
                 <group delimiter=", ">
                   <text macro="URL"/>
-                  <text macro="accessed"/>
                 </group>
               </if>
             </choose>
diff --git a/buildres/csl/csl-styles/institut-francais-darcheologie-orientale-etudes-arabes.csl b/buildres/csl/csl-styles/institut-francais-darcheologie-orientale-etudes-arabes.csl
index 6bed9224445..9cd5dc18390 100644
--- a/buildres/csl/csl-styles/institut-francais-darcheologie-orientale-etudes-arabes.csl
+++ b/buildres/csl/csl-styles/institut-francais-darcheologie-orientale-etudes-arabes.csl
@@ -8,7 +8,7 @@
     <link href="http://www.zotero.org/styles/institut-francais-darcheologie-orientale-etudes-arabes" rel="self"/>
     <link href="http://www.zotero.org/styles/institut-francais-darcheologie-orientale" rel="template"/>
     <link href="https://www.ifao.egnet.net/publications/publier/normes-ed/" rel="documentation"/>
-    <link href="https://www.ifao.egnet.net/uploads/publications/normes/IFAO_publications_normes_bibliographiques_pub_arabisantes_2021_fr.pdf" rel="documentation"/>
+    <link href="https://www.ifao.egnet.net/uploads/publications/normes/IFAO_publications_normes_bibliographiques_pub_arabisantes_2022_fr.pdf" rel="documentation"/>
     <author>
       <name>Nicolas Souchon</name>
       <email>souchon.nicolas.ns@gmail.com</email>
@@ -16,13 +16,14 @@
     <category citation-format="note"/>
     <category field="history"/>
     <summary>Feuille de style pour les publications dans le domaine des études arabes de l'Institut français d'archéologie orientale</summary>
-    <updated>2021-07-11T17:53:47+00:00</updated>
+    <updated>2022-03-07T16:08:31+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="fr">
     <terms>
       <term name="no date" form="short">s.d.</term>
       <term name="sub-verbo" form="short">s.v.</term>
+      <term name="in">dans</term>
     </terms>
   </locale>
   <macro name="title">
@@ -41,15 +42,13 @@
   <macro name="container-title">
     <text variable="container-title" form="short" font-style="italic"/>
   </macro>
-  <macro name="collection-title">
-    <text variable="collection-title" form="short"/>
-  </macro>
   <macro name="author">
     <names variable="author">
-      <name and="text" delimiter-precedes-last="never" initialize="false" name-as-sort-order="all">
-        <name-part name="family"/>
+      <name delimiter-precedes-last="never" et-al-min="5" et-al-use-first="1" initialize-with=".">
         <name-part name="given"/>
+        <name-part name="family"/>
       </name>
+      <et-al font-style="italic"/>
     </names>
   </macro>
   <macro name="author-short">
@@ -62,10 +61,11 @@
   </macro>
   <macro name="editor">
     <names variable="editor" font-variant="normal" text-decoration="none">
-      <name font-variant="normal" and="text" delimiter-precedes-last="never" initialize="false" name-as-sort-order="all">
+      <name font-variant="normal" delimiter-precedes-last="never" et-al-min="5" et-al-use-first="1" initialize-with=".">
         <name-part name="family" font-variant="normal"/>
         <name-part name="given"/>
       </name>
+      <et-al/>
       <label form="short" plural="never" prefix=" (" suffix=")"/>
       <substitute>
         <text macro="container-author"/>
@@ -74,10 +74,11 @@
   </macro>
   <macro name="translator">
     <names variable="translator">
-      <name and="text" delimiter-precedes-last="never" initialize="false">
+      <name delimiter-precedes-et-al="never" delimiter-precedes-last="never" et-al-min="5" et-al-use-first="1" initialize-with=".">
         <name-part name="given" font-variant="small-caps"/>
         <name-part name="family" font-variant="small-caps"/>
       </name>
+      <et-al font-style="italic"/>
       <label form="short" plural="never" prefix=" (" suffix=")"/>
     </names>
   </macro>
@@ -100,9 +101,6 @@
   <macro name="archive-location">
     <text variable="archive_location"/>
   </macro>
-  <macro name="collection-number">
-    <number variable="collection-number"/>
-  </macro>
   <macro name="volume">
     <choose>
       <if match="any" is-numeric="volume">
@@ -126,16 +124,14 @@
       <text variable="page"/>
     </group>
   </macro>
-  <macro name="accessed">
-    <group delimiter="&#160;">
-      <text term="accessed" text-case="lowercase"/>
-      <date form="text" variable="accessed"/>
-    </group>
-  </macro>
   <macro name="issued-year-month-day">
     <choose>
       <if match="any" variable="issued">
-        <date form="text" date-parts="year-month-day" variable="issued"/>
+        <date delimiter=" " variable="issued">
+          <date-part name="day" range-delimiter="-"/>
+          <date-part name="month" range-delimiter="-"/>
+          <date-part name="year" range-delimiter="-"/>
+        </date>
       </if>
       <else>
         <text term="no date" form="short" text-case="lowercase" prefix="[" suffix="]"/>
@@ -145,7 +141,9 @@
   <macro name="issued-year">
     <choose>
       <if match="any" variable="issued">
-        <date date-parts="year" form="text" variable="issued"/>
+        <date delimiter="" variable="issued">
+          <date-part name="year" range-delimiter="-"/>
+        </date>
       </if>
       <else>
         <text term="no date" form="short" prefix="[" suffix="]"/>
@@ -153,15 +151,21 @@
     </choose>
   </macro>
   <macro name="original-date">
-    <date date-parts="year" form="text" variable="original-date"/>
+    <date delimiter="" variable="original-date">
+      <date-part name="year" range-delimiter="-"/>
+    </date>
   </macro>
   <macro name="URL">
     <text variable="URL"/>
   </macro>
-  <macro name="edition">
-    <group delimiter="&#160;" prefix="(" suffix=")">
-      <number variable="edition" form="ordinal"/>
+  <macro name="first-edition">
+    <group delimiter="&#160;" prefix=" (" suffix=")">
+      <group>
+        <text value="1"/>
+        <text value="re" vertical-align="sup"/>
+      </group>
       <label variable="edition" form="short"/>
+      <text macro="original-date"/>
     </group>
   </macro>
   <macro name="sort">
@@ -203,62 +207,41 @@
   </macro>
   <macro name="event-date">
     <date delimiter="" variable="event-date">
-      <date-part name="day"/>
-      <date-part name="month" prefix=" "/>
+      <date-part name="day" range-delimiter="-"/>
+      <date-part name="month" range-delimiter="-" prefix=" "/>
       <date-part name="year" range-delimiter="-" prefix=" "/>
     </date>
   </macro>
   <macro name="citation">
     <choose>
       <if match="any" variable="author editor">
-        <group delimiter=",&#160;">
-          <choose>
-            <if match="any" variable="author">
-              <text macro="author-short"/>
-            </if>
-            <else>
-              <text macro="editor-short"/>
-            </else>
-          </choose>
-          <choose>
-            <if type="entry-dictionary entry-encyclopedia" match="any">
-              <text macro="title"/>
-            </if>
-          </choose>
-          <group>
+        <group delimiter="&#160;">
+          <group delimiter=", ">
+            <choose>
+              <if match="any" variable="author">
+                <text macro="author-short"/>
+              </if>
+              <else>
+                <text macro="editor-short"/>
+              </else>
+            </choose>
             <choose>
               <if type="entry-dictionary entry-encyclopedia" match="any">
-                <choose>
-                  <if match="any" variable="status">
-                    <text macro="status"/>
-                  </if>
-                  <else>
-                    <text macro="issued-year"/>
-                  </else>
-                </choose>
+                <text macro="title"/>
+                <group suffix=",">
+                  <text macro="container-title"/>
+                  <number vertical-align="sup" variable="edition"/>
+                </group>
+              </if>
+            </choose>
+          </group>
+          <group>
+            <choose>
+              <if match="any" variable="status">
+                <text macro="status"/>
               </if>
               <else>
-                <choose>
-                  <if match="any" variable="original-date">
-                    <group delimiter="&#160;">
-                      <text macro="original-date"/>
-                      <group delimiter="&#160;" prefix="(" suffix=")">
-                        <text term="edition" form="short"/>
-                        <text macro="issued-year"/>
-                      </group>
-                    </group>
-                  </if>
-                  <else-if match="any" variable="status">
-                    <group>
-                      <text macro="status"/>
-                    </group>
-                  </else-if>
-                  <else>
-                    <group>
-                      <text macro="issued-year"/>
-                    </group>
-                  </else>
-                </choose>
+                <text macro="issued-year"/>
               </else>
             </choose>
             <text macro="year-suffix"/>
@@ -269,22 +252,46 @@
         <group delimiter=",&#160;">
           <text macro="container-title"/>
           <text macro="title"/>
+          <group>
+            <choose>
+              <if match="any" variable="status">
+                <text macro="status"/>
+              </if>
+              <else>
+                <text macro="issued-year"/>
+              </else>
+            </choose>
+            <text macro="year-suffix"/>
+          </group>
         </group>
       </else-if>
       <else>
         <choose>
           <if type="webpage" match="any">
-            <text macro="container-title"/>
+            <group delimiter=", ">
+              <text macro="container-title"/>
+              <text macro="issued-year"/>
+            </group>
           </if>
           <else>
-            <choose>
-              <if match="any" variable="title-short">
-                <text macro="title-short"/>
-              </if>
-              <else>
-                <text macro="title"/>
-              </else>
-            </choose>
+            <group delimiter=", ">
+              <choose>
+                <if match="any" variable="title-short">
+                  <text macro="title-short"/>
+                </if>
+                <else>
+                  <text macro="title"/>
+                </else>
+              </choose>
+              <choose>
+                <if match="any" variable="status">
+                  <text macro="status"/>
+                </if>
+                <else>
+                  <text macro="issued-year"/>
+                </else>
+              </choose>
+            </group>
           </else>
         </choose>
       </else>
@@ -292,10 +299,11 @@
   </macro>
   <macro name="container-author">
     <names variable="container-author">
-      <name and="text" delimiter-precedes-last="never" initialize="false" initialize-with="">
+      <name delimiter-precedes-last="never" et-al-min="5" et-al-use-first="1" initialize-with=".">
         <name-part name="given" font-variant="normal"/>
         <name-part name="family" font-variant="normal"/>
       </name>
+      <et-al font-style="italic"/>
     </names>
   </macro>
   <macro name="year-suffix">
@@ -304,25 +312,11 @@
   <macro name="note">
     <text variable="note"/>
   </macro>
-  <macro name="editor-name-first">
-    <names variable="editor">
-      <name and="text" delimiter-precedes-last="never" initialize="false">
-        <name-part name="given"/>
-        <name-part name="family"/>
-      </name>
-      <label form="short" prefix=" (" suffix=")"/>
-      <substitute>
-        <text macro="container-author-name-first"/>
-      </substitute>
-    </names>
-  </macro>
-  <macro name="container-author-name-first">
-    <names variable="container-author">
-      <name and="text" initialize="false">
-        <name-part name="given"/>
-        <name-part name="family"/>
-      </name>
-    </names>
+  <macro name="number-of-volumes">
+    <group delimiter=" ">
+      <number variable="number-of-volumes"/>
+      <text term="volume" form="short"/>
+    </group>
   </macro>
   <citation name-delimiter=", " initialize="false" near-note-distance="1" disambiguate-add-givenname="true" disambiguate-add-year-suffix="true" givenname-disambiguation-rule="all-names" collapse="citation-number">
     <sort>
@@ -333,7 +327,7 @@
       <text macro="locator" prefix=", "/>
     </layout>
   </citation>
-  <bibliography initialize="false" subsequent-author-substitute="&#8212;">
+  <bibliography initialize-with=".">
     <sort>
       <key macro="sort"/>
       <key variable="issued"/>
@@ -354,7 +348,6 @@
               <group delimiter="&#160;">
                 <text macro="title" font-style="normal"/>
                 <text macro="volume"/>
-                <text macro="original-date" prefix="(" suffix=")"/>
               </group>
               <text macro="translator"/>
               <choose>
@@ -367,35 +360,29 @@
                 </if>
               </choose>
               <text macro="note"/>
-              <group delimiter="&#160;">
-                <text macro="collection-title"/>
-                <text macro="collection-number"/>
-              </group>
-              <group>
-                <choose>
-                  <if match="none" variable="publisher-place issued">
-                    <text value="s.l.n.d." prefix="[" suffix="]"/>
-                  </if>
-                  <else>
-                    <group delimiter=", ">
-                      <text macro="publisher"/>
-                      <text macro="publisher-place"/>
-                      <choose>
-                        <if match="any" variable="status">
-                          <text macro="status"/>
-                        </if>
-                        <else>
-                          <group delimiter="&#160;">
-                            <text macro="issued-year"/>
-                            <text macro="edition"/>
-                          </group>
-                        </else>
-                      </choose>
-                    </group>
-                  </else>
-                </choose>
-                <text macro="year-suffix"/>
-              </group>
+              <choose>
+                <if match="none" variable="publisher-place issued">
+                  <text value="s.l.n.d." prefix="[" suffix="]"/>
+                </if>
+                <else>
+                  <text macro="publisher-place"/>
+                  <group delimiter=" ">
+                    <choose>
+                      <if match="any" variable="status">
+                        <text macro="status"/>
+                      </if>
+                      <else>
+                        <text macro="issued-year"/>
+                      </else>
+                    </choose>
+                    <choose>
+                      <if match="any" variable="edition">
+                        <text macro="first-edition"/>
+                      </if>
+                    </choose>
+                  </group>
+                </else>
+              </choose>
             </group>
           </if>
           <else-if type="article-journal article-magazine article-newspaper article" match="any">
@@ -409,44 +396,26 @@
                   <number variable="issue"/>
                 </group>
               </group>
-              <group>
-                <choose>
-                  <if match="any" variable="status">
-                    <text macro="status"/>
-                  </if>
-                  <else>
-                    <text macro="issued-year-month-day"/>
-                  </else>
-                </choose>
-                <text macro="year-suffix"/>
-              </group>
+              <choose>
+                <if match="any" variable="status">
+                  <text macro="status"/>
+                </if>
+                <else>
+                  <text macro="issued-year-month-day"/>
+                </else>
+              </choose>
               <text macro="pages"/>
             </group>
           </else-if>
           <else-if type="chapter paper-conference" match="any">
             <group delimiter=", ">
               <text macro="author"/>
+              <text macro="title" quotes="false"/>
               <group delimiter="&#160;">
-                <text macro="title" quotes="false"/>
-                <choose>
-                  <if match="any" variable="editor container-author">
-                    <group delimiter="&#160;">
-                      <text term="in" font-style="italic"/>
-                      <text macro="editor-name-first" suffix=","/>
-                      <text macro="container-title"/>
-                      <text macro="volume"/>
-                      <text macro="original-date" prefix="(" suffix=")"/>
-                    </group>
-                  </if>
-                  <else>
-                    <group delimiter="&#160;">
-                      <text term="in"/>
-                      <text macro="container-title"/>
-                      <text macro="volume"/>
-                      <text macro="original-date" prefix="(" suffix=")"/>
-                    </group>
-                  </else>
-                </choose>
+                <text term="in" font-style="normal"/>
+                <text macro="editor" suffix=","/>
+                <text macro="container-title"/>
+                <text macro="volume"/>
               </group>
               <choose>
                 <if match="any" variable="genre">
@@ -458,32 +427,26 @@
                 </if>
               </choose>
               <text macro="note"/>
-              <group delimiter="&#160;">
-                <text macro="collection-title"/>
-                <text macro="collection-number"/>
-              </group>
               <choose>
                 <if match="none" variable="publisher-place issued">
                   <text value="s.l.n.d." prefix="[" suffix="]"/>
                 </if>
                 <else>
-                  <group delimiter=", ">
-                    <text macro="publisher"/>
-                    <text macro="publisher-place"/>
-                    <group>
-                      <choose>
-                        <if match="any" variable="status">
-                          <text macro="status"/>
-                        </if>
-                        <else>
-                          <group delimiter="&#160;">
-                            <text macro="issued-year"/>
-                            <text macro="edition"/>
-                          </group>
-                        </else>
-                      </choose>
-                      <text macro="year-suffix"/>
-                    </group>
+                  <text macro="publisher-place"/>
+                  <group delimiter=" ">
+                    <choose>
+                      <if match="any" variable="status">
+                        <text macro="status"/>
+                      </if>
+                      <else>
+                        <text macro="issued-year"/>
+                      </else>
+                    </choose>
+                    <choose>
+                      <if match="any" variable="edition">
+                        <text macro="first-edition"/>
+                      </if>
+                    </choose>
                   </group>
                 </else>
               </choose>
@@ -502,35 +465,40 @@
               <text macro="archive-location"/>
             </group>
           </else-if>
-          <else-if type="entry-dictionary entry-encyclopedia" match="any">
+          <else-if type="entry-dictionary" match="any">
+            <group delimiter=", ">
+              <text macro="author"/>
+              <text macro="container-title"/>
+              <text macro="number-of-volumes"/>
+              <choose>
+                <if match="none" variable="publisher-place issued">
+                  <text value="s.l.n.d."/>
+                </if>
+                <else>
+                  <text macro="publisher-place"/>
+                  <choose>
+                    <if match="any" variable="status">
+                      <text macro="status"/>
+                    </if>
+                    <else>
+                      <text macro="issued-year"/>
+                    </else>
+                  </choose>
+                </else>
+              </choose>
+            </group>
+          </else-if>
+          <else-if type="entry-encyclopedia" match="any">
             <group delimiter=", ">
               <text macro="author"/>
               <text macro="title"/>
-              <group>
-                <text macro="container-title"/>
-                <text variable="edition" vertical-align="sup"/>
-              </group>
               <text macro="volume"/>
               <choose>
-                <if match="none" variable="publisher-place issued">
-                  <text value="s.l.n.d." prefix="[" suffix="]"/>
+                <if match="any" variable="status">
+                  <text macro="status"/>
                 </if>
                 <else>
-                  <group delimiter=", ">
-                    <text macro="publisher"/>
-                    <text macro="publisher-place"/>
-                  </group>
-                  <group>
-                    <choose>
-                      <if match="any" variable="status">
-                        <text macro="status"/>
-                      </if>
-                      <else>
-                        <text macro="issued-year"/>
-                      </else>
-                    </choose>
-                    <text macro="year-suffix"/>
-                  </group>
+                  <text macro="issued-year"/>
                 </else>
               </choose>
               <text macro="pages"/>
@@ -559,9 +527,7 @@
             <group delimiter=", ">
               <text macro="author"/>
               <text macro="container-title"/>
-              <group delimiter="&#160;">
-                <text macro="genre"/>
-              </group>
+              <text macro="genre"/>
               <text macro="URL"/>
               <choose>
                 <if match="any" variable="issued">
@@ -571,14 +537,13 @@
                   </group>
                 </if>
               </choose>
-              <text macro="accessed"/>
             </group>
           </else-if>
           <else-if type="post-weblog" match="any">
             <group delimiter=", ">
               <text macro="author"/>
+              <text macro="title" quotes="false"/>
               <group delimiter="&#160;">
-                <text macro="title" quotes="false"/>
                 <text term="in" font-style="normal"/>
                 <text macro="container-title"/>
               </group>
@@ -591,7 +556,6 @@
                 <text value="publié le"/>
                 <text macro="issued-year-month-day"/>
               </group>
-              <text macro="accessed"/>
             </group>
           </else-if>
         </choose>
@@ -600,7 +564,6 @@
             <choose>
               <if type="webpage post-weblog" match="none">
                 <text macro="URL"/>
-                <text macro="accessed"/>
               </if>
             </choose>
           </if>
diff --git a/buildres/csl/csl-styles/institut-francais-darcheologie-orientale.csl b/buildres/csl/csl-styles/institut-francais-darcheologie-orientale.csl
index 416e32d96dc..6edfa836f74 100644
--- a/buildres/csl/csl-styles/institut-francais-darcheologie-orientale.csl
+++ b/buildres/csl/csl-styles/institut-francais-darcheologie-orientale.csl
@@ -7,7 +7,7 @@
     <id>http://www.zotero.org/styles/institut-francais-darcheologie-orientale</id>
     <link href="http://www.zotero.org/styles/institut-francais-darcheologie-orientale" rel="self"/>
     <link href="https://www.ifao.egnet.net/publications/publier/normes-ed/" rel="documentation"/>
-    <link href="https://www.ifao.egnet.net/uploads/publications/normes/IFAO_publications_normes_bibliographiques_pub_egypto_2021_fr.pdf" rel="documentation"/>
+    <link href="https://www.ifao.egnet.net/uploads/publications/normes/IFAO_publications_normes_bibliographiques_pub_egypto_2022_fr.pdf" rel="documentation"/>
     <author>
       <name>Nicolas Souchon</name>
       <email>souchon.nicolas.ns@gmail.com</email>
@@ -15,13 +15,14 @@
     <category citation-format="note"/>
     <category field="history"/>
     <summary>Feuille de style pour les publications d'archéologie et d'égyptologie de l'Institut français d'archéologie orientale</summary>
-    <updated>2021-07-07T20:27:34+00:00</updated>
+    <updated>2022-03-07T15:45:14+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="fr">
     <terms>
       <term name="no date" form="short">s.d.</term>
       <term name="sub-verbo" form="short">s.v.</term>
+      <term name="in">dans</term>
     </terms>
   </locale>
   <macro name="title">
@@ -45,10 +46,11 @@
   </macro>
   <macro name="author">
     <names variable="author">
-      <name delimiter=", " initialize-with=".">
+      <name delimiter-precedes-et-al="never" delimiter-precedes-last="never" et-al-min="5" et-al-use-first="1" initialize-with=".">
         <name-part name="given"/>
         <name-part name="family"/>
       </name>
+      <et-al font-style="italic"/>
     </names>
   </macro>
   <macro name="author-short">
@@ -61,10 +63,11 @@
   </macro>
   <macro name="editor">
     <names variable="editor">
-      <name delimiter=", " initialize-with=".">
+      <name delimiter-precedes-et-al="never" delimiter-precedes-last="never" et-al-min="5" et-al-use-first="1" initialize-with=".">
         <name-part name="given"/>
         <name-part name="family"/>
       </name>
+      <et-al font-style="italic"/>
       <label form="short" plural="never" prefix=" (" suffix=")"/>
       <substitute>
         <text macro="container-author"/>
@@ -73,10 +76,11 @@
   </macro>
   <macro name="translator">
     <names variable="translator">
-      <name delimiter=", " initialize-with=".">
+      <name delimiter-precedes-et-al="never" delimiter-precedes-last="never" et-al-min="5" et-al-use-first="1" initialize-with=".">
         <name-part name="given" font-variant="small-caps"/>
         <name-part name="family" font-variant="small-caps"/>
       </name>
+      <et-al font-style="italic"/>
       <label form="short" plural="never" prefix=" (" suffix=")"/>
     </names>
   </macro>
@@ -125,16 +129,14 @@
       <text variable="page"/>
     </group>
   </macro>
-  <macro name="accessed">
-    <group delimiter="&#160;">
-      <text term="accessed" text-case="lowercase"/>
-      <date form="text" variable="accessed"/>
-    </group>
-  </macro>
   <macro name="issued-year-month-day">
     <choose>
       <if match="any" variable="issued">
-        <date form="text" date-parts="year-month-day" variable="issued"/>
+        <date delimiter=" " variable="issued">
+          <date-part name="day" range-delimiter="-"/>
+          <date-part name="month" range-delimiter="-"/>
+          <date-part name="year" range-delimiter="-"/>
+        </date>
       </if>
       <else>
         <text term="no date" form="short" text-case="lowercase" prefix="[" suffix="]"/>
@@ -144,7 +146,9 @@
   <macro name="issued-year">
     <choose>
       <if match="any" variable="issued">
-        <date date-parts="year" form="text" variable="issued"/>
+        <date delimiter="" variable="issued">
+          <date-part name="year" range-delimiter="-"/>
+        </date>
       </if>
       <else>
         <text term="no date" form="short" prefix="[" suffix="]"/>
@@ -152,7 +156,9 @@
     </choose>
   </macro>
   <macro name="original-date">
-    <date date-parts="year" form="text" variable="original-date"/>
+    <date delimiter="" variable="original-date">
+      <date-part name="year" range-delimiter="-"/>
+    </date>
   </macro>
   <macro name="URL">
     <text variable="URL"/>
@@ -202,8 +208,8 @@
   </macro>
   <macro name="event-date">
     <date delimiter="" variable="event-date">
-      <date-part name="day"/>
-      <date-part name="month" prefix=" "/>
+      <date-part name="day" range-delimiter="-"/>
+      <date-part name="month" range-delimiter="-" prefix=" "/>
       <date-part name="year" range-delimiter="-" prefix=" "/>
     </date>
   </macro>
@@ -286,10 +292,11 @@
   </macro>
   <macro name="container-author">
     <names variable="container-author">
-      <name initialize-with=".">
+      <name delimiter-precedes-et-al="never" delimiter-precedes-last="never" et-al-min="5" et-al-use-first="1" initialize-with=".">
         <name-part name="given" font-variant="normal"/>
         <name-part name="family" font-variant="normal"/>
       </name>
+      <et-al font-style="italic"/>
     </names>
   </macro>
   <macro name="year-suffix">
@@ -396,27 +403,13 @@
           <else-if type="chapter paper-conference" match="any">
             <group delimiter=", ">
               <text macro="author"/>
+              <text macro="title" quotes="false"/>
               <group delimiter="&#160;">
-                <text macro="title" quotes="false"/>
-                <choose>
-                  <if match="any" variable="editor container-author">
-                    <group delimiter="&#160;">
-                      <text term="in" font-style="italic"/>
-                      <text macro="editor" suffix=","/>
-                      <text macro="container-title"/>
-                      <text macro="volume"/>
-                      <text macro="original-date" prefix="(" suffix=")"/>
-                    </group>
-                  </if>
-                  <else>
-                    <group delimiter="&#160;">
-                      <text term="in"/>
-                      <text macro="container-title"/>
-                      <text macro="volume"/>
-                      <text macro="original-date" prefix="(" suffix=")"/>
-                    </group>
-                  </else>
-                </choose>
+                <text term="in" font-style="normal"/>
+                <text macro="editor" suffix=","/>
+                <text macro="container-title"/>
+                <text macro="volume"/>
+                <text macro="original-date" prefix="(" suffix=")"/>
               </group>
               <choose>
                 <if match="any" variable="genre">
@@ -485,7 +478,7 @@
                 </else>
               </choose>
               <text macro="pages"/>
-              <group delimiter="&#160;">
+              <group display="block" delimiter="&#160;">
                 <text term="sub-verbo" form="short" font-style="italic"/>
                 <text macro="title"/>
               </group>
@@ -524,7 +517,6 @@
                   </group>
                 </if>
               </choose>
-              <text macro="accessed"/>
             </group>
           </else-if>
           <else-if type="post-weblog" match="any">
@@ -544,7 +536,6 @@
                 <text value="publié le"/>
                 <text macro="issued-year-month-day"/>
               </group>
-              <text macro="accessed"/>
             </group>
           </else-if>
         </choose>
@@ -553,7 +544,6 @@
             <choose>
               <if type="webpage post-weblog" match="none">
                 <text macro="URL"/>
-                <text macro="accessed"/>
               </if>
             </choose>
           </if>
diff --git a/buildres/csl/csl-styles/interkulturelle-germanistik-gottingen.csl b/buildres/csl/csl-styles/interkulturelle-germanistik-gottingen.csl
new file mode 100644
index 00000000000..f62b92e06b1
--- /dev/null
+++ b/buildres/csl/csl-styles/interkulturelle-germanistik-gottingen.csl
@@ -0,0 +1,287 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" name-delimiter="/" demote-non-dropping-particle="never" default-locale="de-DE">
+  <!-- This style was edited with the Visual CSL Editor (https://editor.citationstyles.org/visualEditor/) -->
+  <info>
+    <title>Interkulturelle Germanistik Göttingen (Deutsch)</title>
+    <title-short>IKGoe</title-short>
+    <id>http://www.zotero.org/styles/interkulturelle-germanistik-gottingen</id>
+    <link href="http://www.zotero.org/styles/interkulturelle-germanistik-gottingen" rel="self"/>
+    <link href="http://www.zotero.org/styles/open-gender-journal" rel="template"/>
+    <link href="https://www.uni-goettingen.de/de/document/download/a0a0b1c0a7c078514d67fb2d8eae354c.pdf/Formatierungsvorgaben%20f%C3%BCr%20Seminar-%20und%20Masterarbeiten.pdf" rel="documentation"/>
+    <author>
+      <name>Leslie Wathsack</name>
+      <email>leslie.wathsack@uni-goettingen.de</email>
+    </author>
+    <category citation-format="author-date"/>
+    <category field="social_science"/>
+    <published>2022-03-12T14:07:07+00:00</published>
+    <updated>2022-02-14T14:07:07+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="de">
+    <terms>
+      <term name="accessed">zuletzt geprüft am</term>
+      <term name="et-al">et al.</term>
+      <term name="presented at">Paper präsentiert bei der</term>
+      <term name="anonymous" form="long">Ohne Verfasser</term>
+      <term name="anonymous" form="short">O.V.</term>
+      <term name="editor" form="short">Hg.</term>
+    </terms>
+  </locale>
+  <macro name="container">
+    <choose>
+      <if type="chapter paper-conference" match="any">
+        <text term="in" text-case="capitalize-first" suffix=": "/>
+        <names variable="editor translator" delimiter=", " suffix=": ">
+          <name delimiter-precedes-last="always" initialize-with="." name-as-sort-order="all"/>
+          <label form="short" text-case="capitalize-first" prefix=" (" suffix=")"/>
+        </names>
+        <group delimiter=", ">
+          <text variable="container-title" text-case="title"/>
+          <text variable="collection-title" text-case="title"/>
+        </group>
+      </if>
+      <else-if type="book graphic legal_case motion_picture report song" match="any">
+        <group delimiter=", ">
+          <text variable="container-title"/>
+          <text variable="collection-title"/>
+        </group>
+      </else-if>
+      <else-if type="article-journal article-magazine article-newspaper article" match="any">
+        <group delimiter=", ">
+          <group delimiter=" ">
+            <group delimiter=": ">
+              <text term="in" text-case="capitalize-first"/>
+              <group delimiter=", ">
+                <text variable="container-title"/>
+                <text variable="collection-title"/>
+              </group>
+            </group>
+            <text variable="volume"/>
+            <text variable="issue" prefix="(" suffix=")"/>
+          </group>
+          <text variable="page"/>
+        </group>
+      </else-if>
+      <else-if type="bill legislation" match="any">
+        <group delimiter=" ">
+          <group delimiter=", ">
+            <group delimiter=" ">
+              <text variable="container-title"/>
+              <text variable="volume"/>
+              <group delimiter="/">
+                <text variable="number"/>
+                <date date-parts="year" form="numeric" variable="issued"/>
+              </group>
+            </group>
+            <text variable="page"/>
+          </group>
+          <group delimiter=" ">
+            <text value="in der Fassung"/>
+            <text variable="references"/>
+          </group>
+        </group>
+      </else-if>
+      <else>
+        <group delimiter=", ">
+          <text variable="container-title"/>
+          <text variable="collection-title"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name delimiter-precedes-last="always" initialize="false" initialize-with="." name-as-sort-order="all"/>
+      <label form="short" prefix=" (" suffix=")" text-case="capitalize-first"/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <text variable="title"/>
+        <group>
+          <text term="anonymous" form="short"/>
+        </group>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="author-short">
+    <names variable="author">
+      <name form="short" initialize-with=". "/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <text variable="title" form="short"/>
+        <group>
+          <text term="anonymous" form="short"/>
+        </group>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if variable="DOI">
+        <text variable="DOI" prefix="doi: "/>
+      </if>
+      <else-if type="webpage post post-weblog" match="any">
+        <group delimiter=": ">
+          <text term="online" text-case="capitalize-first"/>
+          <group delimiter=", ">
+            <text variable="URL"/>
+            <text term="accessed"/>
+          </group>
+          <date form="text" variable="accessed"/>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="report" match="any">
+        <text variable="title"/>
+        <group prefix=" (" suffix=")" delimiter=" ">
+          <text variable="genre"/>
+          <text variable="number" prefix="Nr. "/>
+        </group>
+      </if>
+      <else-if type="bill book graphic legal_case legislation motion_picture report song speech" match="any">
+        <group delimiter=". ">
+          <text variable="title"/>
+          <text variable="medium"/>
+          <text macro="edition"/>
+        </group>
+      </else-if>
+      <else-if type="webpage">
+        <text variable="title"/>
+      </else-if>
+      <else>
+        <text variable="title"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=": ">
+      <text variable="publisher-place"/>
+      <text variable="publisher"/>
+    </group>
+  </macro>
+  <macro name="event">
+    <choose>
+      <if variable="event">
+        <text term="presented at" text-case="capitalize-first" suffix=" "/>
+        <text variable="event"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="issued">
+    <choose>
+      <if variable="issued">
+        <date date-parts="year" form="numeric" variable="issued"/>
+      </if>
+      <else>
+        <text term="no date" form="short"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="edition">
+    <group delimiter=" ">
+      <choose>
+        <if is-numeric="edition">
+          <number variable="edition" form="ordinal"/>
+          <text term="edition"/>
+        </if>
+        <else>
+          <text variable="edition"/>
+        </else>
+      </choose>
+    </group>
+  </macro>
+  <macro name="locators">
+    <choose>
+      <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+        <group delimiter=", ">
+          <text macro="event"/>
+          <text macro="publisher"/>
+        </group>
+      </if>
+      <else-if type="chapter paper-conference" match="any">
+        <group delimiter=", ">
+          <text macro="event"/>
+          <text macro="publisher"/>
+          <text macro="pages"/>
+        </group>
+      </else-if>
+      <else-if type="patent">
+        <text variable="number"/>
+      </else-if>
+      <else-if type="thesis" match="any">
+        <group delimiter=". ">
+          <text macro="publisher"/>
+          <text variable="genre"/>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="pages">
+    <text variable="page"/>
+  </macro>
+  <macro name="author-year-title">
+    <group delimiter=": ">
+      <group>
+        <choose>
+          <if type="bill" match="any">
+            <choose>
+              <if match="none" variable="author editor">
+                <text variable="title-short"/>
+              </if>
+              <else>
+                <text macro="author"/>
+              </else>
+            </choose>
+          </if>
+          <else>
+            <text macro="author"/>
+          </else>
+        </choose>
+        <text macro="issued" prefix=" (" suffix=")"/>
+      </group>
+      <text macro="title"/>
+    </group>
+  </macro>
+  <citation et-al-min="4" et-al-use-first="1" disambiguate-add-givenname="true" disambiguate-add-year-suffix="true" collapse="year">
+    <sort>
+      <key macro="author"/>
+      <key macro="issued" sort="descending"/>
+    </sort>
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <group delimiter=", ">
+        <group delimiter=" ">
+          <choose>
+            <if type="legislation" match="any">
+              <text variable="title-short"/>
+            </if>
+            <else>
+              <text macro="author-short"/>
+            </else>
+          </choose>
+          <text macro="issued"/>
+        </group>
+        <text variable="locator"/>
+      </group>
+    </layout>
+  </citation>
+  <bibliography initialize="false" entry-spacing="0" hanging-indent="true">
+    <sort>
+      <key macro="author"/>
+      <key macro="issued" sort="descending"/>
+      <key macro="title"/>
+    </sort>
+    <layout suffix=".">
+      <group delimiter=": ">
+        <text macro="author-year-title"/>
+        <text macro="container"/>
+        <text macro="locators"/>
+      </group>
+      <text macro="access" prefix=". "/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/buildres/csl/csl-styles/international-journal-of-cosmetic-science.csl b/buildres/csl/csl-styles/international-journal-of-cosmetic-science.csl
new file mode 100644
index 00000000000..3db494448c5
--- /dev/null
+++ b/buildres/csl/csl-styles/international-journal-of-cosmetic-science.csl
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" page-range-format="minimal" demote-non-dropping-particle="sort-only" default-locale="en-US">
+  <info>
+    <title>International Journal of Cosmetic Science</title>
+    <id>http://www.zotero.org/styles/international-journal-of-cosmetic-science</id>
+    <link href="http://www.zotero.org/styles/international-journal-of-cosmetic-science" rel="self"/>
+    <link href="http://www.zotero.org/styles/institute-of-mathematical-statistics" rel="template"/>
+    <link href="https://onlinelibrary.wiley.com/page/journal/14682494/homepage/forauthors.html" rel="documentation"/>
+    <author>
+      <name>Patrick O'Brien</name>
+      <email>obrienpat86@gmail.com</email>
+    </author>
+    <category citation-format="numeric"/>
+    <category field="medicine"/>
+    <issn>0142-5463</issn>
+    <eissn>1468-2494</eissn>
+    <updated>2022-02-24T14:20:31+00:00</updated>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
+  </info>
+  <locale xml:lang="en">
+    <terms>
+      <term name="et-al">et al</term>
+      <term name="editor" form="short">ed</term>
+    </terms>
+  </locale>
+  <macro name="editor">
+    <names variable="editor" delimiter=", ">
+      <name and="text" delimiter-precedes-last="never" initialize-with="" name-as-sort-order="all" sort-separator=" "/>
+      <label strip-periods="false" prefix=", "/>
+    </names>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name and="text" initialize-with="" name-as-sort-order="all" sort-separator=" "/>
+      <et-al font-style="italic"/>
+      <label form="short" prefix=", "/>
+      <substitute>
+        <names variable="editor"/>
+        <text variable="title"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+        <text variable="title" font-style="italic"/>
+      </if>
+      <else>
+        <text variable="title" suffix="."/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <group delimiter="; ">
+      <group delimiter=": ">
+        <text variable="publisher"/>
+        <text variable="publisher-place"/>
+      </group>
+      <text macro="year-date"/>
+    </group>
+  </macro>
+  <macro name="volume">
+    <group delimiter=" ">
+      <text term="volume" form="short" text-case="capitalize-first" strip-periods="true"/>
+      <text variable="volume"/>
+    </group>
+  </macro>
+  <macro name="year-date">
+    <date date-parts="year" form="text" variable="issued"/>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if type="article-journal" match="any">
+        <choose>
+          <if match="none" variable="page volume">
+            <text variable="DOI" prefix="doi:"/>
+          </if>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <citation collapse="citation-number">
+    <sort>
+      <key variable="citation-number"/>
+    </sort>
+    <layout delimiter=", " prefix="[" suffix="]">
+      <text variable="citation-number"/>
+    </layout>
+  </citation>
+  <bibliography et-al-min="11" et-al-use-first="10" second-field-align="flush">
+    <layout>
+      <text variable="citation-number" suffix="."/>
+      <group delimiter=". " prefix=" " suffix=".">
+        <text macro="author"/>
+        <text macro="title"/>
+        <choose>
+          <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+            <group delimiter=" " prefix=" ">
+              <group delimiter=", ">
+                <text macro="volume"/>
+                <text macro="editor"/>
+              </group>
+              <text macro="publisher"/>
+            </group>
+          </if>
+          <else-if type="chapter paper-conference" match="any">
+            <group delimiter=". ">
+              <group delimiter=": ">
+                <text term="in" text-case="capitalize-first" prefix=" "/>
+                <text macro="editor"/>
+              </group>
+              <group delimiter=", ">
+                <text variable="container-title" font-style="italic"/>
+                <text variable="collection-title"/>
+                <text variable="event"/>
+                <text macro="volume"/>
+              </group>
+              <text macro="publisher"/>
+            </group>
+          </else-if>
+          <else-if type="thesis">
+            <group delimiter=", ">
+              <text variable="genre"/>
+              <text macro="publisher"/>
+            </group>
+          </else-if>
+          <else-if type="webpage post-weblog post" match="any">
+            <group delimiter=". ">
+              <text variable="container-title"/>
+              <group delimiter=" ">
+                <text term="available at" text-case="capitalize-first"/>
+                <text variable="URL"/>
+              </group>
+            </group>
+          </else-if>
+          <else>
+            <group delimiter=". ">
+              <text variable="container-title" form="short" strip-periods="true" font-style="normal"/>
+              <group delimiter=";">
+                <text macro="year-date"/>
+                <group delimiter=":">
+                  <group>
+                    <text variable="volume" font-weight="normal"/>
+                    <text variable="issue" prefix="(" suffix=")"/>
+                  </group>
+                  <text variable="page"/>
+                </group>
+              </group>
+            </group>
+          </else>
+        </choose>
+      </group>
+      <text macro="access"/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/buildres/csl/csl-styles/international-journal-of-wildland-fire.csl b/buildres/csl/csl-styles/international-journal-of-wildland-fire.csl
index 7aec31872a2..c5bbd000006 100644
--- a/buildres/csl/csl-styles/international-journal-of-wildland-fire.csl
+++ b/buildres/csl/csl-styles/international-journal-of-wildland-fire.csl
@@ -110,7 +110,7 @@
     <group>
       <choose>
         <if type="article-journal">
-          <text variable="container-title" strip-periods="true"/>
+          <text variable="container-title" text-case="title" strip-periods="true"/>
         </if>
         <else>
           <text variable="container-title" form="short"/>
diff --git a/buildres/csl/csl-styles/isnad-dipnotlu.csl b/buildres/csl/csl-styles/isnad-dipnotlu.csl
index 5f363c76d2c..b9b1a3f6c4d 100644
--- a/buildres/csl/csl-styles/isnad-dipnotlu.csl
+++ b/buildres/csl/csl-styles/isnad-dipnotlu.csl
@@ -17,11 +17,11 @@
     <category field="humanities"/>
     <category field="social_science"/>
     <summary>ISNAD Citation Style full notes and bibliography format.</summary>
-    <updated>2020-04-08T12:59:16+00:00</updated>
+    <updated>2022-05-31T12:59:16+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <!--
-	ISNAD FULL NOTES v.1.1
+	ISNAD FULL NOTES v.1.2
 
 	Document Type Mappings
 	ISNAD				CSL
@@ -51,14 +51,14 @@
 	Interview			interview
 	Interview			article-journal, article-magazine, article-newspaper, book (as collection-title with interviewer extra)
 	Legislation			legislation (with code number for official journal)
-	Legislation			legislation (without code number other legal sources) 
-	Standart			book
+	Legislation			legislation (without code number other legal sources)
+	Standard			standard (For backward compability book with issued, collection-number, authority)
 	Case				legal_case
 	Website				webpage
 	Databese			webpage
 	Software			book (with version number)
 	Patent				patent
-	Socail media		webpage (social media title as container-title)	
+	Socail media		webpage (social media title as container-title)
 	Movie				motion_picture (with genre)
 	TV broadcast		broadcast
 	Video record		motion_picture (without genre)
@@ -303,8 +303,7 @@
               <choose>
                 <if type="entry-encyclopedia" match="none">
                   <names variable="editor">
-                    <name/>
-                    <label form="short" prefix=" (" suffix=")"/>
+                    <name form="short"/>
                   </names>
                 </if>
               </choose>
@@ -765,7 +764,14 @@
       <if type="article-journal article-magazine article-newspaper" match="any">
         <group delimiter=", ">
           <group>
-            <number suffix="/" variable="volume"/>
+            <choose>
+              <if match="all" variable="volume issue">
+                <number suffix="/" variable="volume"/>
+              </if>
+              <else>
+                <number variable="volume"/>
+              </else>
+            </choose>
             <number variable="issue"/>
           </group>
         </group>
@@ -871,7 +877,14 @@
       <if type="article-journal article-magazine article-newspaper" match="any">
         <group delimiter=", ">
           <group>
-            <number suffix="/" variable="volume"/>
+            <choose>
+              <if match="all" variable="volume issue">
+                <number suffix="/" variable="volume"/>
+              </if>
+              <else>
+                <number variable="volume"/>
+              </else>
+            </choose>
             <number variable="issue"/>
           </group>
         </group>
@@ -1038,7 +1051,17 @@
               <if is-uncertain-date="issued">
                 <date variable="issued" form="numeric" date-parts="year" prefix="[" suffix="?]"/>
               </if>
-              <else-if type="book" variable="issued collection-number">
+              <else-if type="standard">
+                <choose>
+                  <if variable="collection-title" match="none">
+                    <group delimiter=", ">
+                      <date date-parts="year" form="numeric" variable="issued"/>
+                      <text variable="collection-number"/>
+                    </group>
+                  </if>
+                </choose>
+              </else-if>
+              <else-if type="book" variable="issued collection-number authority">
                 <choose>
                   <if variable="collection-title" match="none">
                     <group delimiter=", ">
diff --git a/buildres/csl/csl-styles/isnad-metinici.csl b/buildres/csl/csl-styles/isnad-metinici.csl
index b622aea27c4..552bf336a9a 100644
--- a/buildres/csl/csl-styles/isnad-metinici.csl
+++ b/buildres/csl/csl-styles/isnad-metinici.csl
@@ -21,7 +21,7 @@
     <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>
   <!--
-	ISNAD AUTHOR-DATE v.1.0
+	ISNAD AUTHOR-DATE v.1.1
 
 	Document Type Mappings
 	ISNAD				CSL
@@ -51,8 +51,8 @@
 	Interview			interview
 	Interview			article-journal, article-magazine, article-newspaper, book (as collection-title with interviewer extra)
 	Legislation			legislation (with code number for official journal)
-	Legislation			legislation (without code number other legal sources) 
-	Standart			book
+	Legislation			legislation (without code number other legal sources)
+	Standard			standard (For backward compability book with issued, collection-number, authority)
 	Case				legal_case
 	Website				webpage
 	Databese			webpage
@@ -601,7 +601,14 @@
       <if type="article-journal article-magazine article-newspaper" match="any">
         <group delimiter=", ">
           <group>
-            <number suffix="/" variable="volume"/>
+            <choose>
+              <if match="all" variable="volume issue">
+                <number suffix="/" variable="volume"/>
+              </if>
+              <else>
+                <number variable="volume"/>
+              </else>
+            </choose>
             <number variable="issue"/>
           </group>
         </group>
@@ -736,7 +743,17 @@
               <if is-uncertain-date="issued">
                 <date variable="issued" form="numeric" date-parts="year" prefix="[" suffix="?]"/>
               </if>
-              <else-if type="book" variable="issued collection-number">
+              <else-if type="standard">
+                <choose>
+                  <if variable="collection-title" match="none">
+                    <group delimiter=", ">
+                      <date date-parts="year" form="numeric" variable="issued"/>
+                      <text variable="collection-number"/>
+                    </group>
+                  </if>
+                </choose>
+              </else-if>
+              <else-if type="book" variable="issued collection-number authority">
                 <choose>
                   <if variable="collection-title" match="none">
                     <group delimiter=", ">
diff --git a/buildres/csl/csl-styles/iso690-author-date-en.csl b/buildres/csl/csl-styles/iso690-author-date-en.csl
index 91ce883ef4b..bb4fed3090c 100644
--- a/buildres/csl/csl-styles/iso690-author-date-en.csl
+++ b/buildres/csl/csl-styles/iso690-author-date-en.csl
@@ -21,7 +21,7 @@
     <category citation-format="author-date"/>
     <category field="generic-base"/>
     <summary>Style based on ISO 690:2010(E), v1.1</summary>
-    <updated>2020-11-19T21:30:00+00:00</updated>
+    <updated>2022-03-21T10:00:00+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <locale>
@@ -118,7 +118,7 @@
       <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"/>
+            <text variable="title" font-style="italic" suffix=". "/>
           </if>
           <else>
             <text variable="title" font-style="italic" suffix=", "/>
@@ -153,10 +153,10 @@
         </choose>
         <choose>
           <if variable="container-title">
-            <text variable="container-title" font-style="italic"/>
+            <text variable="container-title" font-style="italic" suffix="."/>
           </if>
           <else>
-            <text variable="event" font-style="italic"/>
+            <text variable="event" font-style="italic" suffix="."/>
           </else>
         </choose>
       </else-if>
@@ -176,7 +176,7 @@
       <else-if type="patent">
         <choose>
           <if variable="author editor translator" match="any">
-            <text variable="title"/>
+            <text variable="title" suffix="."/>
           </if>
           <else>
             <text variable="title" suffix=", "/>
@@ -187,7 +187,7 @@
       <else>
         <choose>
           <if variable="author editor translator" match="any">
-            <text variable="title" font-style="italic"/>
+            <text variable="title" font-style="italic" suffix="."/>
           </if>
           <else>
             <text variable="title" font-style="italic" suffix=", "/>
@@ -198,7 +198,7 @@
     </choose>
     <choose>
       <if variable="URL">
-        <text term="online" prefix=" [" suffix="]"/>
+        <text term="online" text-case="capitalize-first" prefix=" "/>
       </if>
     </choose>
   </macro>
@@ -304,12 +304,16 @@
   </macro>
   <macro name="url">
     <choose>
-      <if variable="URL">
-        <group>
-          <text term="retrieved" suffix=" " text-case="capitalize-first"/>
-          <text term="from" suffix=": "/>
-          <text variable="URL"/>
-        </group>
+      <if variable="DOI" match="none">
+        <choose>
+          <if variable="URL">
+            <group>
+              <text term="retrieved" suffix=" " text-case="capitalize-first"/>
+              <text term="from" suffix=": "/>
+              <text variable="URL"/>
+            </group>
+          </if>
+        </choose>
       </if>
     </choose>
   </macro>
@@ -453,6 +457,7 @@
             <text macro="accessed" suffix=". "/>
             <text macro="collection" suffix=". "/>
             <text macro="isbn" suffix=". "/>
+            <text macro="doi" suffix=". "/>
             <text macro="url"/>
           </group>
         </else-if>
diff --git a/buildres/csl/csl-styles/iso690-author-date-fr.csl b/buildres/csl/csl-styles/iso690-author-date-fr.csl
index 770f4f54ab8..13ad58e145f 100644
--- a/buildres/csl/csl-styles/iso690-author-date-fr.csl
+++ b/buildres/csl/csl-styles/iso690-author-date-fr.csl
@@ -24,7 +24,7 @@
     <category citation-format="author-date"/>
     <category field="generic-base"/>
     <summary>Style based on ISO 690:2010(F), V1.1</summary>
-    <updated>2020-11-19T21:30:00+00:00</updated>
+    <updated>2022-03-21T10:00:00+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <locale>
@@ -127,7 +127,7 @@
       <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"/>
+            <text variable="title" font-style="italic" suffix=". "/>
           </if>
           <else>
             <text variable="title" font-style="italic" suffix=", "/>
@@ -162,10 +162,10 @@
         </choose>
         <choose>
           <if variable="container-title">
-            <text variable="container-title" font-style="italic"/>
+            <text variable="container-title" font-style="italic" suffix="."/>
           </if>
           <else>
-            <text variable="event" font-style="italic"/>
+            <text variable="event" font-style="italic" suffix="."/>
           </else>
         </choose>
       </else-if>
@@ -185,7 +185,7 @@
       <else-if type="patent">
         <choose>
           <if variable="author editor translator" match="any">
-            <text variable="title"/>
+            <text variable="title" suffix="."/>
           </if>
           <else>
             <text variable="title" suffix=", "/>
@@ -313,12 +313,16 @@
   </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 variable="DOI" match="none">
+        <choose>
+          <if variable="URL">
+            <group>
+              <text term="retrieved" suffix=" " text-case="capitalize-first"/>
+              <text term="from" suffix=": "/>
+              <text variable="URL"/>
+            </group>
+          </if>
+        </choose>
       </if>
     </choose>
   </macro>
@@ -462,6 +466,7 @@
             <text macro="accessed" suffix=". "/>
             <text macro="collection" suffix=". "/>
             <text macro="isbn" suffix=". "/>
+            <text macro="doi" suffix=". "/>
             <text macro="url"/>
           </group>
         </else-if>
diff --git a/buildres/csl/csl-styles/iso690-numeric-en.csl b/buildres/csl/csl-styles/iso690-numeric-en.csl
index 1c6f11784b7..6a27e40259f 100644
--- a/buildres/csl/csl-styles/iso690-numeric-en.csl
+++ b/buildres/csl/csl-styles/iso690-numeric-en.csl
@@ -20,7 +20,7 @@
     <category citation-format="numeric"/>
     <category field="generic-base"/>
     <summary>Style based on ISO 690:2010(E), V1.1</summary>
-    <updated>2013-05-31T20:00:00+01:00</updated>
+    <updated>2022-03-21T10:00:00+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <locale>
@@ -116,7 +116,7 @@
   <macro name="title">
     <choose>
       <if type="book thesis map motion_picture song manuscript" match="any">
-        <text variable="title" font-style="italic"/>
+        <text variable="title" font-style="italic" suffix=". "/>
       </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">
         <text variable="title" suffix=". "/>
@@ -137,10 +137,10 @@
         </choose>
         <choose>
           <if variable="container-title">
-            <text variable="container-title" font-style="italic"/>
+            <text variable="container-title" font-style="italic" suffix="."/>
           </if>
           <else>
-            <text variable="event" font-style="italic"/>
+            <text variable="event" font-style="italic" suffix="."/>
           </else>
         </choose>
       </else-if>
@@ -149,15 +149,15 @@
         <text variable="title" font-style="italic"/>
       </else-if>
       <else-if type="patent">
-        <text variable="title"/>
+        <text variable="title" suffix="."/>
       </else-if>
       <else>
-        <text variable="title" font-style="italic"/>
+        <text variable="title" font-style="italic" suffix="."/>
       </else>
     </choose>
     <choose>
       <if variable="URL">
-        <text term="online" prefix=" [" suffix="]"/>
+        <text term="online" text-case="capitalize-first" prefix=" "/>
       </if>
     </choose>
   </macro>
@@ -266,12 +266,16 @@
   </macro>
   <macro name="url">
     <choose>
-      <if variable="URL">
-        <group>
-          <text term="retrieved" suffix=" " text-case="capitalize-first"/>
-          <text term="from" suffix=": "/>
-          <text variable="URL"/>
-        </group>
+      <if variable="DOI" match="none">
+        <choose>
+          <if variable="URL">
+            <group>
+              <text term="retrieved" suffix=" " text-case="capitalize-first"/>
+              <text term="from" suffix=": "/>
+              <text variable="URL"/>
+            </group>
+          </if>
+        </choose>
       </if>
     </choose>
   </macro>
@@ -393,6 +397,7 @@
             <text macro="accessed" suffix=". "/>
             <text macro="collection" suffix=". "/>
             <text macro="isbn" suffix=". "/>
+            <text macro="doi" suffix=". "/>
             <text macro="url"/>
           </group>
         </else-if>
diff --git a/buildres/csl/csl-styles/iso690-numeric-fr.csl b/buildres/csl/csl-styles/iso690-numeric-fr.csl
index 859d029587e..52540813769 100644
--- a/buildres/csl/csl-styles/iso690-numeric-fr.csl
+++ b/buildres/csl/csl-styles/iso690-numeric-fr.csl
@@ -20,7 +20,7 @@
     <category citation-format="numeric"/>
     <category field="generic-base"/>
     <summary>Style based on ISO 690:2010(F), V1.1</summary>
-    <updated>2020-11-19T21:30:00+00:00</updated>
+    <updated>2022-03-21T10:00:00+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <locale>
@@ -116,7 +116,7 @@
   <macro name="title">
     <choose>
       <if type="book thesis map motion_picture song manuscript" match="any">
-        <text variable="title" font-style="italic"/>
+        <text variable="title" font-style="italic" suffix=". "/>
       </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">
         <text variable="title" suffix=". "/>
@@ -137,10 +137,10 @@
         </choose>
         <choose>
           <if variable="container-title">
-            <text variable="container-title" font-style="italic"/>
+            <text variable="container-title" font-style="italic" suffix="."/>
           </if>
           <else>
-            <text variable="event" font-style="italic"/>
+            <text variable="event" font-style="italic" suffix="."/>
           </else>
         </choose>
       </else-if>
@@ -149,10 +149,10 @@
         <text variable="title" font-style="italic"/>
       </else-if>
       <else-if type="patent">
-        <text variable="title"/>
+        <text variable="title" suffix="."/>
       </else-if>
       <else>
-        <text variable="title" font-style="italic"/>
+        <text variable="title" font-style="italic" suffix="."/>
       </else>
     </choose>
     <choose>
@@ -263,12 +263,16 @@
   </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 variable="DOI" match="none">
+        <choose>
+          <if variable="URL">
+            <group>
+              <text term="retrieved" suffix=" " text-case="capitalize-first"/>
+              <text term="from" suffix=": "/>
+              <text variable="URL"/>
+            </group>
+          </if>
+        </choose>
       </if>
     </choose>
   </macro>
@@ -390,6 +394,7 @@
             <text macro="accessed" suffix=". "/>
             <text macro="collection" suffix=". "/>
             <text macro="isbn" suffix=". "/>
+            <text macro="doi" suffix=". "/>
             <text macro="url"/>
           </group>
         </else-if>
diff --git a/buildres/csl/csl-styles/journal-de-la-societe-des-oceanistes.csl b/buildres/csl/csl-styles/journal-de-la-societe-des-oceanistes.csl
index 441046c9277..709dbd73ac9 100644
--- a/buildres/csl/csl-styles/journal-de-la-societe-des-oceanistes.csl
+++ b/buildres/csl/csl-styles/journal-de-la-societe-des-oceanistes.csl
@@ -1,5 +1,6 @@
 <?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-GB">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only">
+  <!-- Polyglot; journal publishes in English, and French -->
   <info>
     <title>Journal de la Société des Océanistes</title>
     <title-short>JSO</title-short>
@@ -314,8 +315,8 @@
       <key macro="issued"/>
       <key macro="author"/>
     </sort>
-    <layout prefix="(" suffix=")" delimiter="; ">
-      <group delimiter=": ">
+    <layout prefix="(" suffix=")" delimiter="&#160;; ">
+      <group delimiter="&#160;: ">
         <group delimiter=", ">
           <text macro="author-short"/>
           <text macro="issued"/>
diff --git a/buildres/csl/csl-styles/journal-fur-medienlinguistik.csl b/buildres/csl/csl-styles/journal-fur-medienlinguistik.csl
new file mode 100644
index 00000000000..2e4376befe5
--- /dev/null
+++ b/buildres/csl/csl-styles/journal-fur-medienlinguistik.csl
@@ -0,0 +1,206 @@
+<?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="de-DE">
+  <!-- This style was edited with the Visual CSL Editor (https://editor.citationstyles.org/visualEditor/) -->
+  <info>
+    <title>Journal für Medienlinguistik (Deutsch)</title>
+    <title-short>jfml (Deutsch)</title-short>
+    <id>http://www.zotero.org/styles/journal-fur-medienlinguistik</id>
+    <link href="http://www.zotero.org/styles/journal-fur-medienlinguistik" rel="self"/>
+    <link href="http://www.zotero.org/styles/technische-universitat-dresden-linguistik" rel="template"/>
+    <link xml:lang="de" href="https://jfml.org/libraryFiles/downloadPublic/5" rel="documentation"/>
+    <author>
+      <name>Simon Meier-Vieracker</name>
+      <uri>https://tu-dresden.de/gsw/slk/germanistik/al</uri>
+      <email>simon.meier-vieracker@tu-dresden.de</email>
+    </author>
+    <category citation-format="author-date"/>
+    <category field="linguistics"/>
+    <issn>2569-6491</issn>
+    <summary>Stylesheet des Journals für Medienlinguistik (jfml)</summary>
+    <updated>2022-06-22T06:36:28+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="de-DE">
+    <terms>
+      <term name="et-al">et al.</term>
+      <term name="editor" form="short">Hg.</term>
+      <term name="online">Online unter</term>
+    </terms>
+  </locale>
+  <macro name="creator-year-long">
+    <choose>
+      <if match="none" variable="author editor">
+        <text value="o. A." suffix=" "/>
+      </if>
+    </choose>
+    <group delimiter=" ">
+      <names variable="author">
+        <name delimiter="/" name-as-sort-order="all"/>
+        <label form="short" prefix=" (" suffix=")"/>
+        <substitute>
+          <names variable="editor"/>
+        </substitute>
+      </names>
+      <date date-parts="year" form="text" variable="issued" prefix="(" suffix=")"/>
+    </group>
+  </macro>
+  <macro name="editor-container-title">
+    <group delimiter=": " suffix=" ">
+      <text term="in" text-case="capitalize-first"/>
+      <group delimiter=": " suffix=".">
+        <names variable="editor">
+          <name delimiter="/" name-as-sort-order="all"/>
+          <label form="short" prefix=" (" suffix=")"/>
+        </names>
+        <text macro="container-title"/>
+      </group>
+    </group>
+  </macro>
+  <macro name="publication-place-publisher">
+    <group delimiter=" ">
+      <group delimiter=": ">
+        <text variable="publisher-place" suffix=":"/>
+        <text variable="publisher"/>
+      </group>
+      <text macro="collection-title-number"/>
+    </group>
+  </macro>
+  <macro name="creator-year-short">
+    <group delimiter=" ">
+      <text macro="creator-short"/>
+      <date date-parts="year" form="text" variable="issued"/>
+    </group>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if match="any" is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <text term="edition"/>
+        </group>
+      </if>
+      <else>
+        <text variable="edition"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="collection-title-number">
+    <group delimiter=" " prefix=" (" suffix=")">
+      <text variable="collection-title" suffix=","/>
+      <text variable="collection-number"/>
+    </group>
+  </macro>
+  <macro name="page-range">
+    <group>
+      <text variable="page"/>
+    </group>
+  </macro>
+  <macro name="online-url">
+    <group delimiter=" ">
+      <text variable="URL"/>
+    </group>
+  </macro>
+  <macro name="container-title-volume">
+    <group delimiter=" " suffix=",">
+      <text variable="container-title" font-style="italic"/>
+      <text variable="volume"/>
+      <text variable="issue" prefix="(" suffix=")"/>
+    </group>
+  </macro>
+  <macro name="creator-short">
+    <names variable="author">
+      <name form="short" delimiter="/"/>
+      <substitute>
+        <names variable="editor"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="book" match="any">
+        <text variable="title" font-style="italic"/>
+      </if>
+      <else>
+        <text variable="title"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="container-title">
+    <choose>
+      <if type="chapter" match="any">
+        <text variable="container-title" font-style="italic"/>
+      </if>
+    </choose>
+  </macro>
+  <citation et-al-min="4" et-al-use-first="1" disambiguate-add-year-suffix="true" collapse="year-suffix">
+    <layout delimiter="; " prefix="(" suffix=")">
+      <group delimiter=", ">
+        <text macro="creator-year-short"/>
+        <group delimiter=" ">
+          <text term="page" form="symbol"/>
+          <text variable="locator"/>
+        </group>
+      </group>
+    </layout>
+  </citation>
+  <bibliography et-al-min="9" et-al-use-first="1" entry-spacing="0" hanging-indent="true">
+    <sort>
+      <key macro="creator-short"/>
+      <key macro="creator-year-short"/>
+    </sort>
+    <layout suffix=".">
+      <group delimiter=". ">
+        <group delimiter=" ">
+          <text macro="creator-year-long" suffix=":"/>
+          <text macro="title"/>
+        </group>
+        <choose>
+          <if type="book" match="any">
+            <group delimiter=". ">
+              <text macro="edition"/>
+              <text macro="publication-place-publisher"/>
+            </group>
+          </if>
+          <else-if type="article-journal article-magazine article-newspaper" match="any">
+            <group delimiter=" ">
+              <group delimiter=": ">
+                <text term="in" text-case="capitalize-first"/>
+                <text macro="container-title-volume"/>
+              </group>
+              <text macro="page-range" suffix="."/>
+              <text variable="DOI" prefix="DOI: "/>
+              <choose>
+                <if match="none" variable="DOI">
+                  <text variable="URL" prefix="URL: "/>
+                </if>
+              </choose>
+            </group>
+          </else-if>
+          <else-if type="chapter" match="any">
+            <group>
+              <text macro="editor-container-title"/>
+              <text macro="edition"/>
+              <text macro="publication-place-publisher"/>
+              <text macro="page-range" prefix=", "/>
+              <text variable="DOI" prefix=". DOI: "/>
+            </group>
+          </else-if>
+          <else-if type="dataset" match="any"/>
+          <else>
+            <group delimiter=". ">
+              <choose>
+                <if match="any" variable="container-title">
+                  <text macro="editor-container-title"/>
+                </if>
+              </choose>
+              <text macro="publication-place-publisher"/>
+              <text macro="page-range"/>
+              <text macro="collection-title-number"/>
+              <text macro="online-url"/>
+            </group>
+          </else>
+        </choose>
+      </group>
+    </layout>
+  </bibliography>
+</style>
diff --git a/buildres/csl/csl-styles/journal-of-avian-biology.csl b/buildres/csl/csl-styles/journal-of-avian-biology.csl
index 8bd45f68e4f..9c5f5f74858 100644
--- a/buildres/csl/csl-styles/journal-of-avian-biology.csl
+++ b/buildres/csl/csl-styles/journal-of-avian-biology.csl
@@ -13,7 +13,7 @@
     <category field="biology"/>
     <issn>0908-8857</issn>
     <eissn>1600-048X</eissn>
-    <updated>2014-06-10T12:00:00+00:00</updated>
+    <updated>2022-03-26T13:07:33+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <macro name="editor-translator">
@@ -39,6 +39,9 @@
     <names variable="author">
       <name name-as-sort-order="all" and="text" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="never"/>
       <label form="short" text-case="capitalize-first"/>
+      <substitute>
+        <names variable="editor"/>
+      </substitute>
     </names>
   </macro>
   <macro name="author-count">
@@ -121,62 +124,70 @@
       <key macro="author-count" names-min="3" names-use-first="3"/>
       <key variable="issued"/>
     </sort>
-    <layout>
-      <text macro="author"/>
-      <date variable="issued" prefix=" " suffix=".">
-        <date-part name="year"/>
-      </date>
-      <choose>
-        <if type="book">
-          <group suffix=".">
-            <text macro="title" prefix=" "/>
-            <text macro="editor-translator" prefix=" "/>
-          </group>
-          <text prefix=" - " suffix="." macro="publisher"/>
-        </if>
-        <else-if type="chapter">
-          <text macro="title" prefix=" "/>
-          <group prefix=". - ">
-            <text term="in" text-case="capitalize-first" suffix=": "/>
-            <names variable="editor translator">
-              <name name-as-sort-order="all" and="text" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="never" et-al-min="3" et-al-use-first="1"/>
-              <label form="short" prefix=" (" suffix=")," strip-periods="true"/>
-            </names>
-            <text variable="container-title" prefix=" " suffix="."/>
-            <text macro="edition" prefix=" "/>
-            <text variable="collection-title" prefix=" " suffix="."/>
-            <group suffix=".">
-              <text macro="publisher" prefix=" " suffix=","/>
-              <text macro="page-chapter" prefix=" "/>
+    <layout suffix=".">
+      <group delimiter=". ">
+        <text macro="author"/>
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
+        <text macro="title" prefix=" "/>
+        <choose>
+          <if type="book">
+            <group delimiter=". ">
+              <text macro="editor-translator"/>
+              <text prefix="&#8211; " macro="publisher"/>
             </group>
-          </group>
-        </else-if>
-        <else-if type="article article-journal review" match="any">
-          <group suffix=".">
-            <text macro="title" prefix=" "/>
-            <text macro="editor-translator" prefix=" "/>
-          </group>
-          <text variable="container-title" form="short" prefix=" - "/>
-          <choose>
-            <if variable="page">
-              <text variable="volume" prefix=" "/>
-              <text variable="page" prefix=": " suffix="."/>
-            </if>
-            <else>
-              <text term="in press" prefix=" " suffix="."/>
-            </else>
-          </choose>
-        </else-if>
-        <else>
-          <group suffix=".">
-            <text macro="title" prefix=" "/>
+          </if>
+          <else-if type="chapter">
+            <group delimiter=". ">
+              <group delimiter=", " prefix=" &#8211; ">
+                <group delimiter=": ">
+                  <text term="in" text-case="capitalize-first"/>
+                  <names variable="editor translator">
+                    <name name-as-sort-order="all" and="text" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="never" et-al-min="3" et-al-use-first="1"/>
+                    <label form="short" prefix=" (" suffix=")," strip-periods="true"/>
+                  </names>
+                </group>
+                <text variable="container-title"/>
+                <text macro="edition"/>
+                <text variable="collection-title"/>
+              </group>
+              <group delimiter=", ">
+                <text macro="publisher"/>
+                <text macro="page-chapter"/>
+              </group>
+            </group>
+          </else-if>
+          <else-if type="article article-journal review" match="any">
+            <group delimiter=" ">
+              <text variable="container-title" form="short" prefix=" &#8211; "/>
+              <choose>
+                <if variable="page">
+                  <group delimiter=": ">
+                    <text variable="volume"/>
+                    <text variable="page"/>
+                  </group>
+                </if>
+                <else>
+                  <text variable="DOI" prefix=" &lt;https://doi.org/" suffix=">"/>
+                </else>
+              </choose>
+            </group>
+          </else-if>
+          <else-if type="thesis" match="any">
+            <group delimiter=", " prefix=" &#8211; ">
+              <text variable="genre"/>
+              <text variable="publisher"/>
+            </group>
+          </else-if>
+          <else>
             <text macro="editor-translator" prefix=" "/>
-          </group>
-          <text variable="container-title" form="short" prefix=" - "/>
-          <text variable="volume" prefix=" "/>
-          <text variable="page" prefix=": " suffix="."/>
-        </else>
-      </choose>
+            <text variable="container-title" form="short" prefix=" &#8211; "/>
+            <text variable="volume" prefix=" "/>
+            <text variable="page" prefix=": "/>
+          </else>
+        </choose>
+      </group>
     </layout>
   </bibliography>
 </style>
diff --git a/buildres/csl/csl-styles/journal-of-contemporary-water-research-and-education.csl b/buildres/csl/csl-styles/journal-of-contemporary-water-research-and-education.csl
new file mode 100644
index 00000000000..69c1a18ef17
--- /dev/null
+++ b/buildres/csl/csl-styles/journal-of-contemporary-water-research-and-education.csl
@@ -0,0 +1,625 @@
+<?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="display-and-sort" page-range-format="chicago">
+  <info>
+    <title>Journal of Contemporary Water Research and Education</title>
+    <title-short>JCWRE</title-short>
+    <id>http://www.zotero.org/styles/journal-of-contemporary-water-research-and-education</id>
+    <link href="http://www.zotero.org/styles/journal-of-contemporary-water-research-and-education" rel="self"/>
+    <link href="http://www.zotero.org/styles/chicago-author-date" rel="template"/>
+    <link href="https://ucowr.org/wp-content/uploads/2020/11/Original-Research-Article-Author-Instructions.pdf" rel="documentation"/>
+    <author>
+      <name>Michael Schramm</name>
+      <email>mpschramm@gmail.com</email>
+    </author>
+    <category citation-format="author-date"/>
+    <category field="generic-base"/>
+    <issn>1936-704X</issn>
+    <summary>A style for the Journal of Contemporary Water Research and Education.</summary>
+    <updated>2022-03-30T20:25:47+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 entry-dictionary entry-encyclopedia paper-conference" match="none">
+        <group delimiter=". ">
+          <names variable="editor translator" delimiter=". ">
+            <label form="verb" text-case="capitalize-first" suffix=" "/>
+            <name and="text" delimiter=", "/>
+          </names>
+          <names variable="director" delimiter=". ">
+            <label form="verb" text-case="capitalize-first" suffix=" "/>
+            <name and="text" delimiter=", "/>
+          </names>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="container-contributors">
+    <choose>
+      <if type="chapter entry-dictionary entry-encyclopedia 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=", ">
+            <name and="text" delimiter=", "/>
+            <label form="short" text-case="capitalize-first" prefix=" (" suffix=")"/>
+          </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-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"/>
+          <names variable="director"/>
+          <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" et-al-min="11" initialize-with=". "/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <names variable="director"/>
+        <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 type="legal_case" match="none">
+          <choose>
+            <if variable="DOI">
+              <text variable="DOI" prefix="DOI: "/>
+            </if>
+            <else>
+              <text variable="URL" prefix="Available at: "/>
+            </else>
+          </choose>
+        </if>
+      </choose>
+      <choose>
+        <if type="webpage post-weblog" match="any">
+          <date form="text" variable="issued" prefix="Accessed "/>
+        </if>
+      </choose>
+      <choose>
+        <if variable="issued" match="none">
+          <group delimiter=" ">
+            <text term="accessed" text-case="capitalize-first"/>
+            <date form="text" variable="accessed"/>
+          </group>
+        </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 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">
+        <choose>
+          <if variable="reviewed-title">
+            <group delimiter=". ">
+              <text variable="title" text-case="title" quotes="true"/>
+              <group delimiter=", ">
+                <text variable="reviewed-title" text-case="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>
+            </group>
+          </if>
+          <else>
+            <group delimiter=", ">
+              <text variable="title" text-case="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>
+        </choose>
+      </else-if>
+      <else-if type="legal_case interview patent" 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" text-case="capitalize-first" prefix=". "/>
+          </else>
+        </choose>
+      </if>
+      <else-if type="chapter entry-dictionary entry-encyclopedia 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 entry-dictionary entry-encyclopedia 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 entry-dictionary entry-encyclopedia paper-conference" match="any">
+        <choose>
+          <if variable="page">
+            <group prefix=", ">
+              <label suffix=" " variable="page" form="short"/>
+              <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" suffix=":"/>
+  </macro>
+  <macro name="container-title">
+    <choose>
+      <if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
+        <text macro="container-prefix" suffix=" "/>
+      </if>
+    </choose>
+    <choose>
+      <if type="webpage">
+        <text variable="container-title" text-case="title"/>
+      </if>
+      <else-if type="legal_case" match="none">
+        <group delimiter=" ">
+          <text variable="container-title" text-case="title" font-style="italic"/>
+          <choose>
+            <if type="post-weblog">
+              <text value="(blog)"/>
+            </if>
+          </choose>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=", ">
+      <text variable="publisher"/>
+      <text variable="publisher-place"/>
+    </group>
+  </macro>
+  <macro name="date">
+    <choose>
+      <if variable="issued">
+        <group delimiter=" ">
+          <date variable="original-date" form="text" date-parts="year" prefix="(" suffix=")"/>
+          <date variable="issued">
+            <date-part name="year"/>
+          </date>
+        </group>
+      </if>
+      <else-if variable="status">
+        <text variable="status" text-case="capitalize-first"/>
+      </else-if>
+      <else>
+        <text term="no date" form="short"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="date-in-text">
+    <choose>
+      <if variable="issued">
+        <group delimiter=" ">
+          <date variable="original-date" form="text" date-parts="year" prefix="[" suffix="]"/>
+          <date variable="issued">
+            <date-part name="year"/>
+          </date>
+        </group>
+      </if>
+      <else-if variable="status">
+        <text variable="status"/>
+      </else-if>
+      <else>
+        <text term="no date" form="short"/>
+      </else>
+    </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 delimiter=" ">
+      <choose>
+        <if variable="genre">
+          <text term="presented at"/>
+        </if>
+        <else>
+          <text term="presented at" text-case="capitalize-first"/>
+        </else>
+      </choose>
+      <text variable="event"/>
+    </group>
+  </macro>
+  <macro name="description">
+    <choose>
+      <if variable="interviewer" type="interview" match="any">
+        <group delimiter=". ">
+          <text macro="interviewer"/>
+          <text variable="medium" text-case="capitalize-first"/>
+        </group>
+      </if>
+      <else-if type="patent">
+        <group delimiter=" " prefix=". ">
+          <text variable="authority"/>
+          <text variable="number"/>
+        </group>
+      </else-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">
+        <date variable="issued" form="text" prefix=", "/>
+      </else-if>
+      <else-if type="patent">
+        <group delimiter=", " prefix=", ">
+          <group delimiter=" ">
+            <text value="filed"/>
+            <date variable="submitted" form="text"/>
+          </group>
+          <group delimiter=" ">
+            <choose>
+              <if variable="issued submitted" match="all">
+                <text term="and"/>
+              </if>
+            </choose>
+            <text value="issued"/>
+            <date variable="issued" form="text"/>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="article-journal" match="any"/>
+      <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" collapse="year" after-collapse-delimiter="; ">
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <group delimiter=", ">
+        <choose>
+          <if variable="issued accessed" match="any">
+            <group delimiter=" ">
+              <text macro="contributors-short"/>
+              <text macro="date-in-text"/>
+            </group>
+          </if>
+          <else>
+            <group delimiter=", ">
+              <text macro="contributors-short"/>
+              <text macro="date-in-text"/>
+            </group>
+          </else>
+        </choose>
+        <text macro="point-locators"/>
+      </group>
+    </layout>
+  </citation>
+  <bibliography hanging-indent="true" et-al-min="11" et-al-use-first="7" subsequent-author-substitute="&#8212;&#8212;&#8212;" entry-spacing="0">
+    <sort>
+      <key macro="contributors"/>
+      <key variable="issued"/>
+      <key variable="title"/>
+    </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="collection-title-journal" prefix=", " suffix=", "/>
+      <text macro="locators"/>
+      <text macro="collection-title" prefix=". "/>
+      <text macro="issue"/>
+      <text macro="locators-chapter"/>
+      <text macro="locators-article"/>
+      <text macro="access" prefix=". "/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/buildres/csl/csl-styles/journal-of-lithic-studies.csl b/buildres/csl/csl-styles/journal-of-lithic-studies.csl
new file mode 100644
index 00000000000..90bc40b7e14
--- /dev/null
+++ b/buildres/csl/csl-styles/journal-of-lithic-studies.csl
@@ -0,0 +1,193 @@
+<?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>Journal of Lithic Studies</title>
+    <id>http://www.zotero.org/styles/journal-of-lithic-studies</id>
+    <link href="http://www.zotero.org/styles/journal-of-lithic-studies" rel="self"/>
+    <link href="http://www.zotero.org/styles/permafrost-and-periglacial-processes" rel="template"/>
+    <link href="http://journals.ed.ac.uk/lithicstudies/article/view/1403/1951" rel="documentation"/>
+    <author>
+      <name>Patrick O'Brien</name>
+    </author>
+    <category citation-format="author-date"/>
+    <category field="geology"/>
+    <issn>2055-0472</issn>
+    <updated>2022-05-31T13:46:53+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="symbol" initialize-with=". " delimiter=", "/>
+      <label form="short" text-case="capitalize-first" prefix=", "/>
+    </names>
+  </macro>
+  <macro name="anon">
+    <text term="anonymous" form="short" text-case="capitalize-first" strip-periods="true"/>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with="." delimiter-precedes-last="never" delimiter=", "/>
+      <label form="short" text-case="capitalize-first" strip-periods="false" prefix=" (" suffix=")"/>
+      <substitute>
+        <names variable="editor"/>
+        <text macro="anon"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="author-short">
+    <names variable="author">
+      <name form="short" and="symbol" delimiter=", " delimiter-precedes-last="never" initialize-with=". "/>
+      <et-al font-style="italic"/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <text macro="anon"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if variable="DOI">
+        <text variable="DOI" prefix="doi:"/>
+      </if>
+      <else-if type="webpage post-weblog post" match="any">
+        <group delimiter=": ">
+          <text variable="URL" prefix="URL: "/>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="bill book graphic legal_case motion_picture report song thesis" match="any">
+        <text variable="title" font-style="italic"/>
+      </if>
+      <else>
+        <text variable="title"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=", ">
+      <text variable="publisher-place"/>
+      <text variable="publisher"/>
+    </group>
+  </macro>
+  <macro name="year-date">
+    <choose>
+      <if variable="issued">
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
+      </if>
+      <else>
+        <text term="no date" form="short"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <text term="edition" form="short"/>
+        </group>
+      </if>
+      <else>
+        <text variable="edition" suffix="."/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="pages">
+    <group delimiter=" ">
+      <label plural="never" variable="page" form="short"/>
+      <text variable="page"/>
+    </group>
+  </macro>
+  <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true">
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <group delimiter=": ">
+        <group delimiter=" ">
+          <text macro="author-short"/>
+          <text macro="year-date"/>
+        </group>
+        <group>
+          <label variable="locator" form="short"/>
+          <text variable="locator"/>
+        </group>
+      </group>
+    </layout>
+  </citation>
+  <bibliography delimiter-precedes-last="never" hanging-indent="true">
+    <sort>
+      <key macro="author"/>
+      <key variable="title"/>
+    </sort>
+    <layout>
+      <group delimiter=", ">
+        <group delimiter=" ">
+          <text macro="author"/>
+          <date variable="issued">
+            <date-part name="year"/>
+          </date>
+        </group>
+        <choose>
+          <if type="bill book graphic legal_case motion_picture report song" match="any">
+            <group delimiter=", ">
+              <text macro="title"/>
+              <text macro="edition"/>
+              <text macro="editor" prefix="(" suffix=")"/>
+              <text prefix=" " suffix="." macro="publisher"/>
+              <group delimiter=" ">
+                <text variable="number-of-pages"/>
+                <label plural="never" variable="number-of-pages" form="short"/>
+              </group>
+            </group>
+          </if>
+          <else-if type="chapter paper-conference" match="any">
+            <group delimiter=", " prefix=" ">
+              <text macro="title"/>
+              <group delimiter=" ">
+                <group delimiter=": ">
+                  <text term="in" text-case="capitalize-first"/>
+                  <text variable="container-title" font-style="italic"/>
+                </group>
+                <text macro="editor" prefix="(" suffix=")"/>
+              </group>
+              <text variable="collection-title" suffix="."/>
+              <text variable="event" suffix="."/>
+              <group delimiter=": " suffix=".">
+                <text macro="publisher" prefix=" "/>
+                <text macro="pages"/>
+              </group>
+            </group>
+          </else-if>
+          <else-if type="thesis">
+            <group delimiter=", " prefix=" " suffix=".">
+              <text macro="title"/>
+              <text variable="genre"/>
+              <text macro="publisher"/>
+            </group>
+          </else-if>
+          <else>
+            <group delimiter=", " prefix=" " suffix=".">
+              <group>
+                <text macro="title" prefix=" "/>
+                <text macro="editor" prefix=" "/>
+              </group>
+              <text variable="container-title" font-style="italic"/>
+              <group delimiter=": " prefix=" ">
+                <group>
+                  <text variable="volume"/>
+                  <text variable="issue" prefix="(" suffix=")"/>
+                </group>
+                <text variable="page"/>
+              </group>
+            </group>
+          </else>
+        </choose>
+      </group>
+      <text prefix=" " macro="access"/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/buildres/csl/csl-styles/journal-of-midwifery-science.csl b/buildres/csl/csl-styles/journal-of-midwifery-science.csl
new file mode 100644
index 00000000000..3b07cfc7161
--- /dev/null
+++ b/buildres/csl/csl-styles/journal-of-midwifery-science.csl
@@ -0,0 +1,198 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" page-range-format="minimal" demote-non-dropping-particle="sort-only" default-locale="en-GB">
+  <info>
+    <title>Journal of Midwifery Science</title>
+    <id>http://www.zotero.org/styles/journal-of-midwifery-science</id>
+    <link href="http://www.zotero.org/styles/journal-of-midwifery-science" rel="self"/>
+    <link href="http://www.zotero.org/styles/journal-of-acoustics" rel="template"/>
+    <link href="https://www.egms.de/static/en/journals/zhwi/authors.htm" rel="documentation"/>
+    <author>
+      <name>Patrick O'Brien</name>
+      <email>obrienpat86@gmail.com</email>
+    </author>
+    <category citation-format="numeric"/>
+    <category field="physics"/>
+    <issn>2366-5076</issn>
+    <updated>2022-05-05T12:56:23+00:00</updated>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
+  </info>
+  <locale xml:lang="en">
+    <terms>
+      <term name="available at">available from</term>
+      <term name="accessed">Access</term>
+    </terms>
+  </locale>
+  <macro name="author">
+    <names variable="author" suffix=". ">
+      <name delimiter-precedes-et-al="always" delimiter-precedes-last="always" initialize-with="" name-as-sort-order="all" sort-separator=" "/>
+      <label prefix=", "/>
+      <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" delimiter-precedes-et-al="never"/>
+      <label prefix=", "/>
+    </names>
+  </macro>
+  <macro name="publisher">
+    <group delimiter="; ">
+      <group delimiter=": ">
+        <text variable="publisher-place"/>
+        <text variable="publisher"/>
+      </group>
+      <text macro="date"/>
+    </group>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if match="any" type="webpage post post-weblog">
+        <group delimiter=". ">
+          <group delimiter=": " prefix="[" suffix="]">
+            <text term="accessed" text-case="capitalize-first"/>
+            <date variable="accessed">
+              <date-part name="day" prefix=" "/>
+              <date-part name="month" form="short" strip-periods="true" prefix=" "/>
+              <date-part name="year" prefix=" "/>
+            </date>
+          </group>
+          <group delimiter=": ">
+            <text term="available at" text-case="capitalize-first"/>
+            <text variable="URL"/>
+          </group>
+        </group>
+      </if>
+      <else>
+        <text variable="DOI" prefix="DOI: "/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="journal-title">
+    <choose>
+      <if type="article-journal article-magazine" match="any">
+        <text variable="container-title" form="short" strip-periods="true" suffix="."/>
+      </if>
+      <else>
+        <text variable="container-title" suffix=". "/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="title">
+    <text variable="title" text-case="title"/>
+    <choose>
+      <if type="thesis" match="any">
+        <text variable="genre" prefix=" [" suffix="]"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <text term="edition" form="short"/>
+        </group>
+      </if>
+      <else>
+        <text variable="edition" suffix="."/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="date">
+    <choose>
+      <if type="report" match="any">
+        <date variable="issued">
+          <date-part name="year"/>
+          <date-part name="month" form="short" prefix=" "/>
+        </date>
+      </if>
+      <else-if type="patent" match="any">
+        <date variable="issued">
+          <date-part name="year"/>
+          <date-part name="month" form="short"/>
+          <date-part name="day" prefix=" "/>
+        </date>
+      </else-if>
+      <else>
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
+      </else>
+    </choose>
+  </macro>
+  <citation collapse="citation-number">
+    <sort>
+      <key variable="citation-number"/>
+    </sort>
+    <layout delimiter="," prefix="[" suffix="]">
+      <text variable="citation-number"/>
+    </layout>
+  </citation>
+  <bibliography et-al-min="7" et-al-use-first="6" second-field-align="flush">
+    <sort>
+      <key macro="author"/>
+      <key variable="issued"/>
+    </sort>
+    <layout suffix=".">
+      <text variable="citation-number" suffix="."/>
+      <text macro="author"/>
+      <text macro="title" suffix=". "/>
+      <choose>
+        <if type="bill book graphic legal_case legislation motion_picture song thesis" match="any">
+          <group delimiter=" " prefix=" ">
+            <text macro="edition"/>
+            <text macro="publisher"/>
+          </group>
+        </if>
+        <else-if type="chapter paper-conference" match="any">
+          <group prefix=" " suffix=".">
+            <text term="in" suffix=": " text-case="capitalize-first"/>
+            <text macro="editor" suffix=". "/>
+            <text variable="container-title" text-case="title" font-style="normal"/>
+          </group>
+          <group delimiter=". " prefix=" ">
+            <text macro="publisher"/>
+            <group delimiter=" ">
+              <label plural="never" variable="page" form="short"/>
+              <text variable="page"/>
+            </group>
+          </group>
+        </else-if>
+        <else-if type="report patent" match="any">
+          <group delimiter=". ">
+            <text macro="publisher"/>
+            <group delimiter=" ">
+              <choose>
+                <if type="report" match="any">
+                  <text value="" prefix="Report No.: "/>
+                </if>
+                <else-if type="patent" match="any">
+                  <text variable="authority"/>
+                </else-if>
+              </choose>
+              <text variable="number"/>
+            </group>
+          </group>
+        </else-if>
+        <else>
+          <text macro="journal-title"/>
+          <group delimiter=";" suffix=".">
+            <date variable="issued" prefix=" ">
+              <date-part name="year"/>
+            </date>
+            <group delimiter=":">
+              <group>
+                <text variable="volume"/>
+                <text variable="issue" prefix="(" suffix=")"/>
+              </group>
+              <text variable="page"/>
+            </group>
+          </group>
+        </else>
+      </choose>
+      <text macro="access" prefix=" "/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/buildres/csl/csl-styles/journal-of-neuroimaging.csl b/buildres/csl/csl-styles/journal-of-neuroimaging.csl
new file mode 100644
index 00000000000..0aa17ec25fe
--- /dev/null
+++ b/buildres/csl/csl-styles/journal-of-neuroimaging.csl
@@ -0,0 +1,218 @@
+<?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>Journal of Neuroimaging</title>
+    <title-short>JON</title-short>
+    <id>http://www.zotero.org/styles/journal-of-neuroimaging</id>
+    <link href="http://www.zotero.org/styles/journal-of-neuroimaging" rel="self"/>
+    <link href="http://www.zotero.org/styles/optometry-and-vision-science" rel="template"/>
+    <link href="https://onlinelibrary.wiley.com/page/journal/15526569/homepage/forauthors.html" rel="documentation"/>
+    <author>
+      <name>Patrick O'Brien</name>
+    </author>
+    <category citation-format="numeric"/>
+    <category field="medicine"/>
+    <issn>1051-2284</issn>
+    <eissn>1552-6569</eissn>
+    <updated>2022-06-02T19:04: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>
+  <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="title">
+    <choose>
+      <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+        <text variable="title" text-case="title"/>
+      </if>
+      <else>
+        <text variable="title"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=": ">
+      <text variable="publisher-place"/>
+      <text variable="publisher"/>
+    </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"/>
+      <group prefix="(" suffix=")">
+        <label variable="locator" form="short" strip-periods="true"/>
+        <text variable="locator"/>
+      </group>
+    </layout>
+  </citation>
+  <bibliography hanging-indent="false" et-al-min="7" et-al-use-first="3" second-field-align="flush">
+    <layout>
+      <text variable="citation-number" suffix=". "/>
+      <group delimiter=". ">
+        <text macro="author"/>
+        <text macro="title"/>
+        <choose>
+          <if type="bill book graphic legislation motion_picture report song" match="any">
+            <group delimiter=" " suffix=".">
+              <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 prefix=" " macro="publisher"/>
+            <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 delimiter=" ">
+              <text term="in" text-case="capitalize-first" suffix=":"/>
+              <text macro="editor"/>
+              <text variable="container-title" suffix="." text-case="title"/>
+              <text term="volume" form="short" text-case="capitalize-first" strip-periods="true"/>
+              <text variable="volume" suffix="."/>
+              <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" 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 delimiter=" " suffix=",">
+              <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">
+            <group delimiter=". ">
+              <text variable="container-title"/>
+              <group delimiter=": ">
+                <text term="available at" text-case="capitalize-first"/>
+                <text variable="URL"/>
+              </group>
+              <group delimiter=" ">
+                <text term="accessed"/>
+                <date form="text" variable="accessed"/>
+              </group>
+            </group>
+          </else-if>
+          <else>
+            <text macro="editor" prefix=" " suffix="."/>
+            <group prefix=" " suffix=".">
+              <text variable="container-title" form="short" strip-periods="true"/>
+              <group delimiter=";" prefix=" ">
+                <choose>
+                  <if match="any" variable="issue volume">
+                    <date variable="issued">
+                      <date-part name="year"/>
+                    </date>
+                  </if>
+                  <else>
+                    <date variable="issued">
+                      <date-part name="month" suffix=" "/>
+                      <date-part name="year"/>
+                    </date>
+                  </else>
+                </choose>
+                <group>
+                  <text variable="volume"/>
+                </group>
+              </group>
+              <text variable="page" prefix=":"/>
+            </group>
+          </else>
+        </choose>
+      </group>
+    </layout>
+  </bibliography>
+</style>
diff --git a/buildres/csl/csl-styles/journal-of-neurotrauma.csl b/buildres/csl/csl-styles/journal-of-neurotrauma.csl
deleted file mode 100644
index 7188db91e76..00000000000
--- a/buildres/csl/csl-styles/journal-of-neurotrauma.csl
+++ /dev/null
@@ -1,157 +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">
-  <!-- This style was edited with the Visual CSL Editor (http://editor.citationstyles.org/visualEditor/) -->
-  <info>
-    <title>Journal of Neurotrauma</title>
-    <id>http://www.zotero.org/styles/journal-of-neurotrauma</id>
-    <link href="http://www.zotero.org/styles/journal-of-neurotrauma" rel="self"/>
-    <link href="http://www.zotero.org/styles/annals-of-neurology" rel="template"/>
-    <link href="http://www.liebertpub.com/manuscript/journal-of-neurotrauma/39/" rel="documentation"/>
-    <author>
-      <name>Sebastian Karcher</name>
-    </author>
-    <category citation-format="numeric"/>
-    <category field="medicine"/>
-    <issn>0897-7151</issn>
-    <eissn>1557-9042</eissn>
-    <updated>2013-02-18T07:18:16+00:00</updated>
-    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
-  </info>
-  <locale xml:lang="en">
-    <terms>
-      <term name="no date" form="long">date unknown</term>
-      <term name="page" form="short">
-        <single>pp.</single>
-        <multiple>pps.</multiple>
-      </term>
-    </terms>
-  </locale>
-  <macro name="author">
-    <names variable="author" suffix=".">
-      <name sort-separator=", " and="text" initialize-with="." name-as-sort-order="all" delimiter=", " delimiter-precedes-last="always"/>
-      <label form="short" prefix=" (" suffix=")" strip-periods="true"/>
-      <substitute>
-        <names variable="editor"/>
-        <names variable="translator"/>
-      </substitute>
-    </names>
-  </macro>
-  <macro name="editor">
-    <names variable="editor">
-      <name sort-separator=", " initialize-with="." name-as-sort-order="all" delimiter=", " and="text" delimiter-precedes-last="always"/>
-      <label form="short" prefix=" (" suffix="). " strip-periods="true"/>
-    </names>
-  </macro>
-  <macro name="publisher">
-    <group delimiter=", ">
-      <group delimiter=": ">
-        <text variable="publisher-place"/>
-        <text variable="publisher"/>
-      </group>
-      <choose>
-        <if type="book report" match="any">
-          <text variable="number-of-pages" suffix=" p."/>
-        </if>
-        <else-if type="chapter paper-conference" match="any">
-          <group delimiter=" ">
-            <label variable="page" form="short"/>
-            <text variable="page"/>
-          </group>
-        </else-if>
-      </choose>
-    </group>
-  </macro>
-  <macro name="date">
-    <choose>
-      <if variable="issued">
-        <date variable="issued">
-          <date-part name="year"/>
-        </date>
-      </if>
-      <else>
-        <text term="no date" prefix="[" suffix="]"/>
-      </else>
-    </choose>
-  </macro>
-  <macro name="access">
-    <group delimiter=" ">
-      <group prefix=" [" suffix="]" delimiter=" ">
-        <text term="cited"/>
-        <date variable="accessed" suffix=" ">
-          <date-part name="year"/>
-          <date-part name="month" prefix=" " form="short" strip-periods="true"/>
-          <date-part name="day" prefix=" "/>
-        </date>
-      </group>
-      <group>
-        <text value="Available from: "/>
-        <text variable="URL"/>
-      </group>
-    </group>
-  </macro>
-  <macro name="title">
-    <group delimiter=", ">
-      <text variable="title"/>
-      <choose>
-        <if type="book report" match="any">
-          <text macro="edition"/>
-        </if>
-      </choose>
-    </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 vertical-align="sup" delimiter=",">
-      <text variable="citation-number"/>
-    </layout>
-  </citation>
-  <bibliography second-field-align="flush" et-al-min="99" et-al-use-first="98">
-    <layout suffix=".">
-      <text variable="citation-number" suffix=". "/>
-      <group delimiter=". " suffix=".">
-        <text macro="author"/>
-        <text macro="date" prefix="(" suffix=")"/>
-        <text macro="title"/>
-      </group>
-      <choose>
-        <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
-          <text macro="publisher" prefix=" " suffix="."/>
-        </if>
-        <else-if type="chapter paper-conference" match="any">
-          <group prefix=", " suffix=". ">
-            <text term="in" suffix=": "/>
-            <text macro="editor"/>
-            <text variable="container-title" font-style="italic" text-case="title"/>
-            <text macro="edition" prefix=", "/>
-          </group>
-          <text macro="publisher" prefix=" "/>
-        </else-if>
-        <else>
-          <text variable="container-title" suffix=" " form="short" prefix=" "/>
-          <text variable="volume"/>
-          <text variable="page" prefix=", "/>
-        </else>
-      </choose>
-      <choose>
-        <if type="webpage">
-          <text macro="access"/>
-        </if>
-      </choose>
-    </layout>
-  </bibliography>
-</style>
diff --git a/buildres/csl/csl-styles/human-gene-therapy.csl b/buildres/csl/csl-styles/journal-of-occupational-and-environmental-medicine.csl
similarity index 83%
rename from buildres/csl/csl-styles/human-gene-therapy.csl
rename to buildres/csl/csl-styles/journal-of-occupational-and-environmental-medicine.csl
index b2f298479a9..287fbe6e1d7 100644
--- a/buildres/csl/csl-styles/human-gene-therapy.csl
+++ b/buildres/csl/csl-styles/journal-of-occupational-and-environmental-medicine.csl
@@ -1,21 +1,21 @@
 <?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>Human Gene Therapy</title>
-    <title-short>HGT</title-short>
-    <id>http://www.zotero.org/styles/human-gene-therapy</id>
-    <link href="http://www.zotero.org/styles/human-gene-therapy" rel="self"/>
-    <link href="http://www.zotero.org/styles/sage-vancouver" rel="template"/>
-    <link href="http://www.liebertpub.com/forauthors/human-gene-therapy/19/" rel="documentation"/>
+    <title>Journal of Occupational and Environmental Medicine</title>
+    <title-short>JOEM</title-short>
+    <id>http://www.zotero.org/styles/journal-of-occupational-and-environmental-medicine</id>
+    <link href="http://www.zotero.org/styles/journal-of-occupational-and-environmental-medicine" rel="self"/>
+    <link href="http://www.zotero.org/styles/cellular-and-molecular-gastroenterology-and-hepatology" rel="template"/>
+    <link href="https://journals.lww.com/joem/pages/informationforauthors.aspx" rel="documentation"/>
+    <link href="https://edmgr.ovid.com/joem/accounts/ifauth.pdf" rel="documentation"/>
     <author>
       <name>Patrick O'Brien</name>
     </author>
     <category citation-format="numeric"/>
     <category field="biology"/>
-    <category field="medicine"/>
-    <issn>1043-0342</issn>
-    <eissn>1557-7422</eissn>
-    <updated>2017-08-03T11:21:14+00:00</updated>
+    <issn>1076-2752</issn>
+    <eissn>1536-5948</eissn>
+    <updated>2022-05-09T10:16:02+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">
@@ -26,7 +26,7 @@
   <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"/>
+      <label strip-periods="true" prefix=", "/>
       <substitute>
         <names variable="editor"/>
       </substitute>
@@ -35,7 +35,7 @@
   <macro name="editor">
     <names variable="editor">
       <name sort-separator=" " initialize-with="" name-as-sort-order="all" delimiter=", " delimiter-precedes-last="always"/>
-      <label form="short" strip-periods="true" prefix=" (" suffix=")"/>
+      <label strip-periods="true" prefix=", "/>
     </names>
   </macro>
   <macro name="date">
@@ -49,7 +49,7 @@
     </choose>
   </macro>
   <macro name="publisher">
-    <group delimiter=". ">
+    <group delimiter="; ">
       <group delimiter=" ">
         <text variable="genre" text-case="title"/>
         <text variable="number"/>
@@ -108,7 +108,7 @@
   <macro name="container-title">
     <choose>
       <if type="article-journal" match="any">
-        <text variable="container-title" form="short" strip-periods="true" font-style="normal"/>
+        <text variable="container-title" form="short" strip-periods="true" font-style="italic" suffix="."/>
       </if>
       <else>
         <text variable="container-title" font-style="italic"/>
@@ -127,7 +127,7 @@
   </macro>
   <macro name="page">
     <group delimiter=" ">
-      <label variable="page" form="short"/>
+      <label plural="never" variable="page" form="short"/>
       <text variable="page"/>
     </group>
   </macro>
@@ -152,7 +152,7 @@
       <text variable="citation-number"/>
     </layout>
   </citation>
-  <bibliography delimiter-precedes-et-al="always" et-al-min="4" et-al-use-first="3" second-field-align="flush" line-spacing="2">
+  <bibliography delimiter-precedes-et-al="always" 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"/>
@@ -165,13 +165,13 @@
           </group>
         </if>
         <else-if type="chapter paper-conference" match="any">
-          <group delimiter="; " prefix=". ">
+          <group delimiter=". " prefix=". ">
             <group delimiter=". ">
               <group delimiter=" ">
                 <text term="in" suffix=":" text-case="capitalize-first"/>
                 <text macro="editor"/>
-                <text variable="container-title" font-style="normal"/>
               </group>
+              <text variable="container-title" font-style="italic"/>
               <text macro="publisher"/>
             </group>
             <text macro="page"/>
diff --git a/buildres/csl/csl-styles/journal-of-oil-palm-research.csl b/buildres/csl/csl-styles/journal-of-oil-palm-research.csl
index 4dc0816f04a..675f6612cf3 100644
--- a/buildres/csl/csl-styles/journal-of-oil-palm-research.csl
+++ b/buildres/csl/csl-styles/journal-of-oil-palm-research.csl
@@ -5,7 +5,7 @@
     <title-short>JOPR</title-short>
     <id>http://www.zotero.org/styles/journal-of-oil-palm-research</id>
     <link href="http://www.zotero.org/styles/journal-of-oil-palm-research" rel="self"/>
-    <link href="http://www.zotero.org/styles/cellular-reprogramming" rel="template"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-harvard" rel="template"/>
     <link href="http://jopr.mpob.gov.my/guide-t/" rel="documentation"/>
     <link href="http://jopr.mpob.gov.my/wp-content/uploads/2021/03/JOPR-Vol-331-March-2021-dragged-16.pdf" rel="documentation"/>
     <author>
diff --git a/buildres/csl/csl-styles/journal-on-efficiency-and-responsibility-in-education-and-science.csl b/buildres/csl/csl-styles/journal-on-efficiency-and-responsibility-in-education-and-science.csl
index 43ac15cd67d..e3387113c32 100644
--- a/buildres/csl/csl-styles/journal-on-efficiency-and-responsibility-in-education-and-science.csl
+++ b/buildres/csl/csl-styles/journal-on-efficiency-and-responsibility-in-education-and-science.csl
@@ -10,7 +10,7 @@
     <link href="https://www.eriesjournal.com/index.php/eries/about/submissions" rel="documentation"/>
     <author>
       <name>Dominik Bláha</name>
-      <email>blahad@sic.czu.cz</email>
+      <email>blahad@lib.czu.cz</email>
     </author>
     <contributor>
       <name>Igor Krejčí</name>
@@ -20,7 +20,7 @@
     <category field="humanities"/>
     <issn>2336-2375</issn>
     <eissn>1803-1617</eissn>
-    <updated>2019-04-20T15:03:39+00:00</updated>
+    <updated>2022-07-10T17:58:51+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">
@@ -618,8 +618,8 @@
       <key macro="issued-sort" sort="ascending"/>
       <key macro="title"/>
     </sort>
-    <layout suffix=".">
-      <group>
+    <layout>
+      <group suffix=".">
         <group>
           <text macro="author"/>
           <text macro="issued"/>
diff --git a/buildres/csl/csl-styles/jurisprudence.csl b/buildres/csl/csl-styles/jurisprudence.csl
new file mode 100644
index 00000000000..a7a532307bd
--- /dev/null
+++ b/buildres/csl/csl-styles/jurisprudence.csl
@@ -0,0 +1,529 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" class="note" demote-non-dropping-particle="sort-only" default-locale="cs-CZ">
+  <info>
+    <title>Jurisprudence (Čeština)</title>
+    <id>http://www.zotero.org/styles/jurisprudence</id>
+    <link href="http://www.zotero.org/styles/jurisprudence" rel="self"/>
+    <link href="http://www.zotero.org/styles/pravnik" rel="template"/>
+    <link href="https://www.jurisprudence.cz/cz/vzory-citaci.c-18.html" rel="documentation"/>
+    <author>
+      <name>Oldrich Tristan Florian</name>
+      <email>oldrich.florian@gmail.com</email>
+      <uri>http://otristan.com</uri>
+    </author>
+    <category citation-format="note"/>
+    <category field="law"/>
+    <issn>1802-3843</issn>
+    <summary>Suitable for Jurisprudence - a journal published by Charles University, Faculty of Law.</summary>
+    <updated>2022-01-17T10:00:00+00:00</updated>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
+  </info>
+  <locale xml:lang="cs">
+    <terms>
+      <term name="accessed" form="short">cit.</term>
+      <term name="ibid">ibidem</term>
+      <term name="editor" form="short">
+        <single>ed.</single>
+        <multiple>eds</multiple>
+      </term>
+      <term name="page" form="short">
+        <single>str.</single>
+        <multiple>str.</multiple>
+      </term>
+      <term name="available at">dostupné na</term>
+    </terms>
+  </locale>
+  <macro name="page-range">
+    <label variable="page" form="short" suffix=" "/>
+    <text variable="page"/>
+  </macro>
+  <macro name="locator-or-period">
+    <choose>
+      <if variable="locator" match="none">
+        <text value="."/>
+      </if>
+      <else>
+        <text prefix=", " macro="citation-locator" suffix="."/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="contributors-full">
+    <choose>
+      <if variable="author">
+        <names variable="author">
+          <name name-as-sort-order="all" sort-separator=", " delimiter=" &#8211; " initialize-with=". ">
+            <name-part name="family" text-case="uppercase"/>
+          </name>
+        </names>
+      </if>
+      <else-if variable="editor">
+        <names variable="editor">
+          <name name-as-sort-order="all" sort-separator=", " delimiter=" &#8211; " initialize-with=". ">
+            <name-part name="family" text-case="uppercase"/>
+          </name>
+          <label prefix=" (" form="short" plural="contextual" suffix=")."/>
+        </names>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="contributors-long">
+    <choose>
+      <if variable="author">
+        <names variable="author">
+          <name name-as-sort-order="all" sort-separator=", " delimiter=" &#8211; " initialize-with=". ">
+            <name-part name="family" text-case="uppercase"/>
+          </name>
+        </names>
+      </if>
+      <else-if variable="editor">
+        <names variable="editor">
+          <name name-as-sort-order="all" sort-separator=", " delimiter=" &#8211; " initialize-with=". ">
+            <name-part name="family" text-case="uppercase"/>
+          </name>
+          <label prefix=" (" form="short" plural="contextual" suffix=")."/>
+        </names>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="contributors-short">
+    <choose>
+      <if variable="author">
+        <names variable="author">
+          <name name-as-sort-order="all" sort-separator=", " delimiter=" &#8211; " initialize-with=". " form="short">
+            <name-part name="family" text-case="uppercase"/>
+          </name>
+        </names>
+      </if>
+      <else-if variable="editor">
+        <names variable="editor">
+          <name name-as-sort-order="all" sort-separator=", " delimiter=" &#8211; " initialize-with=". " form="short">
+            <name-part name="family" text-case="uppercase"/>
+          </name>
+          <label prefix=" (" form="short" plural="contextual" suffix=")."/>
+        </names>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="container-contributors">
+    <choose>
+      <if variable="container-author">
+        <names variable="container-author">
+          <name name-as-sort-order="all" sort-separator=", " delimiter=" &#8211; " initialize-with=". ">
+            <name-part name="family" text-case="uppercase"/>
+          </name>
+        </names>
+      </if>
+      <else>
+        <choose>
+          <if type="chapter paper-conference" match="any">
+            <names variable="editor">
+              <name name-as-sort-order="all" sort-separator=", " delimiter=" &#8211; " initialize-with=". ">
+                <name-part name="family" text-case="uppercase"/>
+              </name>
+              <label prefix=" (" form="short" plural="contextual" suffix=")."/>
+            </names>
+          </if>
+        </choose>
+      </else>
+    </choose>
+  </macro>
+  <macro name="container-contributors-full">
+    <choose>
+      <if variable="container-author">
+        <names variable="container-author">
+          <name name-as-sort-order="all" sort-separator=", " delimiter=" &#8211; " initialize-with=". ">
+            <name-part name="family" text-case="uppercase"/>
+          </name>
+        </names>
+      </if>
+      <else>
+        <choose>
+          <if type="chapter paper-conference" match="any">
+            <names variable="editor">
+              <name name-as-sort-order="all" sort-separator=", " delimiter=" &#8211; " initialize-with=". ">
+                <name-part name="family" text-case="uppercase"/>
+              </name>
+              <label prefix=" (" form="short" plural="contextual" suffix=")."/>
+            </names>
+          </if>
+        </choose>
+      </else>
+    </choose>
+  </macro>
+  <macro name="title-long">
+    <text variable="title"/>
+  </macro>
+  <macro name="title-short">
+    <text variable="title" form="short"/>
+  </macro>
+  <macro name="container">
+    <choose>
+      <if type="chapter entry entry-dictionary entry-encyclopedia webpage" match="any">
+        <text term="in" text-case="capitalize-first" suffix=":&#160;"/>
+        <text macro="container-contributors" suffix=". "/>
+        <choose>
+          <if variable="container-title">
+            <text variable="container-title" font-style="italic"/>
+            <text prefix=" " macro="medium"/>
+          </if>
+          <else-if variable="volume">
+            <text prefix=", " term="volume" form="short" suffix=". "/>
+            <text variable="volume"/>
+          </else-if>
+        </choose>
+      </if>
+      <else-if type="article-journal article-magazine article-newspaper" match="any">
+        <text variable="container-title" font-style="italic"/>
+        <text prefix=" " macro="medium"/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="container-full">
+    <choose>
+      <if type="chapter entry entry-dictionary entry-encyclopedia webpage" match="any">
+        <text term="in" text-case="capitalize-first" suffix=": "/>
+        <text macro="container-contributors-full" suffix=". "/>
+        <choose>
+          <if variable="container-title">
+            <text variable="container-title" font-style="italic"/>
+            <text prefix=" " macro="medium"/>
+          </if>
+          <else-if variable="volume">
+            <text prefix=", " term="volume" form="short" suffix=". "/>
+            <text variable="volume"/>
+          </else-if>
+        </choose>
+      </if>
+      <else-if type="article-journal article-magazine article-newspaper" match="any">
+        <text variable="container-title" font-style="italic"/>
+        <text prefix=" " macro="medium"/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if variable="edition">
+        <text variable="edition" suffix="."/>
+        <text prefix=" " term="edition" form="short"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="publisher-place">
+    <text variable="publisher-place"/>
+  </macro>
+  <macro name="publisher">
+    <text macro="publisher-place"/>
+  </macro>
+  <macro name="issued">
+    <choose>
+      <if type="article-journal article-magazine article-newspaper" match="any">
+        <group delimiter=", ">
+          <date variable="issued">
+            <date-part name="year" range-delimiter="&#160;&#8211;&#160;"/>
+          </date>
+          <group delimiter="&#160;">
+            <text term="volume" form="short"/>
+            <text variable="volume"/>
+          </group>
+          <group delimiter="&#160;">
+            <text term="issue" form="short"/>
+            <text variable="issue"/>
+          </group>
+        </group>
+      </if>
+      <else-if type="webpage" match="any">
+        <date variable="issued">
+          <date-part name="day" suffix=".&#160;"/>
+          <date-part name="month" suffix=".&#160;" form="numeric"/>
+          <date-part name="year"/>
+        </date>
+      </else-if>
+      <else-if type="entry entry-dictionary entry-encyclopedia thesis" match="any">
+        <date variable="issued">
+          <date-part name="year" range-delimiter="&#8211;"/>
+        </date>
+      </else-if>
+      <else>
+        <text prefix=" " macro="publisher" suffix=" "/>
+        <date variable="issued">
+          <date-part name="year" range-delimiter="&#8211;"/>
+        </date>
+      </else>
+    </choose>
+  </macro>
+  <macro name="citation-locator">
+    <label variable="locator" form="short" suffix="&#160;"/>
+    <text variable="locator"/>
+  </macro>
+  <macro name="collection">
+    <text variable="collection-title"/>
+    <text prefix=" " variable="collection-number"/>
+    <choose>
+      <if variable="collection-editor">
+        <text prefix=", " term="editor" form="verb-short" text-case="uppercase" suffix=" "/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="ISBN">
+    <choose>
+      <if variable="ISBN">
+        <text variable="ISBN" prefix="ISBN&#160;"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="identifier">
+    <choose>
+      <if variable="DOI">
+        <text variable="DOI" prefix="DOI:&#160;"/>
+      </if>
+      <else>
+        <text term="available at" text-case="capitalize-first" suffix="&#160;"/>
+        <text variable="URL" prefix="&lt;" suffix=">."/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="medium">
+    <choose>
+      <if variable="URL" match="any">
+        <choose>
+          <if variable="DOI" match="none">
+            <text term="online" prefix="[" suffix="]"/>
+          </if>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <citation et-al-min="4" et-al-use-first="1" disambiguate-add-names="true">
+    <layout delimiter="; ">
+      <choose>
+        <if position="ibid-with-locator">
+          <group delimiter=", ">
+            <text term="ibid"/>
+            <text macro="citation-locator" suffix="."/>
+          </group>
+        </if>
+        <else-if position="ibid">
+          <text term="ibid" suffix="."/>
+        </else-if>
+        <else-if position="subsequent">
+          <text macro="contributors-short" suffix=", "/>
+          <text macro="title-short" font-style="italic"/>
+          <text macro="locator-or-period"/>
+        </else-if>
+        <else>
+          <choose>
+            <if type="chapter entry entry-dictionary entry-encyclopedia" match="any">
+              <text macro="contributors-long" suffix=". "/>
+              <text macro="title-long" suffix=". "/>
+              <text macro="container"/>
+              <text prefix=". " variable="volume" text-case="capitalize-first"/>
+              <choose>
+                <if variable="URL" match="any">
+                  <text prefix=". " macro="issued"/>
+                  <text prefix=", " macro="citation-locator"/>
+                  <!--<text prefix=" " macro="quoted"/>-->
+                  <text prefix=". " macro="identifier"/>
+                </if>
+                <else-if variable="issued" match="none">
+                  <choose>
+                    <if variable="publisher publisher-place" match="any">
+                      <text prefix=". " macro="publisher"/>
+                    </if>
+                  </choose>
+                  <text macro="locator-or-period"/>
+                </else-if>
+                <else>
+                  <text prefix=". " macro="issued"/>
+                  <text macro="locator-or-period"/>
+                </else>
+              </choose>
+            </if>
+            <else-if type="article-magazine article-newspaper webpage" match="any">
+              <text macro="contributors-long" suffix=". "/>
+              <text macro="title-long" suffix=". "/>
+              <text macro="container"/>
+              <choose>
+                <if variable="URL" match="any">
+                  <text prefix=". " macro="issued"/>
+                  <text prefix=", " macro="citation-locator"/>
+                  <!--<text prefix=" " macro="quoted"/>-->
+                  <text prefix=". " macro="identifier"/>
+                </if>
+                <else>
+                  <text prefix=". " macro="issued"/>
+                  <text macro="locator-or-period"/>
+                </else>
+              </choose>
+            </else-if>
+            <else-if type="article-journal" match="any">
+              <text macro="contributors-long" suffix=". "/>
+              <text macro="title-long" suffix=". "/>
+              <text macro="container"/>
+              <text prefix=", " macro="issued"/>
+              <choose>
+                <if variable="URL" match="any">
+                  <text prefix=", " macro="citation-locator"/>
+                  <!--<text prefix=" " macro="quoted"/>-->
+                  <text prefix=". " macro="identifier"/>
+                </if>
+                <else>
+                  <text macro="locator-or-period"/>
+                </else>
+              </choose>
+            </else-if>
+            <else-if type="thesis" match="any">
+              <text macro="contributors-long" suffix=". "/>
+              <text macro="title-long" font-style="italic"/>
+              <text prefix=". " macro="issued"/>
+              <text prefix=", " variable="genre"/>
+              <text prefix=", " variable="publisher"/>
+              <text macro="locator-or-period"/>
+            </else-if>
+            <else>
+              <text macro="contributors-long" suffix=". "/>
+              <text macro="title-long" font-style="italic"/>
+              <choose>
+                <if variable="URL" match="any">
+                  <text prefix=" " macro="medium"/>
+                  <text prefix=". " macro="issued"/>
+                  <text prefix=", " macro="citation-locator"/>
+                  <!--<text prefix=" " macro="quoted"/>-->
+                  <text prefix=". " macro="identifier"/>
+                </if>
+                <else-if variable="issued" match="none">
+                  <text prefix=" " macro="medium"/>
+                  <choose>
+                    <if variable="publisher publisher-place" match="any">
+                      <text prefix=". " macro="publisher"/>
+                    </if>
+                  </choose>
+                  <choose>
+                    <if variable="locator" match="none">
+                      <text value="."/>
+                    </if>
+                    <else>
+                      <text prefix=", " macro="citation-locator" suffix="."/>
+                    </else>
+                  </choose>
+                </else-if>
+                <else>
+                  <text prefix=" " macro="medium"/>
+                  <text prefix=". " macro="issued"/>
+                  <choose>
+                    <if variable="locator" match="none">
+                      <text value="."/>
+                    </if>
+                    <else>
+                      <text prefix=", " macro="citation-locator" suffix="."/>
+                    </else>
+                  </choose>
+                </else>
+              </choose>
+            </else>
+          </choose>
+        </else>
+      </choose>
+    </layout>
+  </citation>
+  <bibliography et-al-min="4" et-al-use-first="1">
+    <sort>
+      <key macro="contributors-full" names-min="3" names-use-first="3"/>
+      <key macro="title-long"/>
+    </sort>
+    <layout>
+      <choose>
+        <if type="chapter entry entry-dictionary entry-encyclopedia" match="any">
+          <text macro="contributors-full" suffix=". "/>
+          <text macro="title-long" suffix=". "/>
+          <text macro="container-full"/>
+          <text prefix=". " variable="volume" text-case="capitalize-first"/>
+          <choose>
+            <if variable="URL" match="any">
+              <text prefix=". " macro="edition"/>
+              <text prefix=". " macro="issued"/>
+              <text prefix=", " macro="page-range"/>
+              <!--<text prefix=" " macro="quoted"/>-->
+              <text prefix=". " macro="collection" suffix="."/>
+              <text prefix=". " macro="ISBN" suffix="."/>
+              <text prefix=". " macro="identifier"/>
+            </if>
+            <else-if variable="issued" match="none">
+              <text prefix=". " macro="edition" suffix="."/>
+              <choose>
+                <if variable="publisher publisher-place" match="any">
+                  <text prefix=". " macro="publisher"/>
+                </if>
+              </choose>
+              <text prefix=". " macro="collection" suffix="."/>
+              <text prefix=", " macro="page-range"/>
+              <text prefix=". " macro="collection" suffix="."/>
+              <text prefix=". " macro="ISBN" suffix="."/>
+            </else-if>
+            <else>
+              <text prefix=". " macro="edition"/>
+              <text prefix=". " macro="issued"/>
+              <text prefix=", " macro="page-range" suffix="."/>
+              <text prefix=". " macro="collection" suffix="."/>
+              <text prefix=". " macro="ISBN" suffix="."/>
+            </else>
+          </choose>
+        </if>
+        <else-if type="article-magazine article-newspaper webpage article-journal" match="any">
+          <text macro="contributors-full" suffix=". "/>
+          <text macro="title-long" suffix=". "/>
+          <text macro="container-full"/>
+          <text prefix=", " macro="issued"/>
+          <choose>
+            <if variable="URL" match="any">
+              <text prefix=", " macro="page-range"/>
+              <!--<text prefix=" " macro="quoted"/>-->
+              <text prefix=". " macro="identifier"/>
+            </if>
+            <else>
+              <text prefix=", " macro="page-range" suffix="."/>
+            </else>
+          </choose>
+        </else-if>
+        <else-if type="thesis" match="any">
+          <text macro="contributors-full" suffix=". "/>
+          <text macro="title-long" font-style="italic"/>
+          <text prefix=". " macro="issued"/>
+          <text prefix=", " variable="genre"/>
+          <text prefix=", " variable="publisher" suffix="."/>
+        </else-if>
+        <else-if type="bill legal_case legislation" match="none">
+          <text macro="contributors-full" suffix=". "/>
+          <text macro="title-long" font-style="italic"/>
+          <choose>
+            <if variable="URL" match="any">
+              <text prefix=" " macro="medium"/>
+              <text prefix=". " macro="edition" suffix="."/>
+              <text prefix=". " macro="issued"/>
+              <!--<text prefix=" " macro="quoted" suffix="."/>-->
+              <text prefix=". " macro="collection" suffix="."/>
+              <text prefix=". " macro="ISBN" suffix="."/>
+              <text prefix=". " macro="identifier"/>
+            </if>
+            <else-if variable="issued" match="none">
+              <text prefix=" " macro="medium" suffix="."/>
+              <choose>
+                <if variable="publisher publisher-place" match="any">
+                  <text prefix=". " macro="publisher" suffix="."/>
+                </if>
+              </choose>
+              <text prefix=". " macro="collection" suffix="."/>
+              <text prefix=". " macro="ISBN" suffix="."/>
+            </else-if>
+            <else>
+              <text prefix=" " macro="medium" suffix="."/>
+              <text prefix=". " macro="edition" suffix="."/>
+              <text prefix=". " macro="issued" suffix="."/>
+              <text prefix=". " macro="collection" suffix="."/>
+              <text prefix=". " macro="ISBN" suffix="."/>
+            </else>
+          </choose>
+        </else-if>
+      </choose>
+    </layout>
+  </bibliography>
+</style>
diff --git a/buildres/csl/csl-styles/mary-ann-liebert-harvard.csl b/buildres/csl/csl-styles/mary-ann-liebert-harvard.csl
new file mode 100644
index 00000000000..8e5d27eae4e
--- /dev/null
+++ b/buildres/csl/csl-styles/mary-ann-liebert-harvard.csl
@@ -0,0 +1,216 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" and="text" demote-non-dropping-particle="sort-only" default-locale="en-US">
+  <info>
+    <title>Mary Ann Liebert - Harvard</title>
+    <title-short>MAL</title-short>
+    <id>http://www.zotero.org/styles/mary-ann-liebert-harvard</id>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-harvard" rel="self"/>
+    <link href="http://www.zotero.org/styles/iawa-journal" rel="template"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
+    <author>
+      <name>Patrick O'Brien</name>
+      <email>obrienpat86@gmail.com</email>
+    </author>
+    <category citation-format="author-date"/>
+    <category field="generic-base"/>
+    <updated>2022-03-09T16:56:49+00:00</updated>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
+  </info>
+  <locale xml:lang="en">
+    <terms>
+      <term name="accessed">last accessed</term>
+      <term name="available at">available from</term>
+    </terms>
+  </locale>
+  <macro name="editor">
+    <names variable="editor" delimiter=", ">
+      <name initialize-with="" name-as-sort-order="all" sort-separator=" "/>
+      <label form="short" strip-periods="true" prefix=". "/>
+    </names>
+  </macro>
+  <macro name="anon">
+    <text term="anonymous" text-case="capitalize-first" strip-periods="false"/>
+  </macro>
+  <macro name="volume-booklike">
+    <group delimiter=" ">
+      <text variable="collection-title" text-case="title"/>
+      <text variable="collection-number"/>
+    </group>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name delimiter-precedes-last="never" initialize-with="" name-as-sort-order="all" sort-separator=" "/>
+      <label form="short" strip-periods="true" prefix=", (" suffix=")"/>
+      <substitute>
+        <names variable="editor"/>
+        <text macro="anon"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="author-short">
+    <names variable="author">
+      <name form="short" initialize-with=". "/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <text macro="anon"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if variable="DOI">
+        <text variable="DOI" prefix="; doi: "/>
+      </if>
+      <else-if type="webpage post post-weblog" match="any">
+        <group delimiter=" " prefix=". ">
+          <group delimiter=": ">
+            <text term="available at" text-case="capitalize-first"/>
+            <text variable="URL"/>
+          </group>
+          <group delimiter=": " prefix="[" suffix="]">
+            <text term="accessed" text-case="capitalize-first"/>
+            <date variable="accessed">
+              <date-part name="month" form="numeric" suffix="/"/>
+              <date-part name="day" suffix="/"/>
+              <date-part name="year"/>
+            </date>
+          </group>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="title">
+    <text variable="title" text-case="title"/>
+  </macro>
+  <macro name="publisher">
+    <group delimiter="; ">
+      <group delimiter=": ">
+        <text variable="publisher"/>
+        <text variable="publisher-place"/>
+      </group>
+      <text macro="year-date"/>
+    </group>
+  </macro>
+  <macro name="year-date">
+    <choose>
+      <if variable="issued">
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
+      </if>
+      <else>
+        <text term="no date" form="short"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="pages">
+    <text variable="page"/>
+  </macro>
+  <macro name="refpages">
+    <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>
+  <macro name="cite-locator">
+    <group delimiter=" ">
+      <label variable="locator" form="short"/>
+      <text variable="locator"/>
+    </group>
+  </macro>
+  <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" collapse="year">
+    <sort>
+      <key macro="author"/>
+      <key macro="year-date" sort="descending"/>
+    </sort>
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <group delimiter=", ">
+        <text macro="author-short"/>
+        <text macro="year-date"/>
+        <text macro="cite-locator"/>
+      </group>
+    </layout>
+  </citation>
+  <bibliography et-al-min="4" et-al-use-first="3">
+    <sort>
+      <key macro="author"/>
+      <key macro="year-date"/>
+      <key variable="title"/>
+    </sort>
+    <layout suffix=".">
+      <group delimiter=". ">
+        <text macro="author"/>
+        <choose>
+          <if type="bill book graphic legal_case legislation motion_picture report song webpage post post-weblog" match="any">
+            <group delimiter=". " prefix=" ">
+              <text macro="title" suffix=""/>
+              <text macro="edition"/>
+              <text macro="editor" prefix="(" suffix=")"/>
+              <text macro="volume-booklike"/>
+              <text variable="genre"/>
+              <text macro="publisher" suffix="."/>
+            </group>
+          </if>
+          <else-if type="chapter paper-conference" match="any">
+            <group delimiter=" ">
+              <group delimiter=". " prefix=" ">
+                <text macro="title" suffix="."/>
+                <group delimiter=": ">
+                  <text term="in" text-case="capitalize-first"/>
+                  <text variable="container-title" text-case="title"/>
+                </group>
+                <text macro="editor" prefix="(" suffix=")"/>
+                <text macro="volume-booklike"/>
+              </group>
+              <group delimiter="; ">
+                <text macro="publisher"/>
+                <text macro="refpages"/>
+              </group>
+            </group>
+          </else-if>
+          <else-if type="thesis">
+            <group delimiter=". ">
+              <text macro="title"/>
+              <text variable="genre"/>
+              <text macro="publisher"/>
+            </group>
+          </else-if>
+          <else>
+            <group delimiter=". ">
+              <text macro="title"/>
+              <text macro="editor"/>
+              <group delimiter=";">
+                <group delimiter=" ">
+                  <text variable="container-title" form="short" strip-periods="true"/>
+                  <text macro="year-date"/>
+                </group>
+                <group delimiter=":">
+                  <group>
+                    <text variable="volume"/>
+                    <text variable="issue" prefix="(" suffix=")"/>
+                  </group>
+                  <text macro="pages" strip-periods="false"/>
+                </group>
+              </group>
+            </group>
+          </else>
+        </choose>
+      </group>
+      <text macro="access"/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/buildres/csl/csl-styles/mary-ann-liebert-vancouver.csl b/buildres/csl/csl-styles/mary-ann-liebert-vancouver.csl
new file mode 100644
index 00000000000..ca52c6dd215
--- /dev/null
+++ b/buildres/csl/csl-styles/mary-ann-liebert-vancouver.csl
@@ -0,0 +1,191 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" and="text" demote-non-dropping-particle="sort-only" default-locale="en-US">
+  <info>
+    <title>Mary Ann Liebert - Vancouver</title>
+    <title-short>MAL</title-short>
+    <id>http://www.zotero.org/styles/mary-ann-liebert-vancouver</id>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-vancouver" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-harvard" rel="template"/>
+    <link href="https://home.liebertpub.com/authors/writing-guidelines/151" rel="documentation"/>
+    <author>
+      <name>Patrick O'Brien</name>
+      <email>obrienpat86@gmail.com</email>
+    </author>
+    <category citation-format="numeric"/>
+    <category field="generic-base"/>
+    <updated>2022-03-23T07:53: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>
+  <locale xml:lang="en">
+    <terms>
+      <term name="accessed">last accessed</term>
+      <term name="available at">available from</term>
+    </terms>
+  </locale>
+  <macro name="editor">
+    <names variable="editor" delimiter=", ">
+      <name initialize-with="" name-as-sort-order="all" sort-separator=" "/>
+      <label form="short" strip-periods="true" prefix=". "/>
+    </names>
+  </macro>
+  <macro name="anon">
+    <text term="anonymous" text-case="capitalize-first" strip-periods="false"/>
+  </macro>
+  <macro name="volume-booklike">
+    <group delimiter=" ">
+      <text variable="collection-title" text-case="title"/>
+      <text variable="collection-number"/>
+    </group>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name delimiter-precedes-last="never" initialize-with="" name-as-sort-order="all" sort-separator=" "/>
+      <label form="short" strip-periods="true" prefix=", (" suffix=")"/>
+      <substitute>
+        <names variable="editor"/>
+        <text macro="anon"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if variable="DOI">
+        <text variable="DOI" prefix="; doi: "/>
+      </if>
+      <else-if type="webpage post post-weblog" match="any">
+        <group delimiter=" " prefix=". ">
+          <group delimiter=": ">
+            <text term="available at" text-case="capitalize-first"/>
+            <text variable="URL"/>
+          </group>
+          <group delimiter=": " prefix="[" suffix="]">
+            <text term="accessed" text-case="capitalize-first"/>
+            <date variable="accessed">
+              <date-part name="month" form="numeric" suffix="/"/>
+              <date-part name="day" suffix="/"/>
+              <date-part name="year"/>
+            </date>
+          </group>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="title">
+    <text variable="title" text-case="title"/>
+  </macro>
+  <macro name="publisher">
+    <group delimiter="; ">
+      <group delimiter=": ">
+        <text variable="publisher"/>
+        <text variable="publisher-place"/>
+      </group>
+      <text macro="year-date"/>
+    </group>
+  </macro>
+  <macro name="year-date">
+    <choose>
+      <if variable="issued">
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
+      </if>
+      <else>
+        <text term="no date" form="short"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="pages">
+    <text variable="page"/>
+  </macro>
+  <macro name="refpages">
+    <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 vertical-align="sup" delimiter=",">
+      <text variable="citation-number"/>
+    </layout>
+  </citation>
+  <bibliography et-al-min="4" et-al-use-first="3" second-field-align="flush">
+    <layout suffix=".">
+      <text variable="citation-number" suffix="."/>
+      <group delimiter=". ">
+        <text macro="author"/>
+        <choose>
+          <if type="bill book graphic legal_case legislation motion_picture report song webpage post post-weblog" match="any">
+            <group delimiter=". " prefix=" ">
+              <text macro="title" suffix=""/>
+              <text macro="edition"/>
+              <text macro="editor" prefix="(" suffix=")"/>
+              <text macro="volume-booklike"/>
+              <text variable="genre"/>
+              <text macro="publisher" suffix="."/>
+            </group>
+          </if>
+          <else-if type="chapter paper-conference" match="any">
+            <group delimiter=" ">
+              <group delimiter=". " prefix=" ">
+                <text macro="title" suffix="."/>
+                <group delimiter=": ">
+                  <text term="in" text-case="capitalize-first"/>
+                  <text variable="container-title" text-case="title"/>
+                </group>
+                <text macro="editor" prefix="(" suffix=")"/>
+                <text macro="volume-booklike"/>
+              </group>
+              <group delimiter="; ">
+                <text macro="publisher"/>
+                <text macro="refpages"/>
+              </group>
+            </group>
+          </else-if>
+          <else-if type="thesis">
+            <group delimiter=". ">
+              <text macro="title"/>
+              <text variable="genre"/>
+              <text macro="publisher"/>
+            </group>
+          </else-if>
+          <else>
+            <group delimiter=". ">
+              <text macro="title"/>
+              <text macro="editor"/>
+              <group delimiter=";">
+                <group delimiter=" ">
+                  <text variable="container-title" form="short" strip-periods="true"/>
+                  <text macro="year-date"/>
+                </group>
+                <group delimiter=":">
+                  <group>
+                    <text variable="volume"/>
+                    <text variable="issue" prefix="(" suffix=")"/>
+                  </group>
+                  <text macro="pages" strip-periods="false"/>
+                </group>
+              </group>
+            </group>
+          </else>
+        </choose>
+      </group>
+      <text macro="access"/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/buildres/csl/csl-styles/cellular-reprogramming.csl b/buildres/csl/csl-styles/medizinische-hochschule-hannover.csl
similarity index 77%
rename from buildres/csl/csl-styles/cellular-reprogramming.csl
rename to buildres/csl/csl-styles/medizinische-hochschule-hannover.csl
index fbc236446c4..d4988b5f214 100644
--- a/buildres/csl/csl-styles/cellular-reprogramming.csl
+++ b/buildres/csl/csl-styles/medizinische-hochschule-hannover.csl
@@ -1,20 +1,19 @@
 <?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>Cellular Reprogramming</title>
-    <id>http://www.zotero.org/styles/cellular-reprogramming</id>
-    <link href="http://www.zotero.org/styles/cellular-reprogramming" rel="self"/>
+    <title>Medizinische Hochschule Hannover</title>
+    <title-short>MHH</title-short>
+    <id>http://www.zotero.org/styles/medizinische-hochschule-hannover</id>
+    <link href="http://www.zotero.org/styles/medizinische-hochschule-hannover" rel="self"/>
     <link href="http://www.zotero.org/styles/cell" rel="template"/>
-    <link href="http://www.liebertpub.com/manuscript/cellular-reprogramming/9/" rel="documentation"/>
+    <link href="https://www.mhh.de/bibliothek/literatur-verwalten/mhh-citation-style" rel="documentation"/>
     <author>
-      <name>Sebastian Karcher</name>
+      <name>Patrick O'Brien</name>
     </author>
     <category citation-format="author-date"/>
-    <category field="biology"/>
-    <issn>2152-4971</issn>
-    <eissn>2152-4998</eissn>
-    <summary>Style for Cellular reprogramming, same as Cell except for no italics in journal vol nos. Use et al min 11 in line with published articls</summary>
-    <updated>2013-01-26T22:06:38+00:00</updated>
+    <category field="medicine"/>
+    <summary>Style for MHH based on the guidelines from 02.12.2020.</summary>
+    <updated>2022-05-12T08:17: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>
   <macro name="author-short">
@@ -49,6 +48,13 @@
       <label form="short" prefix=", "/>
     </names>
   </macro>
+  <macro name="access">
+    <choose>
+      <if type="article-journal" match="any">
+        <text variable="DOI" prefix="DOI: "/>
+      </if>
+    </choose>
+  </macro>
   <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" collapse="year">
     <sort>
       <key macro="author-short" names-min="1" names-use-first="1"/>
@@ -64,7 +70,7 @@
       </group>
     </layout>
   </citation>
-  <bibliography et-al-min="11" et-al-use-first="10">
+  <bibliography et-al-min="26" et-al-use-first="25">
     <sort>
       <key macro="author-short" names-min="1" names-use-first="1"/>
       <key macro="author-count" names-min="3" names-use-first="3"/>
@@ -80,7 +86,7 @@
             <text variable="title" suffix="."/>
             <text variable="container-title" form="short" text-case="title"/>
             <group delimiter=", ">
-              <text variable="volume"/>
+              <text variable="volume" font-style="italic"/>
               <text variable="page"/>
             </group>
           </if>
@@ -103,6 +109,7 @@
           </else>
         </choose>
       </group>
+      <text macro="access" prefix=". "/>
     </layout>
   </bibliography>
 </style>
diff --git a/buildres/csl/csl-styles/meta.csl b/buildres/csl/csl-styles/meta.csl
new file mode 100644
index 00000000000..843a260b514
--- /dev/null
+++ b/buildres/csl/csl-styles/meta.csl
@@ -0,0 +1,938 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" and="text" et-al-min="3" et-al-use-first="2" initialize="false" demote-non-dropping-particle="never">
+  <!-- Polyglot; journal publishes in English, French, and Spanish. -->
+  <info>
+    <title>Meta</title>
+    <id>http://www.zotero.org/styles/meta</id>
+    <link href="http://www.zotero.org/styles/meta" rel="self"/>
+    <link href="http://www.zotero.org/styles/universite-de-montreal-apa" rel="template"/>
+    <link href="https://www.erudit.org/fr/revues/meta/#journal-info-editorial_policy" rel="documentation"/>
+    <author>
+      <name>Maya de Wit</name>
+      <email>mail@tolkngt.nl</email>
+    </author>
+    <contributor>
+      <name>Patrick O'Brien</name>
+    </contributor>
+    <category citation-format="author-date"/>
+    <category field="humanities"/>
+    <issn>0026-0452</issn>
+    <eissn>1492-1421</eissn>
+    <updated>2022-06-13T09:02:50+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="editortranslator" form="short">ed. &amp; Trans.</term>
+      <term name="translator" form="short">trans.</term>
+      <term name="no date" form="short">n.d.</term>
+      <term name="in">in</term>
+      <term name="retrieved">retrieved</term>
+      <term name="accessed">consulted on</term>
+      <term name="presented at">presented at</term>
+      <term name="chapter-number" form="short">chap.</term>
+      <term name="section">section</term>
+      <term name="number-of-volumes" form="short">vol.</term>
+      <term name="number">number</term>
+      <term name="scale">scale</term>
+      <term name="circa" form="short">v. </term>
+      <term name="interview" form="verb">interview</term>
+      <term name="author" form="verb">registered by</term>
+      <term name="number" form="short">n&amp;#7506;</term>
+    </terms>
+  </locale>
+  <macro name="container-contributors">
+    <choose>
+      <if type="chapter paper-conference entry-encyclopedia entry-dictionary map" match="any">
+        <names variable="editor">
+          <name and="text" initialize-with=".">
+            <name-part name="family" font-variant="small-caps"/>
+          </name>
+        </names>
+      </if>
+      <else-if type="interview broadcast" match="any">
+        <choose>
+          <if match="any" variable="container-title">
+            <text variable="publisher" suffix=","/>
+          </if>
+        </choose>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="secondary-contributors">
+    <choose>
+      <if type="article-journal book chapter paper-conference entry-encyclopedia entry-dictionary" match="any">
+        <names variable="editor" prefix=" " suffix=" ">
+          <name and="text"/>
+          <label form="short" prefix=", "/>
+        </names>
+      </if>
+    </choose>
+  </macro>
+  <macro name="author">
+    <choose>
+      <if match="any" variable="composer">
+        <names variable="composer">
+          <name and="text" delimiter-precedes-last="never" et-al-use-last="true" initialize-with="." name-as-sort-order="all"/>
+        </names>
+      </if>
+      <else>
+        <names variable="author">
+          <name and="text" delimiter-precedes-last="never" et-al-use-last="true" initialize="false" initialize-with=". " name-as-sort-order="all">
+            <name-part name="family" font-variant="small-caps"/>
+          </name>
+          <label form="short" prefix=", "/>
+          <substitute>
+            <choose>
+              <if type="entry-dictionary entry-encyclopedia webpage manuscript legislation legal_case bill treaty article map article-magazine article-newspaper" match="any">
+                <text macro="title"/>
+              </if>
+              <else-if type="book" match="any">
+                <names variable="editor"/>
+                <text macro="title" font-style="italic"/>
+              </else-if>
+              <else>
+                <names variable="editor"/>
+                <names variable="translator"/>
+              </else>
+            </choose>
+            <choose>
+              <if type="report">
+                <text variable="publisher"/>
+                <text variable="title" font-style="italic" suffix="."/>
+              </if>
+            </choose>
+          </substitute>
+        </names>
+      </else>
+    </choose>
+  </macro>
+  <macro name="author-short">
+    <choose>
+      <if match="any" variable="composer">
+        <names variable="composer">
+          <name form="short" and="text" et-al-min="3" et-al-use-first="2" name-as-sort-order="all"/>
+        </names>
+      </if>
+      <else>
+        <names variable="author">
+          <name form="short" and="text" et-al-min="3" et-al-use-first="2" et-al-subsequent-min="3" et-al-subsequent-use-first="2" initialize="false" name-as-sort-order="all"/>
+          <et-al font-style="italic"/>
+          <substitute>
+            <choose>
+              <if variable="container-title">
+                <choose>
+                  <if type="bill legal_case legislation treaty article-journal" match="none">
+                    <text variable="title" quotes="true"/>
+                  </if>
+                </choose>
+              </if>
+            </choose>
+            <names variable="editor"/>
+            <names variable="translator"/>
+            <choose>
+              <if type="report">
+                <text variable="publisher"/>
+                <text variable="title" font-style="italic"/>
+              </if>
+              <else>
+                <choose>
+                  <if match="any" variable="title-short">
+                    <text variable="title-short" quotes="false"/>
+                  </if>
+                  <else>
+                    <text variable="title" font-style="italic"/>
+                  </else>
+                </choose>
+              </else>
+            </choose>
+          </substitute>
+        </names>
+      </else>
+    </choose>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if type="thesis dataset" match="any">
+        <choose>
+          <if variable="DOI">
+            <text variable="DOI"/>
+          </if>
+          <else-if variable="archive" match="any">
+            <group delimiter=". ">
+              <text variable="archive" suffix="."/>
+              <text variable="URL"/>
+            </group>
+          </else-if>
+          <else>
+            <choose>
+              <if type="dataset" match="all" variable="accessed">
+                <group delimiter=" ">
+                  <text term="retrieved" text-case="capitalize-first"/>
+                  <date form="text" variable="accessed" prefix="le "/>
+                  <text term="from"/>
+                  <text variable="URL"/>
+                </group>
+              </if>
+              <else>
+                <text variable="URL"/>
+              </else>
+            </choose>
+          </else>
+        </choose>
+      </if>
+      <else>
+        <choose>
+          <if variable="DOI">
+            <text variable="DOI"/>
+          </if>
+          <else>
+            <choose>
+              <if type="entry-encyclopedia entry-dictionary map article" match="any">
+                <choose>
+                  <if match="any" variable="accessed">
+                    <group delimiter=" ">
+                      <text term="retrieved" text-case="capitalize-first"/>
+                      <date form="text" variable="accessed" prefix="le "/>
+                      <text term="from"/>
+                      <text variable="URL"/>
+                    </group>
+                  </if>
+                  <else>
+                    <text variable="URL"/>
+                  </else>
+                </choose>
+              </if>
+              <else>
+                <group delimiter=", ">
+                  <group delimiter=" ">
+                    <text term="accessed" text-case="capitalize-first"/>
+                    <date form="text" variable="accessed"/>
+                  </group>
+                  <text variable="URL"/>
+                </group>
+              </else>
+            </choose>
+          </else>
+        </choose>
+      </else>
+    </choose>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="legislation bill" match="any">
+        <choose>
+          <if match="any" variable="issued">
+            <group delimiter=". ">
+              <text variable="title" font-style="italic"/>
+              <text variable="container-title"/>
+            </group>
+          </if>
+          <else-if match="none" variable="number">
+            <group delimiter=". ">
+              <text variable="title" font-style="italic"/>
+              <text variable="container-title"/>
+            </group>
+          </else-if>
+          <else>
+            <group delimiter=". " suffix=", ">
+              <text variable="title" font-style="italic"/>
+              <text variable="container-title"/>
+            </group>
+          </else>
+        </choose>
+      </if>
+      <else-if type="interview" match="any">
+        <group delimiter=" " suffix=". ">
+          <text term="interview" form="verb" text-case="capitalize-first"/>
+          <names variable="interviewer">
+            <name and="text" initialize-with="."/>
+          </names>
+        </group>
+        <text variable="title"/>
+      </else-if>
+      <else-if type="legal_case" match="all" variable="references">
+        <text variable="title" font-style="italic" suffix=","/>
+      </else-if>
+      <else-if type="thesis report book graphic manuscript speech dataset legal_case treaty article webpage" match="any">
+        <text variable="title" font-style="italic"/>
+      </else-if>
+      <else-if type="motion_picture broadcast figure map article-journal entry-encyclopedia song musical_score" match="any">
+        <choose>
+          <if match="any" variable="container-title">
+            <text variable="title"/>
+          </if>
+          <else>
+            <text variable="title" font-style="italic"/>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="patent" match="any">
+        <text variable="title" font-style="italic"/>
+      </else-if>
+      <else>
+        <text variable="title"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <choose>
+      <if type="book thesis" match="any">
+        <group delimiter=": ">
+          <text variable="publisher-place"/>
+          <text variable="publisher"/>
+        </group>
+      </if>
+      <else-if type="post thesis" match="none">
+        <group delimiter=", ">
+          <choose>
+            <if type="book chapter report" match="any">
+              <group delimiter=": ">
+                <text variable="publisher-place"/>
+                <text variable="publisher" suffix=","/>
+              </group>
+            </if>
+            <else-if type="patent">
+              <group delimiter=", ">
+                <text variable="authority"/>
+                <text variable="publisher"/>
+              </group>
+            </else-if>
+            <else-if type="broadcast interview" match="all" variable="container-title"/>
+            <else-if type="manuscript" match="any">
+              <group delimiter=" ">
+                <text variable="archive"/>
+                <text variable="archive_location" prefix="(" suffix=")"/>
+              </group>
+              <text variable="publisher-place"/>
+            </else-if>
+            <else-if type="article-journal article-magazine" match="any">
+              <group delimiter=": ">
+                <text variable="publisher-place"/>
+                <text variable="publisher"/>
+              </group>
+            </else-if>
+          </choose>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="event">
+    <choose>
+      <if variable="container-title" match="none">
+        <choose>
+          <if variable="event">
+            <text variable="event"/>
+          </if>
+          <else-if type="speech" match="any">
+            <text variable="publisher"/>
+          </else-if>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="extra">
+    <choose>
+      <if type="book thesis" match="any">
+        <choose>
+          <if match="any" is-numeric="number-of-volumes">
+            <group delimiter=" ">
+              <number variable="number-of-volumes"/>
+              <label variable="number-of-volumes" form="short"/>
+            </group>
+          </if>
+          <else>
+            <text variable="number-of-volumes" prefix="[" suffix="]"/>
+          </else>
+        </choose>
+      </if>
+      <else-if type="legal_case" match="all" variable="references">
+        <group delimiter=", " prefix="(" suffix=")">
+          <text variable="authority"/>
+          <date date-parts="year" form="text" variable="issued">
+            <date-part name="year"/>
+          </date>
+          <date delimiter=" " variable="issued">
+            <date-part name="day"/>
+            <date-part name="month"/>
+          </date>
+        </group>
+      </else-if>
+      <else-if type="article-journal" match="any">
+        <choose>
+          <if match="none" variable="container-title">
+            <text variable="genre"/>
+          </if>
+        </choose>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="issued">
+    <choose>
+      <if match="any" variable="original-date">
+        <choose>
+          <if type="musical_score book song" match="any">
+            <group prefix="(" suffix=")">
+              <date date-parts="year" form="text" variable="issued"/>
+              <text variable="year-suffix"/>
+            </group>
+          </if>
+          <else>
+            <group prefix="(" suffix=")">
+              <date delimiter="" variable="original-date">
+                <date-part name="year"/>
+              </date>
+              <text variable="year-suffix"/>
+              <date delimiter=" " variable="original-date" prefix=", ">
+                <date-part name="day" form="ordinal"/>
+                <date-part name="month"/>
+              </date>
+            </group>
+          </else>
+        </choose>
+      </if>
+      <else-if match="any" is-uncertain-date="issued">
+        <choose>
+          <if type="map" match="any">
+            <date form="text" variable="issued" prefix="(" suffix="?)"/>
+          </if>
+          <else>
+            <group delimiter=" " prefix="(" suffix=")">
+              <text term="circa" form="short"/>
+              <date variable="issued">
+                <date-part name="year"/>
+              </date>
+            </group>
+          </else>
+        </choose>
+      </else-if>
+      <else-if match="any" variable="status">
+        <group delimiter="-" prefix="(" suffix=")">
+          <text variable="status"/>
+          <text variable="year-suffix"/>
+        </group>
+      </else-if>
+      <else-if variable="issued">
+        <choose>
+          <if type="legal_case" match="all" variable="references"/>
+          <else-if type="bill legal_case" match="any">
+            <group prefix="(" suffix=").">
+              <date date-parts="year" form="text" variable="issued">
+                <date-part name="year"/>
+              </date>
+              <date delimiter=" " variable="issued" prefix=", ">
+                <date-part name="day"/>
+                <date-part name="month"/>
+              </date>
+            </group>
+          </else-if>
+          <else-if type="legislation" match="any"/>
+          <else-if type="dataset" match="any">
+            <group prefix="(" suffix=")">
+              <date delimiter="" variable="issued">
+                <date-part name="year"/>
+              </date>
+              <text variable="year-suffix" prefix="-"/>
+              <date delimiter="" variable="issued" prefix=", ">
+                <date-part name="day"/>
+                <date-part name="month" prefix=" "/>
+              </date>
+            </group>
+          </else-if>
+          <else>
+            <group prefix="(" suffix="):">
+              <date variable="issued">
+                <date-part name="year"/>
+              </date>
+              <text variable="year-suffix"/>
+              <choose>
+                <if type="article-journal bill book chapter graphic legal_case legislation paper-conference thesis patent" match="none">
+                  <group prefix=", ">
+                    <date variable="issued">
+                      <date-part name="day" form="ordinal"/>
+                      <date-part prefix=" " name="month"/>
+                    </date>
+                    <choose>
+                      <if type="entry-encyclopedia" match="any">
+                        <text variable="issue" prefix=", "/>
+                      </if>
+                    </choose>
+                  </group>
+                </if>
+              </choose>
+            </group>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="manuscript" match="all" variable="issue">
+        <text variable="issue" prefix="[" suffix="]."/>
+      </else-if>
+      <else>
+        <group prefix=" (" suffix=")">
+          <choose>
+            <if type="legislation" match="any"/>
+            <else-if type="graphic" match="none">
+              <text term="no date" form="short"/>
+              <text variable="year-suffix" prefix="-"/>
+            </else-if>
+          </choose>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="issued-sort">
+    <choose>
+      <if type="article-journal bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="none">
+        <date variable="issued">
+          <date-part name="year"/>
+          <date-part name="month"/>
+          <date-part name="day"/>
+        </date>
+      </if>
+      <else>
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
+      </else>
+    </choose>
+  </macro>
+  <macro name="issued-year">
+    <choose>
+      <if match="any" is-uncertain-date="issued">
+        <choose>
+          <if type="map" match="any">
+            <group>
+              <date form="text" variable="issued" suffix="?"/>
+            </group>
+          </if>
+          <else>
+            <group delimiter=" ">
+              <text term="circa" form="short"/>
+              <date variable="issued">
+                <date-part name="year"/>
+              </date>
+            </group>
+          </else>
+        </choose>
+        <text variable="year-suffix"/>
+      </if>
+      <else-if match="any" variable="status">
+        <group delimiter="-">
+          <text variable="status"/>
+          <text variable="year-suffix"/>
+        </group>
+      </else-if>
+      <else-if variable="issued">
+        <choose>
+          <if type="legislation" match="any"/>
+          <else>
+            <group delimiter="/">
+              <date variable="original-date" form="text"/>
+              <group>
+                <date variable="issued">
+                  <date-part name="year"/>
+                </date>
+                <text variable="year-suffix"/>
+              </group>
+            </group>
+          </else>
+        </choose>
+      </else-if>
+      <else>
+        <choose>
+          <if type="legislation" match="any">
+            <group delimiter=" ">
+              <text variable="container-title"/>
+              <text variable="section" prefix="(" suffix=")"/>
+            </group>
+          </if>
+          <else>
+            <group delimiter="-">
+              <text term="no date" form="short"/>
+              <text variable="year-suffix"/>
+            </group>
+          </else>
+        </choose>
+      </else>
+    </choose>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <text term="edition" form="short"/>
+        </group>
+      </if>
+      <else>
+        <text variable="edition"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="translation-illustration">
+    <choose>
+      <if variable="translator illustrator" match="any">
+        <group delimiter=", ">
+          <names variable="translator" delimiter=", " prefix=" ">
+            <name and="text" delimiter-precedes-last="never" initialize-with=". "/>
+            <label form="short" prefix=", "/>
+          </names>
+          <names variable="illustrator">
+            <name and="text" delimiter-precedes-last="never" initialize-with="."/>
+            <label form="short" prefix=", "/>
+          </names>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="locators">
+    <choose>
+      <if type="article-journal article-magazine review-book interview article" match="any">
+        <group delimiter=":" prefix=". ">
+          <group>
+            <text variable="volume" font-style="normal"/>
+            <text variable="issue" prefix="(" suffix=")"/>
+          </group>
+          <text variable="page"/>
+          <text variable="archive_location"/>
+        </group>
+      </if>
+      <else-if type="article-newspaper">
+        <text variable="publisher-place" prefix=" (" suffix=")"/>
+        <group delimiter=", " prefix=", ">
+          <text variable="section" prefix="section "/>
+          <text variable="page"/>
+        </group>
+      </else-if>
+      <else-if type="book paper-conference entry-encyclopedia chapter entry-dictionary musical_score map figure" match="any">
+        <group delimiter=", " prefix=" ">
+          <group delimiter=", ">
+            <text macro="edition"/>
+            <text macro="translation-illustration"/>
+          </group>
+          <group delimiter=" ">
+            <label variable="volume" form="short"/>
+            <number variable="volume" form="numeric"/>
+          </group>
+          <group delimiter=" ">
+            <label variable="chapter-number" form="short"/>
+            <number variable="chapter-number"/>
+          </group>
+          <group delimiter=" ">
+            <text term="version"/>
+            <text variable="version"/>
+          </group>
+          <text variable="page"/>
+        </group>
+        <choose>
+          <if type="book" match="any">
+            <text variable="number" prefix=" (" suffix=")"/>
+            <group prefix=" [" suffix="]">
+              <text variable="genre"/>
+              <text variable="medium"/>
+            </group>
+          </if>
+        </choose>
+      </else-if>
+      <else-if type="legal_case" match="any">
+        <group delimiter=" " prefix=" ">
+          <text variable="number"/>
+          <choose>
+            <if match="none" variable="references page">
+              <text variable="authority" prefix="(" suffix=")"/>
+            </if>
+            <else-if match="none" variable="references">
+              <text variable="authority"/>
+            </else-if>
+          </choose>
+          <text variable="page"/>
+        </group>
+        <text variable="source" prefix=". "/>
+      </else-if>
+      <else-if type="treaty" match="any">
+        <group delimiter=", ">
+          <group delimiter=" " prefix=", ">
+            <label variable="volume" form="short"/>
+            <text variable="volume"/>
+          </group>
+          <group delimiter=" ">
+            <label variable="page" form="short"/>
+            <text variable="page"/>
+          </group>
+          <group delimiter=" " prefix=" ">
+            <text term="issue" form="short"/>
+            <text variable="issue"/>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="song" match="any">
+        <text variable="number" prefix=" (épisode " suffix=")"/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="citation-locator">
+    <group>
+      <choose>
+        <if locator="chapter">
+          <label variable="locator" form="long" text-case="capitalize-first"/>
+        </if>
+        <else>
+          <label variable="locator" form="short"/>
+        </else>
+      </choose>
+      <text variable="locator" prefix=" "/>
+    </group>
+  </macro>
+  <macro name="container">
+    <group>
+      <choose>
+        <if type="chapter paper-conference entry-encyclopedia entry-dictionary song musical_score figure broadcast interview" match="any">
+          <choose>
+            <if match="any" variable="container-title">
+              <text term="in" text-case="capitalize-first" font-style="italic" suffix=": "/>
+            </if>
+          </choose>
+        </if>
+        <else-if type="map" match="all" variable="container-author">
+          <text term="in" text-case="capitalize-first" suffix=" "/>
+        </else-if>
+      </choose>
+      <text macro="container-contributors"/>
+      <text macro="secondary-contributors"/>
+      <text macro="container-title"/>
+    </group>
+  </macro>
+  <macro name="container-title">
+    <choose>
+      <if type="bill legislation legal_case treaty report webpage" match="none">
+        <text variable="container-title" font-style="italic"/>
+      </if>
+      <else-if type="legal_case treaty report" match="any">
+        <choose>
+          <if match="none" variable="references">
+            <text variable="container-title"/>
+          </if>
+        </choose>
+      </else-if>
+      <else>
+        <group delimiter=" ">
+          <choose>
+            <if variable="container-title">
+              <choose>
+                <if type="legislation" match="none">
+                  <text variable="volume"/>
+                  <text variable="container-title"/>
+                  <group delimiter=" ">
+                    <text term="section" form="symbol"/>
+                    <text variable="section"/>
+                  </group>
+                </if>
+              </choose>
+            </if>
+          </choose>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="original-date">
+    <choose>
+      <if type="song musical_score book" match="any">
+        <group prefix="(" suffix=")">
+          <text value="Publication originale en "/>
+          <date variable="original-date">
+            <date-part name="year"/>
+          </date>
+        </group>
+      </if>
+      <else-if type="treaty" match="any">
+        <choose>
+          <if match="any" variable="original-date">
+            <group delimiter=" " suffix=".">
+              <text value="Entrée en vigueur le"/>
+              <date form="text" variable="issued">
+                <date-part name="day" form="ordinal"/>
+              </date>
+            </group>
+          </if>
+        </choose>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="title-extra">
+    <choose>
+      <if type="thesis" match="any">
+        <text variable="genre"/>
+      </if>
+      <else-if type="article-journal" match="any">
+        <choose>
+          <if match="any" variable="container-title">
+            <text variable="genre" prefix="[" suffix="]"/>
+          </if>
+        </choose>
+        <group delimiter=" " prefix="(" suffix=")">
+          <text term="version"/>
+          <text variable="version"/>
+        </group>
+      </else-if>
+      <else-if type="report" match="any">
+        <group delimiter=" ">
+          <text variable="number" prefix="(" suffix=")"/>
+          <group delimiter=" " prefix="[" suffix="]">
+            <text variable="genre"/>
+            <text variable="medium"/>
+          </group>
+          <group delimiter=" " prefix=". ">
+            <text term="number" text-case="capitalize-first"/>
+            <text variable="archive_location"/>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="webpage dataset" match="any">
+        <group delimiter=" " prefix="(" suffix=")">
+          <text term="version"/>
+          <text variable="version"/>
+        </group>
+        <group delimiter=" " prefix=" ">
+          <text variable="number" prefix="(" suffix=")"/>
+          <text variable="genre" prefix="[" suffix="]"/>
+        </group>
+      </else-if>
+      <else-if type="patent" match="any">
+        <group delimiter=" " prefix="(" suffix=")">
+          <text variable="genre"/>
+          <text variable="number" font-style="normal"/>
+        </group>
+      </else-if>
+      <else-if type="song musical_score" match="any">
+        <choose>
+          <if match="any" variable="composer">
+            <group delimiter=";  " prefix=" [" suffix="]">
+              <group delimiter=" ">
+                <text term="author" form="verb" text-case="capitalize-first"/>
+                <names variable="author">
+                  <name and="text" delimiter-precedes-last="never"/>
+                </names>
+              </group>
+              <text variable="medium"/>
+              <text variable="genre"/>
+            </group>
+          </if>
+          <else>
+            <text variable="medium" prefix="[" suffix="]"/>
+            <text variable="genre" prefix="[" suffix="]"/>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="legislation bill" match="any">
+        <group delimiter=" ">
+          <text variable="number" prefix="c. "/>
+          <text variable="section" prefix="(" suffix=")"/>
+          <text variable="authority"/>
+        </group>
+      </else-if>
+      <else-if type="review-book" match="any">
+        <group delimiter=" " prefix="[" suffix="]">
+          <text variable="reviewed-title" font-style="italic" prefix="Compte rendu du livre " suffix=","/>
+          <text term="by"/>
+          <names variable="reviewed-author">
+            <name and="text" delimiter-precedes-last="never" initialize-with="."/>
+          </names>
+        </group>
+      </else-if>
+      <else-if type="broadcast" match="any">
+        <group delimiter=" ">
+          <group delimiter=" " prefix="(" suffix=")">
+            <text term="number" form="short"/>
+            <text variable="number"/>
+          </group>
+          <group prefix="[" suffix="]">
+            <text variable="medium"/>
+            <text variable="genre"/>
+          </group>
+        </group>
+      </else-if>
+      <else>
+        <choose>
+          <if type="musical_score book article" match="none">
+            <group delimiter=". ">
+              <choose>
+                <if type="manuscript" match="none">
+                  <text variable="archive" prefix=". "/>
+                </if>
+              </choose>
+              <group delimiter=" " prefix="[" suffix="]">
+                <text variable="medium"/>
+                <text variable="genre"/>
+              </group>
+              <group delimiter=" : ">
+                <text term="scale" text-case="capitalize-first"/>
+                <text variable="scale"/>
+              </group>
+              <number variable="number-of-pages"/>
+            </group>
+          </if>
+        </choose>
+      </else>
+    </choose>
+  </macro>
+  <macro name="container-title-extra">
+    <choose>
+      <if type="map" match="all">
+        <text variable="collection-title" prefix=". "/>
+        <text variable="number" prefix=", "/>
+      </if>
+      <else-if type="article" match="any">
+        <text variable="number" prefix="(" suffix=")"/>
+        <choose>
+          <if match="none" variable="author editor">
+            <text variable="genre" prefix=". [" suffix="]"/>
+          </if>
+          <else>
+            <text variable="genre" prefix=" [" suffix="]"/>
+          </else>
+        </choose>
+      </else-if>
+    </choose>
+  </macro>
+  <citation et-al-min="3" et-al-use-first="1" et-al-subsequent-min="3" et-al-subsequent-use-first="1" disambiguate-add-year-suffix="true" collapse="year">
+    <sort>
+      <key macro="author-short"/>
+      <key macro="issued-sort"/>
+    </sort>
+    <layout delimiter="; " prefix="(" suffix=")">
+      <group delimiter=" ">
+        <text macro="author-short" font-variant="normal"/>
+        <text macro="issued-year"/>
+        <text macro="citation-locator"/>
+      </group>
+    </layout>
+  </citation>
+  <bibliography et-al-min="7" et-al-use-first="3" et-al-use-last="true" hanging-indent="true">
+    <sort>
+      <key macro="author"/>
+      <key macro="issued-sort" sort="ascending"/>
+      <key macro="title"/>
+    </sort>
+    <layout>
+      <group suffix=".">
+        <group delimiter=" ">
+          <text macro="author"/>
+          <text macro="issued"/>
+          <text macro="title" prefix=" "/>
+        </group>
+        <text macro="title-extra" prefix=" "/>
+        <text macro="container" prefix=". "/>
+        <text macro="container-title-extra"/>
+        <group delimiter=", " prefix=". ">
+          <text macro="event"/>
+          <text macro="publisher"/>
+        </group>
+        <text macro="locators"/>
+      </group>
+      <text macro="extra" prefix=" " suffix="."/>
+      <text macro="access" prefix=" "/>
+      <text macro="original-date" prefix=" "/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/buildres/csl/csl-styles/microbial-drug-resistance.csl b/buildres/csl/csl-styles/microbial-drug-resistance.csl
deleted file mode 100644
index c364e02bcbf..00000000000
--- a/buildres/csl/csl-styles/microbial-drug-resistance.csl
+++ /dev/null
@@ -1,113 +0,0 @@
-<?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">
-  <info>
-    <title>Microbial Drug Resistance</title>
-    <id>http://www.zotero.org/styles/microbial-drug-resistance</id>
-    <link href="http://www.zotero.org/styles/microbial-drug-resistance" rel="self"/>
-    <link href="http://www.zotero.org/styles/cell" rel="template"/>
-    <link href="https://home.liebertpub.com/publications/microbial-drug-resistance/44/for-authors" rel="documentation"/>
-    <author>
-      <name>Sebastian Karcher</name>
-    </author>
-    <contributor>
-      <name>Jessica Chong</name>
-      <email>jxchong@gmail.com</email>
-    </contributor>
-    <contributor>
-      <name>Patrick O'Brien</name>
-    </contributor>
-    <category citation-format="numeric"/>
-    <category field="biology"/>
-    <issn>1076-6294</issn>
-    <eissn>1931-8448</eissn>
-    <updated>2019-03-15T09:14: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">
-      <name and="text" delimiter-precedes-last="always" initialize-with="." name-as-sort-order="first"/>
-      <label form="short" prefix=" (" suffix=")"/>
-      <substitute>
-        <names variable="editor"/>
-      </substitute>
-    </names>
-  </macro>
-  <macro name="issued">
-    <date variable="issued">
-      <date-part name="year"/>
-    </date>
-  </macro>
-  <macro name="publisher">
-    <group delimiter=", ">
-      <text variable="publisher"/>
-      <text variable="publisher-place"/>
-    </group>
-  </macro>
-  <macro name="editor">
-    <names variable="editor">
-      <name initialize-with="." and="text" delimiter-precedes-last="always"/>
-      <label form="short" plural="never" prefix=" (" suffix=")"/>
-    </names>
-  </macro>
-  <citation collapse="citation-number">
-    <sort>
-      <key variable="citation-number"/>
-    </sort>
-    <layout delimiter="," vertical-align="sup">
-      <text variable="citation-number"/>
-    </layout>
-  </citation>
-  <bibliography second-field-align="flush">
-    <sort>
-      <key variable="citation-number"/>
-    </sort>
-    <layout suffix=".">
-      <text variable="citation-number" suffix=". "/>
-      <group delimiter=". ">
-        <text macro="author"/>
-        <text macro="issued"/>
-        <text variable="title"/>
-        <group>
-          <choose>
-            <if type="article article-magazine article-newspaper article-journal review" match="any">
-              <group delimiter=" ">
-                <text variable="container-title" form="short" text-case="title"/>
-                <group delimiter=":">
-                  <text variable="volume"/>
-                  <text variable="page"/>
-                </group>
-              </group>
-            </if>
-            <else-if type="chapter paper-conference" match="any">
-              <text term="in" text-case="capitalize-first" suffix=" "/>
-              <group delimiter=", ">
-                <text macro="editor"/>
-                <group delimiter=". ">
-                  <text variable="container-title" text-case="title"/>
-                  <text macro="publisher"/>
-                </group>
-                <group delimiter=" ">
-                  <label variable="page" form="short"/>
-                  <text variable="page"/>
-                </group>
-              </group>
-            </else-if>
-            <else-if type="thesis">
-              <text variable="genre" suffix="."/>
-              <text variable="publisher"/>
-            </else-if>
-            <else-if type="webpage post-weblog post" match="any">
-              <group delimiter=" ">
-                <text term="available at" text-case="capitalize-first"/>
-                <text variable="URL"/>
-              </group>
-            </else-if>
-            <else>
-              <text macro="publisher"/>
-            </else>
-          </choose>
-        </group>
-      </group>
-    </layout>
-  </bibliography>
-</style>
diff --git a/buildres/csl/csl-styles/modern-language-association.csl b/buildres/csl/csl-styles/modern-language-association.csl
index d2efc93209a..26b92bdff12 100644
--- a/buildres/csl/csl-styles/modern-language-association.csl
+++ b/buildres/csl/csl-styles/modern-language-association.csl
@@ -205,7 +205,7 @@
       <if type="book chapter paper-conference motion_picture" match="any">
         <date variable="issued" form="numeric" date-parts="year"/>
       </if>
-      <else-if type="article-journal article-magazine" match="any">
+      <else-if type="article-journal" match="any">
         <date variable="issued" form="text" date-parts="year-month"/>
       </else-if>
       <else-if type="speech" match="none">
diff --git a/buildres/csl/csl-styles/mrs-bulletin.csl b/buildres/csl/csl-styles/mrs-bulletin.csl
new file mode 100644
index 00000000000..24c5eaa01fe
--- /dev/null
+++ b/buildres/csl/csl-styles/mrs-bulletin.csl
@@ -0,0 +1,236 @@
+<?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>MRS Bulletin</title>
+    <title-short>MRSB</title-short>
+    <id>http://www.zotero.org/styles/mrs-bulletin</id>
+    <link href="http://www.zotero.org/styles/mrs-bulletin" rel="self"/>
+    <link href="http://www.zotero.org/styles/science-without-titles" rel="template"/>
+    <link href="https://www.springer.com/journal/43577/submission-guidelines#Instructions%20for%20Authors_References" rel="documentation"/>
+    <author>
+      <name>Tyler Harvey</name>
+      <email>tyler.r.harvey@gmail.com</email>
+    </author>
+    <category citation-format="numeric"/>
+    <category field="science"/>
+    <issn>0883-7694</issn>
+    <eissn>1938-1425</eissn>
+    <summary>MRS Bulletin, using Science reference style and superscript citations. Adapted from 'Science without titles' style from Julian Onions et al.</summary>
+    <updated>2021-07-20T13:44:48+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 initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+      <label form="short" prefix=", " text-case="capitalize-first"/>
+    </names>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+      <label form="short" prefix=", " text-case="capitalize-first"/>
+      <substitute>
+        <names variable="editor"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if variable="page" match="none">
+        <text macro="access-value"/>
+      </if>
+      <else-if is-numeric="page" match="none">
+        <text macro="access-value"/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="access-value">
+    <choose>
+      <if variable="DOI">
+        <text variable="DOI" prefix=", doi:"/>
+      </if>
+      <else>
+        <group prefix=" (" suffix=")">
+          <text value="available at "/>
+          <text variable="URL"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+        <text variable="title" font-style="italic"/>
+      </if>
+      <else>
+        <text variable="title"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="article-details">
+    <group delimiter=", ">
+      <group delimiter=". ">
+        <text form="short" variable="container-title" font-style="italic"/>
+        <text variable="volume" font-weight="bold"/>
+      </group>
+      <text variable="page"/>
+    </group>
+    <text macro="issued" prefix=" (" suffix=")"/>
+    <text macro="access"/>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=", ">
+      <text variable="publisher"/>
+      <text variable="publisher-place"/>
+    </group>
+  </macro>
+  <macro name="pages">
+    <label variable="page" form="short" suffix=" "/>
+    <text variable="page" form="short"/>
+  </macro>
+  <macro name="issued">
+    <date variable="issued" delimiter=" ">
+      <date-part name="year"/>
+    </date>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <text term="edition" form="short"/>
+          <number variable="edition" form="numeric"/>
+        </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="40" et-al-use-first="1" second-field-align="flush">
+    <layout suffix=".">
+      <text variable="citation-number" suffix=". "/>
+      <group delimiter=", ">
+        <text macro="author"/>
+        <choose>
+          <if type="thesis">
+            <group delimiter=" ">
+              <group delimiter=", ">
+                <group>
+                  <!-- Always print, even if no university given -->
+                  <text value="thesis"/>
+                </group>
+                <text macro="publisher"/>
+              </group>
+              <text macro="issued" prefix="(" suffix=")"/>
+            </group>
+          </if>
+          <else-if type="bill book graphic legal_case legislation motion_picture song chapter paper-conference" match="any">
+            <group delimiter=" ">
+              <choose>
+                <if type="chapter paper-conference" match="any">
+                  <group delimiter=", ">
+                    <group delimiter=" ">
+                      <text term="in"/>
+                      <text variable="container-title" font-style="italic"/>
+                    </group>
+                    <text macro="editor"/>
+                  </group>
+                </if>
+                <else>
+                  <text macro="title"/>
+                </else>
+              </choose>
+              <group prefix="(" suffix=")" delimiter="; ">
+                <group delimiter=", ">
+                  <text macro="publisher"/>
+                  <text macro="edition"/>
+                  <text macro="issued"/>
+                </group>
+                <text variable="URL"/>
+              </group>
+            </group>
+            <group delimiter=" of ">
+              <group>
+                <label variable="volume" form="short" suffix=" "/>
+                <number variable="volume"/>
+              </group>
+              <text variable="collection-title" font-style="italic"/>
+            </group>
+            <choose>
+              <if type="chapter paper-conference" match="any">
+                <text macro="pages"/>
+              </if>
+            </choose>
+          </else-if>
+          <else-if type="article-journal">
+            <choose>
+              <if variable="page">
+                <choose>
+                  <if is-numeric="page" match="none">
+                    <group>
+                      <group delimiter=", ">
+                        <text variable="container-title" form="short" font-style="italic"/>
+                        <group>
+                          <text term="in press"/>
+                        </group>
+                      </group>
+                      <text macro="access"/>
+                    </group>
+                  </if>
+                  <else>
+                    <text macro="article-details"/>
+                  </else>
+                </choose>
+              </if>
+              <else>
+                <text macro="article-details"/>
+              </else>
+            </choose>
+          </else-if>
+          <else-if type="report">
+            <group>
+              <group delimiter=", ">
+                <text variable="title" quotes="true"/>
+                <text variable="collection-title" font-style="italic"/>
+              </group>
+              <group prefix=" (" suffix=")" delimiter=", ">
+                <group delimiter=" ">
+                  <text variable="genre" form="short"/>
+                  <number variable="number"/>
+                </group>
+                <text variable="publisher"/>
+                <text variable="publisher-place"/>
+                <text macro="issued"/>
+              </group>
+            </group>
+            <text macro="pages"/>
+            <text macro="access"/>
+          </else-if>
+          <else>
+            <group>
+              <group delimiter=", ">
+                <text macro="editor"/>
+                <group delimiter=". ">
+                  <text macro="title"/>
+                  <text form="short" variable="container-title" font-style="italic"/>
+                  <text variable="volume" font-weight="bold"/>
+                </group>
+              </group>
+              <text macro="issued" prefix=" (" suffix=")"/>
+            </group>
+            <text macro="pages"/>
+            <text macro="access"/>
+          </else>
+        </choose>
+      </group>
+    </layout>
+  </bibliography>
+</style>
diff --git a/buildres/csl/csl-styles/multilingual-matters.csl b/buildres/csl/csl-styles/multilingual-matters.csl
new file mode 100644
index 00000000000..0b8dcea269a
--- /dev/null
+++ b/buildres/csl/csl-styles/multilingual-matters.csl
@@ -0,0 +1,329 @@
+<?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-GB">
+  <info>
+    <title>Multilingual Matters</title>
+    <id>http://www.zotero.org/styles/multilingual-matters</id>
+    <link href="http://www.zotero.org/styles/multilingual-matters" rel="self"/>
+    <link href="http://www.zotero.org/styles/harvard-north-west-university" rel="template"/>
+    <link href="https://www.multilingual-matters.com/page/guidelines-for-authors/" rel="documentation"/>
+    <link href="https://www.multilingual-matters.com/resources/docs/Author%20guidelines.docx" rel="documentation"/>
+    <author>
+      <name>Patrick O'Brien</name>
+    </author>
+    <category citation-format="author-date"/>
+    <category field="generic-base"/>
+    <updated>2022-03-09T11:31:15+00:00</updated>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
+  </info>
+  <locale xml:lang="en">
+    <terms>
+      <term name="available at">available</term>
+      <term name="edition" form="short">edn</term>
+      <term name="editor" form="short">
+        <single>ed.</single>
+        <multiple>eds</multiple>
+      </term>
+    </terms>
+  </locale>
+  <macro name="editor-translator">
+    <group delimiter=", ">
+      <choose>
+        <if variable="editor">
+          <names variable="editor">
+            <name and="text" initialize-with="."/>
+            <label form="short" strip-periods="false" prefix=" (" suffix=")"/>
+          </names>
+        </if>
+      </choose>
+      <choose>
+        <if variable="translator">
+          <names variable="translator">
+            <name and="symbol" initialize="false"/>
+            <label form="short" prefix=" (" suffix=")"/>
+          </names>
+        </if>
+      </choose>
+    </group>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name and="text" delimiter-precedes-last="never" et-al-min="7" et-al-use-first="6" et-al-use-last="true" initialize-with="." name-as-sort-order="all"/>
+      <label form="short" text-case="lowercase" prefix=" (" suffix=")"/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <choose>
+          <if type="bill book graphic legal_case legislation motion_picture report song webpage" match="any">
+            <text variable="title" font-style="italic"/>
+          </if>
+          <else>
+            <text variable="title" quotes="true" text-case="capitalize-first"/>
+          </else>
+        </choose>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="author-short">
+    <names variable="author">
+      <name form="short" and="symbol" delimiter-precedes-last="never" et-al-min="3" et-al-use-first="1" initialize-with="." sort-separator=" "/>
+      <et-al font-style="italic"/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <choose>
+          <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+            <text variable="title" form="short" font-style="italic"/>
+          </if>
+          <else>
+            <text variable="title" form="short" quotes="true" text-case="capitalize-first"/>
+          </else>
+        </choose>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="author-count">
+    <names variable="author">
+      <name form="count"/>
+    </names>
+  </macro>
+  <macro name="date-issued">
+    <choose>
+      <if type="article-journal" match="none">
+        <text macro="date-issued-year"/>
+      </if>
+      <else-if variable="page" match="none">
+        <text macro="date-issued-year"/>
+      </else-if>
+      <else-if is-numeric="page">
+        <text macro="date-issued-year"/>
+      </else-if>
+      <else>
+        <text term="in press" prefix="(" suffix=")"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="date-issued-no-parentheses">
+    <choose>
+      <if type="article-journal" match="none">
+        <text macro="date-issued-year"/>
+      </if>
+      <else-if variable="page" match="none">
+        <text macro="date-issued-year"/>
+      </else-if>
+      <else-if is-numeric="page">
+        <text macro="date-issued-year"/>
+      </else-if>
+      <else>
+        <text term="in press"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="date-issued-year">
+    <choose>
+      <if variable="issued">
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
+      </if>
+      <else>
+        <text value="s.a."/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if variable="DOI"/>
+      <else-if variable="URL">
+        <group delimiter=". ">
+          <text macro="date-access"/>
+          <text variable="URL"/>
+        </group>
+      </else-if>
+      <else-if variable="source accessed" match="all">
+        <group delimiter=" ">
+          <text variable="source"/>
+          <text macro="date-access"/>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="date-access">
+    <group delimiter=" ">
+      <text term="accessed"/>
+      <date form="text" variable="accessed"/>
+    </group>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="bill book graphic legal_case legislation motion_picture report song webpage" match="any">
+        <text variable="title" font-style="italic"/>
+      </if>
+      <else>
+        <text variable="title"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="book-details">
+    <group delimiter=". ">
+      <group delimiter=" ">
+        <text macro="editor-translator"/>
+        <text variable="container-title" font-style="italic"/>
+        <group delimiter=" " prefix="(" suffix=")">
+          <number variable="edition" form="ordinal"/>
+          <label strip-periods="true" variable="edition" form="short"/>
+        </group>
+        <group delimiter=" " prefix="(" suffix=")">
+          <label variable="volume" form="short" text-case="capitalize-first"/>
+          <text variable="volume"/>
+        </group>
+        <group delimiter=" " prefix="(" suffix=")">
+          <label variable="page" form="short"/>
+          <text variable="page"/>
+        </group>
+      </group>
+      <group delimiter=" " prefix="(" suffix=")">
+        <text variable="collection-title"/>
+        <group delimiter=" ">
+          <label variable="issue" form="short"/>
+          <text variable="collection-number"/>
+        </group>
+      </group>
+      <text macro="publisher"/>
+    </group>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=" ">
+      <group delimiter=": ">
+        <text variable="publisher-place"/>
+        <text variable="publisher"/>
+      </group>
+      <group delimiter=" " prefix="(" suffix=")">
+        <text term="original-work-published"/>
+        <date date-parts="year" form="text" variable="original-date"/>
+      </group>
+    </group>
+  </macro>
+  <citation disambiguate-add-year-suffix="true" year-suffix-delimiter="," disambiguate-add-names="true" disambiguate-add-givenname="false" collapse="year-suffix">
+    <sort>
+      <key macro="author"/>
+      <key macro="date-issued-no-parentheses"/>
+    </sort>
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <group delimiter=":">
+        <group delimiter=", ">
+          <text macro="author-short"/>
+          <text macro="date-issued-no-parentheses"/>
+        </group>
+        <group delimiter=" ">
+          <choose>
+            <if locator="page" match="none">
+              <label variable="locator" form="short"/>
+            </if>
+          </choose>
+          <text variable="locator" prefix=" "/>
+        </group>
+      </group>
+    </layout>
+  </citation>
+  <bibliography hanging-indent="true">
+    <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="date-issued-no-parentheses"/>
+    </sort>
+    <layout suffix=".">
+      <group delimiter=", ">
+        <group delimiter=". ">
+          <text macro="author"/>
+          <group delimiter=" ">
+            <text macro="date-issued" prefix="(" suffix=")"/>
+            <choose>
+              <if type="bill book graphic legal_case legislation motion_picture post-weblog song webpage post article" match="any">
+                <group delimiter=". ">
+                  <text macro="title"/>
+                  <text macro="book-details"/>
+                </group>
+              </if>
+              <else-if type="article-journal article-magazine" match="any">
+                <group delimiter=". ">
+                  <text macro="title"/>
+                  <group delimiter=" ">
+                    <text variable="container-title" font-style="italic"/>
+                    <group delimiter=", ">
+                      <choose>
+                        <if variable="volume issue" match="any">
+                          <group delimiter=" ">
+                            <text variable="volume"/>
+                            <text variable="issue" prefix="(" suffix=")"/>
+                          </group>
+                        </if>
+                        <else>
+                          <date variable="issued" prefix="(" suffix=")">
+                            <date-part name="month" form="long"/>
+                            <date-part name="day" prefix=", "/>
+                          </date>
+                        </else>
+                      </choose>
+                      <text variable="page"/>
+                    </group>
+                  </group>
+                </group>
+              </else-if>
+              <else-if type="article-newspaper" match="any">
+                <text macro="title"/>
+                <group delimiter=" ">
+                  <text variable="container-title" font-style="italic"/>
+                  <text variable="publisher-place" prefix="(" suffix=")"/>
+                </group>
+                <group delimiter=": ">
+                  <date variable="issued">
+                    <date-part name="day" suffix=" "/>
+                    <date-part name="month" form="long"/>
+                  </date>
+                  <text variable="page"/>
+                </group>
+              </else-if>
+              <else-if type="thesis" match="any">
+                <group delimiter=". ">
+                  <text macro="title"/>
+                  <group delimiter=", ">
+                    <text variable="genre"/>
+                    <text variable="publisher"/>
+                  </group>
+                </group>
+              </else-if>
+              <else-if type="chapter paper-conference entry-encyclopedia entry-dictionary" match="any">
+                <group delimiter=". ">
+                  <text macro="title"/>
+                  <group delimiter=" ">
+                    <text term="in" text-case="capitalize-first"/>
+                    <text macro="book-details"/>
+                  </group>
+                </group>
+              </else-if>
+              <else-if type="patent" match="any">
+                <group font-style="italic">
+                  <text variable="number" prefix="Patent No. "/>
+                </group>
+                <group delimiter=": ">
+                  <text macro="publisher"/>
+                  <text variable="authority"/>
+                </group>
+              </else-if>
+              <else-if type="report" match="any">
+                <text macro="title"/>
+                <group delimiter=" " prefix="(" suffix=")">
+                  <text variable="genre" text-case="capitalize-first"/>
+                  <text variable="number"/>
+                </group>
+                <text macro="publisher"/>
+              </else-if>
+            </choose>
+          </group>
+        </group>
+        <text macro="access"/>
+      </group>
+    </layout>
+  </bibliography>
+</style>
diff --git a/buildres/csl/csl-styles/national-library-of-medicine-grant-proposals.csl b/buildres/csl/csl-styles/national-library-of-medicine-grant-proposals.csl
index f657db88ec9..fdda8f5b2c7 100644
--- a/buildres/csl/csl-styles/national-library-of-medicine-grant-proposals.csl
+++ b/buildres/csl/csl-styles/national-library-of-medicine-grant-proposals.csl
@@ -1,5 +1,5 @@
 <?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">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only" initialize-with-hyphen="false" default-locale="en-US">
   <info>
     <title>National Library of Medicine (grant proposals with PMCID/PMID)</title>
     <title-short>NLM</title-short>
diff --git a/buildres/csl/csl-styles/nature-no-et-al.csl b/buildres/csl/csl-styles/nature-no-et-al.csl
index 60dbfb6c761..115b680cb44 100644
--- a/buildres/csl/csl-styles/nature-no-et-al.csl
+++ b/buildres/csl/csl-styles/nature-no-et-al.csl
@@ -12,7 +12,7 @@
     <category citation-format="numeric"/>
     <category field="science"/>
     <category field="generic-base"/>
-    <updated>2014-06-22T12:00:00+00:00</updated>
+    <updated>2014-06-23T03:22:15+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <macro name="title">
@@ -35,7 +35,7 @@
   </macro>
   <macro name="access">
     <choose>
-      <if variable="volume"/>
+      <if variable="volume" type="article" match="any"/>
       <else-if variable="DOI">
         <text variable="DOI" prefix="doi:"/>
       </else-if>
@@ -55,6 +55,28 @@
           </date>
         </group>
       </if>
+      <else-if type="article">
+        <group delimiter=" ">
+          <choose>
+            <if variable="genre" match="any">
+              <text variable="genre" text-case="capitalize-first"/>
+            </if>
+            <else>
+              <text term="article" text-case="capitalize-first"/>
+            </else>
+          </choose>
+          <text term="at"/>
+          <choose>
+            <if variable="DOI" match="any">
+              <text variable="DOI" prefix="https://doi.org/"/>
+            </if>
+            <else>
+              <text variable="URL"/>
+            </else>
+          </choose>
+          <date date-parts="year" form="text" variable="issued" prefix="(" suffix=")"/>
+        </group>
+      </else-if>
       <else>
         <date prefix="(" suffix=")." variable="issued">
           <date-part name="year"/>
diff --git a/buildres/csl/csl-styles/nature-no-superscript.csl b/buildres/csl/csl-styles/nature-no-superscript.csl
index 225eaf50c59..6c04d8139b3 100644
--- a/buildres/csl/csl-styles/nature-no-superscript.csl
+++ b/buildres/csl/csl-styles/nature-no-superscript.csl
@@ -12,7 +12,7 @@
     <category citation-format="numeric"/>
     <category field="science"/>
     <category field="generic-base"/>
-    <updated>2014-06-03T22:14:43+00:00</updated>
+    <updated>2022-07-02T11:44:17+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="title">
@@ -35,7 +35,7 @@
   </macro>
   <macro name="access">
     <choose>
-      <if variable="volume"/>
+      <if variable="volume" type="article" match="any"/>
       <else-if variable="DOI">
         <text variable="DOI" prefix="doi:"/>
       </else-if>
@@ -55,6 +55,28 @@
           </date>
         </group>
       </if>
+      <else-if type="article">
+        <group delimiter=" ">
+          <choose>
+            <if variable="genre" match="any">
+              <text variable="genre" text-case="capitalize-first"/>
+            </if>
+            <else>
+              <text term="article" text-case="capitalize-first"/>
+            </else>
+          </choose>
+          <text term="at"/>
+          <choose>
+            <if variable="DOI" match="any">
+              <text variable="DOI" prefix="https://doi.org/"/>
+            </if>
+            <else>
+              <text variable="URL"/>
+            </else>
+          </choose>
+          <date date-parts="year" form="text" variable="issued" prefix="(" suffix=")"/>
+        </group>
+      </else-if>
       <else>
         <date prefix="(" suffix=")." variable="issued">
           <date-part name="year"/>
diff --git a/buildres/csl/csl-styles/nature.csl b/buildres/csl/csl-styles/nature.csl
index 2646cfe922c..a2253b8b817 100644
--- a/buildres/csl/csl-styles/nature.csl
+++ b/buildres/csl/csl-styles/nature.csl
@@ -15,7 +15,7 @@
     <category field="generic-base"/>
     <issn>0028-0836</issn>
     <eissn>1476-4687</eissn>
-    <updated>2019-10-08T13:18:12+00:00</updated>
+    <updated>2022-07-01T16:03:34+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="title">
@@ -37,7 +37,7 @@
   </macro>
   <macro name="access">
     <choose>
-      <if variable="volume"/>
+      <if variable="volume" type="article" match="any"/>
       <else-if variable="DOI">
         <text variable="DOI" prefix="doi:"/>
       </else-if>
@@ -55,6 +55,28 @@
           </group>
         </group>
       </if>
+      <else-if type="article">
+        <group delimiter=" ">
+          <choose>
+            <if variable="genre" match="any">
+              <text variable="genre" text-case="capitalize-first"/>
+            </if>
+            <else>
+              <text term="article" text-case="capitalize-first"/>
+            </else>
+          </choose>
+          <text term="at"/>
+          <choose>
+            <if variable="DOI" match="any">
+              <text variable="DOI" prefix="https://doi.org/"/>
+            </if>
+            <else>
+              <text variable="URL"/>
+            </else>
+          </choose>
+          <date date-parts="year" form="text" variable="issued" prefix="(" suffix=")"/>
+        </group>
+      </else-if>
       <else-if type="report webpage post post-weblog" match="any">
         <group delimiter=" ">
           <text variable="URL"/>
diff --git a/buildres/csl/csl-styles/netherlands-journal-of-geosciences-geologie-en-mijnbouw.csl b/buildres/csl/csl-styles/netherlands-journal-of-geosciences-geologie-en-mijnbouw.csl
index 4e08216a93b..fa3e251ac9b 100644
--- a/buildres/csl/csl-styles/netherlands-journal-of-geosciences-geologie-en-mijnbouw.csl
+++ b/buildres/csl/csl-styles/netherlands-journal-of-geosciences-geologie-en-mijnbouw.csl
@@ -16,7 +16,7 @@
     <category field="engineering"/>
     <issn>0016-7746</issn>
     <eissn>1573-9708</eissn>
-    <updated>2021-09-07T11:15:14+00:00</updated>
+    <updated>2022-05-03T09:47:13+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <locale xml:lang="en">
@@ -203,12 +203,12 @@
     <choose>
       <if type="song">
         <names variable="composer" delimiter=", ">
-          <name and="symbol" delimiter-precedes-last="always" initialize-with="." name-as-sort-order="all"/>
+          <name and="symbol" delimiter-precedes-last="never" initialize-with="." name-as-sort-order="all"/>
           <substitute>
             <names variable="original-author"/>
             <names variable="author"/>
             <names variable="translator">
-              <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+              <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="never"/>
               <label form="short" prefix=" (" suffix=")"/>
             </names>
             <group delimiter=" ">
@@ -222,12 +222,12 @@
       <else-if type="treaty"/>
       <else>
         <names variable="author" delimiter=", ">
-          <name and="symbol" delimiter-precedes-last="always" initialize-with="." name-as-sort-order="all"/>
+          <name and="symbol" delimiter-precedes-last="never" initialize-with="." name-as-sort-order="all"/>
           <substitute>
             <names variable="illustrator"/>
             <names variable="composer"/>
             <names variable="director">
-              <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+              <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="never"/>
               <label form="long" prefix=" (" suffix=")"/>
             </names>
             <choose>
@@ -241,21 +241,21 @@
                   </else>
                 </choose>
                 <names variable="translator">
-                  <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+                  <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="never"/>
                   <label form="short" prefix=" (" suffix=")"/>
                 </names>
               </if>
             </choose>
             <names variable="editor translator" delimiter=", ">
-              <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+              <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="never"/>
               <label form="short" prefix=" (" suffix=")"/>
             </names>
             <names variable="editorial-director">
-              <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+              <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="never"/>
               <label form="short" prefix=" (" suffix=")"/>
             </names>
             <names variable="collection-editor">
-              <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+              <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="never"/>
               <label form="short" prefix=" (" suffix=")"/>
             </names>
             <choose>
@@ -482,7 +482,7 @@
             <text variable="title"/>
           </else-if>
           <else>
-            <text variable="title" font-style="italic"/>
+            <text variable="title" font-style="normal"/>
           </else>
         </choose>
       </else-if>
@@ -524,7 +524,7 @@
             <text macro="secondary-contributors"/>
           </group>
         </else-if>
-        <else-if type="book interview manuscript motion_picture musical_score pamphlet post-weblog speech webpage" match="any">
+        <else-if type="interview manuscript motion_picture musical_score pamphlet post-weblog speech webpage" match="any">
           <group delimiter="; ">
             <text macro="locators"/>
             <text macro="secondary-contributors"/>
@@ -692,9 +692,6 @@
           <text macro="locators"/>
         </group>
       </if>
-      <else>
-        <text macro="locators"/>
-      </else>
     </choose>
   </macro>
   <macro name="format-report">
@@ -806,8 +803,8 @@
             <else>
               <group delimiter=": ">
                 <group delimiter=" ">
-                  <text variable="publisher-place"/>
-                  <text variable="publisher" prefix="(" suffix=")"/>
+                  <text variable="publisher"/>
+                  <text variable="publisher-place" prefix="(" suffix=")"/>
                 </group>
                 <text macro="locators"/>
               </group>
@@ -1103,6 +1100,10 @@
         <label variable="page" form="short" suffix=" "/>
         <text variable="page"/>
       </group>
+      <group delimiter=" ">
+        <text variable="number-of-pages"/>
+        <label plural="always" variable="number-of-pages" form="short"/>
+      </group>
     </group>
   </macro>
   <macro name="citation-locator">
@@ -1424,8 +1425,8 @@
   </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" givenname-disambiguation-rule="primary-name">
     <sort>
-      <key macro="author" names-min="8" names-use-first="6"/>
       <key macro="issued-sort"/>
+      <key macro="author" names-min="8" names-use-first="6"/>
     </sort>
     <layout prefix="(" suffix=")" delimiter="; ">
       <group delimiter=", ">
@@ -1445,7 +1446,7 @@
       <group delimiter=" ">
         <group delimiter=". " suffix=".">
           <group delimiter=", ">
-            <text macro="author" font-weight="bold"/>
+            <text macro="author" font-style="italic" font-weight="bold"/>
             <text macro="issued"/>
           </group>
           <text macro="title-and-descriptions"/>
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 32b5b6cbdcf..335fa944a16 100644
--- a/buildres/csl/csl-styles/norsk-henvisningsstandard-for-rettsvitenskapelige-tekster.csl
+++ b/buildres/csl/csl-styles/norsk-henvisningsstandard-for-rettsvitenskapelige-tekster.csl
@@ -260,8 +260,15 @@
             <text macro="nor-legislation"/>
           </else-if>
           <else-if type="report">
-            <text macro="author-short"/>
-            <text macro="issued"/>
+            <choose>
+              <if variable="author" match="none">
+                <text variable="title"/>
+              </if>
+              <else>
+                <text macro="author-short"/>
+                <text macro="issued"/>
+              </else>
+            </choose>
           </else-if>
           <else>
             <text variable="title"/>
diff --git a/buildres/csl/csl-styles/organization-studies.csl b/buildres/csl/csl-styles/organization-studies.csl
new file mode 100644
index 00000000000..912345484b3
--- /dev/null
+++ b/buildres/csl/csl-styles/organization-studies.csl
@@ -0,0 +1,1519 @@
+<?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>Organization Studies</title>
+    <title-short>OSS</title-short>
+    <id>http://www.zotero.org/styles/organization-studies</id>
+    <link href="http://www.zotero.org/styles/organization-studies" rel="self"/>
+    <link href="http://www.zotero.org/styles/apa" rel="template"/>
+    <link href="https://journals.sagepub.com/author-instructions/OSS" rel="documentation"/>
+    <link href="https://journals.sagepub.com/pb-assets/cmscontent/OSS/OS%20Style%20and%20Reference%20Guide_October%202021-1632991647.pdf" rel="documentation"/>
+    <author>
+      <name>Patrick O'Brien</name>
+    </author>
+    <category citation-format="author-date"/>
+    <category field="social_science"/>
+    <issn>0170-8406</issn>
+    <eissn>1741-3044</eissn>
+    <updated>2022-02-17T09:51:30+00:00</updated>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
+  </info>
+  <locale xml:lang="en">
+    <terms>
+      <term name="editortranslator" form="short">
+        <single>ed. &amp; trans.</single>
+        <multiple>eds. &amp; trans.</multiple>
+      </term>
+      <term name="translator" form="short">trans.</term>
+      <term name="interviewer" form="short">
+        <single>interviewer</single>
+        <multiple>interviewers</multiple>
+      </term>
+      <term name="collection-editor" form="short">
+        <single>ed.</single>
+        <multiple>eds.</multiple>
+      </term>
+      <term name="circa" form="short">ca.</term>
+      <term name="bc"> B.C.E.</term>
+      <term name="ad"> C.E.</term>
+      <term name="letter">personal communication</term>
+      <term name="letter" form="short">letter</term>
+      <term name="issue" form="long">
+        <single>issue</single>
+        <multiple>issues</multiple>
+      </term>
+    </terms>
+  </locale>
+  <macro name="author-bib">
+    <names variable="composer" delimiter=", ">
+      <name and="symbol" delimiter-precedes-last="always" name-as-sort-order="all"/>
+      <substitute>
+        <names variable="author"/>
+        <names variable="illustrator"/>
+        <names variable="director">
+          <name name-as-sort-order="all" and="symbol" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
+          <label form="long" prefix=" (" suffix=")" text-case="title"/>
+        </names>
+        <choose>
+          <if variable="container-title">
+            <choose>
+              <if type="book entry entry-dictionary entry-encyclopedia" match="any">
+                <choose>
+                  <if variable="title">
+                    <group delimiter=" ">
+                      <text macro="title"/>
+                      <text macro="parenthetical"/>
+                    </group>
+                  </if>
+                  <else>
+                    <text macro="title-and-descriptions"/>
+                  </else>
+                </choose>
+              </if>
+            </choose>
+          </if>
+        </choose>
+        <names variable="editor" delimiter=", ">
+          <name name-as-sort-order="all" and="symbol" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
+          <label form="short" prefix=" (" suffix=")" text-case="title"/>
+        </names>
+        <names variable="editorial-director">
+          <name name-as-sort-order="all" and="symbol" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
+          <label form="short" prefix=" (" suffix=")" text-case="title"/>
+        </names>
+        <names variable="collection-editor">
+          <name name-as-sort-order="all" and="symbol" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
+          <label form="short" prefix=" (" suffix=")" text-case="title"/>
+        </names>
+        <choose>
+          <if variable="title">
+            <group delimiter=" ">
+              <text macro="title"/>
+              <text macro="parenthetical"/>
+            </group>
+          </if>
+          <else>
+            <text macro="title-and-descriptions"/>
+          </else>
+        </choose>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="author-intext">
+    <choose>
+      <if type="bill legal_case legislation treaty" match="any">
+        <text macro="title-intext"/>
+      </if>
+      <else-if type="interview personal_communication" match="any">
+        <choose>
+          <if variable="archive container-title DOI publisher URL" match="none">
+            <group delimiter=", ">
+              <names variable="author">
+                <name and="symbol" delimiter=", " initialize-with=". "/>
+                <substitute>
+                  <text macro="title-intext"/>
+                </substitute>
+              </names>
+              <text term="letter"/>
+            </group>
+          </if>
+          <else>
+            <names variable="author" delimiter=", ">
+              <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
+              <substitute>
+                <text macro="title-intext"/>
+              </substitute>
+            </names>
+          </else>
+        </choose>
+      </else-if>
+      <else>
+        <names variable="composer" delimiter=", ">
+          <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
+          <substitute>
+            <names variable="author"/>
+            <names variable="illustrator"/>
+            <names variable="director"/>
+            <choose>
+              <if variable="container-title">
+                <choose>
+                  <if type="book entry entry-dictionary entry-encyclopedia" match="any">
+                    <text macro="title-intext"/>
+                  </if>
+                </choose>
+              </if>
+            </choose>
+            <names variable="editor"/>
+            <names variable="editorial-director"/>
+            <text macro="title-intext"/>
+          </substitute>
+        </names>
+      </else>
+    </choose>
+  </macro>
+  <macro name="date-bib">
+    <group delimiter=" " prefix="(" suffix=")">
+      <choose>
+        <if is-uncertain-date="issued">
+          <text term="circa" form="short"/>
+        </if>
+      </choose>
+      <group>
+        <choose>
+          <if variable="issued">
+            <date variable="issued">
+              <date-part name="year"/>
+            </date>
+            <text variable="year-suffix"/>
+            <choose>
+              <if type="article-magazine article-newspaper broadcast interview motion_picture pamphlet personal_communication post post-weblog song speech webpage" match="any">
+                <date variable="issued">
+                  <date-part prefix=", " name="month"/>
+                  <date-part prefix=" " name="day"/>
+                </date>
+              </if>
+              <else-if type="paper-conference">
+                <choose>
+                  <if variable="collection-editor editor editorial-director issue page volume" match="none">
+                    <date variable="issued">
+                      <date-part prefix=", " name="month"/>
+                      <date-part prefix=" " name="day"/>
+                    </date>
+                  </if>
+                </choose>
+              </else-if>
+            </choose>
+          </if>
+          <else-if variable="status">
+            <group>
+              <text variable="status" text-case="lowercase"/>
+              <text variable="year-suffix" prefix="-"/>
+            </group>
+          </else-if>
+          <else>
+            <text term="no date" form="short"/>
+            <text variable="year-suffix" prefix="-"/>
+          </else>
+        </choose>
+      </group>
+    </group>
+  </macro>
+  <macro name="date-sort-group">
+    <choose>
+      <if variable="issued">
+        <text value="1"/>
+      </if>
+      <else-if variable="status">
+        <text value="2"/>
+      </else-if>
+      <else>
+        <text value="0"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="date-sort-date">
+    <choose>
+      <if type="article-magazine article-newspaper broadcast interview pamphlet personal_communication post post-weblog speech treaty webpage" match="any">
+        <date variable="issued" form="numeric"/>
+      </if>
+      <else-if type="paper-conference">
+        <choose>
+          <if variable="collection-editor editor editorial-director issue page volume" match="none">
+            <date variable="issued" form="numeric"/>
+          </if>
+        </choose>
+      </else-if>
+      <else>
+        <date variable="issued" form="numeric"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="date-intext">
+    <choose>
+      <if variable="issued">
+        <group delimiter="/">
+          <group delimiter=" ">
+            <choose>
+              <if is-uncertain-date="original-date">
+                <text term="circa" form="short"/>
+              </if>
+            </choose>
+            <date variable="original-date">
+              <date-part name="year"/>
+            </date>
+          </group>
+          <group delimiter=" ">
+            <choose>
+              <if is-uncertain-date="issued">
+                <text term="circa" form="short"/>
+              </if>
+            </choose>
+            <group>
+              <choose>
+                <if type="interview personal_communication" match="any">
+                  <choose>
+                    <if variable="archive container-title DOI publisher URL" match="none">
+                      <date variable="issued" form="text"/>
+                    </if>
+                    <else>
+                      <date variable="issued">
+                        <date-part name="year"/>
+                      </date>
+                    </else>
+                  </choose>
+                </if>
+                <else>
+                  <date variable="issued">
+                    <date-part name="year"/>
+                  </date>
+                </else>
+              </choose>
+              <text variable="year-suffix"/>
+            </group>
+          </group>
+        </group>
+      </if>
+      <else-if variable="status">
+        <text variable="status" text-case="lowercase"/>
+        <text variable="year-suffix" prefix="-"/>
+      </else-if>
+      <else>
+        <text term="no date" form="short"/>
+        <text variable="year-suffix" prefix="-"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="title-and-descriptions">
+    <choose>
+      <if variable="title">
+        <group delimiter=" ">
+          <text macro="title"/>
+          <text macro="parenthetical"/>
+          <text macro="bracketed"/>
+        </group>
+      </if>
+      <else>
+        <group delimiter=" ">
+          <text macro="bracketed"/>
+          <text macro="parenthetical"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="post webpage" match="any">
+        <text variable="title" font-style="italic"/>
+      </if>
+      <else-if variable="container-title" match="any">
+        <text variable="title"/>
+      </else-if>
+      <else>
+        <choose>
+          <if type="article-journal article-magazine article-newspaper post-weblog review review-book" match="any">
+            <text variable="title" font-style="italic"/>
+          </if>
+          <else-if type="paper-conference">
+            <choose>
+              <if variable="collection-editor editor editorial-director" match="any">
+                <group delimiter=": " font-style="italic">
+                  <text variable="title"/>
+                  <choose>
+                    <if is-numeric="volume" match="none">
+                      <group delimiter=" ">
+                        <label variable="volume" form="short" text-case="capitalize-first"/>
+                        <text variable="volume"/>
+                      </group>
+                    </if>
+                  </choose>
+                </group>
+              </if>
+              <else>
+                <text variable="title" font-style="italic"/>
+              </else>
+            </choose>
+          </else-if>
+          <else>
+            <group delimiter=": " font-style="italic">
+              <text variable="title"/>
+              <choose>
+                <if is-numeric="volume" match="none">
+                  <group delimiter=" ">
+                    <label variable="volume" form="short" text-case="capitalize-first"/>
+                    <text variable="volume"/>
+                  </group>
+                </if>
+              </choose>
+            </group>
+          </else>
+        </choose>
+      </else>
+    </choose>
+  </macro>
+  <macro name="title-intext">
+    <choose>
+      <if variable="title" match="none">
+        <text macro="bracketed-intext" prefix="[" suffix="]"/>
+      </if>
+      <else-if type="bill">
+        <choose>
+          <if variable="number container-title" match="none">
+            <text variable="title" form="short" font-style="italic" text-case="title"/>
+          </if>
+          <else-if variable="title">
+            <text variable="title" form="short" text-case="title"/>
+          </else-if>
+          <else>
+            <group delimiter=" ">
+              <text variable="genre"/>
+              <group delimiter=" ">
+                <choose>
+                  <if variable="chapter-number container-title" match="none">
+                    <text term="issue" form="short"/>
+                  </if>
+                </choose>
+                <text variable="number"/>
+              </group>
+            </group>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="legal_case" match="any">
+        <text variable="title" font-style="italic"/>
+      </else-if>
+      <else-if type="legislation treaty" match="any">
+        <text variable="title" form="short" text-case="title"/>
+      </else-if>
+      <else-if type="post webpage" match="any">
+        <text variable="title" form="short" font-style="italic" text-case="title"/>
+      </else-if>
+      <else-if variable="container-title" match="any">
+        <text variable="title" form="short" quotes="true" text-case="title"/>
+      </else-if>
+      <else>
+        <text variable="title" form="short" font-style="italic" text-case="title"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="parenthetical">
+    <group prefix="(" suffix=")">
+      <choose>
+        <if type="patent">
+          <group delimiter=" ">
+            <text variable="authority" form="short"/>
+            <choose>
+              <if variable="genre">
+                <text variable="genre" text-case="capitalize-first"/>
+              </if>
+              <else>
+                <text value="patent" text-case="capitalize-first"/>
+              </else>
+            </choose>
+            <group delimiter=" ">
+              <text term="issue" form="short" text-case="capitalize-first"/>
+              <text variable="number"/>
+            </group>
+          </group>
+        </if>
+        <else-if type="post webpage" match="any">
+          <group delimiter="; ">
+            <text macro="secondary-contributors"/>
+            <text macro="database-location"/>
+            <text macro="number"/>
+            <text macro="locators-booklike"/>
+          </group>
+        </else-if>
+        <else-if variable="container-title">
+          <group delimiter="; ">
+            <text macro="secondary-contributors"/>
+            <choose>
+              <if type="broadcast graphic map motion_picture song" match="any">
+                <text macro="number"/>
+              </if>
+            </choose>
+          </group>
+        </else-if>
+        <else>
+          <group delimiter="; ">
+            <text macro="secondary-contributors"/>
+            <text macro="database-location"/>
+            <text macro="number"/>
+            <text macro="locators-booklike"/>
+          </group>
+        </else>
+      </choose>
+    </group>
+  </macro>
+  <macro name="parenthetical-container">
+    <choose>
+      <if variable="container-title" match="any">
+        <group prefix="(" suffix=")">
+          <group delimiter="; ">
+            <text macro="database-location"/>
+            <choose>
+              <if type="broadcast graphic map motion_picture song" match="none">
+                <text macro="number"/>
+              </if>
+            </choose>
+            <text macro="locators-booklike"/>
+          </group>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="bracketed">
+    <group prefix="[" suffix="]">
+      <choose>
+        <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
+          <group delimiter="; ">
+            <group delimiter=", ">
+              <group delimiter=" ">
+                <choose>
+                  <if variable="number" match="none">
+                    <choose>
+                      <if variable="genre">
+                        <text variable="genre" text-case="capitalize-first"/>
+                      </if>
+                      <else-if variable="medium">
+                        <text variable="medium" text-case="capitalize-first"/>
+                      </else-if>
+                      <else>
+                        <text value="Review of"/>
+                      </else>
+                    </choose>
+                  </if>
+                  <else>
+                    <choose>
+                      <if variable="medium">
+                        <text variable="medium" text-case="capitalize-first"/>
+                      </if>
+                      <else>
+                        <text value="Review of"/>
+                      </else>
+                    </choose>
+                  </else>
+                </choose>
+                <text macro="reviewed-title"/>
+              </group>
+              <names variable="reviewed-author">
+                <label form="verb-short" suffix=" "/>
+                <name and="symbol" initialize-with=". " delimiter=", "/>
+              </names>
+            </group>
+            <choose>
+              <if variable="genre" match="any">
+                <choose>
+                  <if variable="number" match="none">
+                    <text variable="medium" text-case="capitalize-first"/>
+                  </if>
+                </choose>
+              </if>
+            </choose>
+          </group>
+        </if>
+        <else-if type="thesis">
+          <group delimiter="; ">
+            <choose>
+              <if variable="number" match="none">
+                <group delimiter=", ">
+                  <text variable="genre" text-case="capitalize-first"/>
+                  <choose>
+                    <if variable="archive DOI URL" match="any">
+                      <text variable="publisher"/>
+                    </if>
+                  </choose>
+                </group>
+              </if>
+            </choose>
+            <text variable="medium" text-case="capitalize-first"/>
+          </group>
+        </else-if>
+        <else-if variable="interviewer" type="interview" match="any">
+          <choose>
+            <if variable="title">
+              <text macro="format"/>
+            </if>
+            <else-if variable="genre">
+              <group delimiter="; ">
+                <group delimiter=" ">
+                  <text variable="genre" text-case="capitalize-first"/>
+                  <group delimiter=" ">
+                    <text term="author" form="verb"/>
+                    <names variable="interviewer">
+                      <name and="symbol" initialize-with=". " delimiter=", "/>
+                    </names>
+                  </group>
+                </group>
+              </group>
+            </else-if>
+            <else-if variable="interviewer">
+              <group delimiter="; ">
+                <names variable="interviewer">
+                  <label form="verb" suffix=" " text-case="capitalize-first"/>
+                  <name and="symbol" initialize-with=". " delimiter=", "/>
+                </names>
+                <text variable="medium" text-case="capitalize-first"/>
+              </group>
+            </else-if>
+            <else>
+              <text macro="format"/>
+            </else>
+          </choose>
+        </else-if>
+        <else-if type="personal_communication">
+          <choose>
+            <if variable="recipient">
+              <group delimiter="; ">
+                <group delimiter=" ">
+                  <choose>
+                    <if variable="number" match="none">
+                      <choose>
+                        <if variable="genre">
+                          <text variable="genre" text-case="capitalize-first"/>
+                        </if>
+                        <else-if variable="medium">
+                          <text variable="medium" text-case="capitalize-first"/>
+                        </else-if>
+                        <else>
+                          <text term="letter" form="short" text-case="capitalize-first"/>
+                        </else>
+                      </choose>
+                    </if>
+                    <else>
+                      <choose>
+                        <if variable="medium">
+                          <text variable="medium" text-case="capitalize-first"/>
+                        </if>
+                        <else>
+                          <text term="letter" form="short" text-case="capitalize-first"/>
+                        </else>
+                      </choose>
+                    </else>
+                  </choose>
+                  <names variable="recipient" delimiter=", ">
+                    <label form="verb" suffix=" "/>
+                    <name and="symbol" delimiter=", "/>
+                  </names>
+                </group>
+                <choose>
+                  <if variable="genre" match="any">
+                    <choose>
+                      <if variable="number" match="none">
+                        <text variable="medium" text-case="capitalize-first"/>
+                      </if>
+                    </choose>
+                  </if>
+                </choose>
+              </group>
+            </if>
+            <else>
+              <text macro="format"/>
+            </else>
+          </choose>
+        </else-if>
+        <else-if variable="composer" type="song" match="all">
+          <group delimiter="; ">
+            <choose>
+              <if variable="number" match="none">
+                <group delimiter=" ">
+                  <choose>
+                    <if variable="genre">
+                      <text variable="genre" text-case="capitalize-first"/>
+                      <names variable="author" prefix="recorded by ">
+                        <name and="symbol" initialize-with=". " delimiter=", "/>
+                      </names>
+                    </if>
+                    <else-if variable="medium">
+                      <text variable="medium" text-case="capitalize-first"/>
+                      <names variable="author" prefix="recorded by ">
+                        <name and="symbol" initialize-with=". " delimiter=", "/>
+                      </names>
+                    </else-if>
+                    <else>
+                      <names variable="author" prefix="Recorded by ">
+                        <name and="symbol" initialize-with=". " delimiter=", "/>
+                      </names>
+                    </else>
+                  </choose>
+                </group>
+              </if>
+              <else>
+                <group delimiter=" ">
+                  <choose>
+                    <if variable="medium">
+                      <text variable="medium" text-case="capitalize-first"/>
+                      <names variable="author" prefix="recorded by ">
+                        <name and="symbol" initialize-with=". " delimiter=", "/>
+                      </names>
+                    </if>
+                    <else>
+                      <names variable="author" prefix="Recorded by ">
+                        <name and="symbol" initialize-with=". " delimiter=", "/>
+                      </names>
+                    </else>
+                  </choose>
+                </group>
+              </else>
+            </choose>
+            <choose>
+              <if variable="genre" match="any">
+                <choose>
+                  <if variable="number" match="none">
+                    <text variable="medium" text-case="capitalize-first"/>
+                  </if>
+                </choose>
+              </if>
+            </choose>
+          </group>
+        </else-if>
+        <else-if variable="container-title" match="none">
+          <text macro="format"/>
+        </else-if>
+        <else>
+          <choose>
+            <if type="paper-conference speech" match="any">
+              <choose>
+                <if variable="collection-editor editor editorial-director issue page volume" match="any">
+                  <text macro="format"/>
+                </if>
+              </choose>
+            </if>
+            <else-if type="book">
+              <choose>
+                <if variable="version" match="none">
+                  <text macro="format"/>
+                </if>
+              </choose>
+            </else-if>
+            <else-if type="report" match="none">
+              <text macro="format"/>
+            </else-if>
+          </choose>
+        </else>
+      </choose>
+    </group>
+  </macro>
+  <macro name="bracketed-intext">
+    <group prefix="[" suffix="]">
+      <choose>
+        <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
+          <text macro="reviewed-title-intext" prefix="Review of "/>
+        </if>
+        <else-if variable="interviewer" type="interview" match="any">
+          <names variable="interviewer">
+            <label form="verb" suffix=" " text-case="capitalize-first"/>
+            <name and="symbol" initialize-with=". " delimiter=", "/>
+            <substitute>
+              <text macro="format-intext"/>
+            </substitute>
+          </names>
+        </else-if>
+        <else-if type="personal_communication">
+          <choose>
+            <if variable="recipient">
+              <group delimiter=" ">
+                <choose>
+                  <if variable="number" match="none">
+                    <text variable="genre" text-case="capitalize-first"/>
+                  </if>
+                  <else>
+                    <text term="letter" form="short" text-case="capitalize-first"/>
+                  </else>
+                </choose>
+                <names variable="recipient" delimiter=", ">
+                  <label form="verb" suffix=" "/>
+                  <name and="symbol" delimiter=", "/>
+                </names>
+              </group>
+            </if>
+            <else>
+              <text macro="format-intext"/>
+            </else>
+          </choose>
+        </else-if>
+        <else>
+          <text macro="format-intext"/>
+        </else>
+      </choose>
+    </group>
+  </macro>
+  <macro name="bracketed-container">
+    <group prefix="[" suffix="]">
+      <choose>
+        <if type="paper-conference speech" match="any">
+          <choose>
+            <if variable="collection-editor editor editorial-director issue page volume" match="none">
+              <text macro="format"/>
+            </if>
+          </choose>
+        </if>
+        <else-if type="book" variable="version" match="all">
+          <text macro="format"/>
+        </else-if>
+        <else-if type="report">
+          <text macro="format"/>
+        </else-if>
+      </choose>
+    </group>
+  </macro>
+  <macro name="secondary-contributors">
+    <choose>
+      <if type="article-journal article-magazine article-newspaper post-weblog review review-book" match="any">
+        <text macro="secondary-contributors-periodical"/>
+      </if>
+      <else-if type="paper-conference">
+        <choose>
+          <if variable="collection-editor editor editorial-director" match="any">
+            <text macro="secondary-contributors-booklike"/>
+          </if>
+          <else>
+            <text macro="secondary-contributors-periodical"/>
+          </else>
+        </choose>
+      </else-if>
+      <else>
+        <text macro="secondary-contributors-booklike"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="secondary-contributors-periodical">
+    <group delimiter="; ">
+      <choose>
+        <if variable="title">
+          <names variable="interviewer" delimiter="; ">
+            <name and="symbol" initialize-with=". " delimiter=", "/>
+            <label form="short" prefix=", " text-case="title"/>
+          </names>
+        </if>
+      </choose>
+      <names variable="translator" delimiter="; ">
+        <name and="symbol" initialize-with=". " delimiter=", "/>
+        <label form="short" prefix=", " text-case="title"/>
+      </names>
+    </group>
+  </macro>
+  <macro name="secondary-contributors-booklike">
+    <group delimiter="; ">
+      <choose>
+        <if variable="title">
+          <names variable="interviewer">
+            <name and="symbol" initialize-with=". " delimiter=", "/>
+            <label form="short" prefix=", " text-case="title"/>
+          </names>
+        </if>
+      </choose>
+      <choose>
+        <if type="post webpage" match="none">
+          <choose>
+            <if variable="container-title" match="none">
+              <group delimiter="; ">
+                <names variable="container-author">
+                  <label form="verb-short" suffix=" " text-case="title"/>
+                  <name and="symbol" initialize-with=". " delimiter=", "/>
+                </names>
+                <names variable="editor translator" delimiter="; ">
+                  <name and="symbol" initialize-with=". " delimiter=", "/>
+                  <label form="short" prefix=", " text-case="title"/>
+                </names>
+              </group>
+            </if>
+          </choose>
+        </if>
+        <else>
+          <group delimiter="; ">
+            <names variable="container-author">
+              <label form="verb-short" suffix=" " text-case="title"/>
+              <name and="symbol" initialize-with=". " delimiter=", "/>
+            </names>
+            <names variable="editor translator" delimiter="; ">
+              <name and="symbol" initialize-with=". " delimiter=", "/>
+              <label form="short" prefix=", " text-case="title"/>
+            </names>
+          </group>
+        </else>
+      </choose>
+    </group>
+  </macro>
+  <macro name="database-location">
+    <choose>
+      <if variable="archive-place" match="none">
+        <text variable="archive_location"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="number">
+    <choose>
+      <if variable="number">
+        <group delimiter=", ">
+          <group delimiter=" ">
+            <text variable="genre" text-case="title"/>
+            <choose>
+              <if is-numeric="number">
+                <text term="issue" form="short" text-case="capitalize-first"/>
+                <text variable="number"/>
+              </if>
+              <else>
+                <text variable="number"/>
+              </else>
+            </choose>
+          </group>
+          <choose>
+            <if type="thesis">
+              <choose>
+                <if variable="archive DOI URL" match="any">
+                  <text variable="publisher"/>
+                </if>
+              </choose>
+            </if>
+          </choose>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="locators-booklike">
+    <choose>
+      <if type="article-journal article-magazine article-newspaper broadcast interview patent post post-weblog review review-book speech webpage" match="any"/>
+      <else-if type="paper-conference">
+        <choose>
+          <if variable="collection-editor editor editorial-director" match="any">
+            <group delimiter=", ">
+              <text macro="version"/>
+              <text macro="edition"/>
+              <text macro="volume-booklike"/>
+            </group>
+          </if>
+        </choose>
+      </else-if>
+      <else>
+        <group delimiter=", ">
+          <text macro="version"/>
+          <text macro="edition"/>
+          <text macro="volume-booklike"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="version">
+    <choose>
+      <if is-numeric="version">
+        <group delimiter=" ">
+          <text term="version" text-case="capitalize-first"/>
+          <text variable="version"/>
+        </group>
+      </if>
+      <else>
+        <text variable="version"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <label variable="edition" form="short"/>
+        </group>
+      </if>
+      <else>
+        <text variable="edition"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="volume-booklike">
+    <group delimiter=", ">
+      <choose>
+        <if type="report">
+          <group delimiter=" ">
+            <text variable="collection-title" text-case="title"/>
+            <text variable="collection-number"/>
+          </group>
+        </if>
+      </choose>
+      <choose>
+        <if variable="volume" match="any">
+          <choose>
+            <if is-numeric="volume" match="none"/>
+            <else>
+              <group delimiter=" ">
+                <label variable="volume" form="short" text-case="capitalize-first"/>
+                <number variable="volume" form="numeric"/>
+              </group>
+            </else>
+          </choose>
+        </if>
+        <else>
+          <group>
+            <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+            <text term="page-range-delimiter" prefix="1"/>
+            <number variable="number-of-volumes" form="numeric"/>
+          </group>
+        </else>
+      </choose>
+      <group delimiter=" ">
+        <label variable="issue" text-case="capitalize-first"/>
+        <text variable="issue"/>
+      </group>
+      <group delimiter=" ">
+        <label variable="page" form="short" suffix=" "/>
+        <text variable="page"/>
+      </group>
+    </group>
+  </macro>
+  <macro name="reviewed-title">
+    <choose>
+      <if variable="reviewed-title">
+        <text variable="reviewed-title" font-style="italic"/>
+      </if>
+      <else>
+        <text variable="title" font-style="italic"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="reviewed-title-intext">
+    <choose>
+      <if variable="reviewed-title">
+        <text variable="reviewed-title" form="short" font-style="italic" text-case="title"/>
+      </if>
+      <else>
+        <text variable="title" form="short" font-style="italic" text-case="title"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="format">
+    <choose>
+      <if variable="genre medium" match="any">
+        <group delimiter="; ">
+          <choose>
+            <if variable="number" match="none">
+              <text variable="genre" text-case="capitalize-first"/>
+            </if>
+          </choose>
+          <text variable="medium" text-case="capitalize-first"/>
+        </group>
+      </if>
+      <else-if type="dataset">
+        <text value="Data set"/>
+      </else-if>
+      <else-if type="book" variable="version" match="all">
+        <text value="Computer software"/>
+      </else-if>
+      <else-if type="interview personal_communication" match="any">
+        <choose>
+          <if variable="archive container-title DOI publisher URL" match="none">
+            <text term="letter" text-case="capitalize-first"/>
+          </if>
+          <else-if type="interview">
+            <text term="interview" text-case="capitalize-first"/>
+          </else-if>
+        </choose>
+      </else-if>
+      <else-if type="map">
+        <text value="Map"/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="format-intext">
+    <choose>
+      <if variable="genre" match="any">
+        <text variable="genre" text-case="capitalize-first"/>
+      </if>
+      <else-if variable="medium">
+        <text variable="medium" text-case="capitalize-first"/>
+      </else-if>
+      <else-if type="dataset">
+        <text value="Data set"/>
+      </else-if>
+      <else-if type="book" variable="version" match="all">
+        <text value="Computer software"/>
+      </else-if>
+      <else-if type="interview personal_communication" match="any">
+        <choose>
+          <if variable="archive container-title DOI publisher URL" match="none">
+            <text term="letter" text-case="capitalize-first"/>
+          </if>
+          <else-if type="interview">
+            <text term="interview" text-case="capitalize-first"/>
+          </else-if>
+        </choose>
+      </else-if>
+      <else-if type="map">
+        <text value="Map"/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="container">
+    <choose>
+      <if type="article-journal article-magazine article-newspaper post-weblog review review-book" match="any">
+        <text macro="container-periodical"/>
+      </if>
+      <else-if type="paper-conference">
+        <choose>
+          <if variable="editor editorial-director collection-editor container-author" match="any">
+            <text macro="container-booklike"/>
+          </if>
+          <else>
+            <text macro="container-periodical"/>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="post webpage" match="none">
+        <text macro="container-booklike"/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="container-periodical">
+    <group delimiter=". ">
+      <group delimiter=", ">
+        <text variable="container-title" font-style="italic" text-case="title"/>
+        <choose>
+          <if variable="volume">
+            <group>
+              <text variable="volume" font-style="italic"/>
+              <text variable="issue" prefix="(" suffix=")"/>
+            </group>
+          </if>
+          <else>
+            <text variable="issue" font-style="italic"/>
+          </else>
+        </choose>
+        <choose>
+          <if variable="page">
+            <text variable="page"/>
+          </if>
+          <else>
+            <text variable="number" prefix="Article "/>
+          </else>
+        </choose>
+      </group>
+      <choose>
+        <if variable="issued">
+          <choose>
+            <if variable="issue page volume" match="none">
+              <text variable="status" text-case="capitalize-first"/>
+            </if>
+          </choose>
+        </if>
+      </choose>
+    </group>
+  </macro>
+  <macro name="container-booklike">
+    <choose>
+      <if variable="container-title" match="any">
+        <group delimiter=" ">
+          <text term="in" text-case="capitalize-first"/>
+          <group delimiter=", ">
+            <names variable="editor translator" delimiter=", &amp; ">
+              <name and="symbol"/>
+              <label form="short" text-case="title" prefix=" (" suffix=")"/>
+              <substitute>
+                <names variable="editorial-director"/>
+                <names variable="collection-editor"/>
+                <names variable="container-author"/>
+              </substitute>
+            </names>
+            <group delimiter=": " font-style="italic">
+              <text variable="container-title"/>
+              <choose>
+                <if is-numeric="volume" match="none">
+                  <group delimiter=" ">
+                    <label variable="volume" form="short" text-case="capitalize-first"/>
+                    <text variable="volume"/>
+                  </group>
+                </if>
+              </choose>
+            </group>
+          </group>
+          <text macro="parenthetical-container"/>
+          <text macro="bracketed-container"/>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <group delimiter="; ">
+      <choose>
+        <if type="thesis">
+          <choose>
+            <if variable="archive DOI URL" match="none">
+              <text variable="publisher"/>
+            </if>
+          </choose>
+        </if>
+        <else-if type="post webpage" match="any">
+          <group delimiter="; ">
+            <text variable="container-title" text-case="title"/>
+            <text variable="publisher"/>
+          </group>
+        </else-if>
+        <else-if type="paper-conference">
+          <choose>
+            <if variable="collection-editor editor editorial-director" match="any">
+              <text variable="publisher"/>
+            </if>
+          </choose>
+        </else-if>
+        <else-if type="article-journal article-magazine article-newspaper post-weblog" match="none">
+          <group delimiter=": ">
+            <text variable="publisher-place"/>
+            <text variable="publisher"/>
+          </group>
+        </else-if>
+      </choose>
+      <group delimiter=", ">
+        <choose>
+          <if variable="archive-place">
+            <text variable="archive_location"/>
+          </if>
+        </choose>
+        <text variable="archive"/>
+        <text variable="archive-place"/>
+      </group>
+    </group>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if variable="DOI" match="any">
+        <choose>
+          <if match="none" variable="volume page">
+            <text variable="DOI" prefix="https://doi.org/"/>
+          </if>
+        </choose>
+      </if>
+      <else-if variable="URL">
+        <group delimiter=" ">
+          <choose>
+            <if variable="issued status" match="none">
+              <group delimiter=" ">
+                <text term="retrieved" text-case="capitalize-first"/>
+                <date variable="accessed" form="text" suffix=","/>
+                <text term="from"/>
+              </group>
+            </if>
+          </choose>
+          <text variable="URL"/>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="event">
+    <choose>
+      <if variable="event">
+        <choose>
+          <if variable="collection-editor editor editorial-director issue page volume" match="none">
+            <group delimiter=", ">
+              <text variable="event"/>
+              <text variable="event-place"/>
+            </group>
+          </if>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="publication-history">
+    <choose>
+      <if type="patent" match="none">
+        <group prefix="(" suffix=")">
+          <choose>
+            <if variable="references">
+              <text variable="references"/>
+            </if>
+            <else>
+              <group delimiter=" ">
+                <text value="Original work published"/>
+                <choose>
+                  <if is-uncertain-date="original-date">
+                    <text term="circa" form="short"/>
+                  </if>
+                </choose>
+                <date variable="original-date">
+                  <date-part name="year"/>
+                </date>
+              </group>
+            </else>
+          </choose>
+        </group>
+      </if>
+      <else>
+        <text variable="references" prefix="(" suffix=")"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="legal-cites">
+    <choose>
+      <if type="legal_case">
+        <group delimiter=". ">
+          <group delimiter=", ">
+            <text variable="title"/>
+            <group delimiter=" ">
+              <text macro="container-legal"/>
+              <text macro="date-legal"/>
+            </group>
+            <text variable="references"/>
+          </group>
+          <text macro="access"/>
+        </group>
+      </if>
+      <else-if type="bill">
+        <group delimiter=". ">
+          <group delimiter=", ">
+            <choose>
+              <if variable="number container-title" match="none">
+                <text variable="title" font-style="italic"/>
+              </if>
+              <else>
+                <text variable="title"/>
+              </else>
+            </choose>
+            <group delimiter=" ">
+              <text macro="container-legal"/>
+              <text macro="date-legal"/>
+              <choose>
+                <if variable="number container-title" match="none">
+                  <names variable="author" prefix="(testimony of " suffix=")">
+                    <name and="symbol" delimiter=", "/>
+                  </names>
+                </if>
+                <else>
+                  <text variable="status" prefix="(" suffix=")"/>
+                </else>
+              </choose>
+            </group>
+            <text variable="references"/>
+          </group>
+          <text macro="access"/>
+        </group>
+      </else-if>
+      <else-if type="legislation">
+        <group delimiter=". ">
+          <group delimiter=", ">
+            <text variable="title"/>
+            <group delimiter=" ">
+              <text macro="container-legal"/>
+              <text macro="date-legal"/>
+              <text variable="status" prefix="(" suffix=")"/>
+            </group>
+            <text variable="references"/>
+          </group>
+          <text macro="access"/>
+        </group>
+      </else-if>
+      <else-if type="treaty">
+        <group delimiter=", ">
+          <text variable="title" text-case="title"/>
+          <names variable="author">
+            <name initialize-with="." form="short" delimiter="-"/>
+          </names>
+          <text macro="date-legal"/>
+          <text macro="container-legal"/>
+          <text macro="access"/>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="date-legal">
+    <choose>
+      <if type="legal_case">
+        <group prefix="(" suffix=")" delimiter=" ">
+          <text variable="authority"/>
+          <choose>
+            <if variable="container-title" match="any">
+              <date variable="issued" form="numeric" date-parts="year"/>
+            </if>
+            <else>
+              <date variable="issued" form="text"/>
+            </else>
+          </choose>
+        </group>
+      </if>
+      <else-if type="bill legislation" match="any">
+        <group prefix="(" suffix=")" delimiter=" ">
+          <group delimiter=" ">
+            <date variable="original-date">
+              <date-part name="year"/>
+            </date>
+            <text term="and" form="symbol"/>
+          </group>
+          <date variable="issued">
+            <date-part name="year"/>
+          </date>
+        </group>
+      </else-if>
+      <else-if type="treaty">
+        <date variable="issued" form="text"/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="container-legal">
+    <choose>
+      <if type="legal_case">
+        <group delimiter=" ">
+          <choose>
+            <if variable="container-title">
+              <group delimiter=" ">
+                <text variable="volume"/>
+                <text variable="container-title"/>
+                <group delimiter=" ">
+                  <text term="section" form="symbol"/>
+                  <text variable="section"/>
+                </group>
+                <choose>
+                  <if variable="page page-first" match="any">
+                    <text variable="page-first"/>
+                  </if>
+                  <else>
+                    <text value="___"/>
+                  </else>
+                </choose>
+              </group>
+            </if>
+            <else>
+              <group delimiter=" ">
+                <choose>
+                  <if is-numeric="number">
+                    <text term="issue" form="short" text-case="capitalize-first"/>
+                  </if>
+                </choose>
+                <text variable="number"/>
+              </group>
+            </else>
+          </choose>
+        </group>
+      </if>
+      <else-if type="bill">
+        <group delimiter=", ">
+          <group delimiter=" ">
+            <text variable="genre"/>
+            <group delimiter=" ">
+              <choose>
+                <if variable="chapter-number container-title" match="none">
+                  <text term="issue" form="short"/>
+                </if>
+              </choose>
+              <text variable="number"/>
+            </group>
+          </group>
+          <text variable="authority"/>
+          <text variable="chapter-number"/>
+          <group delimiter=" ">
+            <text variable="volume"/>
+            <text variable="container-title"/>
+            <text variable="page-first"/>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="legislation">
+        <choose>
+          <if variable="number">
+            <group delimiter=", ">
+              <text variable="number" prefix="Pub. L. No. "/>
+              <group delimiter=" ">
+                <text variable="volume"/>
+                <text variable="container-title"/>
+                <text variable="page-first"/>
+              </group>
+            </group>
+          </if>
+          <else>
+            <group delimiter=" ">
+              <text variable="volume"/>
+              <text variable="container-title"/>
+              <choose>
+                <if variable="section">
+                  <group delimiter=" ">
+                    <text term="section" form="symbol"/>
+                    <text variable="section"/>
+                  </group>
+                </if>
+                <else>
+                  <text variable="page-first"/>
+                </else>
+              </choose>
+            </group>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="treaty">
+        <group delimiter=" ">
+          <number variable="volume"/>
+          <text variable="container-title"/>
+          <choose>
+            <if variable="page page-first" match="any">
+              <text variable="page-first"/>
+            </if>
+            <else>
+              <group delimiter=" ">
+                <text term="issue" form="short" text-case="capitalize-first"/>
+                <text variable="number"/>
+              </group>
+            </else>
+          </choose>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="citation-locator">
+    <group delimiter=" ">
+      <choose>
+        <if locator="chapter">
+          <label variable="locator" text-case="capitalize-first"/>
+        </if>
+        <else>
+          <label variable="locator" form="short"/>
+        </else>
+      </choose>
+      <text variable="locator"/>
+    </group>
+  </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" givenname-disambiguation-rule="primary-name-with-initials">
+    <sort>
+      <key macro="author-bib" names-min="3" names-use-first="1"/>
+      <key macro="date-sort-group"/>
+      <key macro="date-sort-date" sort="ascending"/>
+      <key variable="status"/>
+    </sort>
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <group delimiter=", ">
+        <text macro="author-intext"/>
+        <text macro="date-intext"/>
+        <text macro="citation-locator"/>
+      </group>
+    </layout>
+  </citation>
+  <bibliography hanging-indent="true" et-al-min="21" et-al-use-first="19" et-al-use-last="true" entry-spacing="0" line-spacing="2">
+    <sort>
+      <key macro="author-bib"/>
+      <key macro="date-sort-group"/>
+      <key macro="date-sort-date" sort="ascending"/>
+      <key variable="status"/>
+      <key macro="title"/>
+    </sort>
+    <layout>
+      <choose>
+        <if type="bill legal_case legislation treaty" match="any">
+          <choose>
+            <if variable="DOI URL" match="any">
+              <text macro="legal-cites"/>
+            </if>
+            <else>
+              <text macro="legal-cites" suffix="."/>
+            </else>
+          </choose>
+        </if>
+        <else>
+          <group delimiter=" ">
+            <group delimiter=". " suffix=".">
+              <text macro="author-bib"/>
+              <text macro="date-bib"/>
+              <text macro="title-and-descriptions"/>
+              <text macro="container"/>
+              <text macro="event"/>
+              <text macro="publisher"/>
+            </group>
+            <text macro="access"/>
+            <text macro="publication-history"/>
+          </group>
+        </else>
+      </choose>
+    </layout>
+  </bibliography>
+</style>
diff --git a/buildres/csl/csl-styles/pakistani-veterinary-journal.csl b/buildres/csl/csl-styles/pakistani-veterinary-journal.csl
index d6a45b2b6b7..0e8a9fabf2a 100644
--- a/buildres/csl/csl-styles/pakistani-veterinary-journal.csl
+++ b/buildres/csl/csl-styles/pakistani-veterinary-journal.csl
@@ -5,7 +5,7 @@
     <title-short>PKV</title-short>
     <id>http://www.zotero.org/styles/pakistani-veterinary-journal</id>
     <link href="http://www.zotero.org/styles/pakistani-veterinary-journal" rel="self"/>
-    <link href="http://www.zotero.org/styles/high-altitude-medicine-and-biology" rel="template"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-vancouver" rel="template"/>
     <link href="http://www.pvj.com.pk/Instructions.htm" rel="documentation"/>
     <author>
       <email>obrienpat86@gmail.com</email>
diff --git a/buildres/csl/csl-styles/photosynthetica.csl b/buildres/csl/csl-styles/photosynthetica.csl
index 2b36b7329b8..6c1713e9f02 100644
--- a/buildres/csl/csl-styles/photosynthetica.csl
+++ b/buildres/csl/csl-styles/photosynthetica.csl
@@ -4,7 +4,7 @@
     <title>Photosynthetica</title>
     <id>http://www.zotero.org/styles/photosynthetica</id>
     <link href="http://www.zotero.org/styles/photosynthetica" rel="self"/>
-    <link href="http://www.zotero.org/styles/journal-of-child-and-adolescent-psychopharmacology" rel="template"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-harvard" rel="template"/>
     <link href="https://ps.ueb.cas.cz/artkey/inf-990000-0200_For-Authors.php" rel="documentation"/>
     <author>
       <name>Patrick O'Brien</name>
diff --git a/buildres/csl/csl-styles/politique-europeenne.csl b/buildres/csl/csl-styles/politique-europeenne.csl
new file mode 100644
index 00000000000..a19f92cf3fb
--- /dev/null
+++ b/buildres/csl/csl-styles/politique-europeenne.csl
@@ -0,0 +1,270 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" initialize="false" page-range-format="expanded">
+  <!-- This style was edited with the Visual CSL Editor (https://editor.citationstyles.org/visualEditor/) -->
+  <info>
+    <title>Politique Européenne</title>
+    <title-short>PE</title-short>
+    <id>http://www.zotero.org/styles/politique-europeenne</id>
+    <link href="http://www.zotero.org/styles/politique-europeenne" rel="self"/>
+    <link href="http://www.zotero.org/styles/revue-francaise-de-sociologie" rel="template"/>
+    <link href="http://politique-europeenne.eu/fr/" rel="documentation"/>
+    <author>
+      <name>Laurie Beaudonnet</name>
+      <email>laurie.beaudonnet@umontreal.ca</email>
+    </author>
+    <category citation-format="author-date"/>
+    <category field="social_science"/>
+    <category field="political_science"/>
+    <issn>1623-6297</issn>
+    <eissn>2105-2875</eissn>
+    <issnl>1623-6297</issnl>
+    <summary>Style utilisé par Politique Européenne depuis 2022</summary>
+    <updated>2022-01-17T20:19:13+00:00</updated>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
+  </info>
+  <locale xml:lang="fr">
+    <terms>
+      <term name="editor" form="short">
+        <single>dir.</single>
+        <multiple>dirs.</multiple>
+      </term>
+    </terms>
+  </locale>
+  <macro name="editor">
+    <names variable="editor" font-variant="normal" delimiter=" ">
+      <name font-variant="normal" delimiter=" " delimiter-precedes-last="always" initialize="false" initialize-with="." name-as-sort-order="all" sort-separator=" "/>
+      <label form="short" prefix=" (" suffix=")" text-case="lowercase"/>
+      <substitute>
+        <names variable="editorial-director"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="author-last">
+    <names variable="author" font-variant="normal">
+      <name font-variant="normal" font-weight="normal" delimiter-precedes-last="always" initialize="false" initialize-with="." name-as-sort-order="all" sort-separator=" "/>
+      <label form="short" prefix=" (" suffix=")" text-case="lowercase"/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="editorial-director"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="author-sort">
+    <names variable="author" font-variant="normal">
+      <name font-variant="normal" delimiter-precedes-last="always" initialize="false" name-as-sort-order="all" sort-separator=" "/>
+      <label form="short" prefix=" (" suffix=")" text-case="lowercase"/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="editorial-director"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="author-short">
+    <names variable="author">
+      <name form="short" and="text" delimiter-precedes-last="never" initialize="false"/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="editorial-director"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="translator">
+    <text term="translator" form="verb" suffix=" "/>
+    <names variable="translator">
+      <name font-variant="normal" delimiter-precedes-last="always" initialize="false" initialize-with="." name-as-sort-order="all" sort-separator=" "/>
+    </names>
+  </macro>
+  <macro name="publisher-collection">
+    <group delimiter=", ">
+      <text variable="publisher-place"/>
+      <text variable="publisher"/>
+    </group>
+  </macro>
+  <macro name="year-date-short">
+    <choose>
+      <if variable="original-date">
+        <date variable="original-date" prefix="[" suffix="] ">
+          <date-part name="year"/>
+        </date>
+      </if>
+    </choose>
+    <choose>
+      <if variable="issued">
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
+      </if>
+      <else>
+        <text term="no date" form="short"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="full-date">
+    <date delimiter=" " variable="issued">
+      <date-part name="day"/>
+      <date-part name="month"/>
+      <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="long"/>
+        </group>
+      </if>
+      <else>
+        <text variable="edition"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="citation-locator">
+    <group>
+      <label variable="locator" form="short" suffix=".&#160;"/>
+      <text variable="locator"/>
+    </group>
+  </macro>
+  <macro name="page">
+    <group>
+      <label suffix=".&#160;" variable="page" form="short"/>
+      <text variable="page"/>
+    </group>
+  </macro>
+  <macro name="number-of-pages">
+    <group>
+      <text variable="number-of-pages" suffix="&#160;p"/>
+    </group>
+  </macro>
+  <citation et-al-min="4" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" collapse="year">
+    <sort>
+      <key macro="author-last"/>
+      <key macro="year-date-short"/>
+    </sort>
+    <layout prefix="(" suffix=")" delimiter="&#160;; ">
+      <group delimiter=", ">
+        <text macro="author-short"/>
+        <text macro="year-date-short"/>
+        <text macro="citation-locator"/>
+      </group>
+    </layout>
+  </citation>
+  <bibliography initialize="false" entry-spacing="2">
+    <sort>
+      <key macro="author-sort"/>
+      <key variable="issued"/>
+    </sort>
+    <layout suffix=".">
+      <text macro="author-last" font-weight="bold" suffix=" "/>
+      <text macro="year-date-short" prefix="(" suffix="), "/>
+      <choose>
+        <if type="report">
+          <group delimiter=", ">
+            <text variable="title" quotes="true"/>
+            <text macro="translator"/>
+            <text variable="genre"/>
+            <text variable="collection-title" font-style="italic"/>
+            <text variable="number"/>
+            <text variable="publisher-place"/>
+            <text variable="publisher"/>
+          </group>
+        </if>
+        <else-if type="book">
+          <group delimiter=", ">
+            <text variable="title" font-style="italic"/>
+            <text macro="translator"/>
+            <text variable="genre"/>
+            <text macro="editor"/>
+            <text macro="edition"/>
+            <text macro="publisher-collection"/>
+            <text variable="medium"/>
+            <group delimiter=" ">
+              <text term="version"/>
+              <text variable="version"/>
+            </group>
+            <text macro="number-of-pages"/>
+          </group>
+        </else-if>
+        <else-if type="thesis">
+          <group delimiter=", ">
+            <text variable="title" font-style="italic"/>
+            <text macro="translator"/>
+            <choose>
+              <if variable="genre">
+                <text variable="genre"/>
+              </if>
+              <else>
+                <text value="Thèse de doctorat"/>
+              </else>
+            </choose>
+            <text macro="edition"/>
+            <text macro="publisher-collection"/>
+            <text macro="number-of-pages"/>
+          </group>
+        </else-if>
+        <else-if type="chapter">
+          <text variable="title" quotes="true"/>
+          <group prefix=", ">
+            <text value="dans" suffix=" "/>
+            <text macro="editor" suffix=", "/>
+            <group delimiter=", ">
+              <text variable="container-title" font-style="italic"/>
+              <text macro="translator"/>
+              <text macro="edition"/>
+              <text macro="publisher-collection"/>
+              <text macro="page"/>
+            </group>
+          </group>
+        </else-if>
+        <else-if type="speech">
+          <group delimiter=", ">
+            <text variable="title" quotes="true"/>
+            <text variable="event"/>
+            <text variable="event-place"/>
+            <text macro="full-date"/>
+            <text macro="translator"/>
+          </group>
+        </else-if>
+        <else-if type="article-newspaper article-magazine interview broadcast post-weblog post" match="any">
+          <group delimiter=", ">
+            <text variable="title" quotes="true"/>
+            <text variable="container-title" font-style="italic" prefix=" "/>
+            <text macro="full-date"/>
+            <text macro="translator"/>
+            <text macro="page"/>
+            <text variable="URL"/>
+          </group>
+        </else-if>
+        <else-if type="webpage" match="any">
+          <group>
+            <text variable="title" quotes="false"/>
+            <text variable="container-title-short" font-style="italic" prefix=",  "/>
+            <text macro="translator"/>
+            <text variable="URL" prefix=", "/>
+          </group>
+        </else-if>
+        <else-if type="paper-conference" match="any">
+          <group>
+            <text variable="title" quotes="true"/>
+            <text variable="event" font-style="normal" prefix=" "/>
+            <text variable="event-place" font-style="normal" prefix=", "/>
+            <date form="text" variable="event-date" prefix=", "/>
+          </group>
+        </else-if>
+        <else>
+          <group delimiter=" " suffix=",">
+            <text variable="title" quotes="true"/>
+            <text macro="editor"/>
+          </group>
+          <group prefix=" " delimiter=", ">
+            <text variable="container-title" font-style="italic"/>
+            <text variable="volume" font-style="normal" prefix="vol."/>
+            <text variable="issue"/>
+            <text macro="translator"/>
+            <text macro="page"/>
+          </group>
+        </else>
+      </choose>
+    </layout>
+  </bibliography>
+</style>
diff --git a/buildres/csl/csl-styles/population.csl b/buildres/csl/csl-styles/population.csl
index 4a650687147..3e75caa2912 100644
--- a/buildres/csl/csl-styles/population.csl
+++ b/buildres/csl/csl-styles/population.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" default-locale="fr-FR" page-range-format="expanded" demote-non-dropping-particle="never">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" page-range-format="expanded" demote-non-dropping-particle="never" default-locale="fr-FR">
   <info>
     <title>Population (Français)</title>
     <title-short>Population-F</title-short>
@@ -17,7 +17,7 @@
     <issn>0032-4663</issn>
     <eissn>1957-7966</eissn>
     <summary>Le style de la revue de l'Ined Population.</summary>
-    <updated>2015-01-27T16:00:00+01:00</updated>
+    <updated>2022-05-27T10:00:00+02: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">
@@ -30,9 +30,7 @@
   </locale>
   <macro name="editor">
     <names variable="editor" delimiter=" ">
-      <name name-as-sort-order="all" sort-separator=" " delimiter=", " delimiter-precedes-last="always">
-        <name-part name="family" font-weight="bold"/>
-      </name>
+      <name name-as-sort-order="all" sort-separator=" " delimiter=", " delimiter-precedes-last="always" initialize-with=". "/>
       <label form="short" prefix=" (" suffix=")" text-case="lowercase"/>
       <substitute>
         <names variable="editorial-director"/>
@@ -41,13 +39,13 @@
   </macro>
   <macro name="author-last">
     <names variable="author">
-      <name name-as-sort-order="all" sort-separator=" " delimiter=", " delimiter-precedes-last="always">
+      <name name-as-sort-order="all" sort-separator=" " delimiter=", " delimiter-precedes-last="always" initialize-with=". ">
         <name-part name="family" font-variant="small-caps" font-weight="bold"/>
       </name>
       <label form="short" prefix=" " text-case="lowercase"/>
       <substitute>
         <names variable="editor">
-          <name name-as-sort-order="all" sort-separator=" " delimiter=", " delimiter-precedes-last="always">
+          <name name-as-sort-order="all" sort-separator=" " delimiter=", " delimiter-precedes-last="always" initialize-with=". ">
             <name-part name="family" font-variant="small-caps" font-weight="bold"/>
           </name>
           <label form="short" prefix=" (" suffix=")" text-case="lowercase"/>
@@ -155,109 +153,112 @@
       <key macro="author-last"/>
       <key variable="issued"/>
     </sort>
-    <layout suffix=".">
-      <text macro="author-last" suffix=", "/>
-      <text macro="year-date-short" suffix=", "/>
-      <choose>
-        <if type="report">
-          <group delimiter=", ">
-            <text variable="title" quotes="true"/>
-            <text macro="translator"/>
-            <text variable="genre"/>
-            <text variable="collection-title" font-style="italic"/>
-            <text variable="number"/>
-            <text variable="publisher-place"/>
-            <text variable="publisher"/>
-          </group>
-        </if>
-        <else-if type="book">
-          <group delimiter=", ">
-            <text variable="title" font-style="italic"/>
-            <text macro="translator"/>
-            <text variable="genre"/>
-            <text macro="editor"/>
-            <text macro="edition"/>
-            <text macro="publisher-collection"/>
-            <text variable="medium"/>
-            <group delimiter=" ">
-              <text term="version"/>
-              <text variable="version"/>
+    <layout>
+      <group suffix=".">
+        <text macro="author-last" suffix=", "/>
+        <text macro="year-date-short" suffix=", "/>
+        <choose>
+          <if type="report">
+            <group delimiter=", ">
+              <text variable="title" quotes="true"/>
+              <text macro="translator"/>
+              <text variable="genre"/>
+              <text variable="collection-title" font-style="italic"/>
+              <text variable="number"/>
+              <text variable="publisher-place"/>
+              <text variable="publisher"/>
             </group>
-            <text macro="number-of-pages"/>
-          </group>
-        </else-if>
-        <else-if type="thesis">
-          <group delimiter=", ">
-            <text variable="title" font-style="italic"/>
-            <text macro="translator"/>
-            <choose>
-              <if variable="genre">
-                <text variable="genre"/>
-              </if>
-              <else>
-                <text value="Ph.D. thesis"/>
-              </else>
-            </choose>
-            <text macro="edition"/>
-            <text macro="publisher-collection"/>
-            <text macro="number-of-pages"/>
-          </group>
-        </else-if>
-        <else-if type="chapter">
-          <text variable="title" quotes="true"/>
-          <group prefix=", ">
-            <text value="in" suffix=" " font-style="italic"/>
-            <text macro="editor" suffix=", "/>
+          </if>
+          <else-if type="book">
             <group delimiter=", ">
-              <text variable="container-title" font-style="italic"/>
+              <text variable="title" font-style="italic"/>
               <text macro="translator"/>
+              <text variable="genre"/>
+              <text macro="editor"/>
               <text macro="edition"/>
               <text macro="publisher-collection"/>
-              <text macro="page"/>
+              <text variable="medium"/>
+              <group delimiter=" ">
+                <text term="version"/>
+                <text variable="version"/>
+              </group>
+              <text macro="number-of-pages"/>
             </group>
-          </group>
-        </else-if>
-        <else-if type="speech">
-          <group delimiter=", ">
-            <text variable="title" quotes="true"/>
-            <text variable="event"/>
-            <text variable="event-place"/>
-            <text macro="full-date"/>
-            <text macro="translator"/>
-          </group>
-        </else-if>
-        <else-if type="article-newspaper article-magazine interview broadcast" match="any">
-          <group delimiter=", ">
-            <text variable="title" quotes="true"/>
-            <text variable="container-title" font-style="italic" prefix=" "/>
-            <text macro="full-date"/>
-            <text macro="translator"/>
-            <text macro="page"/>
-          </group>
-        </else-if>
-        <else>
-          <group delimiter=" " suffix=",">
-            <text variable="title" quotes="true"/>
-            <text macro="editor"/>
-          </group>
-          <group prefix=" " delimiter=", ">
-            <text variable="container-title" font-style="italic"/>
-            <group>
-              <text variable="volume"/>
+          </else-if>
+          <else-if type="thesis">
+            <group delimiter=", ">
+              <text variable="title" font-style="italic"/>
+              <text macro="translator"/>
               <choose>
-                <if variable="volume">
-                  <text variable="issue" prefix="(" suffix=")"/>
+                <if variable="genre">
+                  <text variable="genre"/>
                 </if>
                 <else>
-                  <text variable="issue"/>
+                  <text value="Ph.D. thesis"/>
                 </else>
               </choose>
+              <text macro="edition"/>
+              <text macro="publisher-collection"/>
+              <text macro="number-of-pages"/>
             </group>
-            <text macro="translator"/>
-            <text macro="page"/>
-          </group>
-        </else>
-      </choose>
+          </else-if>
+          <else-if type="chapter">
+            <text variable="title" quotes="true"/>
+            <group prefix=", ">
+              <text value="in" suffix=" " font-style="italic"/>
+              <text macro="editor" suffix=", "/>
+              <group delimiter=", ">
+                <text variable="container-title" font-style="italic"/>
+                <text macro="translator"/>
+                <text macro="edition"/>
+                <text macro="publisher-collection"/>
+                <text macro="page"/>
+              </group>
+            </group>
+          </else-if>
+          <else-if type="speech">
+            <group delimiter=", ">
+              <text variable="title" quotes="true"/>
+              <text variable="event"/>
+              <text variable="event-place"/>
+              <text macro="full-date"/>
+              <text macro="translator"/>
+            </group>
+          </else-if>
+          <else-if type="article-newspaper article-magazine interview broadcast" match="any">
+            <group delimiter=", ">
+              <text variable="title" quotes="true"/>
+              <text variable="container-title" font-style="italic" prefix=" "/>
+              <text macro="full-date"/>
+              <text macro="translator"/>
+              <text macro="page"/>
+            </group>
+          </else-if>
+          <else>
+            <group delimiter=" " suffix=",">
+              <text variable="title" quotes="true"/>
+              <text macro="editor"/>
+            </group>
+            <group prefix=" " delimiter=", ">
+              <text variable="container-title" font-style="italic"/>
+              <group>
+                <text variable="volume"/>
+                <choose>
+                  <if variable="volume">
+                    <text variable="issue" prefix="(" suffix=")"/>
+                  </if>
+                  <else>
+                    <text variable="issue"/>
+                  </else>
+                </choose>
+              </group>
+              <text macro="translator"/>
+              <text macro="page"/>
+            </group>
+          </else>
+        </choose>
+      </group>
+      <text variable="DOI" prefix=" doi:"/>
     </layout>
   </bibliography>
 </style>
diff --git a/buildres/csl/csl-styles/pour-reussir-note.csl b/buildres/csl/csl-styles/pour-reussir-note.csl
index 884c78ffe94..4cc02a54b98 100644
--- a/buildres/csl/csl-styles/pour-reussir-note.csl
+++ b/buildres/csl/csl-styles/pour-reussir-note.csl
@@ -1,19 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" default-locale="fr-CA" version="1.0" page-range-format="expanded">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.0" page-range-format="expanded" default-locale="fr-CA">
   <info>
-    <title>Pour réussir (note, Français - Canada)</title>
+    <title>Pour Réussir de Dionne 6ème édition (note, Français - Canada)</title>
+    <title-short>Dionne</title-short>
     <id>http://www.zotero.org/styles/pour-reussir-note</id>
     <link href="http://www.zotero.org/styles/pour-reussir-note" rel="self"/>
-    <link href="http://www.zotero.org/styles/le-tapuscrit-note" rel="template"/>
+    <link href="http://www.zotero.org/styles/pour-reussir-note" rel="template"/>
     <link href="http://www.cheneliere.ca/7901-livre-pour-reussir-6e-edition.html" rel="documentation"/>
+    <link href="https://bibliotheque.uqac.ca/rediger-bibliographie/dionne-zotero" rel="documentation"/>
     <author>
-      <name>Dany Thibault</name>
+      <name>Lino Tremblay (cette version)</name>
+      <email>lino_tremblay@uqac.ca</email>
+    </author>
+    <author>
+      <name>Dany Thibault (version précédente)</name>
       <email>dany.thibault@cmontmorency.qc.ca</email>
     </author>
     <category citation-format="note"/>
     <category field="social_science"/>
     <category field="generic-base"/>
-    <updated>2015-03-12T20:54:41+00:00</updated>
+    <updated>2021-02-12T04:50:30+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <locale xml:lang="fr">
@@ -29,7 +35,7 @@
   </locale>
   <macro name="author">
     <names variable="interviewer">
-      <name form="long" and="text" delimiter-precedes-last="never" sort-separator=" " font-style="normal">
+      <name form="long" and="text" delimiter-precedes-last="never" sort-separator=" ">
         <name-part name="family" text-case="uppercase"/>
       </name>
       <substitute>
@@ -45,7 +51,7 @@
       </name>
       <substitute>
         <names variable="author"/>
-        <text macro="editor"/>
+        <text macro="editor-bib"/>
       </substitute>
     </names>
   </macro>
@@ -60,31 +66,172 @@
       </substitute>
     </names>
   </macro>
+  <macro name="composer">
+    <names variable="composer">
+      <name form="long" and="text" delimiter-precedes-last="never" sort-separator=" ">
+        <name-part name="family" text-case="uppercase"/>
+      </name>
+    </names>
+  </macro>
+  <macro name="collection-title">
+    <choose>
+      <if match="none" type="article-journal">
+        <choose>
+          <if match="none" is-numeric="collection-number">
+            <group delimiter=", " prefix=" (Coll. « " suffix=" »)">
+              <text variable="collection-title" text-case="title"/>
+              <text variable="collection-number"/>
+            </group>
+          </if>
+          <else>
+            <group delimiter="" prefix=" (" suffix=")">
+              <group delimiter=" " prefix="Coll. « " suffix=" »">
+                <text variable="collection-title" text-case="title"/>
+              </group>
+              <group delimiter="" prefix=", nº ">
+                <text variable="collection-number"/>
+              </group>
+            </group>
+          </else>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="composer-bib">
+    <names variable="composer">
+      <name name-as-sort-order="first" form="long" and="text" delimiter-precedes-last="after-inverted-name" delimiter-precedes-et-al="always" sort-separator=", " font-style="normal">
+        <name-part name="family" text-case="uppercase"/>
+      </name>
+    </names>
+  </macro>
+  <macro name="date_aaaa">
+    <choose>
+      <if variable="issued" match="any">
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
+      </if>
+      <else>
+        <text value="[s.d.]"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="date_aaaa-mm-jj">
+    <choose>
+      <if variable="issued" match="any">
+        <date variable="issued">
+          <date-part name="day" prefix="" suffix="&#160;"/>
+          <date-part name="month" suffix=" "/>
+          <date-part name="year"/>
+        </date>
+      </if>
+      <else>
+        <text value="[s.d.]"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if type="bill book graphic legal_case motion_picture report song chapter paper-conference" match="any">
+        <choose>
+          <if is-numeric="edition">
+            <group delimiter=" ">
+              <number variable="edition" form="ordinal"/>
+              <text term="edition" form="short"/>
+            </group>
+          </if>
+          <else>
+            <text variable="edition" text-case="capitalize-first" suffix="."/>
+          </else>
+        </choose>
+      </if>
+      <else-if type="article-journal article-magazine" match="any">
+        <group delimiter="" font-style="normal">
+          <choose>
+            <if variable="issued">
+              <text macro="volume"/>
+              <date variable="issued" prefix=", ">
+                <date-part name="day" suffix=" "/>
+                <date-part name="month" suffix=" "/>
+                <date-part name="year"/>
+              </date>
+            </if>
+            <else>
+              <text macro="volume" text-case="capitalize-first"/>
+            </else>
+          </choose>
+        </group>
+      </else-if>
+    </choose>
+    <text macro="issue" prefix=", "/>
+  </macro>
   <macro name="editor">
     <names variable="editor">
-      <name name-as-sort-order="first" form="long" and="text" delimiter-precedes-last="never" sort-separator=", " font-style="normal">
+      <name form="long" and="text" delimiter-precedes-last="never" sort-separator=" ">
         <name-part name="family" text-case="uppercase"/>
       </name>
       <label form="short" prefix=",&#160;" suffix="."/>
     </names>
   </macro>
-  <macro name="translator">
-    <names variable="translator">
-      <name form="long" and="text" delimiter-precedes-last="never" sort-separator=" " font-style="normal" prefix=" traduit par ">
+  <macro name="editor-bib">
+    <names variable="editor">
+      <name name-as-sort-order="first" form="long" and="text" delimiter-precedes-last="after-inverted-name" delimiter-precedes-et-al="always" sort-separator=", " font-style="normal">
+        <name-part name="family" text-case="uppercase"/>
       </name>
+      <label form="short" prefix=",&#160;" suffix="."/>
     </names>
   </macro>
+  <macro name="issue">
+    <choose>
+      <if is-numeric="issue">
+        <text term="issue" form="short" suffix="&#160;"/>
+        <text variable="issue"/>
+      </if>
+      <else>
+        <text variable="issue"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="pub-place">
+    <choose>
+      <if type="book chapter entry-dictionary entry-encyclopedia thesis legal_case manuscript paper-conference report song motion_picture broadcast" match="any">
+        <choose>
+          <if variable="publisher-place" match="any">
+            <text variable="publisher-place"/>
+          </if>
+          <else>
+            <text value="[s.l.]"/>
+          </else>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <text variable="publisher"/>
+  </macro>
   <macro name="title">
     <choose>
-      <if type="bill book graphic interview legal_case motion_picture report song" match="any">
+      <if type="bill book graphic interview legal_case motion_picture report" match="any">
         <text variable="title" text-case="capitalize-first" font-style="italic"/>
       </if>
-      <else-if type="article-journal article-newspaper article-magazine" match="any">
+      <else-if type="article-journal article-newspaper article-magazine song" match="any">
         <group delimiter=", ">
           <text variable="title" text-case="capitalize-first" quotes="true"/>
           <text variable="container-title" font-style="italic"/>
         </group>
       </else-if>
+      <else-if type="broadcast" match="any">
+        <group delimiter="">
+          <choose>
+            <if variable="container-title" match="any">
+              <text variable="title" text-case="capitalize-first" quotes="true" suffix=", "/>
+            </if>
+            <else-if variable="container-title" match="none">
+              <text variable="title" text-case="capitalize-first" font-style="italic"/>
+            </else-if>
+          </choose>
+        </group>
+      </else-if>
       <else-if type="thesis" match="any">
         <group delimiter="">
           <text variable="title" text-case="capitalize-first" font-style="italic" suffix=","/>
@@ -100,12 +247,12 @@
       <else-if type="chapter entry-dictionary entry-encyclopedia" match="any">
         <group delimiter="">
           <text variable="title" text-case="capitalize-first" quotes="true"/>
-          <text value="dans" suffix=" " prefix=" "/>
-          <text macro="editor" suffix=" "/>
+          <text value="dans" suffix=" " prefix=", "/>
+          <text macro="editor" suffix=", "/>
           <text variable="container-title" text-case="capitalize-first" font-style="italic"/>
         </group>
       </else-if>
-      <else-if type="webpage post-weblog" match="any">
+      <else>
         <group delimiter="">
           <choose>
             <if variable="container-title" match="any">
@@ -116,36 +263,50 @@
             </else-if>
           </choose>
         </group>
-      </else-if>
-      <else>
-        <text variable="title" text-case="capitalize-first" font-style="italic"/>
       </else>
     </choose>
   </macro>
-  <macro name="pub-place">
+  <macro name="translator">
+    <names variable="translator">
+      <name form="long" and="text" delimiter-precedes-last="never" sort-separator=" " font-style="normal" prefix=" traduit par "/>
+    </names>
+  </macro>
+  <macro name="url">
+    <group>
+      <choose>
+        <if variable="DOI">
+          <text variable="DOI" prefix="https://doi.org/"/>
+        </if>
+        <else>
+          <text variable="URL"/>
+        </else>
+      </choose>
+    </group>
+    <group delimiter=" " prefix=" (" suffix=")">
+      <text value="Page consultée le" suffix=" " prefix=""/>
+      <date variable="accessed" form="text">
+        <date-part name="day"/>
+        <date-part name="month"/>
+        <date-part name="year"/>
+      </date>
+    </group>
+  </macro>
+  <macro name="volume">
     <choose>
-      <if type="book chapter entry-dictionary entry-encyclopedia thesis graphic legal_case manuscript paper-conference report song" match="any">
-        <choose>
-          <if variable="publisher-place" match="any">
-            <text variable="publisher-place"/>
-          </if>
-          <else>
-            <text value="s.l."/>
-          </else>
-        </choose>
+      <if is-numeric="volume">
+        <text term="volume" form="short" suffix=".&#160;"/>
+        <text variable="volume"/>
       </if>
+      <else>
+        <text variable="volume"/>
+      </else>
     </choose>
   </macro>
-  <macro name="publisher">
-    <text variable="publisher"/>
-  </macro>
   <macro name="yearpage">
     <choose>
-      <if type="bill book graphic legal_case motion_picture paper-conference manuscript report song thesis" match="any">
+      <if type="bill book graphic legal_case paper-conference manuscript report thesis" match="any">
         <group delimiter=", " font-style="normal">
-          <date variable="issued">
-            <date-part name="year"/>
-          </date>
+          <text macro="date_aaaa"/>
           <choose>
             <if variable="locator" match="any">
               <group delimiter="&#8239;">
@@ -154,32 +315,67 @@
               </group>
             </if>
             <else-if variable="locator" match="none">
-              <text variable="number-of-pages" suffix="&#160;p"/>
+              <text variable="number-of-pages" suffix="&#160;p."/>
             </else-if>
           </choose>
         </group>
       </if>
+      <else-if type="broadcast" match="any">
+        <group>
+          <text macro="date_aaaa"/>
+          <choose>
+            <if variable="locator" match="any">
+              <group delimiter="&#8239;" prefix=", ">
+                <text variable="locator"/>
+              </group>
+            </if>
+            <else-if variable="locator" match="none">
+              <text variable="page" prefix=", "/>
+            </else-if>
+          </choose>
+        </group>
+      </else-if>
       <else-if type="chapter entry-dictionary entry-encyclopedia" match="any">
-        <group delimiter=" " font-style="normal">
+        <group>
           <date variable="issued">
-            <date-part name="year" suffix=", "/>
+            <date-part name="year"/>
           </date>
           <choose>
             <if variable="locator" match="any">
-              <group delimiter="&#8239;">
+              <group delimiter="&#8239;" prefix=", ">
                 <label variable="locator" form="short"/>
                 <text variable="locator"/>
               </group>
             </if>
             <else-if variable="locator" match="none">
-              <label variable="page" form="short"/>
-              <text variable="page"/>
+              <group>
+                <text variable="volume" prefix=", tome "/>
+                <text variable="page" prefix=", p. "/>
+              </group>
+            </else-if>
+          </choose>
+        </group>
+      </else-if>
+      <else-if type="song motion_picture" match="any">
+        <group>
+          <date variable="issued">
+            <date-part name="year"/>
+          </date>
+          <choose>
+            <if variable="locator" match="any">
+              <group delimiter="&#8239;" prefix=", ">
+                <text variable="locator"/>
+              </group>
+            </if>
+            <else-if variable="locator" match="none">
+              <text variable="page" prefix=", "/>
             </else-if>
           </choose>
         </group>
       </else-if>
       <else-if type="article-journal" match="any">
-        <group delimiter=" " font-style="normal">
+        <text macro="date_aaaa-mm-jj"/>
+        <group delimiter=" " font-style="normal" prefix=", ">
           <choose>
             <if variable="locator" match="any">
               <group delimiter="&#8239;">
@@ -194,7 +390,7 @@
           </choose>
         </group>
       </else-if>
-      <else-if type="article-newspaper article-magazine" match="any">
+      <else-if type="article-newspaper article-magazine webpage post-weblog" match="any">
         <group delimiter=" " font-style="normal">
           <choose>
             <if variable="locator" match="any">
@@ -210,31 +406,11 @@
           </choose>
         </group>
       </else-if>
-      <else-if type="webpage post-weblog" match="any">
-        <group delimiter=" " prefix="(" suffix=")">
-          <text value="Page consultée le" suffix=" " prefix=""/>
-          <date variable="accessed" form="text">
-            <date-part name="day"/>
-            <date-part name="month"/>
-            <date-part name="year"/>
-          </date>
-        </group>
-      </else-if>
       <else>
         <group delimiter="" font-style="normal">
-          <date variable="issued">
-            <date-part name="year"/>
-          </date>
+          <text macro="date_aaaa-mm-jj"/>
           <text variable="number-of-pages" suffix="&#160;p"/>
-          <text variable="URL" prefix=", "/>
-          <group delimiter=" " prefix=" (" suffix=")">
-            <text value="Page consultée le" suffix=" " prefix=""/>
-            <date variable="accessed" form="text">
-              <date-part name="day"/>
-              <date-part name="month"/>
-              <date-part name="year"/>
-            </date>
-          </group>
+          <text macro="url" prefix=", "/>
           <group>
             <label variable="locator" form="short"/>
             <text variable="locator"/>
@@ -245,13 +421,11 @@
   </macro>
   <macro name="yearpage-bib">
     <choose>
-      <if type="bill book graphic legal_case motion_picture paper-conference report song thesis" match="any">
+      <if type="bill book graphic legal_case paper-conference report thesis" match="any">
         <group delimiter=", ">
           <group delimiter=", " font-style="normal">
-            <date variable="issued">
-              <date-part name="year"/>
-            </date>
-            <text variable="number-of-pages" suffix="&#160;p"/>
+            <text macro="date_aaaa"/>
+            <text variable="number-of-pages" suffix="&#160;p."/>
           </group>
           <group>
             <label variable="locator" form="short"/>
@@ -265,31 +439,44 @@
             <date-part name="year"/>
           </date>
           <group>
+            <text variable="volume" prefix="tome " suffix=", "/>
             <label variable="page" form="short"/>
             <text variable="page" prefix="&#160;"/>
           </group>
         </group>
       </else-if>
-      <else-if type="article-journal chapter article-newspaper article-magazine" match="any">
+      <else-if type="article-journal" match="any">
         <group delimiter=" " font-style="normal">
+          <choose>
+            <if variable="locator" match="any">
+              <group delimiter="&#8239;">
+                <label variable="locator" form="short"/>
+                <text variable="locator"/>
+              </group>
+            </if>
+            <else-if variable="locator" match="none">
+              <label variable="page" form="short"/>
+              <text variable="page"/>
+            </else-if>
+          </choose>
+        </group>
+      </else-if>
+      <else-if type="article-newspaper article-magazine" match="any">
+        <text macro="date_aaaa-mm-jj"/>
+        <group delimiter=" " font-style="normal" prefix=", ">
           <label variable="page" form="short"/>
           <text variable="page"/>
         </group>
       </else-if>
       <else-if type="manuscript">
-        <group delimiter="" font-style="normal">
-          <choose>
-            <if variable="issued">
-              <date variable="issued">
-                <date-part name="day" suffix=" "/>
-                <date-part name="month" suffix=" "/>
-                <date-part name="year"/>
-              </date>
-            </if>
-            <else>
-              <text value="s. d."/>
-            </else>
-          </choose>
+        <text macro="date_aaaa-mm-jj"/>
+      </else-if>
+      <else-if type="song motion_picture" match="any">
+        <group>
+          <date variable="issued">
+            <date-part name="year"/>
+          </date>
+          <text variable="page" prefix=", "/>
         </group>
       </else-if>
       <else-if type="webpage post-weblog" match="any">
@@ -304,19 +491,9 @@
       </else-if>
       <else>
         <group delimiter="" font-style="normal">
-          <date variable="issued">
-            <date-part name="year"/>
-          </date>
+          <text macro="date_aaaa-mm-jj"/>
           <text variable="number-of-pages" suffix="&#160;p"/>
-          <text variable="URL" prefix=", "/>
-          <group delimiter=" " prefix=" (" suffix=")">
-            <text value="Page consultée le" suffix=" " prefix=""/>
-            <date variable="accessed" form="text">
-              <date-part name="day"/>
-              <date-part name="month"/>
-              <date-part name="year"/>
-            </date>
-          </group>
+          <text macro="url" prefix=", "/>
           <group>
             <label variable="locator" form="short"/>
             <text variable="locator"/>
@@ -325,63 +502,6 @@
       </else>
     </choose>
   </macro>
-  <macro name="edition">
-    <choose>
-      <if type="bill book graphic legal_case motion_picture report song chapter paper-conference" match="any">
-        <choose>
-          <if is-numeric="edition">
-            <group delimiter=" ">
-              <number variable="edition" form="ordinal"/>
-              <text term="edition" form="short"/>
-            </group>
-          </if>
-          <else>
-            <text variable="edition" text-case="capitalize-first" suffix="."/>
-          </else>
-        </choose>
-      </if>
-      <else-if type="article-journal article-magazine" match="any">
-        <group delimiter="" font-style="normal">
-          <choose>
-            <if variable="issued">
-              <text macro="volume"/>
-              <date variable="issued" prefix=", ">
-                <date-part name="day" suffix=" "/>
-                <date-part name="month" suffix=" "/>
-                <date-part name="year"/>
-              </date>
-            </if>
-            <else>
-              <text macro="volume" text-case="capitalize-first"/>
-            </else>
-          </choose>
-        </group>
-      </else-if>
-    </choose>
-    <text macro="issue" prefix=", "/>
-  </macro>
-  <macro name="volume">
-    <choose>
-      <if is-numeric="volume">
-        <text term="volume" form="short" suffix=".&#160;"/>
-        <text variable="volume"/>
-      </if>
-      <else>
-        <text variable="volume"/>
-      </else>
-    </choose>
-  </macro>
-  <macro name="issue">
-    <choose>
-      <if is-numeric="issue">
-        <text term="issue" form="short" suffix="&#160;"/>
-        <text variable="issue"/>
-      </if>
-      <else>
-        <text variable="issue"/>
-      </else>
-    </choose>
-  </macro>
   <citation et-al-min="4" et-al-use-first="1">
     <layout delimiter="&#160;; ">
       <choose>
@@ -427,31 +547,41 @@
                 <text macro="yearpage-bib"/>
               </group>
             </if>
-            <else-if type="webpage post-weblog" match="any">
-              <group delimiter=" ">
-                <text macro="author" suffix=","/>
-                <text macro="title" suffix=","/>
-                <text macro="translator" suffix=","/>
-                <group prefix="">
+            <else-if type="article-newspaper" match="any">
+              <group delimiter="" suffix=".">
+                <text macro="author" suffix=", "/>
+                <text macro="title"/>
+                <group>
+                  <text term="volume" form="short" suffix=".&#160;"/>
+                  <text variable="number-of-volumes" prefix=". " suffix="/"/>
+                </group>
+                <group>
+                  <text term="volume" form="short" suffix=".&#160;"/>
+                  <text variable="volume" form="short"/>
+                </group>
+                <text macro="issue" prefix=", "/>
+                <group prefix=" (" suffix=")">
                   <date variable="issued">
-                    <date-part name="day" suffix=" "/>
+                    <date-part name="day" prefix="" suffix="&#160;"/>
                     <date-part name="month" suffix=" "/>
-                    <date-part name="year" suffix=","/>
+                    <date-part name="year"/>
                   </date>
                 </group>
-                <choose>
-                  <if variable="container-title" match="any">
-                    <text value="dans" suffix=" " prefix=" "/>
-                  </if>
-                  <else-if variable="container-title" match="none">
+                <text macro="url" prefix=", "/>
+                <text macro="yearpage" prefix=", "/>
+              </group>
             </else-if>
-                </choose>
-                <text variable="container-title" font-style="italic" suffix=","/>
-                <text macro="edition"/>
-                <text macro="pub-place"/>
-                <text macro="publisher"/>
-                <text variable="URL"/>
-                <text macro="yearpage"/>
+            <else-if type="article-journal article-magazine" match="any">
+              <group delimiter="" suffix=".">
+                <text macro="author" suffix=", "/>
+                <text macro="title"/>
+                <group>
+                  <text term="volume" form="short" prefix=", " suffix=".&#160;"/>
+                  <text variable="volume" form="short"/>
+                </group>
+                <text macro="issue" prefix=", "/>
+                <text macro="yearpage" prefix=", "/>
+                <text macro="url" prefix=", "/>
               </group>
             </else-if>
             <else-if type="bill" match="any">
@@ -464,34 +594,79 @@
                 <text macro="pub-place"/>
                 <text macro="publisher"/>
                 <text macro="yearpage"/>
-                <text variable="URL" prefix=", "/>
+                <text macro="url" prefix=", "/>
               </group>
             </else-if>
-            <else-if type="article-newspaper" match="any">
-              <group delimiter="" suffix=".">
-                <text macro="author" suffix=". "/>
+            <else-if type="book" match="any">
+              <group suffix=".">
+                <text macro="author" suffix=", "/>
                 <text macro="title"/>
-                <group>
-                  <text term="volume" form="short" suffix=".&#160;"/>
-                  <text variable="number-of-volumes" prefix=". " suffix="/"/>
-                </group>
-                <group>
-                  <text term="volume" form="short" suffix=".&#160;"/>
-                  <text variable="volume" form="short"/>
-                </group>
-                <text macro="issue" prefix=", "/>
-                <group prefix=" (" suffix=")">
-                  <date variable="issued">
-                    <date-part name="day" prefix="" suffix="&#160;"/>
-                    <date-part name="month" suffix=" "/>
-                    <date-part name="year"/>
-                  </date>
+                <text variable="volume" prefix=", tome "/>
+                <text macro="translator"/>
+                <text variable="number-of-volumes" prefix=", " suffix=" tomes"/>
+                <text macro="edition" prefix=", "/>
+                <text macro="pub-place" prefix=", "/>
+                <text macro="publisher" prefix=", "/>
+                <text macro="yearpage" prefix=", "/>
+                <text macro="collection-title"/>
+                <text macro="url" prefix=", "/>
+              </group>
+            </else-if>
+            <else-if type="broadcast" match="any">
+              <group suffix=".">
+                <text macro="author" suffix=" (réal.), "/>
+                <text macro="title"/>
+                <text variable="container-title" font-style="italic"/>
+                <text macro="pub-place" prefix=", "/>
+                <text variable="archive" prefix=", "/>
+                <text variable="medium" prefix=", "/>
+                <text macro="date_aaaa-mm-jj" prefix=", "/>
+                <text variable="dimensions" prefix=", "/>
+                <text macro="publisher" prefix=", "/>
+                <text macro="collection-title"/>
+                <text macro="url" prefix=", "/>
+              </group>
+            </else-if>
+            <else-if type="entry-dictionary entry-encyclopedia chapter interview book legal_case report thesis" match="any">
+              <group suffix=".">
+                <text macro="author" suffix=", "/>
+                <text macro="title"/>
+                <text macro="translator" prefix=", "/>
+                <text variable="number-of-volumes" prefix=", " suffix=" tomes"/>
+                <text macro="edition" prefix=", "/>
+                <text macro="pub-place" prefix=", "/>
+                <text macro="publisher" prefix=", "/>
+                <text macro="yearpage" prefix=", "/>
+                <text macro="collection-title" prefix=", "/>
+                <text macro="url" prefix=", "/>
+              </group>
+            </else-if>
+            <else-if type="graphic" match="any">
+              <group suffix=".">
+                <group suffix=", ">
+                  <text macro="author"/>
+                  <text variable="archive" prefix=" (" suffix=")"/>
                 </group>
+                <choose>
+                  <if variable="title" match="none">
+                    <text variable="abstract" prefix="[" suffix="]"/>
+                  </if>
+                  <else>
+                    <text macro="title"/>
+                  </else>
+                </choose>
+                <text variable="medium" prefix=", "/>
+                <text variable="dimensions" prefix=", "/>
+                <text macro="edition" prefix=", "/>
                 <text macro="yearpage" prefix=", "/>
+                <text variable="publisher-place" prefix=", "/>
+                <text macro="publisher" prefix=", "/>
+                <text macro="collection-title" prefix=", "/>
+                <text macro="url" prefix=", "/>
               </group>
             </else-if>
             <else-if type="interview" match="any">
-              <group delimiter="" suffix=".">
+              <group suffix=".">
                 <text macro="author" suffix=". "/>
                 <text macro="title" suffix=","/>
                 <group>
@@ -513,75 +688,121 @@
                 <text macro="yearpage" prefix=", "/>
               </group>
             </else-if>
-            <else-if type="article-journal article-magazine" match="any">
-              <group delimiter="" suffix=".">
+            <else-if type="motion_picture" match="any">
+              <group suffix=".">
                 <text macro="author" suffix=", "/>
-                <text macro="title" suffix=", "/>
-                <group>
-                  <text term="volume" form="short" suffix=".&#160;"/>
-                  <text variable="volume" form="short" suffix=". "/>
-                </group>
-                <text macro="issue" prefix=""/>
-                <group prefix=" (" suffix="), ">
-                  <date variable="issued">
-                    <date-part name="day" prefix="" suffix="&#160;"/>
-                    <date-part name="month" suffix=" "/>
-                    <date-part name="year"/>
-                  </date>
+                <text macro="title"/>
+                <text macro="edition" prefix=", "/>
+                <text variable="publisher-place" prefix=", "/>
+                <text macro="yearpage" prefix=", "/>
+                <text variable="dimensions" prefix=", "/>
+                <text variable="medium" prefix=", "/>
+                <group prefix=", dans " delimiter=", ">
+                  <text variable="publisher"/>
+                  <text variable="collection-title" font-style="italic"/>
                 </group>
-                <text macro="pub-place"/>
-                <text macro="publisher"/>
-                <text macro="yearpage"/>
+                <text variable="archive" prefix=", "/>
+                <text macro="url" prefix=", "/>
               </group>
             </else-if>
-            <else-if type="book" match="any">
-              <group delimiter="" suffix=".">
-                <text macro="author" suffix=", "/>
-                <text macro="title" suffix=", "/>
+            <else-if type="paper-conference" match="any">
+              <group suffix=".">
+                <text macro="author"/>
+                <text macro="title" prefix=", "/>
+                <text variable="genre" prefix=", "/>
+                <text macro="translator" prefix=", "/>
+                <text variable="volume" prefix=", tome "/>
+                <text variable="number-of-volumes" prefix=", " suffix=" tomes"/>
+                <text macro="edition" prefix=", "/>
+                <text macro="pub-place" prefix=", "/>
+                <text variable="event" prefix=", "/>
+                <text macro="publisher" prefix=", "/>
+                <text macro="date_aaaa-mm-jj" prefix=", "/>
+                <text macro="collection-title" prefix=", "/>
+                <text macro="url" prefix=", "/>
+              </group>
+            </else-if>
+            <else-if type="personal_communication" match="any">
+              <text macro="author"/>
+              <text macro="title" prefix=", "/>
+              <date variable="issued" prefix=" (" suffix=")">
+                <date-part name="day" suffix=" "/>
+                <date-part name="month" suffix=" "/>
+                <date-part name="year"/>
+              </date>
+              <group prefix=", " suffix=".">
+                <text variable="genre"/>
+                <names variable="recipient" prefix=" à ">
+                  <name form="long" and="text" delimiter-precedes-last="never" sort-separator=" "/>
+                </names>
+              </group>
+            </else-if>
+            <else-if type="song" match="any">
+              <group suffix=".">
                 <choose>
-                  <if variable="volume" match="any">
-                    <text value="Tome" suffix=" " prefix=" "/>
+                  <if variable="composer">
+                    <text macro="composer"/>
                   </if>
-                  <else-if variable="volume" match="none">
-                    </else-if>
+                  <else>
+                    <text macro="author"/>
+                  </else>
                 </choose>
-                <text variable="volume" suffix=", "/>
-                <text macro="translator"/>
-                <group>
-                  <text term="volume" form="short" suffix=".&#160;"/>
-                  <text variable="number-of-volumes" prefix=". " suffix="/"/>
-                </group>
-                <text macro="edition" suffix=", "/>
-                <text macro="pub-place" suffix=", "/>
-                <text macro="publisher" suffix=", "/>
-                <text macro="yearpage"/>
+                <text macro="title" prefix=", "/>
+                <choose>
+                  <if variable="composer">
+                    <text macro="author" prefix=", interprété par "/>
+                  </if>
+                </choose>
+                <text macro="translator" prefix=", "/>
+                <text macro="edition" prefix=", "/>
+                <text macro="publisher" prefix=", "/>
+                <text variable="volume" prefix=", "/>
+                <text macro="yearpage" prefix=", "/>
+                <text macro="url" prefix=", "/>
               </group>
             </else-if>
-            <else-if type="entry-encyclopedia chapter interview book graphic legal_case motion_picture paper-conference report song thesis" match="any">
-              <group delimiter=", " suffix=".">
-                <text macro="author"/>
-                <text macro="title"/>
-                <text macro="translator"/>
-                <group>
-                  <text term="volume" form="short" suffix=".&#160;"/>
-                  <text variable="number-of-volumes" prefix=". " suffix="/"/>
+            <else-if type="webpage post-weblog" match="any">
+              <group delimiter=" " suffix=".">
+                <text macro="author" suffix=","/>
+                <text macro="title" suffix=","/>
+                <text macro="translator" suffix=","/>
+                <choose>
+                  <if variable="container-title" match="any">
+                    <text value="dans" suffix=" " prefix=" "/>
+                    <text macro="editor" suffix=", "/>
+                  </if>
+                  <else-if variable="container-title" match="none"/>
+                </choose>
+                <text variable="container-title" font-style="italic" prefix=" " suffix=","/>
+                <group prefix="">
+                  <date variable="issued">
+                    <date-part name="day" suffix=" "/>
+                    <date-part name="month" suffix=" "/>
+                    <date-part name="year" suffix=","/>
+                  </date>
                 </group>
                 <text macro="edition"/>
                 <text macro="pub-place"/>
                 <text macro="publisher"/>
+                <text macro="url"/>
                 <text macro="yearpage"/>
               </group>
             </else-if>
             <else>
               <group delimiter="" suffix=".">
                 <text macro="author" suffix=", "/>
-                <text macro="title" suffix=", "/>
+                <text macro="title"/>
+                <choose>
+                  <if variable="container-title" match="any"/>
+                  <else-if variable="container-title" match="none"/>
+                </choose>
+                <text variable="container-title" font-style="italic" prefix=", "/>
+                <text variable="medium" prefix=" [" suffix="]"/>
                 <choose>
                   <if variable="volume" match="any">
-                    <text value="Tome" suffix=" " prefix=" "/>
+                    <text value="tome" suffix=" " prefix=" "/>
                   </if>
-                  <else-if variable="volume" match="none">
-                    </else-if>
+                  <else-if variable="volume" match="none"/>
                 </choose>
                 <text variable="volume" suffix=", "/>
                 <text macro="translator"/>
@@ -590,9 +811,10 @@
                   <text variable="number-of-volumes" prefix=". " suffix="/"/>
                 </group>
                 <text macro="edition" suffix=", "/>
-                <text macro="pub-place" suffix=", "/>
-                <text macro="publisher" suffix=", "/>
-                <text macro="yearpage"/>
+                <text variable="publisher-place" prefix=", "/>
+                <text macro="publisher" prefix=", "/>
+                <text variable="dimensions" prefix=", "/>
+                <text macro="yearpage" prefix=", "/>
               </group>
             </else>
           </choose>
@@ -616,31 +838,28 @@
             <text macro="yearpage-bib"/>
           </group>
         </if>
-        <else-if type="webpage post-weblog" match="any">
-          <group delimiter=" ">
-            <text macro="author-bib" suffix="."/>
-            <text macro="title" suffix=","/>
-            <text macro="translator" suffix=","/>
-            <group prefix="">
+        <else-if type="article-newspaper" match="any">
+          <group delimiter="" suffix=".">
+            <text macro="author-bib" suffix=". "/>
+            <text macro="title"/>
+            <group>
+              <text term="volume" form="short" suffix=".&#160;"/>
+              <text variable="number-of-volumes" prefix=". " suffix="/"/>
+            </group>
+            <group>
+              <text term="volume" form="short" suffix=".&#160;"/>
+              <text variable="volume" form="short"/>
+            </group>
+            <text macro="issue" prefix=", "/>
+            <group prefix=" (" suffix=")">
               <date variable="issued">
-                <date-part name="day" suffix=" "/>
+                <date-part name="day" prefix="" suffix="&#160;"/>
                 <date-part name="month" suffix=" "/>
-                <date-part name="year" suffix=","/>
+                <date-part name="year"/>
               </date>
             </group>
-            <choose>
-              <if variable="container-title" match="any">
-                <text value="dans" suffix=" " prefix=" "/>
-              </if>
-              <else-if variable="container-title" match="none">
-            </else-if>
-            </choose>
-            <text variable="container-title" font-style="italic" suffix=","/>
-            <text macro="edition"/>
-            <text macro="pub-place"/>
-            <text macro="publisher"/>
-            <text variable="URL"/>
-            <text macro="yearpage"/>
+            <text macro="yearpage-bib" prefix=", "/>
+            <text macro="url" prefix=", "/>
           </group>
         </else-if>
         <else-if type="bill" match="any">
@@ -653,71 +872,103 @@
             <text macro="pub-place"/>
             <text macro="publisher"/>
             <text macro="yearpage"/>
-            <text variable="URL" prefix=", "/>
+            <text macro="url" prefix=", "/>
           </group>
         </else-if>
         <else-if type="book" match="any">
-          <group delimiter=" " suffix=".">
+          <group suffix=".">
             <text macro="author-bib" suffix="."/>
-            <text macro="title" suffix=","/>
-            <choose>
-              <if variable="volume" match="any">
-                <text value="Tome" suffix=" " prefix=" "/>
-              </if>
-              <else-if variable="volume" match="none">
-            </else-if>
-            </choose>
-            <text variable="volume" suffix=","/>
+            <text macro="title" prefix=" "/>
+            <text variable="volume" prefix=", tome "/>
+            <text variable="number-of-volumes" prefix=", " suffix=" tomes"/>
             <text macro="translator"/>
-            <text macro="edition" suffix=","/>
-            <text macro="pub-place" suffix=","/>
-            <group delimiter=" ">
-              <text macro="publisher" suffix=","/>
-            </group>
-            <text macro="yearpage-bib"/>
+            <text macro="edition" prefix=", "/>
+            <text macro="pub-place" prefix=", "/>
+            <text macro="publisher" prefix=", "/>
+            <text macro="yearpage-bib" prefix=", "/>
+            <text macro="collection-title"/>
+            <text macro="url" prefix=", "/>
           </group>
         </else-if>
-        <else-if type="entry-encyclopedia chapter book graphic legal_case motion_picture paper-conference report song thesis" match="any">
-          <group delimiter=" " suffix=".">
-            <text macro="author-bib" suffix="."/>
-            <text macro="title" suffix=","/>
-            <group>
-              <text term="volume" form="short" suffix=".&#160;"/>
-              <text variable="volume" suffix=","/>
-            </group>
-            <text macro="translator"/>
-            <text macro="edition" suffix=","/>
-            <text macro="pub-place" suffix=","/>
-            <group delimiter=" ">
-              <text macro="publisher" suffix=","/>
-            </group>
-            <text macro="yearpage-bib"/>
+        <else-if type="broadcast" match="any">
+          <group delimiter="" suffix=".">
+            <text macro="author" suffix=" (réal.). "/>
+            <text macro="title"/>
+            <text variable="container-title" font-style="italic"/>
+            <text macro="pub-place" prefix=", "/>
+            <text variable="archive" prefix=", "/>
+            <text variable="medium" prefix=", "/>
+            <text macro="date_aaaa-mm-jj" prefix=", "/>
+            <text variable="dimensions" prefix=", "/>
+            <text macro="publisher" prefix=", "/>
+            <text macro="collection-title"/>
+            <text macro="url" prefix=", "/>
           </group>
         </else-if>
-        <else-if type="article-newspaper" match="any">
+        <else-if type="article-journal article-magazine" match="any">
           <group delimiter="" suffix=".">
             <text macro="author-bib" suffix=". "/>
             <text macro="title"/>
             <group>
-              <text term="volume" form="short" suffix=".&#160;"/>
-              <text variable="number-of-volumes" prefix=". " suffix="/"/>
-            </group>
-            <group>
-              <text term="volume" form="short" suffix=".&#160;"/>
+              <text term="volume" form="short" prefix=", " suffix=".&#160;"/>
               <text variable="volume" form="short"/>
             </group>
             <text macro="issue" prefix=", "/>
-            <group prefix=" (" suffix=")">
-              <date variable="issued">
-                <date-part name="day" prefix="" suffix="&#160;"/>
-                <date-part name="month" suffix=" "/>
-                <date-part name="year"/>
-              </date>
+            <text macro="yearpage-bib" prefix=", "/>
+            <text macro="url" prefix=", "/>
+          </group>
+        </else-if>
+        <else-if type="chapter" match="any">
+          <group delimiter="" suffix=".">
+            <text macro="author-bib" suffix=". "/>
+            <text macro="title"/>
+            <text variable="number-of-volumes" prefix=", " suffix=" tomes"/>
+            <text macro="edition" prefix=", "/>
+            <text macro="pub-place" prefix=", "/>
+            <text macro="publisher" prefix=", "/>
+            <text macro="yearpage-bib" prefix=", "/>
+            <text macro="url" prefix=", "/>
+          </group>
+        </else-if>
+        <else-if type="entry-dictionary entry-encyclopedia chapter legal_case report thesis" match="any">
+          <group suffix=".">
+            <text macro="author-bib" suffix="."/>
+            <text macro="title" prefix=" "/>
+            <text variable="number-of-volumes" prefix=", " suffix=" tomes"/>
+            <text macro="edition" prefix=", "/>
+            <text macro="translator" prefix=", "/>
+            <text macro="pub-place" prefix=", "/>
+            <text macro="publisher" prefix=", "/>
+            <text macro="yearpage-bib" prefix=", "/>
+            <text macro="collection-title" prefix=", "/>
+            <text macro="url" prefix=", "/>
+          </group>
+        </else-if>
+        <else-if type="graphic" match="any">
+          <group suffix=".">
+            <group suffix=". ">
+              <text macro="author-bib"/>
+              <text variable="archive" prefix=" (" suffix=")"/>
             </group>
+            <choose>
+              <if variable="title" match="none">
+                <text variable="abstract" prefix="[" suffix="]"/>
+              </if>
+              <else>
+                <text macro="title"/>
+              </else>
+            </choose>
+            <text variable="medium" prefix=", "/>
+            <text variable="dimensions" prefix=", "/>
+            <text macro="edition" prefix=", "/>
             <text macro="yearpage-bib" prefix=", "/>
+            <text variable="publisher-place" prefix=", "/>
+            <text macro="publisher" prefix=", "/>
+            <text macro="collection-title" prefix=", "/>
+            <text macro="url" prefix=", "/>
           </group>
         </else-if>
-        <else-if type="chapter article-journal article-magazine" match="any">
+        <else-if type="interview" match="any">
           <group delimiter="" suffix=".">
             <text macro="author-bib" suffix=". "/>
             <text macro="title" suffix=", "/>
@@ -730,7 +981,7 @@
               <text variable="volume" form="short" suffix=", "/>
             </group>
             <text macro="issue" prefix=""/>
-            <group prefix=" (" suffix=")">
+            <group prefix="">
               <date variable="issued">
                 <date-part name="day" prefix="" suffix="&#160;"/>
                 <date-part name="month" suffix=" "/>
@@ -740,44 +991,135 @@
             <text macro="yearpage-bib" prefix=", "/>
           </group>
         </else-if>
-        <else-if type="interview" match="any">
-          <group delimiter="" suffix=".">
+        <else-if type="motion_picture" match="any">
+          <group suffix=".">
             <text macro="author-bib" suffix=". "/>
-            <text macro="title" suffix=", "/>
-            <group>
-              <text term="volume" form="short" suffix=".&#160;"/>
-              <text variable="number-of-volumes" prefix=". " suffix="/"/>
+            <text macro="title"/>
+            <text macro="edition" prefix=", "/>
+            <text variable="publisher-place" prefix=", "/>
+            <text macro="yearpage-bib" prefix=", "/>
+            <text variable="dimensions" prefix=", "/>
+            <text variable="medium" prefix=", "/>
+            <group prefix=", dans " delimiter=", ">
+              <text variable="publisher"/>
+              <text variable="collection-title" font-style="italic"/>
             </group>
-            <group>
-              <text term="volume" form="short" suffix=".&#160;"/>
-              <text variable="volume" form="short" suffix=", "/>
+            <text variable="archive" prefix=", "/>
+            <text macro="url" prefix=", "/>
+          </group>
+        </else-if>
+        <else-if type="paper-conference" match="any">
+          <group suffix=".">
+            <text macro="author-bib" suffix="."/>
+            <text macro="title" prefix=" "/>
+            <text variable="genre" prefix=", "/>
+            <text variable="volume" prefix=", tome "/>
+            <text variable="number-of-volumes" prefix=", " suffix=" tomes"/>
+            <text macro="edition" prefix=", "/>
+            <text macro="translator" prefix=", "/>
+            <text macro="pub-place" prefix=", "/>
+            <text variable="event" prefix=", "/>
+            <text macro="publisher" prefix=", "/>
+            <text macro="date_aaaa-mm-jj" prefix=", "/>
+            <text macro="collection-title" prefix=", "/>
+            <text macro="url" prefix=", "/>
+          </group>
+        </else-if>
+        <else-if type="personal_communication" match="any">
+          <group suffix=".">
+            <text macro="author-bib"/>
+            <text macro="title" prefix=". "/>
+            <date variable="issued" prefix=" (" suffix=")">
+              <date-part name="day" suffix=" "/>
+              <date-part name="month" suffix=" "/>
+              <date-part name="year"/>
+            </date>
+            <group prefix=", ">
+              <text variable="genre"/>
+              <names variable="recipient" prefix=" à ">
+                <name form="long" and="text" delimiter-precedes-last="never" sort-separator=" "/>
+              </names>
             </group>
-            <text macro="issue" prefix=""/>
+          </group>
+        </else-if>
+        <else-if type="song" match="any">
+          <group suffix=".">
+            <choose>
+              <if variable="composer">
+                <text macro="composer-bib"/>
+              </if>
+              <else>
+                <text macro="author-bib"/>
+              </else>
+            </choose>
+            <text macro="title" prefix=". "/>
+            <choose>
+              <if variable="composer">
+                <text macro="author" prefix=", interprété par "/>
+              </if>
+            </choose>
+            <text macro="translator" prefix=", "/>
+            <text macro="edition" prefix=", "/>
+            <text macro="publisher" prefix=", "/>
+            <text variable="volume" prefix=", "/>
+            <text macro="yearpage-bib" prefix=", "/>
+            <text macro="url" prefix=", "/>
+          </group>
+        </else-if>
+        <else-if type="webpage post-weblog" match="any">
+          <group delimiter=" " suffix=".">
+            <text macro="author-bib" suffix="."/>
+            <text macro="title" suffix=","/>
+            <text macro="translator" suffix=","/>
+            <choose>
+              <if variable="container-title" match="any">
+                <text value="dans" suffix=" " prefix=" "/>
+                <text macro="editor" suffix=", "/>
+              </if>
+              <else-if variable="container-title" match="none"/>
+            </choose>
+            <text variable="container-title" font-style="italic" suffix=","/>
             <group prefix="">
               <date variable="issued">
-                <date-part name="day" prefix="" suffix="&#160;"/>
+                <date-part name="day" suffix=" "/>
                 <date-part name="month" suffix=" "/>
-                <date-part name="year"/>
+                <date-part name="year" suffix=","/>
               </date>
             </group>
-            <text macro="yearpage-bib" prefix=", "/>
+            <text macro="edition"/>
+            <text macro="pub-place"/>
+            <text macro="publisher"/>
+            <text macro="url"/>
+            <text macro="yearpage"/>
           </group>
         </else-if>
         <else>
-          <group delimiter=" " suffix=".">
-            <text macro="author-bib" suffix="."/>
-            <text macro="title" suffix=","/>
+          <group delimiter="" suffix=".">
+            <text macro="author-bib" suffix=". "/>
+            <text macro="title"/>
+            <choose>
+              <if variable="container-title" match="any"/>
+              <else-if variable="container-title" match="none"/>
+            </choose>
+            <text variable="container-title" font-style="italic" prefix=", "/>
+            <text variable="medium" prefix=" [" suffix="]"/>
+            <choose>
+              <if variable="volume" match="any">
+                <text value="tome" suffix=" " prefix=" "/>
+              </if>
+              <else-if variable="volume" match="none"/>
+            </choose>
+            <text variable="volume" suffix=", "/>
+            <text macro="translator"/>
             <group>
               <text term="volume" form="short" suffix=".&#160;"/>
-              <text variable="volume" suffix=","/>
-            </group>
-            <text macro="translator"/>
-            <text macro="edition" suffix=","/>
-            <text macro="pub-place" suffix=","/>
-            <group delimiter=" ">
-              <text macro="publisher" suffix=","/>
+              <text variable="number-of-volumes" prefix=". " suffix="/"/>
             </group>
-            <text macro="yearpage-bib"/>
+            <text macro="edition" suffix=", "/>
+            <text variable="publisher-place" prefix=", "/>
+            <text macro="publisher" prefix=", "/>
+            <text variable="dimensions" prefix=", "/>
+            <text macro="yearpage-bib" prefix=", "/>
           </group>
         </else>
       </choose>
diff --git a/buildres/csl/csl-styles/renamed-styles.json b/buildres/csl/csl-styles/renamed-styles.json
index d5396d84489..a8127010827 100644
--- a/buildres/csl/csl-styles/renamed-styles.json
+++ b/buildres/csl/csl-styles/renamed-styles.json
@@ -438,7 +438,7 @@
     "ophthalmic-surgery-lasers-and-imaging": "ophthalmic-surgery-lasers-and-imaging-retina",
     "optical-society-of-america": "the-optical-society",
     "organic-and-medicinal-chemistry-letters": "chemistry-central-journal",
-    "oxford-brookes-university-faculty-of-health-and-life-sciences": "harvard-oxford-brookes-university-faculty-of-health-and-life-sciences",
+    "oxford-brookes-university-faculty-of-health-and-life-sciences": "harvard-cite-them-right",
     "oxford-university-new-south-wales": "oxford-the-university-of-new-south-wales",
     "pedobiologia-international-journal-of-soil-biology": "pedobiologia-journal-of-soil-ecology",
     "pharmacoeconomics-german-research-articles": "springer-vancouver-brackets",
@@ -529,5 +529,10 @@
     "investigaciones-de-historia-economica-economic-history-research": "investigaciones-de-historia-economica",
     "reach-reviews-in-human-space-exploration": "reach",
     "journal-of-oncological-science": "journal-of-oncological-sciences",
-    "harvard-dublin-city-university": "harvard-cite-them-right"
+    "harvard-dublin-city-university": "harvard-cite-them-right",
+    "technische-universitat-dresden-medizin": "apa",
+    "prifysgol-caerdydd-harvard": "cardiff-university-harvard",
+    "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"
 }
diff --git a/buildres/csl/csl-styles/research-in-plant-disease.csl b/buildres/csl/csl-styles/research-in-plant-disease.csl
index 076db77e1e0..9f98702a252 100644
--- a/buildres/csl/csl-styles/research-in-plant-disease.csl
+++ b/buildres/csl/csl-styles/research-in-plant-disease.csl
@@ -5,7 +5,7 @@
     <title-short>RPD</title-short>
     <id>http://www.zotero.org/styles/research-in-plant-disease</id>
     <link href="http://www.zotero.org/styles/research-in-plant-disease" rel="self"/>
-    <link href="http://www.zotero.org/styles/cellular-reprogramming" rel="template"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-harvard" rel="template"/>
     <link href="https://www.online-rpd.org/authors/authors.php?v_type=&amp;lang=en" rel="documentation"/>
     <author>
       <name>Patrick O'Brien</name>
diff --git a/buildres/csl/csl-styles/respiratory-care-journal.csl b/buildres/csl/csl-styles/respiratory-care-journal.csl
new file mode 100644
index 00000000000..91311b3f87b
--- /dev/null
+++ b/buildres/csl/csl-styles/respiratory-care-journal.csl
@@ -0,0 +1,192 @@
+<?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>Respiratory Care Journal</title>
+    <title-short>RC</title-short>
+    <id>http://www.zotero.org/styles/respiratory-care-journal</id>
+    <link href="http://www.zotero.org/styles/respiratory-care-journal" rel="self"/>
+    <link href="http://www.zotero.org/styles/haematologica" rel="template"/>
+    <link href="http://rc.rcjournal.com/content/author-guidelines#references" rel="documentation"/>
+    <author>
+      <name>Patrick O'Brien</name>
+    </author>
+    <category citation-format="numeric"/>
+    <category field="medicine"/>
+    <issn>0020-1324</issn>
+    <eissn>1943-3654</eissn>
+    <updated>2022-03-31T12:01:03+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">
+      <name sort-separator=" " initialize-with="" name-as-sort-order="all" delimiter=", " delimiter-precedes-last="always"/>
+      <label strip-periods="true" prefix=", "/>
+      <substitute>
+        <names variable="editor"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="editor">
+    <names variable="editor">
+      <name delimiter-precedes-last="always" initialize-with="" name-as-sort-order="all" sort-separator=" "/>
+      <label strip-periods="true" prefix=", " suffix="."/>
+    </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" prefix=" "/>
+        </if>
+      </choose>
+    </group>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if type="article-journal" match="any">
+        <choose>
+          <if variable="page volume" match="none">
+            <text variable="DOI" text-case="capitalize-first" prefix=" doi:"/>
+          </if>
+        </choose>
+      </if>
+      <else-if type="webpage post-weblog" match="any">
+        <group delimiter=", " prefix=" (" suffix=")">
+          <text variable="URL"/>
+          <text macro="accessed-date"/>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="accessed-date">
+    <group delimiter=" ">
+      <text term="accessed" text-case="capitalize-first"/>
+      <date form="text" variable="accessed" text-case="capitalize-first"/>
+    </group>
+  </macro>
+  <macro name="container-title">
+    <choose>
+      <if type="article-journal" match="any">
+        <text variable="container-title" form="short" strip-periods="true"/>
+      </if>
+      <else>
+        <text variable="container-title" font-style="italic"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="title">
+    <text variable="title"/>
+  </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" 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 delimiter-precedes-et-al="always" et-al-min="7" et-al-use-first="6" second-field-align="flush">
+    <layout suffix=".">
+      <text variable="citation-number" suffix=". "/>
+      <group delimiter=". ">
+        <text macro="author"/>
+        <choose>
+          <if type="bill book graphic legal_case legislation motion_picture patent report song thesis" match="any">
+            <group delimiter=". ">
+              <group delimiter=", ">
+                <text macro="title"/>
+                <text macro="edition"/>
+              </group>
+              <text macro="publisher"/>
+            </group>
+          </if>
+          <else-if type="chapter paper-conference" match="any">
+            <group delimiter=". ">
+              <text macro="title"/>
+              <group delimiter=": ">
+                <text term="in" text-case="capitalize-first"/>
+                <text macro="editor"/>
+              </group>
+              <group delimiter=", ">
+                <text variable="container-title" font-style="normal"/>
+                <text macro="edition"/>
+              </group>
+              <group delimiter=":">
+                <text macro="publisher"/>
+                <text variable="page"/>
+              </group>
+            </group>
+          </else-if>
+          <else-if type="article-newspaper article-magazine" match="any">
+            <group delimiter=". ">
+              <text macro="title"/>
+              <group delimiter=", ">
+                <text macro="container-title"/>
+                <text macro="date"/>
+                <text variable="page"/>
+              </group>
+            </group>
+          </else-if>
+          <else>
+            <group delimiter=". ">
+              <text macro="title"/>
+              <group delimiter=";">
+                <group delimiter=" ">
+                  <text macro="container-title"/>
+                  <choose>
+                    <if variable="page" match="any">
+                      <text macro="date"/>
+                    </if>
+                  </choose>
+                </group>
+                <group delimiter=":">
+                  <group>
+                    <text variable="volume"/>
+                    <text variable="issue" prefix="(" suffix=")"/>
+                  </group>
+                  <text variable="page"/>
+                </group>
+              </group>
+            </group>
+          </else>
+        </choose>
+      </group>
+      <text macro="access"/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/buildres/csl/csl-styles/revista-ladinia.csl b/buildres/csl/csl-styles/revista-ladinia.csl
new file mode 100644
index 00000000000..f747309d654
--- /dev/null
+++ b/buildres/csl/csl-styles/revista-ladinia.csl
@@ -0,0 +1,191 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" page-range-format="expanded">
+  <info>
+    <title>Revista Ladinia</title>
+    <title-short>LADINIA</title-short>
+    <id>http://www.zotero.org/styles/revista-ladinia</id>
+    <link href="http://www.zotero.org/styles/revista-ladinia" rel="self"/>
+    <link href="http://www.zotero.org/styles/apa" rel="template"/>
+    <link href="https://micura.it/la/ativites/ladinia/style-sheet" rel="documentation"/>
+    <author>
+      <name>Samuel Frontull</name>
+      <email>samuel.frontull@uibk.ac.at</email>
+    </author>
+    <author>
+      <name>Paolo Anvidalfarei</name>
+      <email>paolo@micura.it</email>
+    </author>
+    <category citation-format="author-date"/>
+    <category field="linguistics"/>
+    <issn>1124-1004</issn>
+    <updated>2022-05-11T09:51:15+01: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="it">
+    <terms>
+      <term name="open-quote">“</term>
+      <term name="close-quote">”</term>
+      <term name="and others"/>
+      <term name="no date">s.a.</term>
+      <term name="no-place">s.l.</term>
+      <term name="anonymous">N.N.</term>
+      <term name="editor">
+        <single>ed.</single>
+        <multiple>eds.</multiple>
+      </term>
+    </terms>
+  </locale>
+  <locale xml:lang="de">
+    <terms>
+      <term name="open-quote">“</term>
+      <term name="close-quote">”</term>
+      <term name="and others"/>
+      <term name="no date">s.a.</term>
+      <term name="no-place">s.l.</term>
+      <term name="anonymous">N.N.</term>
+      <term name="editor">
+        <single>ed.</single>
+        <multiple>eds.</multiple>
+      </term>
+    </terms>
+  </locale>
+  <locale xml:lang="en">
+    <terms>
+      <term name="open-quote">“</term>
+      <term name="close-quote">”</term>
+      <term name="and others"/>
+      <term name="no date">s.a.</term>
+      <term name="no-place">s.l.</term>
+      <term name="anonymous">N.N.</term>
+      <term name="editor">
+        <single>ed.</single>
+        <multiple>eds.</multiple>
+      </term>
+    </terms>
+  </locale>
+  <macro name="author">
+    <names variable="author">
+      <name name-as-sort-order="all" delimiter="/" form="short">
+        <name-part name="family" font-variant="small-caps"/>
+      </name>
+      <et-al term="and others"/>
+      <substitute>
+        <names variable="editor"/>
+        <text macro="anonymous"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="anonymous">
+    <text term="anonymous"/>
+  </macro>
+  <macro name="author-bibliography">
+    <names variable="author">
+      <name name-as-sort-order="all" delimiter="/">
+        <name-part name="family" font-variant="small-caps"/>
+      </name>
+      <label prefix=" (" suffix=")"/>
+      <et-al/>
+      <substitute>
+        <names variable="editor translator"/>
+        <text macro="anonymous"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="editor">
+    <names variable="editor translator" delimiter=", ">
+      <name name-as-sort-order="all" delimiter="/">
+        <name-part name="family" font-variant="small-caps"/>
+      </name>
+      <label prefix=" (" suffix=")"/>
+    </names>
+  </macro>
+  <macro name="issued-year">
+    <choose>
+      <if variable="issued">
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
+      </if>
+      <else>
+        <text term="no date"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="publisher-place">
+    <choose>
+      <if variable="publisher-place">
+        <text variable="publisher-place"/>
+      </if>
+      <else-if type="book" match="any">
+        <text term="no-place"/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="place-year">
+    <group delimiter=" ">
+      <text macro="publisher-place"/>
+      <text macro="issued-year"/>
+    </group>
+  </macro>
+  <macro name="container">
+    <choose>
+      <if type="book">
+        <group delimiter=", ">
+          <text macro="editor"/>
+          <text variable="container-title"/>
+        </group>
+      </if>
+      <else>
+        <group delimiter=": ">
+          <text term="in"/>
+          <group delimiter=", ">
+            <text macro="editor"/>
+            <choose>
+              <if type="chapter">
+                <text variable="container-title"/>
+              </if>
+              <else>
+                <text variable="container-title" quotes="true"/>
+              </else>
+            </choose>
+          </group>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="volume">
+    <text variable="volume"/>
+  </macro>
+  <macro name="page">
+    <text variable="page"/>
+  </macro>
+  <citation et-al-min="4" et-al-use-first="1" initialize-with="." disambiguate-add-givenname="true" disambiguate-add-year-suffix="true" collapse="year">
+    <sort>
+      <key macro="author"/>
+      <key macro="issued-year"/>
+    </sort>
+    <layout prefix="(" suffix=")" delimiter=", ">
+      <group delimiter=" ">
+        <text macro="author"/>
+        <text macro="issued-year"/>
+      </group>
+    </layout>
+  </citation>
+  <bibliography et-al-min="4" et-al-use-first="1">
+    <sort>
+      <key macro="author-bibliography"/>
+      <key macro="issued-year"/>
+      <key variable="title"/>
+    </sort>
+    <layout suffix=".">
+      <text macro="author-bibliography" suffix=": "/>
+      <group delimiter=", ">
+        <text variable="title" font-style="italic"/>
+        <text macro="container"/>
+        <text macro="volume"/>
+        <text macro="place-year"/>
+        <text macro="page"/>
+      </group>
+    </layout>
+  </bibliography>
+</style>
diff --git a/buildres/csl/csl-styles/revue-internationale-durbanisme.csl b/buildres/csl/csl-styles/revue-internationale-durbanisme.csl
new file mode 100644
index 00000000000..1ac4a29a004
--- /dev/null
+++ b/buildres/csl/csl-styles/revue-internationale-durbanisme.csl
@@ -0,0 +1,183 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" initialize="false" demote-non-dropping-particle="sort-only" default-locale="fr-FR">
+  <!-- This style was edited with the Visual CSL Editor (https://editor.citationstyles.org/visualEditor/) -->
+  <info>
+    <title>Revue Internationale d'Urbanisme (Français)</title>
+    <title-short>RIUrba</title-short>
+    <id>http://www.zotero.org/styles/revue-internationale-durbanisme</id>
+    <link href="http://www.zotero.org/styles/revue-internationale-durbanisme" rel="self"/>
+    <link href="http://www.zotero.org/styles/revista-de-filologia-espanola" rel="template"/>
+    <link href="http://www.zotero.org/styles/the-open-university-harvard" rel="template"/>
+    <link href="http://www.riurba.review/consignes-aux-auteurs-2/" rel="documentation"/>
+    <author>
+      <name>Eric Verdeil</name>
+    </author>
+    <category citation-format="author-date"/>
+    <category field="geography"/>
+    <summary>RIURBA citation style</summary>
+    <updated>2022-03-19T11:21:40+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="false" initialize-with=". "/>
+      <label form="short" prefix=" (" suffix=")"/>
+    </names>
+  </macro>
+  <macro name="anon">
+    <text term="anonymous" form="short" text-case="capitalize-first" strip-periods="true"/>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name font-variant="normal" and="text" delimiter-precedes-last="never" initialize-with=". " name-as-sort-order="first">
+        <name-part name="family" text-case="uppercase"/>
+      </name>
+      <label form="short" prefix=" (" suffix=")"/>
+      <substitute>
+        <names variable="editor"/>
+        <text macro="anon"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="author-short">
+    <names variable="author">
+      <name form="short" and="symbol" delimiter-precedes-last="never" initialize="false" initialize-with=". "/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <text macro="anon"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if variable="URL">
+        <text term="online" suffix=": "/>
+        <text value=" "/>
+        <text variable="URL" prefix="&lt;" suffix="&gt;"/>
+        <group delimiter=" " prefix=" [" suffix="]">
+          <text term="accessed" text-case="lowercase" suffix=":"/>
+          <date form="numeric" variable="accessed">
+            <date-part name="day" range-delimiter="-"/>
+            <date-part name="month"/>
+            <date-part name="year"/>
+          </date>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+        <text variable="title" font-style="normal"/>
+      </if>
+      <else>
+        <text variable="title" quotes="true"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=", ">
+      <text variable="publisher-place"/>
+      <text variable="publisher"/>
+    </group>
+  </macro>
+  <macro name="year-date">
+    <choose>
+      <if variable="issued">
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
+      </if>
+      <else>
+        <text term="no date" form="short"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="locator">
+    <choose>
+      <if type="article-journal">
+        <text variable="volume"/>
+        <text variable="issue" prefix="/"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="published-date">
+    <choose>
+      <if type="article-newspaper">
+        <date variable="issued">
+          <date-part name="day" form="ordinal" suffix=" "/>
+          <date-part name="month" form="long"/>
+        </date>
+      </if>
+    </choose>
+  </macro>
+  <macro name="pages">
+    <choose>
+      <if type="chapter paper-conference article-journal" match="any">
+        <label variable="page" form="short" suffix=" "/>
+        <text variable="page"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <text term="edition" form="short"/>
+        </group>
+      </if>
+      <else>
+        <text variable="edition" suffix="."/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="container-prefix">
+    <choose>
+      <if type="chapter paper-conference" match="any">
+        <text term="in" text-case="capitalize-first"/>
+      </if>
+    </choose>
+  </macro>
+  <citation et-al-min="10" et-al-use-first="3" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true" collapse="year">
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <group delimiter=", ">
+        <group delimiter=", ">
+          <text macro="author-short"/>
+          <text macro="year-date"/>
+        </group>
+        <group>
+          <text term="page" form="short" suffix=" "/>
+          <text variable="locator"/>
+        </group>
+      </group>
+    </layout>
+  </citation>
+  <bibliography hanging-indent="true">
+    <sort>
+      <key macro="author"/>
+      <key variable="title"/>
+    </sort>
+    <layout suffix=".">
+      <group delimiter=" ">
+        <text macro="author"/>
+        <text macro="year-date" prefix="(" suffix=")"/>
+        <text macro="title" suffix=", "/>
+        <text macro="edition"/>
+        <text macro="container-prefix"/>
+        <group delimiter=", ">
+          <text macro="editor"/>
+          <text variable="container-title" font-style="normal"/>
+          <text variable="collection-title"/>
+          <text variable="genre"/>
+          <text macro="publisher"/>
+          <text macro="locator"/>
+          <text macro="published-date"/>
+          <text macro="pages"/>
+          <text macro="access"/>
+        </group>
+      </group>
+    </layout>
+  </bibliography>
+</style>
diff --git a/buildres/csl/csl-styles/science-china-materials.csl b/buildres/csl/csl-styles/science-china-materials.csl
new file mode 100644
index 00000000000..f6898a0641d
--- /dev/null
+++ b/buildres/csl/csl-styles/science-china-materials.csl
@@ -0,0 +1,141 @@
+<?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>SCIENCE CHINA Materials</title>
+    <title-short>SCM</title-short>
+    <id>http://www.zotero.org/styles/science-china-materials</id>
+    <link href="http://www.zotero.org/styles/science-china-materials" rel="self"/>
+    <link href="http://www.zotero.org/styles/xenotransplantation" rel="template"/>
+    <link href="https://www.sciengine.com/authorCenter/guide/Manuscript/XTQhzDPnrXRQMhhph" rel="documentation"/>
+    <author>
+      <name>Patrick O'Brien</name>
+    </author>
+    <category citation-format="numeric"/>
+    <category field="engineering"/>
+    <issn>2095-8226</issn>
+    <eissn>2199-4501</eissn>
+    <updated>2022-04-13T08:45:04+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">
+    <group suffix=".">
+      <names variable="author">
+        <name font-variant="normal" delimiter-precedes-et-al="never" delimiter-precedes-last="always" initialize-with="" name-as-sort-order="all" sort-separator=" "/>
+        <label form="short" prefix=", "/>
+        <et-al font-style="italic" font-variant="normal"/>
+        <substitute>
+          <names variable="editor"/>
+        </substitute>
+      </names>
+    </group>
+  </macro>
+  <macro name="editor">
+    <names variable="editor">
+      <name name-as-sort-order="all" sort-separator=" " delimiter-precedes-last="always" initialize-with="" delimiter=", "/>
+      <label form="short" prefix=", " suffix="."/>
+    </names>
+  </macro>
+  <macro name="title">
+    <text variable="title" quotes="false"/>
+  </macro>
+  <macro name="year">
+    <date variable="issued">
+      <date-part name="year"/>
+    </date>
+  </macro>
+  <macro name="journal">
+    <group delimiter=", ">
+      <text variable="container-title" form="short" strip-periods="true"/>
+      <text macro="year"/>
+      <text variable="volume"/>
+    </group>
+  </macro>
+  <macro name="conference">
+    <group delimiter=", ">
+      <text variable="container-title"/>
+      <group delimiter=" ">
+        <text variable="publisher"/>
+        <text macro="year"/>
+      </group>
+    </group>
+  </macro>
+  <macro name="book-publisher">
+    <group delimiter=", ">
+      <group delimiter=": ">
+        <text variable="publisher-place"/>
+        <text variable="publisher"/>
+      </group>
+      <text macro="year"/>
+    </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"/>
+      </else>
+    </choose>
+  </macro>
+  <citation>
+    <sort>
+      <key variable="citation-number"/>
+    </sort>
+    <layout prefix="[" suffix="]" delimiter=",">
+      <group delimiter=":">
+        <text variable="citation-number"/>
+        <text variable="locator"/>
+      </group>
+    </layout>
+  </citation>
+  <bibliography et-al-min="6" et-al-use-first="3" second-field-align="flush" entry-spacing="0">
+    <layout suffix=".">
+      <text variable="citation-number"/>
+      <text macro="author" suffix=". "/>
+      <text macro="title" suffix=". "/>
+      <choose>
+        <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+          <text macro="edition" suffix=" "/>
+          <text macro="book-publisher" suffix="."/>
+        </if>
+        <else-if type="paper-conference">
+          <group suffix="." delimiter=", ">
+            <text macro="conference"/>
+            <text variable="page"/>
+          </group>
+        </else-if>
+        <else-if type="chapter paper-conference" match="any">
+          <text term="in" text-case="capitalize-first" suffix=": "/>
+          <text macro="editor" suffix=" "/>
+          <text variable="container-title" suffix=". "/>
+          <text macro="edition" suffix=" "/>
+          <group suffix=".">
+            <text macro="book-publisher"/>
+            <text variable="page" prefix=": "/>
+          </group>
+        </else-if>
+        <else-if type="article-journal">
+          <group suffix=".">
+            <text macro="journal"/>
+            <text variable="page" prefix=": "/>
+          </group>
+        </else-if>
+        <else>
+          <group suffix="." delimiter=" ">
+            <group delimiter=" ">
+              <text variable="container-title"/>
+              <text variable="volume"/>
+            </group>
+            <text macro="year"/>
+            <text variable="page"/>
+          </group>
+          <text variable="URL" prefix=" "/>
+        </else>
+      </choose>
+    </layout>
+  </bibliography>
+</style>
diff --git a/buildres/csl/csl-styles/science.csl b/buildres/csl/csl-styles/science.csl
index 641de8f592d..06ee7b70359 100644
--- a/buildres/csl/csl-styles/science.csl
+++ b/buildres/csl/csl-styles/science.csl
@@ -144,6 +144,7 @@
                 <if type="chapter paper-conference" match="any">
                   <group delimiter=", ">
                     <group delimiter=" ">
+                      <text variable="title" prefix="&quot;" suffix="&quot;"/>
                       <text term="in"/>
                       <text variable="container-title" font-style="italic"/>
                     </group>
diff --git a/buildres/csl/csl-styles/sciences-po-ecole-doctorale-author-date.csl b/buildres/csl/csl-styles/sciences-po-ecole-doctorale-author-date.csl
index 8b570113983..3fe5189cd70 100644
--- a/buildres/csl/csl-styles/sciences-po-ecole-doctorale-author-date.csl
+++ b/buildres/csl/csl-styles/sciences-po-ecole-doctorale-author-date.csl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" default-locale="fr-FR" version="1.0" page-range-format="expanded" demote-non-dropping-particle="sort-only">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" page-range-format="expanded" demote-non-dropping-particle="sort-only" default-locale="fr-FR">
   <info>
-    <title>Sciences Po - Ecole doctorale (author-date, Français)</title>
+    <title>Sciences Po - Ecole de la recherche (author-date, Français)</title>
     <id>http://www.zotero.org/styles/sciences-po-ecole-doctorale-author-date</id>
     <link href="http://www.zotero.org/styles/sciences-po-ecole-doctorale-author-date" rel="self"/>
     <link href="https://sciencespo.libguides.com/zotero/styles" rel="documentation"/>
diff --git a/buildres/csl/csl-styles/sciences-po-ecole-doctorale-note-french.csl b/buildres/csl/csl-styles/sciences-po-ecole-doctorale-note-french.csl
index 779e8ef8620..6502c9e7cbb 100644
--- a/buildres/csl/csl-styles/sciences-po-ecole-doctorale-note-french.csl
+++ b/buildres/csl/csl-styles/sciences-po-ecole-doctorale-note-french.csl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.0" page-range-format="expanded" demote-non-dropping-particle="sort-only" default-locale="fr-FR">
   <info>
-    <title>Sciences Po - École doctorale (note, Français)</title>
+    <title>Sciences Po - École de la recherche (note, Français)</title>
     <id>http://www.zotero.org/styles/sciences-po-ecole-doctorale-note-french</id>
     <link href="http://www.zotero.org/styles/sciences-po-ecole-doctorale-note-french" rel="self"/>
     <link href="https://sciencespo.libguides.com/zotero/styles" rel="documentation"/>
@@ -349,11 +349,9 @@
     <layout delimiter="&#160;; ">
       <choose>
         <if position="ibid-with-locator">
-          <group delimiter=". ">
-            <text term="ibid" text-case="capitalize-first" font-style="italic"/>
-            <label variable="locator" form="short" suffix="&#160;"/>
-            <text variable="locator"/>
-          </group>
+          <text term="ibid" text-case="capitalize-first" font-style="italic"/>
+          <label variable="locator" form="short" suffix="&#160;"/>
+          <text variable="locator"/>
         </if>
         <else-if position="ibid">
           <text term="ibid" text-case="capitalize-first" font-style="italic"/>
diff --git a/buildres/csl/csl-styles/shock.csl b/buildres/csl/csl-styles/shock.csl
index 7a36aa56ab0..cef13317080 100644
--- a/buildres/csl/csl-styles/shock.csl
+++ b/buildres/csl/csl-styles/shock.csl
@@ -4,7 +4,7 @@
     <title>Shock</title>
     <id>http://www.zotero.org/styles/shock</id>
     <link href="http://www.zotero.org/styles/shock" rel="self"/>
-    <link href="http://www.zotero.org/styles/antioxidants-and-redox-signaling" rel="template"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-vancouver" rel="template"/>
     <link href="http://edmgr.ovid.com/shk/accounts/ifauth.htm" rel="documentation"/>
     <author>
       <name>Patrick O'Brien</name>
diff --git a/buildres/csl/csl-styles/society-for-american-archaeology.csl b/buildres/csl/csl-styles/society-for-american-archaeology.csl
index a93d2ddb1c8..6dc4a968263 100644
--- a/buildres/csl/csl-styles/society-for-american-archaeology.csl
+++ b/buildres/csl/csl-styles/society-for-american-archaeology.csl
@@ -1,13 +1,16 @@
 <?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">
-  <!-- Polyglot; journal publishes in English and Spanish -->
+  <!--
+ Polyglot; journal publishes in English and Spanish 
+-->
   <info>
     <title>Society for American Archaeology</title>
     <title-short>SAA</title-short>
     <id>http://www.zotero.org/styles/society-for-american-archaeology</id>
     <link href="http://www.zotero.org/styles/society-for-american-archaeology" rel="self"/>
     <link href="https://www.saa.org/publications" rel="documentation"/>
-    <link href="https://documents.saa.org/container/docs/default-source/doc-publications/style-guide/saa-style-guide_updated-july-2018c5062f7e55154959ab57564384bda7de.pdf?sfvrsn=8247640e_6" rel="documentation"/>
+    <link href="https://documents.saa.org/container/docs/default-source/doc-publications/style-guide/saa-style-guide_english_updated_2021_final08023c15928949dabd02faafb269fb1c.pdf?sfvrsn=c1f41c1b_2" rel="documentation"/>
+    <link href="https://documents.saa.org/container/docs/default-source/doc-publications/style-guide/saa_guia_de_estilo_updated_2021_final770fea7e32154c1e80ed075cb9de3333.pdf?sfvrsn=7250a084_2" rel="documentation"/>
     <author>
       <name>Michael Barton</name>
       <email>michael.barton@asu.edu</email>
@@ -25,7 +28,7 @@
     </contributor>
     <category citation-format="author-date"/>
     <category field="anthropology"/>
-    <updated>2020-11-23T22:11:55+00:00</updated>
+    <updated>2022-02-22T08:50:31+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>
@@ -139,7 +142,7 @@
             </group>
           </group>
         </else-if>
-        <else-if type="webpage post-weblog post" match="any">
+        <else-if type="webpage post-weblog post article-magazine article-newspaper" match="any">
           <group delimiter=", ">
             <text variable="genre"/>
             <text variable="URL"/>
diff --git a/buildres/csl/csl-styles/society-of-biblical-literature-1st-edition-fullnote-bibliography.csl b/buildres/csl/csl-styles/society-of-biblical-literature-1st-edition-fullnote-bibliography.csl
index 21978c4a278..fba6f1635c5 100644
--- a/buildres/csl/csl-styles/society-of-biblical-literature-1st-edition-fullnote-bibliography.csl
+++ b/buildres/csl/csl-styles/society-of-biblical-literature-1st-edition-fullnote-bibliography.csl
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.0" demote-non-dropping-particle="sort-only" default-locale="en-US" page-range-format="chicago">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.0" demote-non-dropping-particle="sort-only" page-range-format="chicago" default-locale="en-US">
   <info>
     <title>Society of Biblical Literature 1st edition (full note)</title>
+    <title-short>SBL (1st edition)</title-short>
     <id>http://www.zotero.org/styles/society-of-biblical-literature-1st-edition-fullnote-bibliography</id>
     <link href="http://www.zotero.org/styles/society-of-biblical-literature-1st-edition-fullnote-bibliography" rel="self"/>
     <link href="http://www.zotero.org/styles/chicago-fullnote-bibliography" rel="template"/>
@@ -24,7 +25,7 @@
     <category citation-format="note"/>
     <category field="theology"/>
     <summary>Society of Biblical Literature, 1st edition, format with full notes and bibliography</summary>
-    <updated>2012-10-26T01:15:26+00:00</updated>
+    <updated>2022-05-27T01:15:26+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">
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 7dba38d085f..5198c11eae8 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
@@ -2,6 +2,7 @@
 <style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.0" demote-non-dropping-particle="sort-only" page-range-format="chicago" default-locale="en-US">
   <info>
     <title>Society of Biblical Literature 2nd edition (full note)</title>
+    <title-short>SBL (2nd edition)</title-short>
     <id>http://www.zotero.org/styles/society-of-biblical-literature-fullnote-bibliography</id>
     <link href="http://www.zotero.org/styles/society-of-biblical-literature-fullnote-bibliography" rel="self"/>
     <link href="http://www.zotero.org/styles/chicago-fullnote-bibliography" rel="template"/>
@@ -32,7 +33,7 @@
     <category citation-format="note"/>
     <category field="theology"/>
     <summary>Society of Biblical Literature format with full notes and bibliography</summary>
-    <updated>2021-05-16T18:39:17+00:00</updated>
+    <updated>2022-06-29T13:58:51+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">
@@ -112,11 +113,11 @@
     <choose>
       <if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="any">
         <group delimiter=", ">
-          <text macro="editor-translator-verb-short-comma"/>
           <names variable="container-author">
             <label form="verb-short" suffix=" "/>
             <name and="text" delimiter=", "/>
           </names>
+          <text macro="editor-translator-verb-short-comma"/>
         </group>
       </if>
     </choose>
@@ -381,7 +382,7 @@
         </choose>
       </else-if>
       <else>
-        <text variable="title" form="short" quotes="true" text-case="title"/>
+        <text variable="title" quotes="true" form="short" text-case="title"/>
       </else>
     </choose>
   </macro>
@@ -674,7 +675,16 @@
     </choose>
   </macro>
   <macro name="event-note">
-    <text variable="event"/>
+    <!-- Support citation of unpublished conference presentations per SBLHS2 §6.3.8. -->
+    <choose>
+      <if type="speech" match="any">
+        <group delimiter=" ">
+          <text variable="genre"/>
+          <text term="presented at" suffix=" "/>
+        </group>
+      </if>
+    </choose>
+    <text variable="event" suffix=","/>
   </macro>
   <macro name="event">
     <group>
@@ -790,7 +800,15 @@
                   <else>
                     <group delimiter=" ">
                       <label variable="locator" form="short"/>
-                      <text variable="locator"/>
+                      <!-- Adds quotes around the locator when the type is sub-verbo per https://sblhs2.com/2017/03/30/citing-reference-works-2-lexica/ -->
+                      <choose>
+                        <if locator="sub-verbo">
+                          <text variable="locator" quotes="true"/>
+                        </if>
+                        <else>
+                          <text variable="locator"/>
+                        </else>
+                      </choose>
                     </group>
                   </else>
                 </choose>
@@ -840,9 +858,9 @@
       </else-if>
       <else-if type="entry-dictionary entry-encyclopedia" match="any">
         <choose>
-          <if position="first" variable="volume" match="all">
+          <if position="first" match="all">
             <text macro="point-locators-subsequent" prefix=" "/>
-            <!--SBL 6.3.6 prefers space in first entry before vol info.-->
+            <!-- Per SBLHS2 §6.3.6, the first reference will, by definition have the dictionary title or abbreviation preceding the locators, volume number included. No comma should appear after the title or abbreviation and before the locators. -->
           </if>
           <else>
             <text macro="point-locators-subsequent" prefix=", "/>
@@ -925,11 +943,10 @@
                   <text macro="publisher"/>
                   <choose>
                     <if variable="title" match="none"/>
-                    <else-if type="thesis speech" match="any">
+                    <else-if type="thesis" match="any">
                       <text variable="genre"/>
                     </else-if>
                   </choose>
-                  <text macro="event"/>
                 </group>
                 <text macro="issued" prefix=", "/>
               </group>
@@ -990,12 +1007,15 @@
           <text macro="archive-note"/>
         </else-if>
       </choose>
+      <!-- SBL style uses DOIs and URLs when the resource is electronic. SBLHS2 §§ 6.1.6, 6.2.25, 6.3.10, 6.4.13&#8211;14. If a resource has physical dimensions, however, it is not electronic. So, DOI or URL output should be bypassed. -->
       <choose>
-        <if variable="DOI">
-          <text variable="DOI" prefix="https://doi.org/"/>
-        </if>
+        <if variable="dimensions"/>
         <else>
-          <text variable="URL"/>
+          <!-- Per SBLHS2 §6.3.10, allows either DOI or URL or both to be included. -->
+          <group delimiter=", ">
+            <text variable="DOI" prefix="https://doi.org/"/>
+            <text variable="URL"/>
+          </group>
         </else>
       </choose>
     </group>
@@ -1010,12 +1030,15 @@
           <text macro="archive"/>
         </else-if>
       </choose>
+      <!-- SBL style uses DOIs and URLs when the resource is electronic. SBLHS2 §§6.1.6, 6.2.25, 6.3.10, 6.4.13&#8211;14. If a resource has physical dimensions, however, it is not electronic. So, DOI or URL output should be bypassed. -->
       <choose>
-        <if variable="DOI">
-          <text variable="DOI" prefix="https://doi.org/"/>
-        </if>
+        <if variable="dimensions"/>
         <else>
-          <text variable="URL"/>
+          <!-- Per SBLHS2 §6.3.10, allows either DOI or URL or both to be included. -->
+          <group delimiter=", ">
+            <text variable="DOI" prefix="https://doi.org/"/>
+            <text variable="URL"/>
+          </group>
         </else>
       </choose>
     </group>
@@ -1071,14 +1094,16 @@
         <!-- Support custom citations via the annote variable. For discussion, see https://forums.zotero.org/discussion/comment/317370 -->
         <if variable="annote">
           <choose>
-            <if locator="section">
-              <group delimiter=" ">
+            <!-- For situations like citation of lexica per https://sblhs2.com/2017/03/30/citing-reference-works-2-lexica/. -->
+            <if locator="sub-verbo">
+              <group delimiter=", ">
                 <text variable="annote"/>
                 <text macro="point-locators-subsequent"/>
               </group>
             </if>
+            <!-- For situations like citation of collections like (M)OTP per https://sblhs2.com/2017/06/08/citing-text-collections-3-otp/ and https://sblhs2.com/2017/06/22/citing-text-collections-3-motp/. -->
             <else>
-              <group delimiter=", ">
+              <group delimiter=" ">
                 <text variable="annote"/>
                 <text macro="point-locators-subsequent"/>
               </group>
diff --git a/buildres/csl/csl-styles/sociologia-urbana-e-rurale.csl b/buildres/csl/csl-styles/sociologia-urbana-e-rurale.csl
new file mode 100644
index 00000000000..c59e6cc5b24
--- /dev/null
+++ b/buildres/csl/csl-styles/sociologia-urbana-e-rurale.csl
@@ -0,0 +1,237 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.0" name-as-sort-order="all" page-range-format="expanded" demote-non-dropping-particle="never" default-locale="it-IT">
+  <!-- This style was edited with the Visual CSL Editor (https://editor.citationstyles.org/visualEditor/) -->
+  <info>
+    <title>Sociologia Urbana e Rurale (Italian)</title>
+    <title-short>SUR</title-short>
+    <id>http://www.zotero.org/styles/sociologia-urbana-e-rurale</id>
+    <link href="http://www.zotero.org/styles/sociologia-urbana-e-rurale" rel="self"/>
+    <link href="http://www.zotero.org/styles/universidade-estadual-do-oeste-do-parana-programa-institucional-de-bolsas-de-iniciacao-cientifica" rel="template"/>
+    <link href="https://journals.francoangeli.it/index.php/sur/" rel="documentation"/>
+    <author>
+      <name>Michele Tutone</name>
+      <email>journals@francoangeli.it</email>
+    </author>
+    <category citation-format="note"/>
+    <category field="sociology"/>
+    <issn>0392-4939</issn>
+    <eissn>1971-8403</eissn>
+    <summary>Citation style for «Sociologia Urbana e Rurale»</summary>
+    <published>2022-04-28T12:14:57+00:00</published>
+    <updated>2022-04-28T12:14:57+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="it">
+    <terms>
+      <term name="and others">et al.</term>
+      <term name="accessed">consultato il</term>
+      <term name="available at">testo disponibile al sito</term>
+    </terms>
+  </locale>
+  <macro name="author">
+    <names variable="author">
+      <name suffix="." delimiter-precedes-last="never" initialize-with="." name-as-sort-order="all" sort-separator=" "/>
+      <et-al font-style="italic"/>
+      <label form="verb" strip-periods="true" prefix=" (" suffix=")."/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <text macro="title"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="author-short">
+    <names variable="author">
+      <name form="short" initialize-with=". "/>
+      <et-al font-style="italic"/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <text variable="container-title" font-style="italic"/>
+        <choose>
+          <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+            <text variable="title" form="short" font-style="italic"/>
+          </if>
+          <else>
+            <text variable="title" form="short" quotes="true"/>
+          </else>
+        </choose>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="container-contributors">
+    <choose>
+      <if type="chapter" match="any">
+        <text term="in" text-case="capitalize-first" prefix=" " suffix=" "/>
+        <names variable="editor translator" delimiter=" " suffix=" ">
+          <name initialize-with="." name-as-sort-order="all" sort-separator=" "/>
+          <label form="verb" plural="always" strip-periods="true" prefix=" (" suffix=")."/>
+        </names>
+      </if>
+      <else-if type="legal_case legislation" match="any">
+        <text variable="number" prefix=" " suffix="."/>
+      </else-if>
+    </choose>
+    <choose>
+      <if type="paper-conference" match="any">
+        <text term="in" text-case="capitalize-first" prefix=" " suffix=" "/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if variable="URL">
+        <group delimiter=" ">
+          <text variable="URL"/>
+          <group delimiter=" " prefix="(" suffix=")">
+            <text term="accessed"/>
+            <date form="numeric" variable="accessed">
+              <date-part name="day"/>
+              <date-part name="month" form="numeric-leading-zeros"/>
+              <date-part name="year"/>
+            </date>
+          </group>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="bill book graphic motion_picture report song thesis" match="any">
+        <text variable="title" font-style="italic"/>
+      </if>
+      <else-if type="legal_case legislation" match="any">
+        <text variable="title" font-weight="bold"/>
+      </else-if>
+      <else>
+        <text variable="title" suffix="."/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <choose>
+      <if type="thesis">
+        <group delimiter=", " prefix=" ">
+          <text variable="genre"/>
+          <text variable="publisher"/>
+        </group>
+      </if>
+      <else-if type="patent" match="any">
+        <text variable="publisher" font-style="italic" suffix=" "/>
+        <text variable="number" font-style="italic" suffix=", "/>
+        <text variable="page"/>
+      </else-if>
+      <else-if type="paper-conference" match="any">
+        <text variable="publisher-place"/>
+      </else-if>
+      <else-if type="legal_case legislation" match="any">
+        <text variable="publisher" suffix=", "/>
+        <text variable="publisher-place" suffix=", "/>
+        <text variable="page"/>
+      </else-if>
+      <else-if type="broadcast interview" match="any">
+        <group delimiter=". " prefix="Entrevistadores: ">
+          <text variable="genre"/>
+          <text variable="publisher-place"/>
+          <text variable="publisher"/>
+        </group>
+      </else-if>
+      <else-if type="article-newspaper" match="any">
+        <text variable="publisher-place" prefix=". "/>
+      </else-if>
+      <else>
+        <text variable="genre" prefix=" " suffix=". "/>
+        <group delimiter=": ">
+          <text variable="publisher-place" prefix=" "/>
+          <text variable="publisher"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="event">
+    <choose>
+      <if variable="event">
+        <text term="presented at" prefix="paper " suffix=" "/>
+        <text variable="event"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="year-date">
+    <choose>
+      <if variable="issued">
+        <group>
+          <date date-parts="year" form="numeric" variable="issued">
+            <date-part name="year"/>
+          </date>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="locators">
+    <choose>
+      <if type="article-journal article-magazine" match="any">
+        <group delimiter=" " prefix=", ">
+          <group>
+            <text variable="volume" suffix=":"/>
+          </group>
+          <text variable="page"/>
+        </group>
+      </if>
+      <else-if type="article-newspaper">
+        <group delimiter=": " prefix=", ">
+          <date variable="issued">
+            <date-part name="day"/>
+            <date-part name="month" form="long" prefix=" "/>
+          </date>
+          <group delimiter=" ">
+            <text variable="page"/>
+          </group>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <citation et-al-min="21" et-al-use-first="20" disambiguate-add-year-suffix="true" collapse="year">
+    <sort>
+      <key macro="year-date"/>
+      <key macro="author"/>
+    </sort>
+    <layout delimiter="; " prefix="(" suffix=")">
+      <group delimiter=", ">
+        <text macro="author-short"/>
+        <text macro="year-date"/>
+      </group>
+      <text variable="locator" prefix=": "/>
+    </layout>
+  </citation>
+  <bibliography>
+    <sort>
+      <key macro="author"/>
+      <key macro="year-date"/>
+    </sort>
+    <layout suffix=".">
+      <group delimiter=" " suffix=".">
+        <text macro="author"/>
+        <text macro="year-date" prefix="(" suffix=")."/>
+        <text macro="title"/>
+      </group>
+      <text macro="container-contributors"/>
+      <choose>
+        <if type="paper-conference" match="any">
+          <text variable="container-title" suffix="."/>
+        </if>
+        <else>
+          <text variable="container-title" font-style="italic" prefix=" "/>
+        </else>
+      </choose>
+      <text macro="event"/>
+      <group delimiter=" ">
+        <text macro="publisher"/>
+      </group>
+      <text macro="locators"/>
+      <group delimiter=": " prefix=". ">
+        <text term="available at"/>
+        <text macro="access"/>
+      </group>
+    </layout>
+  </bibliography>
+</style>
diff --git a/buildres/csl/csl-styles/sodertorns-hogskola-harvard-ibid.csl b/buildres/csl/csl-styles/sodertorns-hogskola-harvard-ibid.csl
index 947c9bd82f2..dae23b6ccd6 100644
--- a/buildres/csl/csl-styles/sodertorns-hogskola-harvard-ibid.csl
+++ b/buildres/csl/csl-styles/sodertorns-hogskola-harvard-ibid.csl
@@ -118,7 +118,7 @@
               <date variable="accessed" delimiter="-">
                 <date-part name="year"/>
                 <date-part name="month" form="numeric-leading-zeros" strip-periods="true"/>
-                <date-part name="day"/>
+                <date-part name="day" form="numeric-leading-zeros"/>
               </date>
             </group>
           </if>
diff --git a/buildres/csl/csl-styles/sodertorns-hogskola-harvard.csl b/buildres/csl/csl-styles/sodertorns-hogskola-harvard.csl
index 40edd364228..13320a55d71 100644
--- a/buildres/csl/csl-styles/sodertorns-hogskola-harvard.csl
+++ b/buildres/csl/csl-styles/sodertorns-hogskola-harvard.csl
@@ -118,7 +118,7 @@
               <date variable="accessed" delimiter="-">
                 <date-part name="year"/>
                 <date-part name="month" form="numeric-leading-zeros" strip-periods="true"/>
-                <date-part name="day"/>
+                <date-part name="day" form="numeric-leading-zeros"/>
               </date>
             </group>
           </if>
diff --git a/buildres/csl/csl-styles/sodertorns-hogskola-oxford.csl b/buildres/csl/csl-styles/sodertorns-hogskola-oxford.csl
index 2937f83bc43..1b4abc6019d 100644
--- a/buildres/csl/csl-styles/sodertorns-hogskola-oxford.csl
+++ b/buildres/csl/csl-styles/sodertorns-hogskola-oxford.csl
@@ -15,7 +15,7 @@
     <category field="humanities"/>
     <category field="social_science"/>
     <summary>Södertörn University Oxford style without ibid</summary>
-    <updated>2021-02-18T14:14:20+00:00</updated>
+    <updated>2022-01-05T13:45:04+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="sv">
@@ -27,16 +27,6 @@
     <label variable="page" form="short" suffix=" "/>
     <text variable="page"/>
   </macro>
-  <macro name="locator-or-period">
-    <choose>
-      <if variable="locator" match="none">
-        <text value="."/>
-      </if>
-      <else>
-        <text prefix=", " macro="citation-locator" suffix="."/>
-      </else>
-    </choose>
-  </macro>
   <macro name="contributors-full">
     <choose>
       <if variable="author">
@@ -51,7 +41,7 @@
           <name name-as-sort-order="all" sort-separator=",&#160;" and="symbol" delimiter=", " delimiter-precedes-last="never">
             <name-part name="family"/>
           </name>
-          <label prefix=" (" form="short" plural="contextual" suffix=")."/>
+          <label prefix=" (" form="short" plural="contextual" suffix=")"/>
         </names>
       </else-if>
       <else-if variable="composer">
@@ -77,7 +67,7 @@
           <name sort-separator=",&#160;" and="symbol" delimiter=", " delimiter-precedes-last="never">
             <name-part name="family"/>
           </name>
-          <label prefix=" (" form="short" plural="contextual" suffix=")."/>
+          <label prefix=" (" form="short" plural="contextual" suffix=")"/>
         </names>
       </else-if>
       <else-if variable="composer">
@@ -103,7 +93,7 @@
           <name sort-separator=",&#160;" and="symbol" delimiter=", " delimiter-precedes-last="never">
             <name-part name="family"/>
           </name>
-          <label prefix=" (" form="short" plural="contextual" suffix=")."/>
+          <label prefix=" (" form="short" plural="contextual" suffix=")"/>
         </names>
       </else-if>
       <else-if variable="composer">
@@ -255,9 +245,11 @@
   <macro name="publisher">
     <choose>
       <if type="book report chapter entry entry-dictionary entry-encyclopedia paper-conference thesis map figure graphic" match="any">
-        <text prefix="(" macro="publisher-place" suffix=": "/>
-        <text macro="printers" suffix=", "/>
-        <text macro="issued-year" suffix=")"/>
+        <group prefix="(" suffix=")">
+          <text macro="publisher-place" suffix=": "/>
+          <text macro="printers" suffix=", "/>
+          <text macro="issued-year"/>
+        </group>
       </if>
       <else>
         <text macro="printers"/>
@@ -327,8 +319,8 @@
       <else-if type="post post-weblog broadcast personal_communication interview manuscript" match="any">
         <date variable="issued">
           <date-part name="day" suffix="/"/>
-          <date-part name="month" suffix=" " form="numeric"/>
-          <date-part name="year"/>
+          <date-part name="month" form="numeric"/>
+          <date-part prefix=" " name="year"/>
         </date>
       </else-if>
       <else>
@@ -339,7 +331,7 @@
     </choose>
   </macro>
   <macro name="citation-locator">
-    <label variable="locator" form="short" suffix="&#160;"/>
+    <label prefix=", " variable="locator" form="short" suffix="&#160;"/>
     <text variable="locator"/>
   </macro>
   <macro name="collection">
@@ -403,13 +395,13 @@
       <text term="accessed" form="short" suffix="&#160;"/>
       <date variable="accessed">
         <date-part name="year" suffix="-"/>
-        <date-part name="month" suffix="-" form="numeric"/>
-        <date-part name="day"/>
+        <date-part name="month" suffix="-" form="numeric-leading-zeros"/>
+        <date-part name="day" form="numeric-leading-zeros"/>
       </date>
     </group>
   </macro>
   <citation et-al-min="20" et-al-use-first="1" disambiguate-add-names="true">
-    <layout delimiter="; ">
+    <layout delimiter="; " suffix=".">
       <choose>
         <if position="subsequent">
           <choose>
@@ -435,7 +427,7 @@
               <text prefix=" " macro="issued-year"/>
             </else>
           </choose>
-          <text macro="locator-or-period"/>
+          <text macro="citation-locator"/>
         </if>
         <else>
           <choose>
@@ -445,7 +437,7 @@
               <text macro="container"/>
               <text prefix=", " variable="volume" text-case="capitalize-first"/>
               <text prefix=" " macro="publisher"/>
-              <text macro="locator-or-period"/>
+              <text macro="citation-locator"/>
             </if>
             <else-if type="book" match="any">
               <text macro="contributors-long" suffix=", "/>
@@ -457,7 +449,7 @@
                 </if>
               </choose>
               <text prefix=" " macro="publisher"/>
-              <text macro="locator-or-period"/>
+              <text macro="citation-locator"/>
             </else-if>
             <else-if type="webpage post post-weblog" match="any">
               <choose>
@@ -475,10 +467,10 @@
                 <if variable="URL" match="any">
                   <text prefix=", " macro="page-range"/>
                   <text prefix=", " macro="identifier"/>
-                  <text prefix=" " macro="quoted" suffix="."/>
+                  <text prefix=" " macro="quoted"/>
                 </if>
                 <else>
-                  <text prefix=", " macro="page-range" suffix="."/>
+                  <text prefix=", " macro="page-range"/>
                 </else>
               </choose>
             </else-if>
@@ -491,10 +483,10 @@
                 <if variable="URL" match="any">
                   <text prefix=", " macro="page-range"/>
                   <text prefix=", " macro="identifier"/>
-                  <text prefix=" " macro="quoted" suffix="."/>
+                  <text prefix=" " macro="quoted"/>
                 </if>
                 <else>
-                  <text prefix=", " macro="page-range" suffix="."/>
+                  <text prefix=", " macro="page-range"/>
                 </else>
               </choose>
             </else-if>
@@ -504,7 +496,7 @@
               <text macro="container"/>
               <text prefix=" " macro="issued"/>
               <text prefix=", doi:" variable="DOI"/>
-              <text macro="locator-or-period"/>
+              <text macro="citation-locator"/>
             </else-if>
             <else-if type="paper-conference speech" match="any">
               <text macro="contributors-long" suffix=", "/>
@@ -518,14 +510,14 @@
                   <text prefix=", doi:" variable="DOI"/>
                 </if>
               </choose>
-              <text macro="locator-or-period"/>
+              <text macro="citation-locator"/>
             </else-if>
             <else-if type="thesis" match="any">
               <text macro="contributors-long" suffix=", "/>
               <text macro="title-long" font-style="italic"/>
               <text prefix=", " macro="genre"/>
               <text prefix=" " macro="publisher"/>
-              <text macro="locator-or-period"/>
+              <text macro="citation-locator"/>
             </else-if>
             <else-if type="report" match="any">
               <text macro="contributors-full" suffix=", "/>
@@ -543,7 +535,7 @@
                   <text prefix=" " macro="quoted"/>
                 </if>
               </choose>
-              <text macro="locator-or-period"/>
+              <text macro="citation-locator"/>
             </else-if>
             <else-if type="map figure graphic" match="any">
               <text macro="contributors-full" suffix=", "/>
@@ -564,11 +556,8 @@
               <choose>
                 <if variable="URL" match="any">
                   <text prefix=", " macro="identifier"/>
-                  <text prefix=" " macro="quoted" suffix="."/>
+                  <text prefix=" " macro="quoted"/>
                 </if>
-                <else>
-                  <text value="."/>
-                </else>
               </choose>
             </else-if>
             <else>
@@ -580,9 +569,9 @@
                 <if variable="URL" match="any">
                   <text prefix=", " macro="issued"/>
                   <text prefix=", " macro="publisher"/>
-                  <text prefix=", " macro="citation-locator"/>
+                  <text macro="citation-locator"/>
                   <text prefix=", " macro="identifier"/>
-                  <text prefix=" " macro="quoted" suffix="."/>
+                  <text prefix=" " macro="quoted"/>
                 </if>
                 <else-if variable="issued" match="none">
                   <choose>
@@ -591,12 +580,9 @@
                     </if>
                   </choose>
                   <choose>
-                    <if variable="locator" match="none">
-                      <text value="."/>
+                    <if variable="locator" match="any">
+                      <text macro="citation-locator"/>
                     </if>
-                    <else>
-                      <text prefix=", " macro="citation-locator" suffix="."/>
-                    </else>
                   </choose>
                 </else-if>
                 <else>
@@ -604,12 +590,9 @@
                   <text prefix=", " macro="issued"/>
                   <text prefix=", " macro="archive"/>
                   <choose>
-                    <if variable="locator" match="none">
-                      <text value="."/>
+                    <if variable="locator" match="any">
+                      <text macro="citation-locator"/>
                     </if>
-                    <else>
-                      <text prefix=", " macro="citation-locator" suffix="."/>
-                    </else>
                   </choose>
                 </else>
               </choose>
@@ -624,7 +607,7 @@
       <key macro="sort-bibliography" names-min="3" names-use-first="3"/>
       <key macro="title-long"/>
     </sort>
-    <layout>
+    <layout suffix=".">
       <choose>
         <if type="chapter entry entry-dictionary entry-encyclopedia" match="any">
           <text macro="contributors-full" suffix=", "/>
@@ -634,7 +617,6 @@
           <text prefix=" " macro="publisher"/>
           <text prefix=", " macro="collection"/>
           <text prefix=", " macro="page-range"/>
-          <text value="."/>
         </if>
         <else-if type="book" match="any">
           <text macro="contributors-full" suffix=", "/>
@@ -645,7 +627,7 @@
               <text prefix=" " term="edition" form="short"/>
             </if>
           </choose>
-          <text prefix=" " macro="publisher" suffix="."/>
+          <text prefix=" " macro="publisher"/>
         </else-if>
         <else-if type="webpage post post-weblog" match="any">
           <choose>
@@ -663,10 +645,10 @@
             <if variable="URL" match="any">
               <text prefix=", " macro="page-range"/>
               <text prefix=", " macro="identifier"/>
-              <text prefix=" " macro="quoted" suffix="."/>
+              <text prefix=" " macro="quoted"/>
             </if>
             <else>
-              <text prefix=", " macro="page-range" suffix="."/>
+              <text prefix=", " macro="page-range"/>
             </else>
           </choose>
         </else-if>
@@ -679,10 +661,10 @@
             <if variable="URL" match="any">
               <text prefix=", " macro="page-range"/>
               <text prefix=", " macro="identifier"/>
-              <text prefix=" " macro="quoted" suffix="."/>
+              <text prefix=" " macro="quoted"/>
             </if>
             <else>
-              <text prefix=", " macro="page-range" suffix="."/>
+              <text prefix=", " macro="page-range"/>
             </else>
           </choose>
         </else-if>
@@ -693,7 +675,6 @@
           <text prefix=" " macro="issued"/>
           <text prefix=", " macro="page-range"/>
           <text prefix=", doi:" variable="DOI"/>
-          <text value="."/>
         </else-if>
         <else-if type="paper-conference speech" match="any">
           <text macro="contributors-full" suffix=", "/>
@@ -705,11 +686,10 @@
           <choose>
             <if variable="DOI" match="any">
               <text prefix=", " macro="page-range"/>
-              <text prefix=", doi:" variable="DOI" suffix="."/>
+              <text prefix=", doi:" variable="DOI"/>
             </if>
             <else>
               <text prefix=", " macro="page-range"/>
-              <text value="."/>
             </else>
           </choose>
         </else-if>
@@ -717,7 +697,7 @@
           <text macro="contributors-full" suffix=", "/>
           <text macro="title-long" font-style="italic"/>
           <text prefix=", " macro="genre"/>
-          <text prefix=" " macro="publisher" suffix="."/>
+          <text prefix=" " macro="publisher"/>
         </else-if>
         <else-if type="report" match="any">
           <text macro="contributors-full" suffix=", "/>
@@ -735,7 +715,6 @@
               <text prefix=" " macro="quoted"/>
             </if>
           </choose>
-          <text value="."/>
         </else-if>
         <else-if type="map figure graphic" match="any">
           <text macro="contributors-full" suffix=", "/>
@@ -756,11 +735,8 @@
           <choose>
             <if variable="URL" match="any">
               <text prefix=", " macro="identifier"/>
-              <text prefix=" " macro="quoted" suffix="."/>
+              <text prefix=" " macro="quoted"/>
             </if>
-            <else>
-              <text value="."/>
-            </else>
           </choose>
         </else-if>
         <else-if type="bill legal_case legislation personal_communication" match="none">
@@ -773,7 +749,7 @@
               <text prefix=", " macro="issued"/>
               <text prefix=", " macro="publisher"/>
               <text prefix=", " macro="identifier"/>
-              <text prefix=" " macro="quoted" suffix="."/>
+              <text prefix=" " macro="quoted"/>
             </if>
             <else-if variable="issued" match="none">
               <choose>
@@ -782,13 +758,11 @@
                 </if>
               </choose>
               <text prefix=", " macro="collection"/>
-              <text value="."/>
             </else-if>
             <else>
               <text prefix=", " macro="publisher"/>
               <text prefix=", " macro="issued"/>
               <text prefix=", " macro="archive"/>
-              <text value="."/>
             </else>
           </choose>
         </else-if>
diff --git a/buildres/csl/csl-styles/south-african-law-journal.csl b/buildres/csl/csl-styles/south-african-law-journal.csl
new file mode 100644
index 00000000000..66e89063c64
--- /dev/null
+++ b/buildres/csl/csl-styles/south-african-law-journal.csl
@@ -0,0 +1,519 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.0" and="symbol" page-range-format="minimal" demote-non-dropping-particle="sort-only" default-locale="en-GB">
+  <info>
+    <title>South African Law Journal</title>
+    <title-short>SALJ</title-short>
+    <id>http://www.zotero.org/styles/south-african-law-journal</id>
+    <link href="http://www.zotero.org/styles/south-african-law-journal" rel="self"/>
+    <link href="http://www.zotero.org/styles/human-rights-law-review" rel="template"/>
+    <link href="http://blogs.sun.ac.za/iplaw/files/2018/02/SALJ-Style-Guide.pdf" rel="documentation"/>
+    <author>
+      <name>Patrick O'Brien</name>
+    </author>
+    <category citation-format="note"/>
+    <category field="law"/>
+    <issn>0258-2503</issn>
+    <eissn>1996-2177</eissn>
+    <updated>2022-06-14T14:22:07+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="et-al">et al</term>
+    </terms>
+  </locale>
+  <macro name="author-note">
+    <choose>
+      <if type="interview">
+        <group delimiter=", ">
+          <names variable="interviewer">
+            <name delimiter-precedes-last="never" delimiter=", " initialize="false" initialize-with=""/>
+          </names>
+          <names variable="author" prefix="Interview with ">
+            <name delimiter-precedes-last="never" delimiter=", " initialize="false" initialize-with=""/>
+          </names>
+        </group>
+      </if>
+      <else-if type="personal_communication">
+        <group delimiter=" ">
+          <group delimiter=" from ">
+            <text variable="genre"/>
+            <names variable="author">
+              <name delimiter-precedes-last="never" initialize="false" initialize-with=""/>
+            </names>
+          </group>
+          <names variable="recipient" prefix="to ">
+            <name delimiter-precedes-last="never" delimiter=", " initialize="false" initialize-with=""/>
+          </names>
+        </group>
+      </else-if>
+      <else-if type="legal_case legislation broadcast" match="any"/>
+      <else>
+        <names variable="author">
+          <name delimiter-precedes-last="never" initialize="false" initialize-with=""/>
+          <label form="short" prefix=" (" suffix=")" strip-periods="true"/>
+          <substitute>
+            <names variable="editor"/>
+            <names variable="translator"/>
+            <text macro="title"/>
+          </substitute>
+        </names>
+      </else>
+    </choose>
+  </macro>
+  <macro name="author-short">
+    <choose>
+      <if type="interview">
+        <group delimiter=", ">
+          <names variable="interviewer">
+            <name delimiter-precedes-last="never" form="short" delimiter=", " initialize="false" initialize-with=""/>
+          </names>
+          <names variable="author" prefix="Interview with ">
+            <name delimiter-precedes-last="never" form="short" delimiter=", " initialize="false" initialize-with=""/>
+          </names>
+        </group>
+      </if>
+      <else-if type="personal_communication">
+        <group delimiter=" ">
+          <group delimiter=" from ">
+            <text variable="genre"/>
+            <names variable="author">
+              <name delimiter-precedes-last="never" delimiter=", " form="short" initialize="false" initialize-with=""/>
+            </names>
+          </group>
+          <names variable="recipient" prefix="to ">
+            <name delimiter-precedes-last="never" delimiter=", " initialize="false" form="short" initialize-with=""/>
+          </names>
+        </group>
+      </else-if>
+      <else>
+        <names variable="author">
+          <name delimiter-precedes-last="never" delimiter=", " initialize="false" initialize-with="" form="short"/>
+          <substitute>
+            <names variable="editor"/>
+            <names variable="translator"/>
+            <text macro="title"/>
+          </substitute>
+        </names>
+      </else>
+    </choose>
+  </macro>
+  <macro name="editor">
+    <group>
+      <choose>
+        <if type="chapter paper-conference" match="any">
+          <text term="in" suffix=" "/>
+        </if>
+      </choose>
+      <names variable="editor translator" delimiter=", ">
+        <name delimiter-precedes-last="never" initialize="false" initialize-with=""/>
+        <label form="short" prefix=" (" suffix=")" strip-periods="true"/>
+      </names>
+    </group>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="book legislation thesis motion_picture manuscript entry-dictionary" match="any">
+        <text variable="title" font-style="italic" text-case="title"/>
+      </if>
+      <else-if type="bill" match="any">
+        <text variable="title" text-case="title"/>
+      </else-if>
+      <else-if type="report">
+        <text variable="title" font-style="normal" suffix=","/>
+      </else-if>
+      <else-if type="legal_case">
+        <text variable="title" font-style="italic" strip-periods="true"/>
+      </else-if>
+      <else-if type="webpage post post-weblog" match="any">
+        <group delimiter=", ">
+          <text variable="title" text-case="title" quotes="true" suffix=","/>
+          <text variable="container-title" font-style="italic" suffix=","/>
+        </group>
+      </else-if>
+      <else-if type="article" match="any">
+        <text variable="title" text-case="title" font-style="italic"/>
+      </else-if>
+      <else-if type="broadcast" match="any">
+        <text variable="title"/>
+      </else-if>
+      <else-if type="article-journal" match="any">
+        <text variable="title" quotes="true"/>
+      </else-if>
+      <else>
+        <text variable="title" quotes="true"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="title-short">
+    <choose>
+      <if type="book legislation webpage thesis motion_picture manuscript legal_case" match="any">
+        <text variable="title-short" font-style="italic" text-case="title"/>
+      </if>
+      <else-if type="report broadcast" match="any">
+        <text variable="title" form="short" quotes="false" font-style="normal"/>
+      </else-if>
+      <else-if type="article" match="any">
+        <text variable="title" form="short" font-style="italic"/>
+      </else-if>
+      <else>
+        <text variable="title" quotes="true" text-case="title" form="short"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="issued-year">
+    <date date-parts="year" form="text" variable="issued"/>
+  </macro>
+  <macro name="issued-full">
+    <date form="text" variable="issued"/>
+  </macro>
+  <macro name="date-news">
+    <choose>
+      <if type="article-newspaper broadcast personal_communication manuscript report" match="any">
+        <date form="text" variable="issued"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="date-parenthesis">
+    <choose>
+      <if type="article-journal article-magazine" match="any">
+        <choose>
+          <if variable="volume">
+            <text macro="issued-year" prefix="(" suffix=")"/>
+          </if>
+          <else-if variable="container-title volume number" match="any">
+            <date date-parts="year" form="text" variable="issued" prefix="(" suffix=")"/>
+          </else-if>
+        </choose>
+      </if>
+      <else-if type="webpage">
+        <text macro="issued-full" suffix=","/>
+      </else-if>
+      <else-if type="legislation">
+        <text macro="issued-year" font-style="italic"/>
+      </else-if>
+      <else-if type="bill">
+        <text macro="issued-full" suffix=","/>
+        <text variable="container-title" prefix=" (" suffix=")"/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <choose>
+      <if type="paper-conference article-newspaper legislation motion_picture speech interview thesis book chapter" match="any">
+        <group prefix="(" suffix=")" delimiter=", ">
+          <choose>
+            <if type="thesis speech interview" match="any">
+              <group delimiter=", ">
+                <text variable="genre"/>
+                <text variable="number"/>
+                <text variable="event" prefix="at the "/>
+                <text variable="publisher"/>
+              </group>
+            </if>
+          </choose>
+          <choose>
+            <if type="article-newspaper"/>
+            <else-if type="legislation bill" match="any">
+              <text variable="container-title"/>
+            </else-if>
+            <else>
+              <names variable="director">
+                <label form="verb" text-case="capitalize-first" suffix=" "/>
+                <name delimiter-precedes-last="never" delimiter=", " initialize="false" initialize-with=""/>
+              </names>
+              <choose>
+                <if type="speech">
+                  <text variable="event-place"/>
+                  <text macro="issued-full"/>
+                </if>
+                <else-if type="report interview" match="any">
+                  <text macro="issued-full"/>
+                </else-if>
+                <else>
+                  <text macro="issued-year"/>
+                </else>
+              </choose>
+            </else>
+          </choose>
+        </group>
+      </if>
+      <else-if type="report" match="any">
+        <group delimiter=", ">
+          <text variable="publisher" suffix=","/>
+          <text variable="call-number"/>
+          <text macro="date-news"/>
+          <text variable="number"/>
+          <text variable="genre"/>
+        </group>
+      </else-if>
+      <else-if type="entry-dictionary" match="any">
+        <text macro="edition"/>
+        <text macro="issued-year" prefix=" (" suffix=")"/>
+      </else-if>
+      <else-if type="bill" match="any">
+        <text variable="number"/>
+      </else-if>
+      <else-if type="article" match="any">
+        <group>
+          <text variable="publisher" suffix=" "/>
+          <text variable="call-number" suffix=" "/>
+          <date date-parts="year" form="numeric" variable="issued" font-variant="normal" prefix="(" suffix=")"/>
+          <text variable="locator" prefix=" at "/>
+          <text variable="URL" prefix=", available at: "/>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="looseleaf">
+    <choose>
+      <if type="book">
+        <choose>
+          <if variable="publisher issued" match="none">
+            <group prefix="(at " suffix=")">
+              <choose>
+                <if variable="edition">
+                  <text variable="edition"/>
+                </if>
+                <else>
+                  <date variable="accessed" form="text"/>
+                </else>
+              </choose>
+            </group>
+          </if>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="volume-book">
+    <choose>
+      <if type="book chapter report" match="any">
+        <group delimiter=" ">
+          <label variable="volume" form="short" strip-periods="true"/>
+          <text variable="volume"/>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition"/>
+          <label strip-periods="true" variable="edition" form="short"/>
+        </group>
+      </if>
+      <else>
+        <text variable="edition"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="book-container">
+    <choose>
+      <if type="chapter paper-conference" match="any">
+        <group>
+          <text macro="editor"/>
+          <text variable="container-title" font-style="italic" prefix=" "/>
+          <text macro="edition"/>
+        </group>
+      </if>
+      <else-if type="book" match="any">
+        <text macro="edition"/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="broadcast-container">
+    <choose>
+      <if type="broadcast" match="any">
+        <group delimiter=", ">
+          <text variable="number"/>
+          <text variable="publisher" font-style="normal"/>
+          <date date-parts="year" form="text" variable="issued" prefix="(" suffix=")"/>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="article-case-info">
+    <choose>
+      <if type="article-journal article-magazine article-newspaper legal_case" match="any">
+        <group>
+          <text variable="volume"/>
+          <choose>
+            <if type="legal_case">
+              <choose>
+                <if variable="container-title">
+                  <text variable="container-title" form="short"/>
+                </if>
+                <else-if variable="authority number" match="all">
+                  <group delimiter=" ">
+                    <text variable="authority" form="short" strip-periods="true"/>
+                    <text variable="number"/>
+                    <text macro="issued-full" prefix="(" suffix=")"/>
+                  </group>
+                </else-if>
+                <else>
+                  <group delimiter=", " suffix=",">
+                    <text variable="number" prefix="(" suffix=")"/>
+                  </group>
+                </else>
+              </choose>
+            </if>
+            <else>
+              <text variable="container-title" font-style="italic" prefix=" "/>
+            </else>
+          </choose>
+        </group>
+      </if>
+      <else-if type="legal_case" match="any"/>
+    </choose>
+  </macro>
+  <macro name="page-first">
+    <text variable="page"/>
+  </macro>
+  <macro name="manuscript-catchall">
+    <choose>
+      <if type="manuscript">
+        <text variable="genre"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="URL">
+    <choose>
+      <if type="legal_case legislation bill webpage report article broadcast article-journal thesis" match="none">
+        <text variable="URL" prefix=" available at: "/>
+      </if>
+      <else-if type="webpage post post-weblog" match="any">
+        <text variable="URL" prefix=" available at: "/>
+        <date form="text" variable="accessed" prefix=" [last accessed " suffix="]"/>
+      </else-if>
+      <else-if type="report" match="all">
+        <text variable="URL" font-weight="normal" prefix=" available at: "/>
+        <date form="text" variable="accessed" prefix=" [last accessed " suffix="]"/>
+      </else-if>
+      <else-if type="article" match="any">
+        <date form="text" variable="accessed" prefix=" [last accessed " suffix="]"/>
+      </else-if>
+    </choose>
+  </macro>
+  <citation et-al-min="4" et-al-use-first="1">
+    <layout suffix="." delimiter="; ">
+      <choose>
+        <if position="ibid-with-locator">
+          <group delimiter=" ">
+            <text term="ibid" strip-periods="true"/>
+            <choose>
+              <if match="any" locator="paragraph">
+                <text variable="locator" prefix="at para "/>
+              </if>
+              <else>
+                <text variable="locator" prefix="at "/>
+              </else>
+            </choose>
+          </group>
+        </if>
+        <else-if position="ibid">
+          <text term="ibid" strip-periods="true"/>
+        </else-if>
+        <else-if position="subsequent">
+          <choose>
+            <if type="legal_case bill legislation manuscript" match="any">
+              <group delimiter=" ">
+                <text macro="author-note"/>
+                <choose>
+                  <if match="any" variable="title-short">
+                    <text macro="title-short"/>
+                  </if>
+                  <else>
+                    <text macro="title"/>
+                  </else>
+                </choose>
+                <group>
+                  <text macro="date-parenthesis"/>
+                  <text macro="article-case-info"/>
+                  <text macro="book-container"/>
+                  <text macro="publisher"/>
+                </group>
+              </group>
+              <text macro="manuscript-catchall" prefix=", "/>
+              <text macro="date-news" prefix=", "/>
+              <group delimiter=", " prefix=" ">
+                <text macro="looseleaf"/>
+                <text macro="page-first"/>
+                <choose>
+                  <if match="any" locator="paragraph">
+                    <text variable="locator" prefix=" at para "/>
+                  </if>
+                  <else>
+                    <text variable="locator" prefix=" at "/>
+                  </else>
+                </choose>
+              </group>
+            </if>
+            <else>
+              <group delimiter=", ">
+                <text macro="author-short"/>
+                <choose>
+                  <if disambiguate="true">
+                    <text macro="title-short"/>
+                  </if>
+                </choose>
+                <group>
+                  <text variable="first-reference-note-number" prefix="supra n "/>
+                  <choose>
+                    <if match="any" locator="paragraph">
+                      <text variable="locator" prefix=" at para "/>
+                    </if>
+                    <else>
+                      <text variable="locator" prefix=" at "/>
+                    </else>
+                  </choose>
+                </group>
+              </group>
+            </else>
+          </choose>
+        </else-if>
+        <else>
+          <group delimiter=" ">
+            <group delimiter=", ">
+              <group delimiter=" ">
+                <text macro="author-note"/>
+                <group delimiter=", ">
+                  <text macro="title"/>
+                  <text macro="broadcast-container"/>
+                </group>
+                <group delimiter=" ">
+                  <text macro="date-parenthesis"/>
+                  <text macro="article-case-info"/>
+                  <text macro="book-container"/>
+                  <text macro="publisher"/>
+                </group>
+              </group>
+              <text macro="manuscript-catchall"/>
+            </group>
+            <group>
+              <group delimiter=" ">
+                <text macro="volume-book"/>
+                <text macro="looseleaf"/>
+              </group>
+              <text macro="page-first"/>
+              <choose>
+                <if match="any" locator="paragraph">
+                  <text variable="locator" prefix="at para "/>
+                </if>
+                <else>
+                  <text variable="locator" prefix=" at "/>
+                </else>
+              </choose>
+              <choose>
+                <if type="legal_case bill legislation manuscript" match="any">
+                  <text macro="title-short" text-case="title" quotes="true" prefix=" (" suffix=")"/>
+                </if>
+              </choose>
+            </group>
+            <text macro="URL"/>
+          </group>
+        </else>
+      </choose>
+    </layout>
+  </citation>
+</style>
diff --git a/buildres/csl/csl-styles/spanish-legal.csl b/buildres/csl/csl-styles/spanish-legal.csl
index 43316e1fd70..407d9cd8d07 100644
--- a/buildres/csl/csl-styles/spanish-legal.csl
+++ b/buildres/csl/csl-styles/spanish-legal.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" default-locale="es-ES" version="1.0" demote-non-dropping-particle="sort-only">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.0" demote-non-dropping-particle="sort-only" default-locale="es-ES">
   <info>
     <title>Spanish Legal (Español)</title>
     <id>http://www.zotero.org/styles/spanish-legal</id>
@@ -111,7 +111,7 @@
         <text variable="title" text-case="capitalize-first" font-style="italic"/>
       </if>
       <else>
-        <text variable="title" text-case="capitalize-first" prefix="“" suffix="”"/>
+        <text variable="title" text-case="capitalize-first" quotes="true"/>
       </else>
     </choose>
   </macro>
@@ -121,7 +121,7 @@
         <text variable="title" text-case="capitalize-first" font-style="italic" suffix=", cit." form="short"/>
       </if>
       <else>
-        <text variable="title" text-case="capitalize-first" prefix="“" suffix="”, cit." form="short"/>
+        <text variable="title" text-case="capitalize-first" quotes="true" suffix=", cit." form="short"/>
       </else>
     </choose>
   </macro>
diff --git a/buildres/csl/csl-styles/spec/filters.yaml b/buildres/csl/csl-styles/spec/filters.yaml
index 7b2c35c49b2..1c4ddb7bab4 100644
--- a/buildres/csl/csl-styles/spec/filters.yaml
+++ b/buildres/csl/csl-styles/spec/filters.yaml
@@ -81,6 +81,7 @@ EXTRA_FILES:
 - STYLE_DEVELOPMENT.md
 - STYLE_REQUIREMENTS.md
 - QUALITY_CONTROL.md
+- composer.json
 
 # These directories and their contents are ignored when checking for extra files
 EXTRA_FILES_DIRECTORY:
diff --git a/buildres/csl/csl-styles/springer-basic-brackets-no-et-al.csl b/buildres/csl/csl-styles/springer-basic-brackets-no-et-al.csl
index c3325c7253f..b66533c3b60 100644
--- a/buildres/csl/csl-styles/springer-basic-brackets-no-et-al.csl
+++ b/buildres/csl/csl-styles/springer-basic-brackets-no-et-al.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" default-locale="en-US" version="1.0" demote-non-dropping-particle="sort-only">
+<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>Springer - Basic (numeric, brackets, no "et al.")</title>
     <id>http://www.zotero.org/styles/springer-basic-brackets-no-et-al</id>
@@ -121,8 +121,8 @@
                     <text variable="volume" suffix=":"/>
                     <text variable="page"/>
                   </group>
-                  <text prefix=". https://doi.org/" variable="DOI"/>
                 </group>
+                <text prefix=". https://doi.org/" variable="DOI"/>
               </group>
             </if>
             <else>
diff --git a/buildres/csl/csl-styles/steel-research-international.csl b/buildres/csl/csl-styles/steel-research-international.csl
index a7fcc1d6a89..2cb5aa05621 100644
--- a/buildres/csl/csl-styles/steel-research-international.csl
+++ b/buildres/csl/csl-styles/steel-research-international.csl
@@ -5,8 +5,8 @@
     <title-short>Steel Res. Int.</title-short>
     <id>http://www.zotero.org/styles/steel-research-international</id>
     <link href="http://www.zotero.org/styles/steel-research-international" rel="self"/>
-    <link href="https://onlinelibrary.wiley.com/page/journal/1869344x/homepage/author-guidelines" rel="documentation"/>
     <link href="http://www.zotero.org/styles/taylor-and-francis-national-library-of-medicine" rel="template"/>
+    <link href="https://onlinelibrary.wiley.com/page/journal/1869344x/homepage/author-guidelines" rel="documentation"/>
     <author>
       <name>Christian Schubert</name>
     </author>
@@ -20,31 +20,34 @@
     <issnl>1611-3683</issnl>
     <summary>Citation style for the Steel research international
     
-    There are some difficulties i.e. with patents, preprint  specifications and the variables that the CSL offers (nor preprint type or company variable availably), which probably cannot be fixed right now (perfectly) and need manual correction.
-    Also there is no way to automatically use or define journal or conference abbrevitation in the csl file right now?</summary>
-    <updated>2021-11-10T16:22:30+01:00</updated>
+    Known issues:
+
+    - Patents should have the following form:
+      [2] H.-S. Seo, D.-C. Kim (Samsung Electronics Co., Ltd.), Ger. 2016122271, 2016
+
+      Issue: There is no specific field for patent owner/assignee in CSL (1.0.x) right now. It may come with CSL 1.1.
+      The current idea is to call this variable `assignee`. This is implemented (commented out) in line 53, 
+      which may work with CSL 1.1.
+
+      Journal Abbreviation (for journal titles) are handeled by citation software, experience may therefore vary.</summary>
+    <updated>2022-02-22T10:00:30+01: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">
     <date form="text" delimiter=" ">
+      <date-part name="day" suffix=" " range-delimiter="-" form="numeric-leading-zeros"/>
       <date-part name="month" form="short" strip-periods="true" suffix=" "/>
       <date-part name="year" font-weight="bold"/>
     </date>
     <terms>
       <term name="chapter" form="short">Ch.</term>
-      <term name="editor" form="short">eds</term>
     </terms>
   </locale>
   <macro name="author">
     <names variable="author">
       <name sort-separator=" " initialize-with="." delimiter=", " delimiter-precedes-last="always"/>
-      <substitute>
-        <names variable="editor">
-            <name/>
-            <label form="short" text-case="capitalize-first" prefix=" (" suffix=")"/>
-        </names>
-      </substitute>
     </names>
+    <!--     <choose><if type="patent"><text variable="assignee" prefix=" (" suffix=")"/></if></choose> -->
   </macro>
   <macro name="title">
     <choose>
@@ -67,7 +70,7 @@
         <text variable="genre" font-style="italic"/>
       </else-if>
       <else-if type="article-journal" match="any">
-        <text variable="container-title" font-style="italic"/>
+        <text variable="container-title" font-style="italic" form="short"/>
       </else-if>
       <else-if type="article-magazine article-newspaper" match="any">
         <text variable="container-title" font-style="italic"/>
@@ -75,6 +78,19 @@
       <else-if type="webpage" match="any">
         <text variable="title"/>
       </else-if>
+      <else-if type="article" match="any">
+        <text value="(Preprint)"/>
+        <text variable="number" prefix=" "/>
+        <text variable="version" prefix=", "/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="book-chapter-volume">
+    <choose>
+      <if type="book chapter" match="any">
+        <label variable="volume" form="short" prefix=", "/>
+        <text variable="volume"/>
+      </if>
     </choose>
   </macro>
   <macro name="editor">
@@ -138,6 +154,14 @@
       <if type="speech" match="any">
         <date variable="issued" prefix=", " form="text"/>
       </if>
+      <else-if type="paper-conference" match="any">
+        <group>
+          <date variable="issued" form="text" date-parts="year-month" prefix=", "/>
+        </group>
+      </else-if>
+      <else-if type="article" match="any">
+        <date variable="issued" prefix=", submitted: " form="text" date-parts="year-month"/>
+      </else-if>
       <else-if type="webpage" match="none">
         <group font-weight="bold">
           <date variable="issued" form="text" date-parts="year" prefix=" "/>
@@ -155,14 +179,27 @@
               <text variable="chapter-number"/>
             </group>
           </if>
-          <else>
+          <else-if variable="page">
             <group delimiter=" ">
-              <text term="page" form="short" prefix=", "/>
-              <text variable="page"/>
+              <text variable="page" prefix=", "/>
             </group>
-          </else>
+          </else-if>
         </choose>
       </if>
+      <else-if type="article-journal article-magazine article-newspaper" match="any">
+        <choose>
+          <if variable="page-first">
+            <group delimiter=" ">
+              <text variable="page-first" prefix=", "/>
+            </group>
+          </if>
+          <else-if variable="page">
+            <group delimiter=" ">
+              <text variable="page" prefix=", "/>
+            </group>
+          </else-if>
+        </choose>
+      </else-if>
     </choose>
   </macro>
   <macro name="journal-volume">
@@ -193,7 +230,7 @@
     <sort>
       <key variable="citation-number"/>
     </sort>
-    <layout prefix="[" suffix="]" delimiter=",">
+    <layout vertical-align="sup" delimiter="," prefix="[" suffix="]">
       <group delimiter=",">
         <text variable="citation-number"/>
         <group>
@@ -210,6 +247,7 @@
         <text macro="author"/>
         <text macro="title"/>
       </group>
+      <text macro="book-chapter-volume"/>
       <text macro="editor"/>
       <text macro="publisher"/>
       <text macro="report-patent-numbers"/>
diff --git a/buildres/csl/csl-styles/stem-cells-and-development.csl b/buildres/csl/csl-styles/stem-cells-and-development.csl
deleted file mode 100644
index d3e5e15d4bc..00000000000
--- a/buildres/csl/csl-styles/stem-cells-and-development.csl
+++ /dev/null
@@ -1,86 +0,0 @@
-<?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">
-  <info>
-    <title>Stem Cells and Development</title>
-    <id>http://www.zotero.org/styles/stem-cells-and-development</id>
-    <link href="http://www.zotero.org/styles/stem-cells-and-development" rel="self"/>
-    <link href="http://www.zotero.org/styles/cell" rel="template"/>
-    <link href="http://www.zotero.org/styles/nature" rel="template"/>
-    <link href="http://www.liebertpub.com/manuscript/scd" rel="documentation"/>
-    <author>
-      <name>Charles Parnot</name>
-      <uri>http://twitter.com/cparnot</uri>
-      <email>charles.parnot@gmail.com</email>
-    </author>
-    <category citation-format="numeric"/>
-    <category field="biology"/>
-    <issn>1547-3287</issn>
-    <eissn>1557-8534</eissn>
-    <updated>2012-09-27T22: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">
-    <names variable="author">
-      <name name-as-sort-order="first" initialize-with="" sort-separator=" " and="text" delimiter-precedes-last="never"/>
-    </names>
-  </macro>
-  <macro name="issued">
-    <date variable="issued">
-      <date-part name="year"/>
-    </date>
-  </macro>
-  <macro name="publisher">
-    <group prefix="(" delimiter=": " suffix=")">
-      <text variable="publisher-place"/>
-      <text variable="publisher"/>
-    </group>
-  </macro>
-  <macro name="editor">
-    <names variable="editor">
-      <name name-as-sort-order="first" initialize-with="" and="text" delimiter-precedes-last="never"/>
-      <label form="short" prefix=", "/>
-    </names>
-  </macro>
-  <citation collapse="citation-number">
-    <sort>
-      <key variable="citation-number"/>
-    </sort>
-    <layout delimiter="," prefix="[" suffix="]">
-      <text variable="citation-number"/>
-    </layout>
-  </citation>
-  <bibliography et-al-min="51" et-al-use-first="50" line-spacing="2">
-    <layout suffix=".">
-      <text variable="citation-number" 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" strip-periods="true"/>
-            <text variable="volume" suffix=":"/>
-            <text variable="page"/>
-          </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>
-    </layout>
-  </bibliography>
-</style>
diff --git a/buildres/csl/csl-styles/studi-slavistici-rivista-dellassociazione-italiana-degli-slavisti.csl b/buildres/csl/csl-styles/studi-slavistici-rivista-dellassociazione-italiana-degli-slavisti.csl
new file mode 100644
index 00000000000..010be20a001
--- /dev/null
+++ b/buildres/csl/csl-styles/studi-slavistici-rivista-dellassociazione-italiana-degli-slavisti.csl
@@ -0,0 +1,424 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" delimiter-precedes-et-al="never" demote-non-dropping-particle="sort-only">
+  <info>
+    <title>Studi Slavistici Rivista dell’Associazione Italiana degli Slavisti</title>
+    <id>http://www.zotero.org/styles/studi-slavistici-rivista-dellassociazione-italiana-degli-slavisti</id>
+    <link href="http://www.zotero.org/styles/studi-slavistici-rivista-dellassociazione-italiana-degli-slavisti" rel="self"/>
+    <link href="http://www.zotero.org/styles/journal-of-neolithic-archaeology" rel="template"/>
+    <link href="https://oaj.fupress.net/index.php/ss/index" rel="documentation"/>
+    <author>
+      <name>Patrick O'Brien</name>
+    </author>
+    <category citation-format="author-date"/>
+    <category field="humanities"/>
+    <issn>1824-761X</issn>
+    <eissn>1824-7601</eissn>
+    <updated>2022-02-16T15:30:32+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="reviewed-author" form="verb">rev. of</term>
+      <term name="presented at">talk</term>
+      <term name="accessed">last accessed</term>
+    </terms>
+  </locale>
+  <locale xml:lang="de">
+    <terms>
+      <term name="reviewed-author" form="verb">Rez. zu</term>
+      <term name="presented at">Vortrag</term>
+      <term name="accessed">Zugriff: </term>
+    </terms>
+  </locale>
+  <locale xml:lang="it">
+    <terms>
+      <term name="reviewed-author" form="verb">recens. di</term>
+      <term name="presented at">presentazione</term>
+    </terms>
+  </locale>
+  <locale xml:lang="fr">
+    <terms>
+      <term name="reviewed-author" form="verb">rec. de</term>
+      <term name="presented at">conférence</term>
+    </terms>
+  </locale>
+  <locale xml:lang="es">
+    <terms>
+      <term name="reviewed-author" form="verb">recensión de</term>
+      <term name="presented at">conferencia</term>
+    </terms>
+  </locale>
+  <macro name="short-container-contributors">
+    <choose>
+      <if type="chapter paper-conference" match="any">
+        <group>
+          <choose>
+            <if variable="editor container-title" match="any">
+              <text term="in" prefix=". " suffix=": "/>
+              <names variable="editor">
+                <name delimiter="," delimiter-precedes-et-al="never" delimiter-precedes-last="always" initialize-with="."/>
+                <et-al font-style="italic"/>
+                <label form="short" strip-periods="false" prefix=" (" suffix="),"/>
+              </names>
+              <names variable="container-author">
+                <name delimiter="/" delimiter-precedes-et-al="never" delimiter-precedes-last="always" initialize-with="."/>
+              </names>
+              <text macro="collection-title"/>
+            </if>
+          </choose>
+        </group>
+      </if>
+      <else-if type="article article-journal article-magazine article-newspaper" match="any">
+        <text macro="translator"/>
+        <text variable="container-title" quotes="true" prefix=", "/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="editor">
+    <names variable="editor">
+      <name delimiter="," delimiter-precedes-et-al="never" delimiter-precedes-last="always" initialize-with="."/>
+      <label form="short" prefix=" (" suffix=")"/>
+    </names>
+  </macro>
+  <macro name="translator">
+    <choose>
+      <if match="any" variable="translator">
+        <choose>
+          <if match="none" variable="editor">
+            <names variable="translator" prefix=", ">
+              <label form="verb-short" suffix=" "/>
+              <name delimiter="," delimiter-precedes-et-al="never" delimiter-precedes-last="always" initialize-with="."/>
+            </names>
+          </if>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="contributors">
+    <group suffix=", ">
+      <choose>
+        <if variable="author">
+          <names variable="author">
+            <name delimiter="," delimiter-precedes-et-al="never" delimiter-precedes-last="always" initialize-with="."/>
+          </names>
+        </if>
+        <else-if variable="editor">
+          <text macro="editor"/>
+        </else-if>
+      </choose>
+    </group>
+  </macro>
+  <macro name="contributors-short-citation">
+    <choose>
+      <if variable="author">
+        <names variable="author">
+          <name form="short" delimiter="," et-al-min="3" et-al-use-first="1"/>
+          <et-al font-style="italic"/>
+        </names>
+      </if>
+      <else-if variable="editor">
+        <names variable="editor">
+          <name form="short" delimiter="," et-al-min="3" et-al-use-first="1"/>
+          <et-al font-style="italic"/>
+        </names>
+      </else-if>
+      <else>
+        <text variable="title-short"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="contributors-short-biblio">
+    <choose>
+      <if variable="author">
+        <names variable="author">
+          <name form="short" delimiter="," et-al-min="3" et-al-use-first="1"/>
+          <et-al font-style="italic"/>
+        </names>
+      </if>
+      <else-if variable="editor">
+        <names variable="editor">
+          <name form="short" delimiter="," delimiter-precedes-last="always" et-al-min="3" et-al-use-first="1"/>
+          <et-al font-style="italic"/>
+        </names>
+      </else-if>
+      <else>
+        <text variable="title-short"/>
+      </else>
+    </choose>
+  </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 legal_case motion_picture report song thesis" match="any">
+        <text variable="title"/>
+        <text variable="volume" prefix=" "/>
+      </else-if>
+      <else>
+        <text variable="title" font-style="italic"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if type="bill book graphic legal_case motion_picture report song chapter paper-conference" match="any">
+        <choose>
+          <if is-numeric="edition">
+            <text variable="edition" vertical-align="sup"/>
+          </if>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="locators">
+    <choose>
+      <if type="article-journal">
+        <number text-case="uppercase" prefix=" " variable="volume" form="roman"/>
+        <text variable="issue" prefix=", "/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="locators-article">
+    <choose>
+      <if type="article-newspaper">
+        <group delimiter=", ">
+          <group delimiter=" ">
+            <text variable="edition" prefix=", "/>
+            <text term="edition" prefix=", "/>
+          </group>
+          <group>
+            <text term="section" form="short" suffix=" "/>
+            <text variable="section"/>
+          </group>
+        </group>
+      </if>
+      <else-if type="article-journal chapter" match="any">
+        <group delimiter=" " prefix=", ">
+          <label variable="page" form="short"/>
+          <text variable="page"/>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="date">
+    <date variable="issued">
+      <date-part name="year"/>
+    </date>
+  </macro>
+  <macro name="place-date">
+    <choose>
+      <if type="book thesis chapter paper-conference" match="any">
+        <choose>
+          <if match="none" variable="edition">
+            <text value=" "/>
+          </if>
+        </choose>
+        <group delimiter=" " prefix=", ">
+          <choose>
+            <if type="thesis" match="any">
+              <text variable="genre" suffix=" "/>
+              <text variable="publisher"/>
+            </if>
+            <else>
+              <choose>
+                <if match="any" variable="original-date original-publisher-place">
+                  <text variable="original-publisher-place"/>
+                  <date date-parts="year" form="text" variable="original-date" prefix=" "/>
+                  <text value="; "/>
+                </if>
+              </choose>
+              <text variable="publisher-place"/>
+            </else>
+          </choose>
+          <text macro="date"/>
+          <text macro="edition"/>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="journal-date">
+    <choose>
+      <if type="article-journal">
+        <text macro="date" prefix=", "/>
+      </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">
+    <text variable="container-title" prefix=" "/>
+    <text variable="volume" prefix=" "/>
+  </macro>
+  <macro name="event">
+    <text term="presented at" suffix=" "/>
+    <date form="text" variable="issued" suffix=", "/>
+    <text variable="event-place" suffix=". "/>
+    <text variable="event"/>
+  </macro>
+  <macro name="issue">
+    <choose>
+      <if type="speech" match="any">
+        <text macro="event" prefix=" "/>
+      </if>
+      <else-if type="paper-conference" match="any">
+        <text variable="event" prefix=" "/>
+        <date form="text" variable="event-date" prefix=" "/>
+      </else-if>
+      <else-if type="article-newspaper article-magazine" match="any">
+        <text macro="day-month" prefix=", "/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="series">
+    <choose>
+      <if match="any" variable="collection-title">
+        <text variable="collection-title" prefix=". "/>
+        <text variable="collection-number" prefix=" "/>
+      </if>
+    </choose>
+    <choose>
+      <if type="paper-conference" match="any">
+        <text variable="volume" prefix=" "/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="url">
+    <choose>
+      <if match="any" variable="URL">
+        <group delimiter=" " prefix=", ">
+          <text variable="URL" prefix="&lt;" suffix=">"/>
+          <group delimiter=": " prefix="(" suffix=")">
+            <text term="accessed"/>
+            <date variable="accessed">
+              <date-part name="day" suffix="."/>
+              <date-part name="month" form="numeric" suffix="."/>
+              <date-part name="year"/>
+            </date>
+          </group>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="doi">
+    <text variable="DOI" prefix=", DOI: https://doi.org/"/>
+  </macro>
+  <macro name="review">
+    <choose>
+      <if match="any" variable="reviewed-author">
+        <text term="reviewed-author" form="verb" prefix=", " suffix=" "/>
+        <names variable="reviewed-author">
+          <name delimiter="/" delimiter-precedes-et-al="never" delimiter-precedes-last="always" initialize-with="."/>
+        </names>
+        <text variable="reviewed-title" prefix=", "/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="encyclopedia-article">
+    <text variable="container-title"/>
+    <number prefix=" " variable="volume"/>
+    <choose>
+      <if match="none" is-uncertain-date="issued">
+        <date date-parts="year" form="text" variable="issued" prefix=" (" suffix=")"/>
+      </if>
+    </choose>
+    <text variable="page" prefix=" "/>
+    <group>
+      <choose>
+        <if match="any" variable="title">
+          <text term="sub-verbo" form="short" prefix=" " suffix=" "/>
+          <text variable="title"/>
+        </if>
+      </choose>
+    </group>
+    <text variable="edition" prefix=" [" suffix="]"/>
+    <choose>
+      <if match="any" variable="author">
+        <group prefix=" (" suffix=")">
+          <names variable="author"/>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="webpage-date">
+    <choose>
+      <if type="webpage" match="any">
+        <choose>
+          <if match="none" is-uncertain-date="issued">
+            <date date-parts="year" form="text" variable="issued" prefix=", "/>
+          </if>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true">
+    <sort>
+      <key variable="issued"/>
+      <key macro="contributors-short-citation"/>
+    </sort>
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <group delimiter=", ">
+        <group delimiter=" ">
+          <text macro="contributors-short-citation"/>
+          <text macro="date"/>
+        </group>
+        <text variable="locator"/>
+      </group>
+    </layout>
+  </citation>
+  <bibliography hanging-indent="false" line-spacing="1" entry-spacing="0">
+    <sort>
+      <key macro="contributors-short-biblio"/>
+      <key variable="issued"/>
+    </sort>
+    <layout>
+      <group suffix=".">
+        <group suffix=": ">
+          <text macro="contributors-short-biblio" suffix=" "/>
+          <text macro="date"/>
+        </group>
+        <group>
+          <choose>
+            <if type="entry-encyclopedia entry-dictionary" match="any">
+              <text macro="encyclopedia-article"/>
+            </if>
+            <else>
+              <text macro="contributors"/>
+              <text macro="title" strip-periods="false"/>
+              <text macro="review"/>
+              <text macro="short-container-contributors"/>
+              <text macro="locators"/>
+              <text macro="issue"/>
+              <text macro="series"/>
+              <choose>
+                <if type="article article-journal article-magazine article-newspaper" match="none">
+                  <text macro="translator" suffix=" "/>
+                </if>
+              </choose>
+              <text macro="webpage-date"/>
+              <text macro="place-date"/>
+              <text macro="journal-date"/>
+              <text macro="locators-article"/>
+            </else>
+          </choose>
+          <choose>
+            <if variable="DOI" match="any">
+              <text macro="doi"/>
+            </if>
+            <else>
+              <text macro="url"/>
+            </else>
+          </choose>
+        </group>
+      </group>
+    </layout>
+  </bibliography>
+</style>
diff --git a/buildres/csl/csl-styles/style-manual-australian-government.csl b/buildres/csl/csl-styles/style-manual-australian-government.csl
index a6f7c8ec2db..6fc37d47d51 100644
--- a/buildres/csl/csl-styles/style-manual-australian-government.csl
+++ b/buildres/csl/csl-styles/style-manual-australian-government.csl
@@ -16,7 +16,7 @@
     <category citation-format="author-date"/>
     <category field="generic-base"/>
     <summary>Snooks style manual Australia Harvard author-date style</summary>
-    <updated>2021-08-19T14:32:14+00:00</updated>
+    <updated>2022-07-04T07:48: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>
   <locale xml:lang="en">
@@ -32,7 +32,7 @@
   </macro>
   <macro name="author">
     <names variable="author">
-      <name and="symbol" initialize-with="" name-as-sort-order="all" sort-separator=" "/>
+      <name and="text" delimiter-precedes-last="never" initialize-with="" name-as-sort-order="all" sort-separator=" "/>
       <label form="short" strip-periods="true" prefix=" (" suffix=")"/>
       <substitute>
         <names variable="editor"/>
@@ -90,7 +90,7 @@
     <choose>
       <if variable="issued">
         <choose>
-          <if type="article-newspaper article-magazine" match="any">
+          <if type="article-newspaper article-magazine paper-conference speech" match="any">
             <date form="text" date-parts="year-month-day" variable="issued"/>
           </if>
           <else>
@@ -154,16 +154,16 @@
               <text macro="publisher"/>
             </group>
           </if>
-          <else-if type="chapter paper-conference" match="any">
-            <group>
+          <else-if type="chapter paper-conference speech" match="any">
+            <group delimiter=", ">
               <text macro="title"/>
               <group delimiter=" ">
-                <text term="in" prefix=", "/>
-                <text macro="editor" prefix=" "/>
+                <text term="in"/>
+                <text macro="editor"/>
+                <text variable="container-title" font-style="italic"/>
               </group>
-              <text variable="container-title" font-style="italic"/>
               <text variable="collection-title"/>
-              <text variable="event"/>
+              <text variable="event" font-style="italic"/>
               <text macro="publisher"/>
             </group>
           </else-if>
diff --git a/buildres/csl/csl-styles/suomen-antropologi-journal-of-the-finnish-anthropological-society.csl b/buildres/csl/csl-styles/suomen-antropologi-journal-of-the-finnish-anthropological-society.csl
new file mode 100644
index 00000000000..eae72a0bd38
--- /dev/null
+++ b/buildres/csl/csl-styles/suomen-antropologi-journal-of-the-finnish-anthropological-society.csl
@@ -0,0 +1,633 @@
+<?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="en-GB">
+  <!-- This style was edited with the Visual CSL Editor (https://editor.citationstyles.org/visualEditor/) and by hand by Tuomas Tammisto-->
+  <info>
+    <title>Suomen antropologi: Journal of the Finnish Anthropological Society</title>
+    <title-short>Suomen antropologi</title-short>
+    <id>http://www.zotero.org/styles/suomen-antropologi-journal-of-the-finnish-anthropological-society</id>
+    <link href="http://www.zotero.org/styles/suomen-antropologi-journal-of-the-finnish-anthropological-society" rel="self"/>
+    <link href="https://journal.fi/suomenantropologi/about/submissions" rel="documentation"/>
+    <author>
+      <name>Tuomas Tammisto</name>
+      <email>tutam@iki.fi</email>
+    </author>
+    <category citation-format="author-date"/>
+    <category field="anthropology"/>
+    <eissn>1799-8972</eissn>
+    <updated>2022-05-29T06:57:42+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="short">
+        <single>ed.</single>
+        <multiple>eds</multiple>
+      </term>
+      <term name="editor" form="long">
+        <single>Edited by</single>
+        <multiple>Edited by</multiple>
+      </term>
+      <term name="translator" form="short">
+        <single>trans.</single>
+        <multiple>trans.</multiple>
+      </term>
+      <term name="translator" form="long">
+        <single>Translated by</single>
+        <multiple>Translated by</multiple>
+      </term>
+    </terms>
+  </locale>
+  <macro name="container-contributors">
+    <choose>
+      <if type="chapter paper-conference entry-dictionary entry-encyclopedia" match="any">
+        <group delimiter=", ">
+          <names variable="container-author" delimiter=", ">
+            <name and="symbol" initialize-with=". " delimiter=", "/>
+            <label form="short" prefix=" (" text-case="title" suffix=")"/>
+          </names>
+          <names variable="editor translator" delimiter=",">
+            <name and="text"/>
+            <label form="short" prefix=" (" suffix=")"/>
+          </names>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="secondary-contributors">
+    <choose>
+      <if type="article-journal chapter paper-conference entry-dictionary entry-encyclopedia" match="none">
+        <group delimiter=", " suffix=".">
+          <names variable="container-author" delimiter=", ">
+            <name and="symbol" initialize-with=". " delimiter=", "/>
+            <label form="long" prefix=", " text-case="title"/>
+          </names>
+          <names variable="translator editor" delimiter=". ">
+            <label text-case="capitalize-first" suffix=" "/>
+            <name and="text" initialize-with=". "/>
+          </names>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="author">
+    <names variable="author" font-weight="bold" suffix=" ">
+      <name and="text" delimiter-precedes-last="never" initialize="false" initialize-with="." name-as-sort-order="first"/>
+      <label form="short" prefix=" (" suffix=")"/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <choose>
+          <if type="report">
+            <text variable="publisher"/>
+            <text macro="title"/>
+          </if>
+          <else>
+            <text macro="title"/>
+          </else>
+        </choose>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="author-short">
+    <names variable="author">
+      <name form="short" and="text" initialize-with=". "/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <choose>
+          <if type="report">
+            <text variable="publisher"/>
+            <text variable="title" form="short" font-style="italic"/>
+          </if>
+          <else-if type="legal_case">
+            <text variable="title" font-style="italic"/>
+          </else-if>
+          <else-if type="book graphic  motion_picture song" match="any">
+            <text variable="title" form="short" font-style="italic"/>
+          </else-if>
+          <else-if type="bill legislation" match="any">
+            <text variable="title" form="short"/>
+          </else-if>
+          <else-if variable="reviewed-author">
+            <choose>
+              <if variable="reviewed-title" match="none">
+                <text variable="title" form="short" font-style="italic" prefix="Review of "/>
+              </if>
+              <else>
+                <text variable="title" form="short" quotes="true"/>
+              </else>
+            </choose>
+          </else-if>
+          <else>
+            <text variable="title" form="short" quotes="true"/>
+          </else>
+        </choose>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if type="thesis report" match="any">
+        <choose>
+          <if variable="DOI" match="any">
+            <text variable="DOI" prefix="https://doi.org/" suffix="."/>
+          </if>
+          <else-if variable="archive" match="any">
+            <group>
+              <text term="retrieved" text-case="capitalize-first" suffix=" "/>
+              <text term="from" suffix=" "/>
+              <text variable="archive" suffix="."/>
+              <text variable="archive_location" prefix=" (" suffix=")"/>
+            </group>
+          </else-if>
+          <else>
+            <group>
+              <text term="retrieved" text-case="capitalize-first" suffix=" "/>
+              <text term="from" suffix=" "/>
+              <text variable="URL"/>
+            </group>
+          </else>
+        </choose>
+      </if>
+      <else>
+        <choose>
+          <if variable="DOI">
+            <text variable="DOI" prefix="https://doi.org/" suffix="."/>
+          </if>
+          <else>
+            <choose>
+              <if type="webpage">
+                <group delimiter=" ">
+                  <text variable="URL" suffix="."/>
+                  <group delimiter=" " prefix="&lt;" suffix="&gt;">
+                    <text term="accessed" text-case="capitalize-first" suffix=" "/>
+                    <date form="text" variable="accessed">
+                      <date-part name="year"/>
+                      <date-part name="month"/>
+                      <date-part name="day" form="numeric"/>
+                    </date>
+                  </group>
+                </group>
+              </if>
+              <else>
+                <group>
+                  <text term="retrieved" text-case="capitalize-first" suffix=" "/>
+                  <text term="from" suffix=" "/>
+                  <text variable="URL"/>
+                </group>
+              </else>
+            </choose>
+          </else>
+        </choose>
+      </else>
+    </choose>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="book graphic manuscript motion_picture report song speech thesis" match="any">
+        <choose>
+          <if variable="version" type="book" match="all">
+            <text variable="title"/>
+          </if>
+          <else>
+            <text variable="title" text-case="title" font-style="italic" suffix="."/>
+          </else>
+        </choose>
+      </if>
+      <else-if variable="reviewed-author">
+        <choose>
+          <if variable="reviewed-title">
+            <group delimiter=" ">
+              <text variable="title"/>
+              <group delimiter=", " prefix="[" suffix="]">
+                <text variable="reviewed-title" font-style="italic" prefix="Review of "/>
+                <names variable="reviewed-author" delimiter=", ">
+                  <label form="verb-short" suffix=" "/>
+                  <name and="symbol" initialize-with=". " delimiter=", "/>
+                </names>
+              </group>
+            </group>
+          </if>
+          <else>
+            <group delimiter=", " prefix="[" suffix="]">
+              <text variable="title" font-style="italic" prefix="Review of "/>
+              <names variable="reviewed-author" delimiter=", ">
+                <label form="verb-short" suffix=" "/>
+                <name and="symbol" initialize-with=". " delimiter=", "/>
+              </names>
+            </group>
+          </else>
+        </choose>
+      </else-if>
+      <else>
+        <text variable="title" text-case="title" suffix="."/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="title-plus-extra">
+    <text macro="title"/>
+    <choose>
+      <if type="report" match="any">
+        <group prefix=" (" suffix=")" delimiter=", ">
+          <group delimiter=" ">
+            <choose>
+              <if variable="genre" match="any">
+                <text variable="genre"/>
+              </if>
+              <else>
+                <text variable="collection-title"/>
+              </else>
+            </choose>
+            <text variable="number" prefix="No. "/>
+          </group>
+          <group delimiter=" ">
+            <text term="version" text-case="capitalize-first"/>
+            <text variable="version"/>
+          </group>
+          <text macro="edition"/>
+        </group>
+      </if>
+      <else-if type="post-weblog webpage" match="any">
+        <text variable="genre" prefix=" [" suffix="]"/>
+      </else-if>
+      <else-if variable="version">
+        <group delimiter=" " prefix=" (" suffix=")">
+          <text term="version" text-case="capitalize-first"/>
+          <text variable="version"/>
+        </group>
+      </else-if>
+    </choose>
+    <text macro="format" prefix=" [" suffix="]"/>
+  </macro>
+  <macro name="format">
+    <choose>
+      <if match="any" variable="medium">
+        <text variable="medium" text-case="capitalize-first"/>
+      </if>
+      <else-if type="dataset" match="any">
+        <text value="Data set"/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <choose>
+      <if type="report" match="any">
+        <group delimiter=": ">
+          <text variable="publisher-place"/>
+          <text variable="publisher"/>
+        </group>
+      </if>
+      <else-if type="thesis" match="any">
+        <group delimiter=": ">
+          <text variable="publisher-place"/>
+          <text variable="publisher" suffix=" dissertation"/>
+        </group>
+      </else-if>
+      <else-if type="post-weblog webpage" match="none">
+        <group delimiter=", ">
+          <choose>
+            <if variable="event version" type="speech motion_picture" match="none">
+              <text variable="genre"/>
+            </if>
+          </choose>
+          <choose>
+            <if type="article-journal article-magazine" match="none">
+              <group delimiter=": ">
+                <choose>
+                  <if variable="publisher-place">
+                    <text variable="publisher-place"/>
+                  </if>
+                  <else>
+                    <text variable="event-place"/>
+                  </else>
+                </choose>
+                <text variable="publisher"/>
+              </group>
+            </if>
+          </choose>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="event">
+    <choose>
+      <if variable="container-title" match="none">
+        <choose>
+          <if variable="event">
+            <choose>
+              <if variable="genre" match="none">
+                <text term="presented at" text-case="capitalize-first" suffix=" "/>
+                <text variable="event"/>
+              </if>
+              <else>
+                <group delimiter=" ">
+                  <text variable="genre" text-case="capitalize-first"/>
+                  <text term="presented at"/>
+                  <text variable="event"/>
+                </group>
+              </else>
+            </choose>
+          </if>
+          <else-if type="speech">
+            <text variable="genre" text-case="capitalize-first"/>
+          </else-if>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="issued">
+    <choose>
+      <if type="bill legal_case legislation" match="none">
+        <choose>
+          <if variable="issued">
+            <group prefix=" ">
+              <date variable="issued">
+                <date-part name="year"/>
+              </date>
+              <text variable="year-suffix"/>
+              <choose>
+                <if type="speech" match="any">
+                  <date variable="issued">
+                    <date-part prefix=", " name="month"/>
+                  </date>
+                </if>
+                <else-if type="article-journal bill book chapter graphic legal_case legislation motion_picture paper-conference report song dataset" match="none"/>
+              </choose>
+            </group>
+          </if>
+          <else-if variable="status">
+            <group prefix=" (" suffix=")">
+              <text variable="status"/>
+              <text variable="year-suffix" prefix="-"/>
+            </group>
+          </else-if>
+          <else>
+            <group prefix=" ">
+              <text term="no date" form="short"/>
+              <text variable="year-suffix" prefix="-"/>
+            </group>
+          </else>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="issued-sort">
+    <choose>
+      <if type="article-journal bill book chapter graphic legal_case legislation motion_picture paper-conference report song dataset" match="none">
+        <date variable="issued">
+          <date-part name="year"/>
+          <date-part name="month"/>
+          <date-part name="day"/>
+        </date>
+      </if>
+      <else>
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
+      </else>
+    </choose>
+  </macro>
+  <macro name="issued-year">
+    <choose>
+      <if variable="issued">
+        <group delimiter="/">
+          <date variable="original-date" form="text"/>
+          <group>
+            <date variable="issued">
+              <date-part name="year"/>
+            </date>
+            <text variable="year-suffix"/>
+          </group>
+        </group>
+      </if>
+      <else-if variable="status">
+        <text variable="status"/>
+        <text variable="year-suffix" prefix="-"/>
+      </else-if>
+      <else>
+        <text term="no date" form="short"/>
+        <text variable="year-suffix" prefix="-"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <text term="edition" form="long"/>
+        </group>
+      </if>
+      <else>
+        <text variable="edition"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="locators">
+    <choose>
+      <if type="article-journal article-magazine" match="any">
+        <group delimiter=":" prefix="  ">
+          <group>
+            <text variable="volume" font-style="normal" suffix=" "/>
+            <text variable="issue" prefix="(" suffix=")"/>
+          </group>
+          <text variable="page" prefix=" "/>
+        </group>
+        <choose>
+          <if variable="issued">
+            <choose>
+              <if variable="page issue" match="none">
+                <text variable="status" prefix=". "/>
+              </if>
+            </choose>
+          </if>
+        </choose>
+      </if>
+      <else-if type="article-newspaper">
+        <group delimiter=" " prefix=", ">
+          <label variable="page" form="short"/>
+          <text variable="page"/>
+        </group>
+      </else-if>
+      <else-if type="book graphic motion_picture report song chapter paper-conference entry-encyclopedia entry-dictionary" match="any">
+        <group delimiter=", " prefix=" ">
+          <choose>
+            <if type="report" match="none">
+              <text macro="edition"/>
+            </if>
+          </choose>
+          <choose>
+            <if variable="volume" match="any">
+              <group>
+                <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+                <number variable="volume" form="numeric"/>
+              </group>
+            </if>
+            <else>
+              <group>
+                <text term="volume" form="short" plural="true" text-case="capitalize-first" suffix=" "/>
+                <number variable="number-of-volumes" form="numeric" prefix="1&#8211;"/>
+              </group>
+            </else>
+          </choose>
+        </group>
+      </else-if>
+      <else-if type="legal_case">
+        <group prefix=" (" suffix=")" delimiter=" ">
+          <text variable="authority"/>
+          <choose>
+            <if variable="container-title" match="any">
+              <date variable="issued" form="numeric" date-parts="year"/>
+            </if>
+            <else>
+              <date variable="issued" form="text"/>
+            </else>
+          </choose>
+        </group>
+      </else-if>
+      <else-if type="bill legislation" match="any">
+        <date variable="issued" prefix=" (" suffix=")">
+          <date-part name="year"/>
+        </date>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="citation-locator">
+    <group delimiter=" ">
+      <choose>
+        <if locator="page" match="none">
+          <label variable="locator" form="long" text-case="capitalize-first"/>
+        </if>
+      </choose>
+      <text variable="locator"/>
+    </group>
+  </macro>
+  <macro name="container">
+    <choose>
+      <if type="post-weblog webpage" match="none">
+        <group>
+          <choose>
+            <if type="chapter paper-conference entry-encyclopedia" match="any">
+              <text term="in" text-case="capitalize-first" suffix=" "/>
+            </if>
+          </choose>
+          <group delimiter=".">
+            <text macro="container-contributors"/>
+            <text macro="secondary-contributors"/>
+            <text macro="container-title" text-case="capitalize-all"/>
+          </group>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="container-title">
+    <choose>
+      <if type="article article-magazine article-newspaper" match="any">
+        <text variable="container-title" font-style="italic" text-case="title"/>
+        <date variable="issued">
+          <date-part name="day" prefix=" " suffix=" "/>
+          <date-part name="month"/>
+        </date>
+      </if>
+      <else-if type="bill legal_case legislation" match="none">
+        <text variable="container-title" text-case="title" font-style="italic" prefix=" "/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="legal-cites">
+    <choose>
+      <if type="legal_case" match="any">
+        <group prefix=", " delimiter=" ">
+          <choose>
+            <if variable="container-title">
+              <text variable="volume"/>
+              <text variable="container-title"/>
+              <group delimiter=" ">
+                <text term="section" form="symbol"/>
+                <text variable="section"/>
+              </group>
+              <text variable="page"/>
+            </if>
+            <else>
+              <text variable="number" prefix="No. "/>
+            </else>
+          </choose>
+        </group>
+      </if>
+      <else-if type="bill legislation" match="any">
+        <group delimiter=", " prefix=", ">
+          <choose>
+            <if variable="number">
+              <text variable="number" prefix="Pub. L. No. "/>
+              <group delimiter=" ">
+                <text term="section" form="symbol"/>
+                <text variable="section"/>
+              </group>
+              <group delimiter=" ">
+                <text variable="volume"/>
+                <text variable="container-title"/>
+                <text variable="page-first"/>
+              </group>
+            </if>
+            <else>
+              <group delimiter=" ">
+                <text variable="volume"/>
+                <text variable="container-title"/>
+                <text term="section" form="symbol"/>
+                <text variable="section"/>
+              </group>
+            </else>
+          </choose>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="original-date">
+    <choose>
+      <if variable="original-date">
+        <group prefix="(" suffix=")" delimiter=" ">
+          <text value="Original work published"/>
+          <date variable="original-date" form="text"/>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <citation et-al-min="4" et-al-use-first="1" et-al-subsequent-min="3" et-al-subsequent-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true" collapse="year" givenname-disambiguation-rule="primary-name" delimiter-precedes-last="never" cite-group-delimiter="; ">
+    <sort>
+      <key macro="issued-sort"/>
+      <key macro="author"/>
+    </sort>
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <group delimiter=" ">
+        <text macro="author-short"/>
+        <text macro="issued-year"/>
+      </group>
+      <text macro="citation-locator" prefix=": "/>
+    </layout>
+  </citation>
+  <bibliography hanging-indent="true" et-al-min="8" et-al-use-first="6" et-al-use-last="true" entry-spacing="0" line-spacing="2">
+    <sort>
+      <key macro="author"/>
+      <key macro="issued-sort" sort="ascending"/>
+      <key macro="title"/>
+    </sort>
+    <layout>
+      <group suffix=".">
+        <group delimiter=" ">
+          <text macro="author"/>
+          <text macro="issued" suffix="."/>
+          <text macro="title-plus-extra"/>
+          <text macro="container"/>
+        </group>
+        <text macro="legal-cites"/>
+        <text macro="locators"/>
+        <group delimiter=", " prefix=". ">
+          <text macro="event"/>
+          <text macro="publisher"/>
+        </group>
+      </group>
+      <text macro="access" prefix=" "/>
+      <text macro="original-date" prefix=" "/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/buildres/csl/csl-styles/technische-universitat-dresden-linguistik.csl b/buildres/csl/csl-styles/technische-universitat-dresden-linguistik.csl
index 19301d851e8..beb06a7e4b7 100644
--- a/buildres/csl/csl-styles/technische-universitat-dresden-linguistik.csl
+++ b/buildres/csl/csl-styles/technische-universitat-dresden-linguistik.csl
@@ -6,7 +6,7 @@
     <id>http://www.zotero.org/styles/technische-universitat-dresden-linguistik</id>
     <link href="http://www.zotero.org/styles/technische-universitat-dresden-linguistik" rel="self"/>
     <link href="http://www.zotero.org/styles/deutsche-sprache" rel="template"/>
-    <link xml:lang="de" href="https://tu-dresden.de/gsw/slk/germanistik/al/ressourcen/dateien/studium/200424_Stylesheet_ALI.pdf" rel="documentation"/>
+    <link href="https://tu-dresden.de/gsw/slk/germanistik/al/ressourcen/dateien/studium/200424_Stylesheet_ALI.pdf" rel="documentation"/>
     <author>
       <name>Simon Meier-Vieracker</name>
       <uri>https://tu-dresden.de/gsw/slk/germanistik/al</uri>
@@ -16,7 +16,7 @@
     <category field="linguistics"/>
     <category field="literature"/>
     <summary>Zitierstil entsprechend den Vorgaben der linguistischen Professuren am Institut für Germanistik der Technischen Universität Dresden. Der Stil orientiert sich an den Richtlinien von 'Deutsche Sprache: Zeitschrift für Theorie Praxis Dokumentation', hg. vom IDS Mannheim</summary>
-    <updated>2021-07-19T08:34:39+00:00</updated>
+    <updated>2022-06-23T08:36:06+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="de">
@@ -51,14 +51,14 @@
           <name delimiter="/" name-as-sort-order="all"/>
           <label form="short" prefix=" (" suffix=")"/>
         </names>
-        <text variable="container-title"/>
+        <text macro="container-title"/>
       </group>
     </group>
   </macro>
   <macro name="publication-place-publisher">
     <group delimiter=": ">
       <text variable="publisher-place"/>
-      <text variable="publisher"/>
+      <text variable="publisher" quotes="false" font-variant="normal" font-weight="normal" vertical-align="baseline"/>
     </group>
   </macro>
   <macro name="creator-year-short">
@@ -81,7 +81,7 @@
     </choose>
   </macro>
   <macro name="collection-title-number">
-    <group delimiter=" " prefix="(= " suffix=")">
+    <group delimiter=" " prefix=" (= " suffix=")">
       <text variable="collection-title"/>
       <text variable="collection-number"/>
     </group>
@@ -113,6 +113,28 @@
       </substitute>
     </names>
   </macro>
+  <macro name="doi">
+    <text variable="DOI" prefix="https://doi.org/"/>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="book" match="any">
+        <text variable="title"/>
+        <text macro="collection-title-number" prefix=" "/>
+      </if>
+      <else>
+        <text variable="title"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="container-title">
+    <choose>
+      <if type="chapter" match="any">
+        <text variable="container-title"/>
+        <text macro="collection-title-number"/>
+      </if>
+    </choose>
+  </macro>
   <citation et-al-min="4" et-al-use-first="1" disambiguate-add-year-suffix="true" collapse="year-suffix">
     <layout delimiter="; " prefix="(" suffix=")">
       <group delimiter=", ">
@@ -133,12 +155,11 @@
       <group delimiter=". " suffix=".">
         <group delimiter=" ">
           <text macro="creator-year-long" suffix=":"/>
-          <text variable="title" strip-periods="false" font-variant="normal"/>
+          <text macro="title"/>
         </group>
         <choose>
           <if type="book" match="any">
             <group delimiter=". ">
-              <text macro="collection-title-number"/>
               <text macro="edition"/>
               <text macro="publication-place-publisher"/>
             </group>
@@ -150,17 +171,16 @@
                 <text macro="container-title-volume"/>
               </group>
               <text macro="page-range"/>
-              <text variable="DOI" strip-periods="false" prefix="doi:"/>
+              <text macro="doi" strip-periods="false"/>
             </group>
           </else-if>
           <else-if type="chapter" match="any">
             <group delimiter=". ">
               <text macro="editor-container-title"/>
-              <text macro="collection-title-number"/>
               <text macro="edition"/>
               <text macro="publication-place-publisher"/>
               <text macro="page-range"/>
-              <text variable="DOI" prefix="doi:"/>
+              <text macro="doi"/>
             </group>
           </else-if>
           <else-if type="dataset" match="any"/>
diff --git a/buildres/csl/csl-styles/technische-universitat-dresden-medizin.csl b/buildres/csl/csl-styles/technische-universitat-dresden-medizin.csl
deleted file mode 100644
index 23f99e6938f..00000000000
--- a/buildres/csl/csl-styles/technische-universitat-dresden-medizin.csl
+++ /dev/null
@@ -1,265 +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">
-  <info>
-    <title>Technische Universität Dresden - Medizin</title>
-    <title-short>TUD Medizin</title-short>
-    <id>http://www.zotero.org/styles/technische-universitat-dresden-medizin</id>
-    <link href="http://www.zotero.org/styles/technische-universitat-dresden-medizin" rel="self"/>
-    <link href="http://www.zotero.org/styles/harvard-cite-them-right" rel="template"/>
-    <link href="https://tu-dresden.de/med/mf/ressourcen/dateien/postgraduales/promotionen/zitierrichtinien_fuer_die_dissertation_formblatt9.0?lang=de" xml:lang="DE-de" rel="documentation"/>
-    <author>
-      <name>Jens Mittelbach</name>
-      <email>jens.mittelbach@slub-dresden.de</email>
-      <uri>http://www.slub-dresden.de</uri>
-    </author>
-    <category citation-format="author-date"/>
-    <category field="medicine"/>
-    <summary>Zitierstil entsprechend den Zitierrichtlinien für die Dissertation, Medizinische Fakultät Carl Gustav Carus, Technische Universität Dresden. Stil basiert auf dem Zitierstil der Zeitschrift Human Mutation</summary>
-    <updated>2021-01-31T18:08: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="de">
-    <terms>
-      <term name="et-al">et al.</term>
-      <term name="accessed">Aufruf am</term>
-      <term name="presented at">Vortrag auf</term>
-    </terms>
-  </locale>
-  <locale xml:lang="en">
-    <terms>
-      <term name="presented at">Presentation at</term>
-    </terms>
-  </locale>
-  <macro name="editor">
-    <names variable="editor" delimiter=", ">
-      <name initialize-with="" name-as-sort-order="all" sort-separator=" "/>
-      <label form="short" strip-periods="true" prefix=" (" suffix=")"/>
-    </names>
-  </macro>
-  <macro name="anon">
-    <text term="anonymous" form="short" text-case="capitalize-first" strip-periods="true"/>
-  </macro>
-  <macro name="author">
-    <names variable="author">
-      <name delimiter-precedes-last="never" initialize-with="" name-as-sort-order="all" sort-separator=" "/>
-      <label form="short" strip-periods="true" prefix=" (" suffix=")"/>
-      <substitute>
-        <names variable="editor"/>
-        <text macro="anon"/>
-      </substitute>
-    </names>
-  </macro>
-  <macro name="author-short">
-    <names variable="author" suffix=", ">
-      <name form="short" and="text" delimiter-precedes-et-al="never" delimiter-precedes-last="never"/>
-      <substitute>
-        <names variable="editor"/>
-        <names variable="translator"/>
-        <text macro="anon"/>
-      </substitute>
-    </names>
-  </macro>
-  <macro name="access">
-    <choose>
-      <if match="any" variable="DOI">
-        <text value="DOI: "/>
-        <text variable="DOI"/>
-      </if>
-      <else-if variable="URL">
-        <group prefix="[" suffix="] ">
-          <text term="accessed" suffix=": "/>
-          <date form="numeric" variable="accessed"/>
-        </group>
-        <text value="URL:" suffix=" "/>
-        <text variable="URL"/>
-      </else-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="normal"/>
-      </if>
-      <else>
-        <text variable="title"/>
-      </else>
-    </choose>
-  </macro>
-  <macro name="publisher">
-    <group>
-      <text variable="publisher"/>
-      <text variable="publisher-place" prefix=", "/>
-      <text macro="series" strip-periods="false"/>
-    </group>
-  </macro>
-  <macro name="year-date">
-    <choose>
-      <if variable="issued">
-        <date variable="issued">
-          <date-part name="year"/>
-        </date>
-      </if>
-      <else>
-        <text term="no date" form="short"/>
-      </else>
-    </choose>
-  </macro>
-  <macro name="edition">
-    <choose>
-      <if is-numeric="edition">
-        <group delimiter=" ">
-          <number variable="edition" form="ordinal"/>
-          <text term="edition" form="short"/>
-        </group>
-      </if>
-      <else>
-        <text variable="edition" suffix="."/>
-      </else>
-    </choose>
-  </macro>
-  <macro name="pages">
-    <group>
-      <label variable="page" form="short" suffix=" "/>
-      <text variable="page"/>
-    </group>
-  </macro>
-  <macro name="series">
-    <choose>
-      <if match="any" variable="collection-title">
-        <group delimiter="; " prefix=" (" suffix=")">
-          <text variable="collection-title"/>
-          <text variable="collection-number"/>
-        </group>
-      </if>
-    </choose>
-  </macro>
-  <macro name="interviewer">
-    <choose>
-      <if match="any" variable="interviewer">
-        <group delimiter=" " prefix=" ">
-          <text term="interview" text-case="capitalize-first"/>
-          <text term="by"/>
-          <names variable="interviewer">
-            <name initialize-with="" name-as-sort-order="first" sort-separator=" "/>
-          </names>
-        </group>
-      </if>
-    </choose>
-  </macro>
-  <macro name="day-date">
-    <date variable="issued" prefix=", ">
-      <date-part name="month" form="short" suffix=" "/>
-      <date-part name="day" suffix="."/>
-    </date>
-  </macro>
-  <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true">
-    <sort>
-      <key macro="year-date"/>
-      <key variable="author"/>
-    </sort>
-    <layout prefix="(" suffix=")" delimiter="; ">
-      <group delimiter=", ">
-        <group delimiter=" ">
-          <text macro="author-short"/>
-          <text macro="year-date"/>
-        </group>
-        <group>
-          <label suffix=" " variable="locator" form="short"/>
-          <text variable="locator"/>
-        </group>
-      </group>
-    </layout>
-  </citation>
-  <bibliography hanging-indent="true">
-    <sort>
-      <key macro="author"/>
-      <key variable="title"/>
-    </sort>
-    <layout suffix=".">
-      <text macro="author" suffix="."/>
-      <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" suffix="."/>
-            <text macro="edition"/>
-            <text macro="editor"/>
-          </group>
-          <text macro="publisher" prefix=" "/>
-        </if>
-        <else-if type="chapter paper-conference entry-encyclopedia entry-dictionary" match="any">
-          <text macro="title" prefix=" " suffix="."/>
-          <group prefix=" " delimiter=" ">
-            <text term="in" text-case="capitalize-first" suffix=":"/>
-            <text macro="editor"/>
-            <text variable="container-title" font-style="normal" suffix="."/>
-            <text variable="event" suffix="."/>
-            <group delimiter=", ">
-              <text macro="publisher"/>
-              <text macro="pages"/>
-            </group>
-          </group>
-        </else-if>
-        <else-if type="thesis">
-          <group prefix=" ">
-            <text macro="title" suffix=". "/>
-            <text macro="publisher"/>
-            <text variable="genre" prefix=", "/>
-          </group>
-        </else-if>
-        <else-if type="speech" match="any">
-          <group delimiter=" " prefix=" ">
-            <text macro="title" suffix="."/>
-            <group delimiter=": ">
-              <text term="presented at"/>
-              <group delimiter=", ">
-                <text variable="event"/>
-                <text variable="event-place"/>
-              </group>
-            </group>
-          </group>
-        </else-if>
-        <else>
-          <group>
-            <text macro="title" prefix=" " suffix="."/>
-            <choose>
-              <if match="any" variable="editor">
-                <group delimiter=" " prefix=" ">
-                  <text term="in" text-case="capitalize-first" suffix=":"/>
-                  <text macro="editor" prefix=" "/>
-                </group>
-              </if>
-            </choose>
-            <choose>
-              <if type="interview legal_case" match="any">
-                <text macro="interviewer" suffix="."/>
-                <group prefix=" ">
-                  <text variable="medium"/>
-                  <text macro="day-date"/>
-                </group>
-              </if>
-            </choose>
-          </group>
-          <group prefix=" ">
-            <text variable="container-title" form="short" strip-periods="true" font-style="normal"/>
-            <choose>
-              <if type="article-newspaper" match="any">
-                <text macro="day-date"/>
-              </if>
-            </choose>
-            <group prefix=", ">
-              <text variable="volume"/>
-              <text variable="issue" prefix="(" suffix=")"/>
-            </group>
-            <group prefix=":">
-              <text variable="page"/>
-            </group>
-          </group>
-        </else>
-      </choose>
-      <text prefix=" " macro="access" suffix="."/>
-    </layout>
-  </bibliography>
-</style>
diff --git a/buildres/csl/csl-styles/the-american-journal-of-geriatric-psychiatry.csl b/buildres/csl/csl-styles/the-american-journal-of-geriatric-psychiatry.csl
index 3e8b28b9067..9af9fdd53cc 100644
--- a/buildres/csl/csl-styles/the-american-journal-of-geriatric-psychiatry.csl
+++ b/buildres/csl/csl-styles/the-american-journal-of-geriatric-psychiatry.csl
@@ -5,7 +5,7 @@
     <title-short>AJGP</title-short>
     <id>http://www.zotero.org/styles/the-american-journal-of-geriatric-psychiatry</id>
     <link href="http://www.zotero.org/styles/the-american-journal-of-geriatric-psychiatry" rel="self"/>
-    <link href="http://www.zotero.org/styles/diabetes-technology-and-therapeutics" rel="template"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-vancouver" rel="template"/>
     <link href="https://www.editorialmanager.com/jgp/default.aspx" rel="documentation"/>
     <author>
       <name>Patrick O'Brien, PhD</name>
diff --git a/buildres/csl/csl-styles/the-journal-of-egyptian-archaeology.csl b/buildres/csl/csl-styles/the-journal-of-egyptian-archaeology.csl
index 8e0558d0f8b..1d13a44187b 100644
--- a/buildres/csl/csl-styles/the-journal-of-egyptian-archaeology.csl
+++ b/buildres/csl/csl-styles/the-journal-of-egyptian-archaeology.csl
@@ -6,15 +6,15 @@
     <id>http://www.zotero.org/styles/the-journal-of-egyptian-archaeology</id>
     <link href="http://www.zotero.org/styles/the-journal-of-egyptian-archaeology" rel="self"/>
     <link href="http://www.zotero.org/styles/journal-of-the-history-of-collections" rel="template"/>
-    <link href="http://www.ees.ac.uk/publications/journal-egyptian-archaeology.html" rel="documentation"/>
+    <link href="https://www.ees.ac.uk/writing-for-the-jea" rel="documentation"/>
+    <link href="https://journals.sagepub.com/pb-assets/cmscontent/EGA/JEA_Referencing_Style.pdf" rel="documentation"/>
     <author>
       <name>Patrick O'Brien</name>
-      <email>obrienpat86@gmail.com</email>
     </author>
     <category citation-format="note"/>
     <category field="history"/>
     <issn>0307-5133</issn>
-    <updated>2018-01-04T11:08:07+00:00</updated>
+    <updated>2022-04-19T09:32:54+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">
@@ -28,6 +28,10 @@
       <term name="close-quote">’</term>
       <term name="open-inner-quote">“</term>
       <term name="close-inner-quote">”</term>
+      <term name="editor" form="short">
+        <single>ed.</single>
+        <multiple>eds</multiple>
+      </term>
     </terms>
   </locale>
   <macro name="author">
@@ -70,7 +74,6 @@
           <names variable="editor"/>
           <names variable="translator"/>
           <names variable="container-author"/>
-          <text macro="title"/>
         </substitute>
       </names>
     </group>
@@ -79,13 +82,12 @@
     <group delimiter=" ">
       <text term="in" suffix=" "/>
       <names variable="editor">
-        <name form="short" and="text" initialize-with=". "/>
+        <name form="short" and="text" et-al-min="2" et-al-use-first="1" initialize-with=". "/>
         <label form="short" prefix=" (" suffix=")" strip-periods="false"/>
         <substitute>
           <names variable="editor"/>
           <names variable="translator"/>
           <names variable="container-author"/>
-          <text macro="title"/>
         </substitute>
       </names>
     </group>
@@ -151,10 +153,6 @@
       </if>
     </choose>
   </macro>
-  <macro name="pageref-subsequent">
-    <label variable="locator" form="short" suffix=" "/>
-    <text variable="locator"/>
-  </macro>
   <macro name="volref">
     <group delimiter=" ">
       <text variable="volume"/>
@@ -226,7 +224,7 @@
           <group delimiter=", ">
             <text macro="author-short"/>
             <text macro="container-short"/>
-            <text macro="pageref-subsequent"/>
+            <text macro="pageref"/>
           </group>
         </if>
         <else>
diff --git a/buildres/csl/csl-styles/the-journal-of-hellenic-studies.csl b/buildres/csl/csl-styles/the-journal-of-hellenic-studies.csl
index 9ce9f5531ba..bfd40f29bfe 100644
--- a/buildres/csl/csl-styles/the-journal-of-hellenic-studies.csl
+++ b/buildres/csl/csl-styles/the-journal-of-hellenic-studies.csl
@@ -4,7 +4,7 @@
     <title>The Journal of Hellenic Studies</title>
     <id>http://www.zotero.org/styles/the-journal-of-hellenic-studies</id>
     <link href="http://www.zotero.org/styles/the-journal-of-hellenic-studies" rel="self"/>
-    <link href="http://www.zotero.org/styles/harvard-cardiff-university-old" rel="template"/>
+    <link href="http://www.zotero.org/styles/cardiff-university-harvard" rel="template"/>
     <link href="http://www.hellenicsociety.org.uk/publications/" rel="documentation"/>
     <author>
       <name>Polly Low</name>
diff --git a/buildres/csl/csl-styles/the-korean-journal-of-gastroenterology.csl b/buildres/csl/csl-styles/the-korean-journal-of-gastroenterology.csl
index 72a7a71a938..1c99f8822aa 100644
--- a/buildres/csl/csl-styles/the-korean-journal-of-gastroenterology.csl
+++ b/buildres/csl/csl-styles/the-korean-journal-of-gastroenterology.csl
@@ -5,7 +5,7 @@
     <title-short>KjG</title-short>
     <id>http://www.zotero.org/styles/the-korean-journal-of-gastroenterology</id>
     <link href="http://www.zotero.org/styles/the-korean-journal-of-gastroenterology" rel="self"/>
-    <link href="http://www.zotero.org/styles/human-gene-therapy" rel="template"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-vancouver" rel="template"/>
     <link href="http://www.kjg.or.kr/contributors/authors.html" rel="documentation"/>
     <author>
       <name>Patrick O'Brien</name>
diff --git a/buildres/csl/csl-styles/thyroid.csl b/buildres/csl/csl-styles/thyroid.csl
deleted file mode 100644
index ce99ea31cd2..00000000000
--- a/buildres/csl/csl-styles/thyroid.csl
+++ /dev/null
@@ -1,152 +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="never" default-locale="en-US">
-  <info>
-    <title>Thyroid</title>
-    <id>http://www.zotero.org/styles/thyroid</id>
-    <link href="http://www.zotero.org/styles/thyroid" rel="self"/>
-    <link href="http://www.zotero.org/styles/american-society-for-microbiology" rel="template"/>
-    <link href="http://www.liebertpub.com/forauthors/thyroid-journal-program/625/" rel="documentation"/>
-    <author>
-      <name>Patrick O'Brien</name>
-    </author>
-    <category citation-format="numeric"/>
-    <category field="medicine"/>
-    <category field="biology"/>
-    <issn>1050-7256</issn>
-    <eissn>1557-9077</eissn>
-    <updated>2020-07-21T14:41:51+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">
-      <name sort-separator=" " initialize-with="" name-as-sort-order="all" delimiter=", " delimiter-precedes-last="always"/>
-    </names>
-  </macro>
-  <macro name="issued">
-    <group prefix=" ">
-      <choose>
-        <if type="patent">
-          <date variable="issued">
-            <date-part name="month" suffix=" "/>
-            <date-part name="year"/>
-          </date>
-        </if>
-        <else>
-          <date variable="issued">
-            <date-part name="year"/>
-          </date>
-        </else>
-      </choose>
-    </group>
-  </macro>
-  <macro name="chapter-specifics">
-    <choose>
-      <if type="chapter paper-conference" match="any">
-        <text term="in" text-case="capitalize-first" font-style="normal" prefix=". " suffix=": "/>
-        <names variable="editor" delimiter=", " suffix=" ">
-          <name initialize-with="" delimiter=", " name-as-sort-order="all" delimiter-precedes-last="always"/>
-          <label form="short" strip-periods="true" prefix=" (" suffix=")"/>
-        </names>
-      </if>
-    </choose>
-  </macro>
-  <macro name="patent-specifics">
-    <text variable="number" prefix=". "/>
-  </macro>
-  <macro name="container-title">
-    <choose>
-      <if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="any">
-        <text variable="container-title"/>
-      </if>
-      <else>
-        <text variable="container-title" form="short" strip-periods="true" prefix=". "/>
-      </else>
-    </choose>
-  </macro>
-  <macro name="edition">
-    <choose>
-      <if is-numeric="edition">
-        <group delimiter=" " prefix=", ">
-          <number variable="edition" form="ordinal"/>
-          <text term="edition" form="short"/>
-        </group>
-      </if>
-      <else>
-        <text variable="edition" suffix="."/>
-      </else>
-    </choose>
-  </macro>
-  <macro name="publisher">
-    <group delimiter=", " prefix=". ">
-      <choose>
-        <if type="article-journal article-magazine" match="none">
-          <text variable="genre"/>
-          <text variable="publisher"/>
-          <text variable="publisher-place"/>
-        </if>
-      </choose>
-    </group>
-  </macro>
-  <macro name="locators">
-    <choose>
-      <if type="article-journal">
-        <group prefix=" " delimiter=":">
-          <text variable="volume" font-weight="bold"/>
-          <text variable="page"/>
-        </group>
-      </if>
-      <else-if type="chapter" match="any">
-        <group delimiter=" " prefix=", ">
-          <label strip-periods="true" variable="page" form="short"/>
-          <text variable="page"/>
-        </group>
-      </else-if>
-    </choose>
-  </macro>
-  <macro name="access">
-    <choose>
-      <if type="webpage post-weblog" match="any">
-        <group delimiter=". " prefix=". ">
-          <group delimiter=" ">
-            <text term="available at" text-case="capitalize-first"/>
-            <text variable="URL"/>
-          </group>
-          <group delimiter=" ">
-            <text term="accessed" text-case="capitalize-first"/>
-            <date form="text" variable="accessed"/>
-          </group>
-        </group>
-      </if>
-      <else-if type="article-journal" match="any">
-        <choose>
-          <if match="none" variable="page volume">
-            <text variable="DOI" prefix=" https://doi.org/"/>
-          </if>
-        </choose>
-      </else-if>
-    </choose>
-  </macro>
-  <citation collapse="citation-number">
-    <sort>
-      <key variable="citation-number"/>
-    </sort>
-    <layout prefix="(" suffix=")" delimiter=", ">
-      <text variable="citation-number"/>
-    </layout>
-  </citation>
-  <bibliography et-al-min="4" et-al-use-first="3" second-field-align="flush" line-spacing="2">
-    <layout suffix=".">
-      <text variable="citation-number" suffix=". "/>
-      <text macro="author"/>
-      <text macro="issued"/>
-      <text variable="title" prefix=" "/>
-      <text macro="chapter-specifics"/>
-      <text macro="patent-specifics"/>
-      <text macro="container-title"/>
-      <text macro="edition"/>
-      <text macro="publisher"/>
-      <text macro="locators"/>
-      <text macro="access"/>
-    </layout>
-  </bibliography>
-</style>
diff --git a/buildres/csl/csl-styles/tissue-engineering.csl b/buildres/csl/csl-styles/tissue-engineering.csl
deleted file mode 100644
index 0c4b28c017a..00000000000
--- a/buildres/csl/csl-styles/tissue-engineering.csl
+++ /dev/null
@@ -1,243 +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" page-range-format="minimal" default-locale="en-US">
-  <info>
-    <title>Tissue Engineering</title>
-    <id>http://www.zotero.org/styles/tissue-engineering</id>
-    <link href="http://www.zotero.org/styles/tissue-engineering" rel="self"/>
-    <link href="http://www.zotero.org/styles/vancouver" rel="template"/>
-    <link href="https://home.liebertpub.com/publications/tissue-engineering-parts-a-b-and-c/595/for-authors" rel="documentation"/>
-    <author>
-      <name>Charles Parnot</name>
-      <email>charles.parnot@gmail.com</email>
-    </author>
-    <category citation-format="numeric"/>
-    <category field="medicine"/>
-    <issn>2152-4947</issn>
-    <eissn>2152-4955</eissn>
-    <summary>A style for the journal Tissue Engineering, Parts A, B &amp; C, published by Mary Ann Liebert, Inc.</summary>
-    <updated>2019-12-04T12:33: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 xml:lang="en">
-    <terms>
-      <term name="retrieved">available</term>
-      <term name="section" form="short">sect.</term>
-    </terms>
-  </locale>
-  <macro name="author">
-    <names variable="author">
-      <name delimiter-precedes-last="always" initialize-with="." name-as-sort-order="all"/>
-      <label form="short" prefix=", "/>
-      <substitute>
-        <names variable="editor"/>
-      </substitute>
-    </names>
-  </macro>
-  <macro name="editor">
-    <group delimiter=": ">
-      <choose>
-        <if type="chapter paper-conference" match="any">
-          <text term="in" text-case="capitalize-first"/>
-        </if>
-      </choose>
-      <names variable="editor" suffix=".">
-        <name delimiter-precedes-last="always" initialize-with="." name-as-sort-order="all"/>
-        <label form="short" prefix=", "/>
-      </names>
-    </group>
-  </macro>
-  <macro name="publisher">
-    <group delimiter=": " suffix=",">
-      <choose>
-        <if type="thesis">
-          <text variable="publisher-place" prefix="[" suffix="]"/>
-        </if>
-        <else>
-          <text variable="publisher-place"/>
-        </else>
-      </choose>
-      <text variable="publisher"/>
-    </group>
-  </macro>
-  <macro name="access">
-    <choose>
-      <if variable="URL">
-        <group delimiter=": ">
-          <group delimiter=" ">
-            <text term="retrieved" text-case="capitalize-first"/>
-            <text term="from"/>
-          </group>
-          <text variable="URL"/>
-        </group>
-      </if>
-    </choose>
-  </macro>
-  <macro name="accessed-date">
-    <choose>
-      <if variable="URL">
-        <group prefix="[" suffix="]" delimiter=" ">
-          <text term="cited"/>
-          <date variable="accessed">
-            <date-part name="year"/>
-            <date-part name="month" prefix=" " form="short" strip-periods="true"/>
-            <date-part name="day" prefix=" "/>
-          </date>
-        </group>
-      </if>
-    </choose>
-  </macro>
-  <macro name="container-title">
-    <choose>
-      <if type="article-journal article-magazine chapter paper-conference article-newspaper" match="any">
-        <group suffix="." delimiter=" ">
-          <text variable="container-title" form="short" strip-periods="true"/>
-          <choose>
-            <if variable="URL">
-              <text term="internet" prefix="[" suffix="]" text-case="capitalize-first"/>
-            </if>
-          </choose>
-        </group>
-        <text macro="edition" prefix=" "/>
-      </if>
-      <else-if type="bill legislation" match="any">
-        <group delimiter=", ">
-          <group delimiter=". ">
-            <text variable="container-title" form="short"/>
-            <group delimiter=" ">
-              <text term="section" form="short" text-case="capitalize-first"/>
-              <text variable="section"/>
-            </group>
-          </group>
-          <text variable="number"/>
-        </group>
-      </else-if>
-      <else>
-        <text variable="container-title" suffix="." form="short"/>
-      </else>
-    </choose>
-  </macro>
-  <macro name="title">
-    <text variable="title"/>
-    <choose>
-      <if type="article-journal article-magazine chapter paper-conference article-newspaper" match="none">
-        <choose>
-          <if variable="URL">
-            <text term="internet" prefix=" [" suffix="]" text-case="capitalize-first"/>
-          </if>
-        </choose>
-        <text macro="edition" prefix=". "/>
-      </if>
-    </choose>
-    <choose>
-      <if type="thesis">
-        <text variable="genre" prefix=" [" suffix="]"/>
-      </if>
-    </choose>
-  </macro>
-  <macro name="edition">
-    <choose>
-      <if is-numeric="edition">
-        <group delimiter=" ">
-          <number variable="edition" form="ordinal"/>
-          <text term="edition" form="short"/>
-        </group>
-      </if>
-      <else>
-        <text variable="edition" suffix="."/>
-      </else>
-    </choose>
-  </macro>
-  <macro name="date">
-    <choose>
-      <if type="article-journal article-magazine article-newspaper" match="any">
-        <group delimiter=" ">
-          <date variable="issued" delimiter=" ">
-            <date-part name="year"/>
-          </date>
-          <text macro="accessed-date"/>
-        </group>
-      </if>
-      <else-if type="bill legislation" match="any">
-        <group delimiter=", ">
-          <date variable="issued" delimiter=" ">
-            <date-part name="month" form="short" strip-periods="true"/>
-            <date-part name="day"/>
-          </date>
-          <date variable="issued">
-            <date-part name="year"/>
-          </date>
-        </group>
-      </else-if>
-      <else-if type="report">
-        <date variable="issued" delimiter=" ">
-          <date-part name="year"/>
-          <date-part name="month" form="short" strip-periods="true"/>
-        </date>
-      </else-if>
-      <else>
-        <group suffix=".">
-          <date variable="issued">
-            <date-part name="year"/>
-          </date>
-          <text macro="accessed-date" prefix=" "/>
-        </group>
-      </else>
-    </choose>
-  </macro>
-  <macro name="pages">
-    <choose>
-      <if type="article-journal article-magazine article-newspaper" match="any">
-        <text variable="page-first"/>
-      </if>
-      <else>
-        <group delimiter=" ">
-          <label variable="page" form="short"/>
-          <text variable="page"/>
-        </group>
-      </else>
-    </choose>
-  </macro>
-  <macro name="journal-location">
-    <choose>
-      <if type="article-journal article-magazine" match="any">
-        <text variable="volume" font-weight="bold"/>
-      </if>
-    </choose>
-  </macro>
-  <macro name="report-details">
-    <choose>
-      <if type="report">
-        <text variable="number" prefix="Report No.: "/>
-      </if>
-    </choose>
-  </macro>
-  <citation collapse="citation-number">
-    <sort>
-      <key variable="citation-number"/>
-    </sort>
-    <layout vertical-align="sup" delimiter=",">
-      <text variable="citation-number"/>
-    </layout>
-  </citation>
-  <bibliography and="text" et-al-min="7" et-al-use-first="6" second-field-align="flush" line-spacing="2">
-    <layout>
-      <text variable="citation-number" suffix=". "/>
-      <group delimiter=". " suffix=". ">
-        <text macro="author"/>
-        <text macro="title"/>
-      </group>
-      <group delimiter=" " suffix=". ">
-        <text macro="editor"/>
-        <text macro="container-title"/>
-        <text macro="publisher"/>
-        <group delimiter=", ">
-          <text macro="journal-location"/>
-          <text macro="pages"/>
-          <text macro="date"/>
-        </group>
-      </group>
-      <text macro="report-details" suffix=". "/>
-      <text macro="access"/>
-    </layout>
-  </bibliography>
-</style>
diff --git a/buildres/csl/csl-styles/trinity-college-dublin-zoology-botany-environmental-sciences-harvard.csl b/buildres/csl/csl-styles/trinity-college-dublin-zoology-botany-environmental-sciences-harvard.csl
new file mode 100644
index 00000000000..cc75323d242
--- /dev/null
+++ b/buildres/csl/csl-styles/trinity-college-dublin-zoology-botany-environmental-sciences-harvard.csl
@@ -0,0 +1,202 @@
+<?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-GB">
+  <info>
+    <title>Trinity College Dublin - Zoology Botany Environmental Sciences - Harvard</title>
+    <title-short>TCD - ZOBOES</title-short>
+    <id>http://www.zotero.org/styles/trinity-college-dublin-zoology-botany-environmental-sciences-harvard</id>
+    <link href="http://www.zotero.org/styles/trinity-college-dublin-zoology-botany-environmental-sciences-harvard" rel="self"/>
+    <link href="http://www.zotero.org/styles/harvard-the-university-of-northampton" rel="template"/>
+    <link href="https://github.com/citation-style-language/styles/pull/5893" rel="documentation"/>
+    <author>
+      <email>obrienpat86@gmail.com</email>
+      <name>Patrick O'Brien</name>
+    </author>
+    <category citation-format="author-date"/>
+    <category field="science"/>
+    <updated>2022-01-31T08:45:30+00:00</updated>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
+  </info>
+  <locale xml:lang="en">
+    <terms>
+      <term name="accessed">visited</term>
+    </terms>
+  </locale>
+  <macro name="editor">
+    <names variable="editor" delimiter=", ">
+      <name and="symbol" initialize-with="." name-as-sort-order="all"/>
+      <label form="short" strip-periods="true" prefix=" (" suffix=")"/>
+    </names>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name name-as-sort-order="all" sort-separator=", " initialize-with="." delimiter=", "/>
+      <label form="short" strip-periods="true" prefix=" (" suffix=")"/>
+      <substitute>
+        <names variable="editor"/>
+        <text macro="title"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="author-short">
+    <names variable="author">
+      <name form="short" and="text" delimiter=", " delimiter-precedes-last="never"/>
+      <et-al font-style="italic"/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <text macro="title"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if type="webpage post-weblog post" match="any">
+        <group delimiter=". ">
+          <text variable="URL"/>
+          <group delimiter=": ">
+            <text term="accessed" text-case="capitalize-first"/>
+            <date variable="accessed">
+              <date-part name="day" form="ordinal" suffix=" "/>
+              <date-part name="month" suffix=" "/>
+              <date-part name="year"/>
+            </date>
+          </group>
+        </group>
+      </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" text-case="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">
+    <choose>
+      <if variable="issued">
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
+      </if>
+      <else>
+        <text term="no date" form="short"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <text term="edition" form="short"/>
+        </group>
+      </if>
+      <else>
+        <text variable="edition" suffix="."/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="pages">
+    <group>
+      <label variable="page" form="short" suffix=" "/>
+      <text variable="page"/>
+    </group>
+  </macro>
+  <macro name="number-of-pages">
+    <group delimiter=" ">
+      <text variable="number-of-pages"/>
+      <label variable="number-of-pages" form="short"/>
+    </group>
+  </macro>
+  <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true">
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <group delimiter=", ">
+        <text macro="author-short"/>
+        <text macro="year-date"/>
+        <group>
+          <label variable="locator" form="short"/>
+          <text variable="locator"/>
+        </group>
+      </group>
+    </layout>
+  </citation>
+  <bibliography hanging-indent="false">
+    <sort>
+      <key macro="author"/>
+      <key variable="title"/>
+    </sort>
+    <layout suffix=".">
+      <group delimiter=". ">
+        <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=". ">
+              <text macro="title"/>
+              <text macro="edition"/>
+              <text macro="editor"/>
+              <group delimiter=", ">
+                <text macro="publisher" prefix=" "/>
+                <text macro="number-of-pages"/>
+              </group>
+            </group>
+          </if>
+          <else-if type="chapter paper-conference" match="any">
+            <group delimiter=". " prefix=" ">
+              <text macro="title" prefix=" " suffix="."/>
+              <group delimiter=" ">
+                <group delimiter=": ">
+                  <text term="in" text-case="capitalize-first"/>
+                  <text macro="editor"/>
+                </group>
+                <text variable="container-title" text-case="title" font-style="italic" suffix="."/>
+                <text variable="event" suffix="."/>
+              </group>
+              <text variable="collection-title" suffix="."/>
+              <group delimiter=", ">
+                <text macro="publisher" prefix=" "/>
+                <text macro="pages"/>
+              </group>
+            </group>
+          </else-if>
+          <else-if type="thesis">
+            <group delimiter=". ">
+              <text macro="title"/>
+              <group delimiter=", ">
+                <text variable="genre"/>
+                <text macro="publisher"/>
+              </group>
+              <text macro="number-of-pages"/>
+            </group>
+          </else-if>
+          <else>
+            <group delimiter=". ">
+              <text macro="title" prefix=" "/>
+              <text macro="editor" prefix=" "/>
+              <group delimiter=", ">
+                <text variable="container-title" font-style="italic"/>
+                <group delimiter=": ">
+                  <text variable="volume" font-weight="bold"/>
+                  <text variable="page"/>
+                </group>
+              </group>
+            </group>
+          </else>
+        </choose>
+      </group>
+      <text prefix=" " macro="access" suffix="."/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/buildres/csl/csl-styles/twentieth-century-music.csl b/buildres/csl/csl-styles/twentieth-century-music.csl
index b137c2c870c..2565ea626d3 100644
--- a/buildres/csl/csl-styles/twentieth-century-music.csl
+++ b/buildres/csl/csl-styles/twentieth-century-music.csl
@@ -6,6 +6,7 @@
     <link href="http://www.zotero.org/styles/twentieth-century-music" rel="self"/>
     <link href="http://www.zotero.org/styles/university-of-new-england-australia-note" rel="template"/>
     <link href="https://www.cambridge.org/core/journals/twentieth-century-music/information/instructions-contributors" rel="documentation"/>
+    <link href="https://www.cambridge.org/core/services/aop-file-manager/file/626929e82cca172c593a1e27/TCM-IFC.pdf" rel="documentation"/>
     <author>
       <name>Patrick O'Brien</name>
     </author>
@@ -14,7 +15,7 @@
     <category field="history"/>
     <issn>1478-5722</issn>
     <eissn>1478-5730</eissn>
-    <updated>2018-01-16T09:37:56+00:00</updated>
+    <updated>2022-06-26T15:04:55+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">
@@ -410,7 +411,11 @@
           <number variable="volume" form="numeric" suffix=":"/>
         </else-if>
       </choose>
-      <label variable="locator" form="short" suffix=" "/>
+      <choose>
+        <if match="none" locator="page">
+          <label variable="locator" form="short" suffix=" "/>
+        </if>
+      </choose>
       <text variable="locator"/>
     </group>
   </macro>
diff --git a/buildres/csl/csl-styles/tyndale-bulletin.csl b/buildres/csl/csl-styles/tyndale-bulletin.csl
index 1fde54768c7..45abf4996fb 100644
--- a/buildres/csl/csl-styles/tyndale-bulletin.csl
+++ b/buildres/csl/csl-styles/tyndale-bulletin.csl
@@ -16,7 +16,7 @@
     <issn>0082-7118</issn>
     <eissn>2752-7042</eissn>
     <summary>Tyndale Bulletin format with full notes and bibliography</summary>
-    <updated>2022-01-11T14:38:09+00:00</updated>
+    <updated>2022-03-04T14:17:21+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>
     <!-- Tyndale Bulletin style differs from SBLHS2 only rarely (§4.1). The departures are that Tyndale Bulletin 
       1) insists that DOIs be included where available (§§11.1, 11.3.7) and
@@ -40,6 +40,11 @@
       </term>
       <term name="translator" form="verb-short">trans.</term>
       <term name="translator" form="short">trans.</term>
+      <!-- Use a period after the abbreviation for volume(s) per §12.3. -->
+      <term name="volume" form="short">
+        <single>vol.</single>
+        <multiple>vols.</multiple>
+      </term>
     </terms>
   </locale>
   <macro name="editor-translator-verb-short-comma">
diff --git a/buildres/csl/csl-styles/uclouvain-centre-charles-de-visscher-pour-le-droit-international-et-europeen.csl b/buildres/csl/csl-styles/uclouvain-centre-charles-de-visscher-pour-le-droit-international-et-europeen.csl
index 3bb1bafc6dd..46ecd92ade8 100644
--- a/buildres/csl/csl-styles/uclouvain-centre-charles-de-visscher-pour-le-droit-international-et-europeen.csl
+++ b/buildres/csl/csl-styles/uclouvain-centre-charles-de-visscher-pour-le-droit-international-et-europeen.csl
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.0" and="text" et-al-min="5" et-al-use-first="1" initialize-with="." page-range-format="expanded" demote-non-dropping-particle="never" default-locale="fr-FR">
-  <!-- This style was edited with the Visual CSL Editor (http://editor.citationstyles.org/visualEditor/) -->
+  <!-- This style was edited with the Visual CSL Editor (https://editor.citationstyles.org/visualEditor/) -->
   <info>
-    <title>UCLouvain - Centre Charles De Visscher pour le droit international et européen (Français)</title>
+    <title>UCLouvain - Centre Charles De Visscher pour le droit international et européen (French)</title>
     <title-short>UCLouvain - CeDIE</title-short>
     <id>http://www.zotero.org/styles/uclouvain-centre-charles-de-visscher-pour-le-droit-international-et-europeen</id>
     <link href="http://www.zotero.org/styles/uclouvain-centre-charles-de-visscher-pour-le-droit-international-et-europeen" rel="self"/>
@@ -14,7 +14,7 @@
     </author>
     <category citation-format="note"/>
     <category field="law"/>
-    <updated>2019-03-27T03:56:25+00:00</updated>
+    <updated>2021-12-13T10:30:05+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="fr">
@@ -34,24 +34,18 @@
       <if variable="locator" match="any">
         <choose>
           <if locator="page paragraph" match="any">
-            <label variable="locator" prefix=" " suffix="&#160;" form="short"/>
+            <label suffix="&#160;" variable="locator" form="short"/>
             <text variable="locator"/>
           </if>
           <else-if locator="sub-verbo" match="any">
-            <label variable="locator" prefix=", " suffix="&#160;" form="long" font-style="italic"/>
+            <label font-style="italic" suffix="&#160;" variable="locator"/>
             <text variable="locator" quotes="true"/>
           </else-if>
-          <else-if type="legislation bill" match="none">
-            <!--Standard locator -->
-            <label variable="locator" prefix=", " suffix="&#160;" form="short"/>
-            <text variable="locator"/>
-          </else-if>
-          <!--Rest is just for bill and legislation-->
           <else-if locator="section">
-            <text variable="locator" prefix=", art&#160;"/>
+            <text variable="locator" prefix="art.&#160;"/>
           </else-if>
           <else>
-            <label variable="locator" prefix=", " suffix="&#160;" form="short"/>
+            <label suffix="&#160;" variable="locator" form="short"/>
             <text variable="locator"/>
           </else>
         </choose>
@@ -82,7 +76,7 @@
   </macro>
   <macro name="author-long">
     <names variable="author">
-      <name and="text" delimiter-precedes-last="never">
+      <name delimiter="" and="text" delimiter-precedes-last="never">
         <name-part name="family" font-variant="small-caps"/>
       </name>
       <substitute>
@@ -101,34 +95,10 @@
     </names>
   </macro>
   <macro name="thesis">
-    <choose>
-      <if type="thesis" match="any">
-        <group prefix="(" suffix=")" delimiter=" ">
-          <text variable="genre" suffix=" thesis,  "/>
-          <choose>
-            <if variable="URL" match="none">
-              <group>
-                <text term="available at"/>
-                <group delimiter=", " prefix=" ">
-                  <text variable="publisher"/>
-                  <text variable="publisher-place"/>
-                </group>
-              </group>
-            </if>
-            <else>
-              <group>
-                <group delimiter=", " prefix=" ">
-                  <text variable="publisher"/>
-                  <text variable="publisher-place"/>
-                </group>
-                <text term="available at" prefix="/" suffix=" "/>
-                <text variable="URL"/>
-              </group>
-            </else>
-          </choose>
-        </group>
-      </if>
-    </choose>
+    <group delimiter=", ">
+      <text variable="publisher-place"/>
+      <text variable="publisher"/>
+    </group>
   </macro>
   <macro name="volume">
     <number suffix=" " variable="number-of-volumes"/>
@@ -137,12 +107,11 @@
   <macro name="URL">
     <choose>
       <if match="any" variable="URL">
-        <text term="available at" suffix=" "/>
         <text variable="URL"/>
         <choose>
           <if match="all" variable="accessed">
-            <text term="accessed" prefix=" ("/>
-            <date form="text" variable="accessed" prefix=" " suffix=")"/>
+            <text term="accessed" prefix=", "/>
+            <date form="text" variable="accessed" prefix=" "/>
           </if>
         </choose>
       </if>
@@ -152,7 +121,7 @@
     <group delimiter=", ">
       <text variable="title" text-case="title" quotes="true"/>
       <text variable="container-title" font-style="italic"/>
-      <date form="text" variable="issued"/>
+      <date form="text" variable="issued" suffix=", "/>
       <text macro="URL"/>
     </group>
   </macro>
@@ -168,26 +137,22 @@
   </macro>
   <macro name="sort-type">
     <choose>
-      <if type="book chapter article article-journal article-magazine article-newspaper paper-conference report speech" match="any">
+      <if type="legislation" match="any">
         <text value="1"/>
+        <text variable="title"/>
       </if>
       <else-if type="legal_case" match="any">
         <text value="2"/>
-        <text variable="title"/>
+        <text variable="authority"/>
       </else-if>
-      <else-if type="bill legislation" match="any">
+      <else-if type="article article-journal article-magazine article-newspaper book chapter manuscript paper-conference personal_communication post post-weblog report speech thesis" match="any">
         <text value="3"/>
-        <choose>
-          <if type="legislation" match="any">
-            <text variable="title"/>
-          </if>
-        </choose>
       </else-if>
-      <else-if type="manuscript" match="any">
+      <else-if type="webpage" match="any">
         <text value="4"/>
       </else-if>
       <else>
-        <text value="1"/>
+        <text value="4"/>
       </else>
     </choose>
   </macro>
@@ -200,9 +165,9 @@
       <choose>
         <if position="first">
           <choose>
-            <if type="book motion_picture" match="any">
+            <if type="book report" match="any">
               <group delimiter=", ">
-                <text macro="author-long"/>
+                <text macro="author"/>
                 <text variable="authority" prefix=" "/>
                 <text variable="title" text-case="title" font-style="italic"/>
                 <text variable="genre"/>
@@ -218,16 +183,6 @@
                 <text macro="point-locators"/>
               </group>
             </if>
-            <else-if type="report" match="any">
-              <group delimiter=", ">
-                <text variable="publisher"/>
-                <text variable="title" font-style="italic"/>
-                <text variable="collection-title" font-style="normal"/>
-                <text variable="number"/>
-                <text variable="publisher-place"/>
-                <date form="text" variable="issued"/>
-              </group>
-            </else-if>
             <else-if type="legal_case" match="any">
               <group delimiter=", ">
                 <text variable="authority"/>
@@ -236,7 +191,7 @@
                 <number variable="number"/>
                 <text variable="container-title" font-style="italic"/>
                 <text variable="volume"/>
-                <text macro="page"/>
+                <text macro="point-locators"/>
               </group>
             </else-if>
             <else-if type="chapter paper-conference" match="any">
@@ -289,14 +244,14 @@
                 <text variable="title" text-case="title" quotes="true"/>
                 <text variable="container-title" text-case="title" font-style="italic"/>
                 <text variable="collection-title"/>
-                <date form="text" variable="issued">
-                  <date-part name="year"/>
-                </date>
                 <group delimiter=" ">
                   <text term="volume" form="short" suffix=" "/>
                   <text variable="volume"/>
                 </group>
-                <text variable="issue"/>
+                <text variable="issue" prefix="n° "/>
+                <date form="text" variable="issued">
+                  <date-part name="year"/>
+                </date>
                 <text macro="page"/>
                 <text variable="edition"/>
                 <text macro="URL"/>
@@ -324,7 +279,7 @@
                 <text variable="container-title" font-style="italic"/>
                 <text variable="volume"/>
                 <date form="text" variable="issued"/>
-                <text macro="page"/>
+                <text macro="point-locators"/>
               </group>
             </else-if>
             <else>
@@ -352,7 +307,7 @@
         <else-if position="ibid-with-locator">
           <group delimiter=", ">
             <text term="ibid" form="long" font-style="italic" text-case="capitalize-first"/>
-            <group>
+            <group delimiter=", ">
               <text macro="point-locators"/>
             </group>
           </group>
@@ -412,12 +367,8 @@
               <text variable="title" font-style="italic" suffix=", "/>
             </else>
           </choose>
-          <text value="op. cit." font-style="italic" suffix=","/>
-          <choose>
-            <if match="any" variable="locator">
-              <text macro="point-locators"/>
-            </if>
-          </choose>
+          <text value="op. cit." font-style="italic"/>
+          <text macro="point-locators" prefix=", "/>
         </else-if>
       </choose>
     </layout>
@@ -431,7 +382,27 @@
     </sort>
     <layout suffix=".">
       <choose>
-        <if type="book motion_picture" match="any">
+        <if type="legislation" match="any">
+          <group delimiter=", ">
+            <text variable="title"/>
+            <text variable="container-title" font-style="italic"/>
+            <text variable="volume"/>
+            <date form="text" date-parts="year-month-day" variable="issued"/>
+            <text macro="page"/>
+          </group>
+        </if>
+        <else-if type="legal_case" match="any">
+          <group delimiter=", ">
+            <text variable="authority"/>
+            <date form="text" variable="issued"/>
+            <text variable="title" font-style="italic"/>
+            <number variable="number"/>
+            <text variable="container-title" font-style="italic"/>
+            <text variable="volume"/>
+            <text macro="page"/>
+          </group>
+        </else-if>
+        <else-if type="book" match="any">
           <group delimiter=", ">
             <text macro="author-bibliography"/>
             <text variable="authority"/>
@@ -447,7 +418,7 @@
             <date date-parts="year" form="text" variable="issued"/>
             <names variable="translator" prefix="trad. "/>
           </group>
-        </if>
+        </else-if>
         <else-if type="report" match="any">
           <group delimiter=", ">
             <text variable="publisher"/>
@@ -458,17 +429,6 @@
             <date form="text" date-parts="year-month-day" variable="issued"/>
           </group>
         </else-if>
-        <else-if type="legal_case" match="any">
-          <group delimiter=", ">
-            <text variable="authority"/>
-            <date form="text" variable="issued"/>
-            <text variable="title" font-style="italic"/>
-            <number variable="number"/>
-            <text variable="container-title" font-style="italic"/>
-            <text variable="volume"/>
-            <text macro="page"/>
-          </group>
-        </else-if>
         <else-if type="chapter paper-conference" match="any">
           <group delimiter=", ">
             <text macro="author-bibliography"/>
@@ -508,7 +468,7 @@
               <date variable="issued">
                 <date-part name="year"/>
               </date>
-              <text macro="page"/>
+              <text macro="page" prefix=", "/>
             </group>
           </group>
         </else-if>
@@ -518,41 +478,32 @@
             <text variable="title" text-case="title" quotes="true"/>
             <text variable="container-title" text-case="title" font-style="italic"/>
             <text variable="collection-title"/>
-            <date variable="issued">
-              <date-part name="year"/>
-            </date>
             <group delimiter=" ">
-              <text term="volume" suffix=" "/>
+              <text term="volume" form="short" suffix=" "/>
               <text variable="volume"/>
             </group>
-            <text variable="issue"/>
+            <text variable="issue" vertical-align="baseline" prefix="n° "/>
+            <date variable="issued">
+              <date-part name="year"/>
+            </date>
             <text macro="page"/>
             <text variable="edition"/>
             <text macro="URL"/>
           </group>
         </else-if>
-        <else-if type="webpage post-weblog" match="any">
-          <group delimiter=", ">
-            <text macro="author-bibliography"/>
-            <text macro="web"/>
-          </group>
-        </else-if>
         <else-if type="thesis" match="any">
           <group delimiter=", ">
-            <text macro="author-bibliography" suffix=", "/>
-            <text variable="title" text-case="title" quotes="true"/>
-            <date date-parts="year" form="text" variable="issued" prefix="(" suffix=") "/>
+            <text macro="author-bibliography"/>
+            <text variable="title" text-case="title" quotes="true" suffix=", thèse "/>
+            <date date-parts="year" form="text" variable="issued"/>
             <text macro="thesis"/>
             <text macro="point-locators"/>
           </group>
         </else-if>
-        <else-if type="legislation" match="any">
-          <group>
-            <text variable="title" suffix=", "/>
-            <text variable="container-title" font-style="italic" suffix=", "/>
-            <text variable="volume" suffix=", "/>
-            <date form="text" date-parts="year-month-day" variable="issued"/>
-            <text macro="page"/>
+        <else-if type="webpage post-weblog" match="any">
+          <group delimiter=", ">
+            <text macro="author-bibliography"/>
+            <text macro="web"/>
           </group>
         </else-if>
         <else>
diff --git a/buildres/csl/csl-styles/unified-style-sheet-for-linguistics.csl b/buildres/csl/csl-styles/unified-style-sheet-for-linguistics.csl
index d5e5b544377..05755f4fb2c 100644
--- a/buildres/csl/csl-styles/unified-style-sheet-for-linguistics.csl
+++ b/buildres/csl/csl-styles/unified-style-sheet-for-linguistics.csl
@@ -1,5 +1,6 @@
 <?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="display-and-sort" default-locale="en-US">
+  <!-- This style was edited with the Visual CSL Editor (https://editor.citationstyles.org/visualEditor/) -->
   <info>
     <title>Unified style sheet for linguistics</title>
     <id>http://www.zotero.org/styles/unified-style-sheet-for-linguistics</id>
@@ -24,9 +25,12 @@
     <contributor>
       <name>Brian Plimley</name>
     </contributor>
+    <contributor>
+      <name>Simon Meier-Vieracker</name>
+    </contributor>
     <category citation-format="author-date"/>
     <category field="linguistics"/>
-    <updated>2020-03-19T16:21:55+00:00</updated>
+    <updated>2022-06-21T14:23:09+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>
@@ -164,14 +168,18 @@
         </else-if>
       </choose>
       <text variable="DOI" prefix="https://doi.org/"/>
-      <text variable="URL"/>
-    </group>
-    <group prefix=" (" suffix=")">
-      <date variable="accessed">
-        <date-part name="day" suffix=" "/>
-        <date-part name="month" suffix=", "/>
-        <date-part name="year"/>
-      </date>
+      <choose>
+        <if match="none" variable="DOI">
+          <text variable="URL"/>
+          <group prefix=" (" suffix=")">
+            <date variable="accessed">
+              <date-part name="day" suffix=" "/>
+              <date-part name="month" suffix=", "/>
+              <date-part name="year"/>
+            </date>
+          </group>
+        </if>
+      </choose>
     </group>
   </macro>
   <macro name="title">
diff --git a/buildres/csl/csl-styles/united-states-international-trade-commission.csl b/buildres/csl/csl-styles/united-states-international-trade-commission.csl
index 5f88f74ee62..f477a13946d 100644
--- a/buildres/csl/csl-styles/united-states-international-trade-commission.csl
+++ b/buildres/csl/csl-styles/united-states-international-trade-commission.csl
@@ -27,7 +27,7 @@
     <category citation-format="note"/>
     <category field="generic-base"/>
     <summary>A bibliographical style file for the United States International Trade Commission</summary>
-    <updated>2021-10-07T15:21:08+00:00</updated>
+    <updated>2022-03-04T21:24:35+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <locale xml:lang="en">
@@ -195,7 +195,7 @@
           <choose>
             <if type="article-magazine" match="all" variable="author">
               <names variable="author">
-                <name and="text" delimiter-precedes-last="always" name-as-sort-order="first"/>
+                <name and="text"/>
                 <substitute>
                   <text macro="editor"/>
                 </substitute>
@@ -329,7 +329,14 @@
         </choose>
       </else-if>
       <else-if type="legislation bill" match="any">
-        <text variable="title" text-case="title"/>
+        <choose>
+          <if match="any" variable="title-short">
+            <text variable="title" form="short" text-case="title"/>
+          </if>
+          <else>
+            <text variable="title"/>
+          </else>
+        </choose>
       </else-if>
       <else-if type="book graphic map song" match="any">
         <choose>
@@ -419,14 +426,13 @@
         </group>
       </else-if>
       <else-if type="bill legislation legal_case interview patent" match="any">
-        <text variable="title" text-case="title"/>
+        <text variable="title" form="short" text-case="title"/>
       </else-if>
       <else-if type="motion_picture" match="all">
         <choose>
           <if match="any" variable="issued">
-            <group>
-              <text variable="title" text-case="title" quotes="true" suffix=","/>
-              <date form="text" variable="issued" prefix=" " suffix=". "/>
+            <group delimiter=". ">
+              <text variable="title" text-case="title" quotes="true"/>
               <text variable="dimensions" prefix="Video, "/>
             </group>
           </if>
@@ -713,7 +719,6 @@
                 <text variable="section"/>
               </group>
               <group delimiter=" ">
-                <text variable="volume"/>
                 <text variable="container-title"/>
                 <text variable="page-first"/>
               </group>
@@ -933,7 +938,9 @@
               <if is-uncertain-date="issued">
                 <date variable="issued" form="numeric" date-parts="year" prefix="[" suffix="?]"/>
               </if>
-              <else-if match="any" variable="abstract"/>
+              <else-if match="any" variable="abstract">
+                <date form="text" date-parts="year-month-day" variable="issued"/>
+              </else-if>
               <else>
                 <date form="text" variable="issued"/>
               </else>
@@ -972,6 +979,7 @@
         <text variable="status"/>
       </else-if>
       <else-if variable="accessed URL" match="all"/>
+      <else-if type="legislation" match="any"/>
       <else>
         <text term="no date" form="short"/>
       </else>
@@ -1147,7 +1155,7 @@
       <if type="graphic map" match="any">
         <choose>
           <if variable="publisher publisher-place" match="none">
-            <text macro="issued"/>
+            <text macro="issued-note"/>
           </if>
         </choose>
       </if>
@@ -1156,7 +1164,7 @@
   <macro name="issue-note">
     <choose>
       <if type="bill legislation legal_case" match="any">
-        <text macro="issued" prefix="(" suffix=")"/>
+        <text macro="issued-note"/>
       </if>
       <else-if type="speech" match="any">
         <date form="text" date-parts="year-month-day" variable="issued"/>
@@ -1164,15 +1172,15 @@
       <else-if type="article-journal">
         <choose>
           <if variable="volume issue" match="any">
-            <text macro="issued"/>
+            <text macro="issued-note"/>
           </if>
           <else>
-            <text macro="issued"/>
+            <text macro="issued-note"/>
           </else>
         </choose>
       </else-if>
       <else-if type="article-newspaper">
-        <text macro="issued"/>
+        <text macro="issued-note"/>
       </else-if>
       <else-if type="manuscript thesis speech" match="any">
         <group delimiter=", ">
@@ -1181,7 +1189,7 @@
           </choose>
           <text variable="event"/>
           <text variable="event-place"/>
-          <text macro="issued"/>
+          <text macro="issued-note"/>
         </group>
       </else-if>
       <else-if variable="publisher-place event-place publisher" match="none">
@@ -1194,11 +1202,11 @@
               <text macro="publisher"/>
             </group>
           </group>
-          <text macro="issued"/>
+          <text macro="issued-note"/>
         </group>
       </else-if>
       <else>
-        <text macro="issued"/>
+        <text macro="issued-note"/>
       </else>
     </choose>
   </macro>
@@ -1218,7 +1226,7 @@
   </macro>
   <macro name="issue-join-with-period">
     <choose>
-      <if type="article-journal bill legislation legal_case" match="none">
+      <if type="article-journal bill legal_case" match="none">
         <choose>
           <if type="speech" variable="publisher publisher-place" match="any">
             <text macro="issue"/>
@@ -1248,7 +1256,7 @@
   <macro name="issue">
     <choose>
       <if type="bill legislation legal_case" match="any">
-        <text macro="issued" prefix="(" suffix=")"/>
+        <text macro="issued"/>
       </if>
       <else-if type="article-journal">
         <choose>
@@ -1338,7 +1346,6 @@
       </choose>
       <choose>
         <if type="legislation" match="any">
-          <text variable="URL"/>
           <group prefix="(" suffix=")">
             <text term="accessed" form="short" text-case="lowercase"/>
             <date form="text" variable="accessed" prefix=" "/>
@@ -1417,6 +1424,75 @@
       </else>
     </choose>
   </macro>
+  <macro name="issued-note">
+    <choose>
+      <if match="any" variable="issued">
+        <choose>
+          <if type="legal_case" match="any">
+            <group>
+              <text variable="authority"/>
+              <choose>
+                <if match="any" variable="container-title">
+                  <date form="text" date-parts="year-month-day" variable="issued"/>
+                </if>
+                <else>
+                  <date form="text" date-parts="year-month-day" variable="issued"/>
+                </else>
+              </choose>
+            </group>
+          </if>
+          <else-if type="article book bill chapter legislation motion_picture paper-conference song thesis" match="any">
+            <choose>
+              <if match="all" is-uncertain-date="issued">
+                <date form="text" date-parts="year-month-day" variable="issued"/>
+              </if>
+              <else-if match="any" variable="abstract">
+                <date form="text" date-parts="year-month-day" variable="issued"/>
+              </else-if>
+              <else>
+                <date form="text" date-parts="year-month-day" variable="issued"/>
+              </else>
+            </choose>
+          </else-if>
+          <else-if type="patent" match="all">
+            <group delimiter=", ">
+              <group delimiter=" ">
+                <text value="filed"/>
+                <date form="text" date-parts="year-month-day" variable="issued"/>
+              </group>
+              <group delimiter=" ">
+                <choose>
+                  <if match="all" variable="issued submitted">
+                    <text term="and"/>
+                  </if>
+                </choose>
+                <text value="issued"/>
+                <date form="text" date-parts="year-month-day" variable="issued"/>
+              </group>
+            </group>
+          </else-if>
+          <else>
+            <choose>
+              <if match="all" is-uncertain-date="issued">
+                <date form="text" variable="issued" prefix="[" suffix="?]"/>
+              </if>
+              <else>
+                <date form="text" date-parts="year-month-day" variable="issued"/>
+              </else>
+            </choose>
+          </else>
+        </choose>
+      </if>
+      <else-if match="any" variable="status">
+        <text variable="status"/>
+      </else-if>
+      <else-if match="all" variable="accessed URL"/>
+      <else-if type="legislation" match="any"/>
+      <else>
+        <text term="no date"/>
+      </else>
+    </choose>
+  </macro>
   <citation et-al-min="4" et-al-use-first="1" disambiguate-add-names="true">
     <layout suffix="." delimiter="; ">
       <group delimiter=", ">
@@ -1444,7 +1520,6 @@
               </group>
               <text macro="issue-note-join-with-space"/>
             </group>
-            <text macro="locators-newspaper"/>
             <text macro="point-locators-join-with-comma"/>
           </group>
           <text macro="point-locators-join-with-colon"/>
@@ -1464,7 +1539,7 @@
       <group delimiter=". ">
         <group delimiter=": ">
           <group delimiter=", ">
-            <group delimiter=" ">
+            <group delimiter=". ">
               <group delimiter=". ">
                 <group delimiter=" ">
                   <group delimiter=", ">
diff --git a/buildres/csl/csl-styles/universidade-de-sao-paulo-escola-de-comunicacoes-e-artes-abnt.csl b/buildres/csl/csl-styles/universidade-de-sao-paulo-escola-de-comunicacoes-e-artes-abnt.csl
index dfd14826791..7c10c151930 100644
--- a/buildres/csl/csl-styles/universidade-de-sao-paulo-escola-de-comunicacoes-e-artes-abnt.csl
+++ b/buildres/csl/csl-styles/universidade-de-sao-paulo-escola-de-comunicacoes-e-artes-abnt.csl
@@ -552,7 +552,7 @@
         </else-if>
         <else>
           <text macro="author" suffix=". "/>
-          <text macro="title"/>
+          <text macro="title" suffix=". "/>
           <text macro="container-contributors"/>
           <text macro="secondary-contributors"/>
           <text macro="container-title"/>
diff --git a/buildres/csl/csl-styles/universidade-estadual-de-alagoas-abnt.csl b/buildres/csl/csl-styles/universidade-estadual-de-alagoas-abnt.csl
index 5d7397d470d..c5cdc066dcb 100644
--- a/buildres/csl/csl-styles/universidade-estadual-de-alagoas-abnt.csl
+++ b/buildres/csl/csl-styles/universidade-estadual-de-alagoas-abnt.csl
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" class="in-text" initialize="false" demote-non-dropping-particle="never" default-locale="pt-BR">
   <info>
-    <title>Universidade Estadual de Alagoas - ABNT (Português - Brasil)</title>
+    <!-- ESTE ESTILO FOI CONSTRUÍDO A PARTIR DO MODELO DA ABNT (com diversos ajustes, mas os créditos permanecem aos autores originais) -->
+    <title>Universidade Estadual de Alagoas - UNEAL [ABNT] (Portuguese - Brazil)</title>
     <title-short>UNEAL-ABNT</title-short>
     <id>http://www.zotero.org/styles/universidade-estadual-de-alagoas-abnt</id>
     <link href="http://www.zotero.org/styles/universidade-estadual-de-alagoas-abnt" rel="self"/>
     <link href="http://www.zotero.org/styles/associacao-brasileira-de-normas-tecnicas" rel="template"/>
-    <link href="http://www.uneal.edu.br/pro-reitorias/prograd/regulamento-do-tcc-uneal.pdf" rel="documentation"/>
+    <link href="https://www.abntcatalogo.com.br/norma.aspx?ID=408006" rel="documentation"/>
     <author>
       <name>Wellyngton Chaves Monteiro da Silva</name>
       <email>wellyngton@uneal.edu.br</email>
@@ -15,10 +16,14 @@
     <category citation-format="author-date"/>
     <category field="generic-base"/>
     <summary>De acordo com ABNT-NBR 10520.2002 e ABNT-NBR 6023.2018</summary>
-    <updated>2020-10-29T19:02:00+00:00</updated>
+    <updated>2022-02-18T19:02:00+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <locale xml:lang="pt-BR">
+    <!--
+		UTILITÁRIOS (para serem inseridos no campo EXTRA do Zotero):
+			publisher-place: quando não existir espaço para LUGAR da publicação (ex.: publisher-place: Maceió OU QUANDO NECESSÁRIO, publisher-place: Maceió, AL)
+		-->
     <terms>
       <!--Abreviações dos meses do ano -->
       <term name="month-01" form="short">jan.</term>
@@ -53,7 +58,7 @@
       </term>
     </terms>
   </locale>
-  <!--A macro 'container-contribuitor' mostra os nomes dos editores, SOBRENOME, INICIAIS PRENOMES, sendo as inicias separadas por ponto -->
+  <!--A macro 'container-contributor' mostra os nomes dos editores, SOBRENOME, INICIAIS PRENOMES, sendo as inicias separadas por ponto -->
   <macro name="container-contributors">
     <choose>
       <if type="chapter">
@@ -82,14 +87,15 @@
       </if>
     </choose>
   </macro>
-  <!--A macro 'translator' mostra os nomes dos tradutores, SOBRENOME, INICIAIS PRENOMES, sendo as inicias separadas por ponto -->
-  <!-- ESTA INFORMACAO EU IMPORTEI DIRETAMENTE DA ABNT -->
+  <!--A macro 'translator' mostra os nomes dos tradutores, conforme a NBR 6023, de 2018 -->
   <macro name="translator">
-    <names variable="translator" delimiter="; ">
-      <name delimiter="; " sort-separator=" " delimiter-precedes-last="always" prefix="Tradução: ">
-        <name-part name="given" text-case="capitalize-first"/>
+    <text value="Tradução "/>
+    <names variable="translator" delimiter=", ">
+      <name delimiter=", " sort-separator=" " delimiter-precedes-last="always">
+        <name-part name="given"/>
         <name-part name="family" text-case="capitalize-first"/>
       </name>
+      <et-al font-style="normal"/>
     </names>
   </macro>
   <!--A macro 'author' mostra os nomes dos autores na bibliografia, SOBRENOME, INICIAIS PRENOMES, sendo as iniciais 
@@ -142,6 +148,7 @@ do autor. Na regra da ABNT o sobrenome deve aparecer com todas as letras em caix
     <text variable="ISSN" prefix=" ISSN: " suffix="."/>
     <text variable="ISBN" prefix=" ISBN: " suffix="."/>
     <text variable="DOI" prefix=" DOI: " suffix="."/>
+    <!-- <text variable="URL" prefix=" Disponível em: &lt;" suffix="&gt;."/> RETIREI AS ENTRADAS DAS URLs, CONFORME ABNT -->
     <text variable="URL" prefix=" Disponível em: " suffix="."/>
     <date variable="accessed" prefix=". Acesso em: " suffix=".">
       <date-part name="day" suffix=" "/>
@@ -211,7 +218,7 @@ exceto em arquivos do tipo 'artigo de jornal, artigo de revista, artigo de peri
         </choose>
       </if>
       <else>
-        <text value="[s.l: s.n.]"/>
+        <text value="[s.l.: s.n.]"/>
       </else>
     </choose>
   </macro>
@@ -332,7 +339,7 @@ em caixa alta. Utiliza-se antes do nome da conferencia a expressao "In". Segundo
       <else-if match="any" type="book chapter">
         <group delimiter=", ">
           <group>
-            <text variable="volume" prefix="v. "/>
+            <text variable="volume" prefix="v. " suffix=". "/>
             <text variable="page" prefix="p. "/>
             <!--Inseri este campo 'extra' caso queira colocar alguma observacao, como 'nome da coleção', 'nome da série' etc. -->
             <!-- <text variable="note" prefix=". " suffix=""/> -->
@@ -451,12 +458,15 @@ em caixa alta. Utiliza-se antes do nome da conferencia a expressao "In". Segundo
             <!-- ADICIONEI A VÍRGULA PARA SEPARAR A EDIÇÃO DO LOCAL DE PUBLICAÇÃO -->
             <!--Local, data, etc-->
             <text macro="publisher" suffix=". "/>
-            <!--Inseri este campo 'extra' caso queira colocar alguma observacao-->
+            <text variable="number-of-pages" suffix=" p. "/>
+            <!-- ADICIONA A QUANTIDADE DE PÁGINAS NA OBRA -->
+            <!-- Inseri este campo 'extra' caso queira colocar alguma observacao -->
             <text variable="note" suffix=". "/>
             <text macro="collection-title" prefix="(" suffix=")."/>
             <!-- AQUI INSERE A COLEÇÃO OU SÉRIE DA OBRA -->
             <!--Dados complementares "pagina, volume"-->
-            <text macro="locators"/>
+            <!--<text macro="locators"/>-->
+            <!-- REMOVIDO PARA EVITAR DUPLICIDADE DE INFORMAÇÃO SOBRE A SÉRIE OU COLEÇÃO DA OBRA -->
             <text macro="access"/>
           </group>
         </else-if>
@@ -479,7 +489,8 @@ em caixa alta. Utiliza-se antes do nome da conferencia a expressao "In". Segundo
             <text macro="translator" suffix=". "/>
             <!--            <text variable="collection-title" suffix=" "/>  AQUI INSERIA A SÉRIE OU COLEÇÃO DENTRO DO TEXTO -->
             <!--Edicao-->
-            <text macro="edition" suffix=". "/>
+            <text macro="edition" suffix="., "/>
+            <!-- A VÍRGULA QUE SEPARA A EDIÇÃO DO LOCAL DA OBRA -->
             <!--Local, data, etc-->
             <text macro="publisher" suffix=". "/>
             <!--Dados complementares "pagina, volume"-->
@@ -516,6 +527,8 @@ em caixa alta. Utiliza-se antes do nome da conferencia a expressao "In". Segundo
             <!--Titulo-->
             <text macro="title" suffix=". "/>
             <text macro="issued-year" suffix=". "/>
+            <text variable="number-of-pages" suffix=" f. "/>
+            <!-- INSERINDO FOLHAS DE DISSERTAÇÕES E TESES -->
             <!--Tipo-->
             <text macro="genre" suffix=" - "/>
             <!--Local, data, etc-->
@@ -717,6 +730,10 @@ em caixa alta. Utiliza-se antes do nome da conferencia a expressao "In". Segundo
           <!--Data-->
           <text macro="issued" suffix=". "/>
           <!-- REMOVI O prefix=", " DO ORIGINAL -->
+          <text variable="number-of-pages" suffix=" p. "/>
+          <!-- INSERINDO PÁGINAS DO DOCUMENTO -->
+          <text macro="section" prefix="(" suffix=") "/>
+          <!-- INSERINDO INFORMAÇÕES ADICIONAIS SOBRE O DOCUMENTO, ENTRE PARÊNTESES -->
           <!--URL, data do acesso-->
           <text macro="access"/>
           <text variable="medium"/>
diff --git a/buildres/csl/csl-styles/universitat-bern-institut-fur-musikwissenschaft-note.csl b/buildres/csl/csl-styles/universitat-bern-institut-fur-musikwissenschaft-note.csl
index e474459ba0c..537dea9a205 100644
--- a/buildres/csl/csl-styles/universitat-bern-institut-fur-musikwissenschaft-note.csl
+++ b/buildres/csl/csl-styles/universitat-bern-institut-fur-musikwissenschaft-note.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.0" default-locale="de-DE">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.0">
   <!-- This style was edited with the Visual CSL Editor (https://editor.citationstyles.org/visualEditor/) -->
   <info>
     <title>Universität Bern - Institut für Musikwissenschaft (note, Deutsch)</title>
diff --git a/buildres/csl/csl-styles/universitat-bern-institut-fur-sozialanthropologie.csl b/buildres/csl/csl-styles/universitat-bern-institut-fur-sozialanthropologie.csl
index f1bf3ca6c37..ae3ec2afa17 100644
--- a/buildres/csl/csl-styles/universitat-bern-institut-fur-sozialanthropologie.csl
+++ b/buildres/csl/csl-styles/universitat-bern-institut-fur-sozialanthropologie.csl
@@ -12,6 +12,9 @@
       <name>Manuel Meister</name>
       <email>manuel@meister.id</email>
     </author>
+    <contributor>
+      <name>Denis Maier</name>
+    </contributor>
     <category citation-format="author-date"/>
     <category field="anthropology"/>
     <summary>Citation style for Social Anthropology of the University of Berne</summary>
@@ -309,7 +312,6 @@
     </choose>
   </macro>
   <macro name="issued">
-    <text variable="abstract"/>
     <choose>
       <if type="bill legal_case legislation" match="none">
         <choose>
diff --git a/buildres/csl/csl-styles/universitat-mainz-geographisches-institut.csl b/buildres/csl/csl-styles/universitat-mainz-geographisches-institut.csl
index 714949f75f0..2fa3fadefca 100644
--- a/buildres/csl/csl-styles/universitat-mainz-geographisches-institut.csl
+++ b/buildres/csl/csl-styles/universitat-mainz-geographisches-institut.csl
@@ -148,7 +148,7 @@
   <bibliography hanging-indent="true">
     <sort>
       <key macro="author"/>
-      <key variable="author" sort="ascending"/>
+      <key variable="issued" sort="descending"/>
     </sort>
     <layout suffix=".">
       <group delimiter=" ">
diff --git a/buildres/csl/csl-styles/universite-cheikh-anta-diop-faculte-de-medecine-de-pharmacie-et-dodontologie.csl b/buildres/csl/csl-styles/universite-cheikh-anta-diop-faculte-de-medecine-de-pharmacie-et-dodontologie.csl
index 53b8e7f26a3..e7ceb9c748f 100644
--- a/buildres/csl/csl-styles/universite-cheikh-anta-diop-faculte-de-medecine-de-pharmacie-et-dodontologie.csl
+++ b/buildres/csl/csl-styles/universite-cheikh-anta-diop-faculte-de-medecine-de-pharmacie-et-dodontologie.csl
@@ -15,7 +15,7 @@
     <category citation-format="numeric"/>
     <category field="medicine"/>
     <summary>Vancouver style with some changes in order to create the right style for thesis and dissertations from Faculté de Médecine et d'Odontologie of Université Cheikh Anta Diop de Dakar. The main change is the display in the references in alphabetical order.</summary>
-    <updated>2021-12-30T13:19:19+00:00</updated>
+    <updated>2022-01-08T10:34:01+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">
@@ -117,12 +117,19 @@
             <if variable="collection-title" match="none">
               <group delimiter=" ">
                 <label variable="volume" form="short" text-case="capitalize-first"/>
-                <text variable="volume"/>
+                <text variable="volume" suffix="."/>
               </group>
             </if>
           </choose>
           <text variable="container-title" font-style="normal"/>
-          <text variable="edition" suffix=" éd"/>
+          <choose>
+            <if match="all" variable="edition">
+              <group>
+                <number variable="edition" form="ordinal"/>
+                <text term="edition" form="short" prefix=" "/>
+              </group>
+            </if>
+          </choose>
         </group>
       </else>
     </choose>
diff --git a/buildres/csl/csl-styles/universite-de-bordeaux-ecole-doctorale-de-droit.csl b/buildres/csl/csl-styles/universite-de-bordeaux-ecole-doctorale-de-droit.csl
index bc7cec95417..a17324264e4 100644
--- a/buildres/csl/csl-styles/universite-de-bordeaux-ecole-doctorale-de-droit.csl
+++ b/buildres/csl/csl-styles/universite-de-bordeaux-ecole-doctorale-de-droit.csl
@@ -603,7 +603,7 @@
               </group>
             </if>
             <else>
-              <text variable="edition" text-case="capitalize-first" suffix="."/>
+              <text variable="edition"/>
             </else>
           </choose>
         </group>
diff --git a/buildres/csl/csl-styles/universite-du-quebec-a-montreal-prenoms.csl b/buildres/csl/csl-styles/universite-du-quebec-a-montreal-prenoms.csl
new file mode 100644
index 00000000000..eb0ea68d9b9
--- /dev/null
+++ b/buildres/csl/csl-styles/universite-du-quebec-a-montreal-prenoms.csl
@@ -0,0 +1,935 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" et-al-min="3" et-al-use-first="1" initialize="false" demote-non-dropping-particle="never" default-locale="fr-CA">
+  <info>
+    <title>Université du Québec à Montréal - APA - prénoms (Français - Canada)</title>
+    <title-short>UQAM prénoms</title-short>
+    <id>http://www.zotero.org/styles/universite-du-quebec-a-montreal-prenoms</id>
+    <link href="http://www.zotero.org/styles/universite-du-quebec-a-montreal-prenoms" rel="self"/>
+    <link href="http://www.zotero.org/styles/universite-du-quebec-a-montreal" rel="template"/>
+    <link href="https://uqam-ca.libguides.com/etudes-feministes/citer-ses-sources" rel="documentation"/>
+    <link href="http://www.guidemt.uqam.ca/citer/style-uqam" rel="documentation"/>
+    <link href="https://uqam-ca.libguides.com/c.php?g=725279&amp;p=5195760" rel="documentation"/>
+    <author>
+      <name>Jean-Jacques Rondeau</name>
+      <email>rondeau.jean-jacques@uqam.ca</email>
+    </author>
+    <contributor>
+      <name>Noémie Poirier Monfette</name>
+      <email>poirier_monfette.noemie@uqam.ca</email>
+    </contributor>
+    <category citation-format="author-date"/>
+    <category field="psychology"/>
+    <category field="generic-base"/>
+    <summary>Le style UQAM APA avec prénoms est une adaptation française canadienne de la 7e édition de la norme APA qui permet l'affichage des prénoms des personnes autrices dans les références en bibliographie.</summary>
+    <updated>2022-05-26T16:47:05+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="fr">
+    <terms>
+      <term name="editor" form="short">dir.</term>
+      <term name="editortranslator" form="short">éd. &amp; trad.</term>
+      <term name="translator" form="short">trad.</term>
+      <term name="no date" form="short">s. d.</term>
+      <term name="in">dans</term>
+      <term name="retrieved">récupéré</term>
+      <term name="from">de</term>
+      <term name="presented at">communication présentée au</term>
+      <term name="page" form="short">p.</term>
+      <term name="chapter-number" form="short">chap.</term>
+      <term name="section">section</term>
+      <term name="number-of-volumes" form="short">vol.</term>
+      <term name="number">numéro</term>
+      <term name="scale">échelle</term>
+      <term name="circa" form="short">v. </term>
+      <term name="interview" form="verb">interviewé par</term>
+      <term name="author" form="verb">enregistré par</term>
+      <term name="number" form="short">n&amp;#7506;</term>
+    </terms>
+  </locale>
+  <macro name="container-contributors">
+    <choose>
+      <if type="chapter paper-conference entry-encyclopedia entry-dictionary map" match="any">
+        <names variable="editor container-author" delimiter=", " suffix=", ">
+          <name and="text" delimiter-precedes-last="never" initialize="false"/>
+          <label form="short" prefix=" (" suffix=")"/>
+        </names>
+      </if>
+      <else-if type="interview broadcast" match="any">
+        <choose>
+          <if match="any" variable="container-title">
+            <text variable="publisher" suffix=", "/>
+          </if>
+        </choose>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="secondary-contributors">
+    <choose>
+      <if type="article-journal book chapter paper-conference entry-encyclopedia entry-dictionary" match="none">
+        <names variable="editor" delimiter=", " prefix=" (" suffix=")">
+          <name and="symbol" initialize="false"/>
+          <label form="short" prefix=", "/>
+        </names>
+      </if>
+    </choose>
+  </macro>
+  <macro name="author">
+    <choose>
+      <if match="any" variable="composer">
+        <names variable="composer">
+          <name and="text" delimiter-precedes-last="never" et-al-use-last="true" initialize="false" name-as-sort-order="all"/>
+        </names>
+      </if>
+      <else>
+        <names variable="author">
+          <name and="text" delimiter-precedes-last="never" et-al-use-last="true" initialize="false" name-as-sort-order="all"/>
+          <label form="short" prefix=" (" suffix=")"/>
+          <substitute>
+            <choose>
+              <if type="entry-dictionary entry-encyclopedia webpage manuscript legislation legal_case bill treaty article map article-magazine article-newspaper" match="any">
+                <text macro="title"/>
+              </if>
+              <else-if type="book" match="any">
+                <names variable="editor"/>
+                <text macro="title" font-style="italic"/>
+              </else-if>
+              <else>
+                <names variable="editor"/>
+                <names variable="translator"/>
+              </else>
+            </choose>
+            <choose>
+              <if type="report">
+                <text variable="publisher"/>
+                <text variable="title" font-style="italic" suffix="."/>
+              </if>
+            </choose>
+          </substitute>
+        </names>
+      </else>
+    </choose>
+  </macro>
+  <macro name="author-short">
+    <choose>
+      <if match="any" variable="composer">
+        <names variable="composer">
+          <name form="short" and="text" name-as-sort-order="all"/>
+        </names>
+      </if>
+      <else>
+        <names variable="author">
+          <name form="short" and="text" name-as-sort-order="all"/>
+          <et-al font-style="italic"/>
+          <substitute>
+            <choose>
+              <if variable="container-title">
+                <choose>
+                  <if type="bill legal_case legislation treaty article-journal" match="none">
+                    <text variable="title" quotes="true"/>
+                  </if>
+                </choose>
+              </if>
+            </choose>
+            <names variable="editor"/>
+            <names variable="translator"/>
+            <choose>
+              <if type="report">
+                <text variable="publisher"/>
+                <text variable="title" font-style="italic"/>
+              </if>
+              <else>
+                <choose>
+                  <if match="any" variable="title-short">
+                    <text variable="title-short" quotes="false"/>
+                  </if>
+                  <else>
+                    <text variable="title" font-style="italic"/>
+                  </else>
+                </choose>
+              </else>
+            </choose>
+          </substitute>
+        </names>
+      </else>
+    </choose>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if type="thesis dataset" match="any">
+        <choose>
+          <if variable="DOI">
+            <text variable="DOI" prefix="https://doi.org/"/>
+          </if>
+          <else-if variable="archive" match="any">
+            <group delimiter=". ">
+              <text variable="archive" suffix="."/>
+              <text variable="URL"/>
+            </group>
+          </else-if>
+          <else>
+            <choose>
+              <if type="dataset" match="all" variable="accessed">
+                <group delimiter=" ">
+                  <text term="retrieved" text-case="capitalize-first"/>
+                  <date form="text" variable="accessed" prefix="le "/>
+                  <text term="from"/>
+                  <text variable="URL"/>
+                </group>
+              </if>
+              <else>
+                <text variable="URL"/>
+              </else>
+            </choose>
+          </else>
+        </choose>
+      </if>
+      <else>
+        <choose>
+          <if variable="DOI">
+            <text variable="DOI" prefix="https://doi.org/"/>
+          </if>
+          <else>
+            <choose>
+              <if type="entry-encyclopedia entry-dictionary map article" match="any">
+                <choose>
+                  <if match="any" variable="accessed">
+                    <group delimiter=" ">
+                      <text term="retrieved" text-case="capitalize-first"/>
+                      <date form="text" variable="accessed" prefix="le "/>
+                      <text term="from"/>
+                      <text variable="URL"/>
+                    </group>
+                  </if>
+                  <else>
+                    <text variable="URL"/>
+                  </else>
+                </choose>
+              </if>
+              <else>
+                <text variable="URL"/>
+              </else>
+            </choose>
+          </else>
+        </choose>
+      </else>
+    </choose>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="legislation bill" match="any">
+        <choose>
+          <if match="any" variable="issued">
+            <group delimiter=". ">
+              <text variable="title" font-style="italic"/>
+              <text variable="container-title"/>
+            </group>
+          </if>
+          <else-if match="none" variable="number">
+            <group delimiter=". ">
+              <text variable="title" font-style="italic"/>
+              <text variable="container-title"/>
+            </group>
+          </else-if>
+          <else>
+            <group delimiter=". " suffix=", ">
+              <text variable="title" font-style="italic"/>
+              <text variable="container-title"/>
+            </group>
+          </else>
+        </choose>
+      </if>
+      <else-if type="interview" match="any">
+        <group delimiter=" " suffix=". ">
+          <text term="interview" form="verb" text-case="capitalize-first"/>
+          <names variable="interviewer">
+            <name and="text" initialize-with="."/>
+          </names>
+        </group>
+        <text variable="title"/>
+      </else-if>
+      <else-if type="legal_case" match="all" variable="references">
+        <text variable="title" font-style="italic" suffix=","/>
+      </else-if>
+      <else-if type="thesis report book graphic manuscript speech dataset legal_case treaty article webpage" match="any">
+        <text variable="title" font-style="italic"/>
+      </else-if>
+      <else-if type="motion_picture broadcast figure map article-journal entry-encyclopedia song musical_score" match="any">
+        <choose>
+          <if match="any" variable="container-title">
+            <text variable="title"/>
+          </if>
+          <else>
+            <text variable="title" font-style="italic"/>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="patent" match="any">
+        <text variable="title" font-style="italic"/>
+      </else-if>
+      <else>
+        <text variable="title"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <choose>
+      <if type="speech" match="any">
+        <text variable="publisher-place"/>
+      </if>
+      <else-if type="post thesis" match="none">
+        <group delimiter=", ">
+          <choose>
+            <if type="book chapter report" match="any">
+              <text variable="publisher"/>
+            </if>
+            <else-if type="patent">
+              <group delimiter=", ">
+                <text variable="authority"/>
+                <text variable="publisher"/>
+              </group>
+            </else-if>
+            <else-if type="broadcast interview" match="all" variable="container-title"/>
+            <else-if type="manuscript" match="any">
+              <group delimiter=" ">
+                <text variable="archive"/>
+                <text variable="archive_location" prefix="(" suffix=")"/>
+              </group>
+              <text variable="publisher-place"/>
+            </else-if>
+            <else-if type="article-journal article-magazine article-newspaper post-weblog" match="none">
+              <text variable="publisher"/>
+            </else-if>
+          </choose>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="event">
+    <choose>
+      <if variable="container-title" match="none">
+        <choose>
+          <if variable="event">
+            <text variable="event"/>
+          </if>
+          <else-if type="speech" match="any">
+            <text variable="publisher"/>
+          </else-if>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="extra">
+    <choose>
+      <if type="book thesis" match="any">
+        <choose>
+          <if match="any" is-numeric="number-of-volumes">
+            <group delimiter=" ">
+              <number variable="number-of-volumes"/>
+              <label variable="number-of-volumes" form="short"/>
+            </group>
+          </if>
+          <else>
+            <text variable="number-of-volumes" prefix="[" suffix="]"/>
+          </else>
+        </choose>
+      </if>
+      <else-if type="legal_case" match="all" variable="references">
+        <group delimiter=", " prefix="(" suffix=")">
+          <text variable="authority"/>
+          <date date-parts="year" form="text" variable="issued">
+            <date-part name="year"/>
+          </date>
+          <date delimiter=" " variable="issued">
+            <date-part name="day"/>
+            <date-part name="month"/>
+          </date>
+        </group>
+      </else-if>
+      <else-if type="article-journal" match="any">
+        <choose>
+          <if match="none" variable="container-title">
+            <text variable="genre"/>
+          </if>
+        </choose>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="issued">
+    <choose>
+      <if match="any" variable="original-date">
+        <choose>
+          <if type="musical_score book song" match="any">
+            <group prefix="(" suffix=")">
+              <date date-parts="year" form="text" variable="issued"/>
+              <text variable="year-suffix"/>
+            </group>
+          </if>
+          <else>
+            <group prefix="(" suffix=")">
+              <date delimiter="" variable="original-date">
+                <date-part name="year"/>
+              </date>
+              <text variable="year-suffix"/>
+              <date delimiter=" " variable="original-date" prefix=", ">
+                <date-part name="day" form="ordinal"/>
+                <date-part name="month"/>
+              </date>
+            </group>
+          </else>
+        </choose>
+      </if>
+      <else-if match="any" is-uncertain-date="issued">
+        <choose>
+          <if type="map" match="any">
+            <date form="text" variable="issued" prefix="(" suffix="?)"/>
+          </if>
+          <else>
+            <group delimiter=" " prefix="(" suffix=")">
+              <text term="circa" form="short"/>
+              <date variable="issued">
+                <date-part name="year"/>
+              </date>
+            </group>
+          </else>
+        </choose>
+      </else-if>
+      <else-if match="any" variable="status">
+        <group delimiter="-" prefix="(" suffix=")">
+          <text variable="status"/>
+          <text variable="year-suffix"/>
+        </group>
+      </else-if>
+      <else-if variable="issued">
+        <choose>
+          <if type="legal_case" match="all" variable="references"/>
+          <else-if type="bill legal_case" match="any">
+            <group prefix="(" suffix=").">
+              <date date-parts="year" form="text" variable="issued">
+                <date-part name="year"/>
+              </date>
+              <date delimiter=" " variable="issued" prefix=", ">
+                <date-part name="day"/>
+                <date-part name="month"/>
+              </date>
+            </group>
+          </else-if>
+          <else-if type="legislation" match="any"/>
+          <else-if type="dataset" match="any">
+            <group prefix="(" suffix=")">
+              <date delimiter="" variable="issued">
+                <date-part name="year"/>
+              </date>
+              <text variable="year-suffix" prefix="-"/>
+              <date delimiter="" variable="issued" prefix=", ">
+                <date-part name="day"/>
+                <date-part name="month" prefix=" "/>
+              </date>
+            </group>
+          </else-if>
+          <else>
+            <group prefix="(" suffix=").">
+              <date variable="issued">
+                <date-part name="year"/>
+              </date>
+              <text variable="year-suffix"/>
+              <choose>
+                <if type="article-journal bill book chapter graphic legal_case legislation paper-conference thesis patent" match="none">
+                  <group prefix=", ">
+                    <date variable="issued">
+                      <date-part name="day" form="ordinal"/>
+                      <date-part prefix=" " name="month"/>
+                    </date>
+                    <choose>
+                      <if type="entry-encyclopedia" match="any">
+                        <text variable="issue" prefix=", "/>
+                      </if>
+                    </choose>
+                  </group>
+                </if>
+              </choose>
+            </group>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="manuscript" match="all" variable="issue">
+        <text variable="issue" prefix="[" suffix="]."/>
+      </else-if>
+      <else>
+        <group prefix=" (" suffix=")">
+          <choose>
+            <if type="legislation" match="any"/>
+            <else-if type="graphic" match="none">
+              <text term="no date" form="short"/>
+              <text variable="year-suffix" prefix="-"/>
+            </else-if>
+          </choose>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="issued-sort">
+    <choose>
+      <if type="article-journal bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="none">
+        <date variable="issued">
+          <date-part name="year"/>
+          <date-part name="month"/>
+          <date-part name="day"/>
+        </date>
+      </if>
+      <else>
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
+      </else>
+    </choose>
+  </macro>
+  <macro name="issued-year">
+    <choose>
+      <if match="any" is-uncertain-date="issued">
+        <choose>
+          <if type="map" match="any">
+            <group>
+              <date form="text" variable="issued" suffix="?"/>
+            </group>
+          </if>
+          <else>
+            <group delimiter=" ">
+              <text term="circa" form="short"/>
+              <date variable="issued">
+                <date-part name="year"/>
+              </date>
+            </group>
+          </else>
+        </choose>
+        <text variable="year-suffix"/>
+      </if>
+      <else-if match="any" variable="status">
+        <group delimiter="-">
+          <text variable="status"/>
+          <text variable="year-suffix"/>
+        </group>
+      </else-if>
+      <else-if variable="issued">
+        <choose>
+          <if type="legislation" match="any"/>
+          <else>
+            <group delimiter="/">
+              <date variable="original-date" form="text"/>
+              <group>
+                <date variable="issued">
+                  <date-part name="year"/>
+                </date>
+                <text variable="year-suffix"/>
+              </group>
+            </group>
+          </else>
+        </choose>
+      </else-if>
+      <else>
+        <choose>
+          <if type="legislation" match="any">
+            <group delimiter=" ">
+              <text variable="container-title"/>
+              <text variable="section" prefix="(" suffix=")"/>
+            </group>
+          </if>
+          <else>
+            <group delimiter="-">
+              <text term="no date" form="short"/>
+              <text variable="year-suffix"/>
+            </group>
+          </else>
+        </choose>
+      </else>
+    </choose>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <text term="edition" form="short"/>
+        </group>
+      </if>
+      <else>
+        <text variable="edition"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="translation-illustration">
+    <choose>
+      <if variable="translator illustrator" match="any">
+        <group delimiter=", ">
+          <names variable="translator" delimiter=", " prefix=" ">
+            <name and="text" delimiter-precedes-last="never" initialize="false"/>
+            <label form="short" prefix=", "/>
+          </names>
+          <names variable="illustrator">
+            <name and="text" delimiter-precedes-last="never" initialize="false"/>
+            <label form="short" prefix=", "/>
+          </names>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="locators">
+    <choose>
+      <if type="article-journal article-magazine review-book interview article" match="any">
+        <group prefix=", " delimiter=", ">
+          <group>
+            <text variable="volume" font-style="italic"/>
+            <text variable="issue" prefix="(" suffix=")"/>
+          </group>
+          <text variable="page"/>
+          <text variable="archive_location"/>
+        </group>
+      </if>
+      <else-if type="article-newspaper">
+        <text variable="publisher-place" prefix=" (" suffix=")"/>
+        <group delimiter=", " prefix=", ">
+          <text variable="section" prefix="section "/>
+          <text variable="page"/>
+        </group>
+      </else-if>
+      <else-if type="book paper-conference entry-encyclopedia chapter entry-dictionary musical_score map figure" match="any">
+        <group prefix=" (" suffix=")" delimiter=", ">
+          <group delimiter=", ">
+            <text macro="edition"/>
+            <text macro="translation-illustration"/>
+          </group>
+          <group delimiter=" ">
+            <label variable="volume" form="short"/>
+            <number variable="volume" form="numeric"/>
+          </group>
+          <group delimiter=" ">
+            <label variable="chapter-number" form="short"/>
+            <number variable="chapter-number"/>
+          </group>
+          <group delimiter=" ">
+            <text term="version"/>
+            <text variable="version"/>
+          </group>
+          <group delimiter=" ">
+            <label variable="page" form="short"/>
+            <text variable="page"/>
+          </group>
+        </group>
+        <choose>
+          <if type="book" match="any">
+            <text variable="number" prefix=" (" suffix=")"/>
+            <group prefix=" [" suffix="]">
+              <text variable="genre"/>
+              <text variable="medium"/>
+            </group>
+          </if>
+        </choose>
+      </else-if>
+      <else-if type="legal_case" match="any">
+        <group delimiter=" " prefix=" ">
+          <text variable="number"/>
+          <choose>
+            <if match="none" variable="references page">
+              <text variable="authority" prefix="(" suffix=")"/>
+            </if>
+            <else-if match="none" variable="references">
+              <text variable="authority"/>
+            </else-if>
+          </choose>
+          <text variable="page"/>
+        </group>
+        <text variable="source" prefix=". "/>
+      </else-if>
+      <else-if type="treaty" match="any">
+        <group delimiter=", ">
+          <group delimiter=" " prefix=", ">
+            <label variable="volume" form="short"/>
+            <text variable="volume"/>
+          </group>
+          <group delimiter=" ">
+            <label variable="page" form="short"/>
+            <text variable="page"/>
+          </group>
+          <group delimiter=" " prefix=" ">
+            <text term="issue" form="short"/>
+            <text variable="issue"/>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="song" match="any">
+        <text variable="number" prefix=" (épisode " suffix=")"/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="citation-locator">
+    <group>
+      <choose>
+        <if locator="chapter">
+          <label variable="locator" form="long" text-case="capitalize-first"/>
+        </if>
+        <else>
+          <label variable="locator" form="short"/>
+        </else>
+      </choose>
+      <text variable="locator" prefix=" "/>
+    </group>
+  </macro>
+  <macro name="container">
+    <group>
+      <choose>
+        <if type="chapter paper-conference entry-encyclopedia entry-dictionary song musical_score figure broadcast interview" match="any">
+          <choose>
+            <if match="any" variable="container-title">
+              <text term="in" text-case="capitalize-first" suffix=" "/>
+            </if>
+          </choose>
+        </if>
+        <else-if type="map" match="all" variable="container-author">
+          <text term="in" text-case="capitalize-first" suffix=" "/>
+        </else-if>
+      </choose>
+      <text macro="container-contributors"/>
+      <text macro="secondary-contributors"/>
+      <text macro="container-title"/>
+    </group>
+  </macro>
+  <macro name="container-title">
+    <choose>
+      <if type="bill legislation legal_case treaty report webpage" match="none">
+        <text variable="container-title" font-style="italic"/>
+      </if>
+      <else-if type="legal_case treaty report" match="any">
+        <choose>
+          <if match="none" variable="references">
+            <text variable="container-title"/>
+          </if>
+        </choose>
+      </else-if>
+      <else>
+        <group delimiter=" ">
+          <choose>
+            <if variable="container-title">
+              <choose>
+                <if type="legislation" match="none">
+                  <text variable="volume"/>
+                  <text variable="container-title"/>
+                  <group delimiter=" ">
+                    <text term="section" form="symbol"/>
+                    <text variable="section"/>
+                  </group>
+                </if>
+              </choose>
+            </if>
+          </choose>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="original-date">
+    <choose>
+      <if type="song musical_score book" match="any">
+        <group prefix="(" suffix=")">
+          <text value="Publication originale en "/>
+          <date variable="original-date">
+            <date-part name="year"/>
+          </date>
+        </group>
+      </if>
+      <else-if type="treaty" match="any">
+        <choose>
+          <if match="any" variable="original-date">
+            <group delimiter=" " suffix=".">
+              <text value="Entrée en vigueur le"/>
+              <date form="text" variable="issued">
+                <date-part name="day" form="ordinal"/>
+              </date>
+            </group>
+          </if>
+        </choose>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="title-extra">
+    <choose>
+      <if type="thesis" match="any">
+        <text variable="archive_location" prefix="(Publication n&amp;#7506;  " suffix=") "/>
+        <group delimiter=", " prefix="[" suffix="]">
+          <group delimiter=" ">
+            <text term="version"/>
+            <text variable="version"/>
+          </group>
+          <text variable="genre"/>
+          <text variable="publisher"/>
+        </group>
+      </if>
+      <else-if type="article-journal" match="any">
+        <choose>
+          <if match="any" variable="container-title">
+            <text variable="genre" prefix="[" suffix="]"/>
+          </if>
+        </choose>
+        <group delimiter=" " prefix="(" suffix=")">
+          <text term="version"/>
+          <text variable="version"/>
+        </group>
+      </else-if>
+      <else-if type="report" match="any">
+        <group delimiter=" ">
+          <text variable="number" prefix="(" suffix=")"/>
+          <group delimiter=" " prefix="[" suffix="]">
+            <text variable="genre"/>
+            <text variable="medium"/>
+          </group>
+          <group delimiter=" " prefix=". ">
+            <text term="number" text-case="capitalize-first"/>
+            <text variable="archive_location"/>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="webpage dataset" match="any">
+        <group delimiter=" " prefix="(" suffix=")">
+          <text term="version"/>
+          <text variable="version"/>
+        </group>
+        <group delimiter=" " prefix=" ">
+          <text variable="number" prefix="(" suffix=")"/>
+          <text variable="genre" prefix="[" suffix="]"/>
+        </group>
+      </else-if>
+      <else-if type="patent" match="any">
+        <group delimiter=" " prefix="(" suffix=")">
+          <text variable="genre"/>
+          <text variable="number" font-style="normal"/>
+        </group>
+      </else-if>
+      <else-if type="song musical_score" match="any">
+        <choose>
+          <if match="any" variable="composer">
+            <group delimiter=";  " prefix=" [" suffix="]">
+              <group delimiter=" ">
+                <text term="author" form="verb" text-case="capitalize-first"/>
+                <names variable="author">
+                  <name and="text" delimiter-precedes-last="never"/>
+                </names>
+              </group>
+              <text variable="medium"/>
+              <text variable="genre"/>
+            </group>
+          </if>
+          <else>
+            <text variable="medium" prefix="[" suffix="]"/>
+            <text variable="genre" prefix="[" suffix="]"/>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="legislation bill" match="any">
+        <group delimiter=" ">
+          <text variable="number" prefix="c. "/>
+          <text variable="section" prefix="(" suffix=")"/>
+          <text variable="authority"/>
+        </group>
+      </else-if>
+      <else-if type="review-book" match="any">
+        <group delimiter=" " prefix="[" suffix="]">
+          <text variable="reviewed-title" font-style="italic" prefix="Compte rendu du livre " suffix=","/>
+          <text term="by"/>
+          <names variable="reviewed-author">
+            <name and="text" delimiter-precedes-last="never" initialize-with="."/>
+          </names>
+        </group>
+      </else-if>
+      <else-if type="broadcast" match="any">
+        <group delimiter=" ">
+          <group delimiter=" " prefix="(" suffix=")">
+            <text term="number" form="short"/>
+            <text variable="number"/>
+          </group>
+          <group prefix="[" suffix="]">
+            <text variable="medium"/>
+            <text variable="genre"/>
+          </group>
+        </group>
+      </else-if>
+      <else>
+        <choose>
+          <if type="musical_score book article" match="none">
+            <group delimiter=". ">
+              <choose>
+                <if type="manuscript" match="none">
+                  <text variable="archive" prefix=". "/>
+                </if>
+              </choose>
+              <group delimiter=" " prefix="[" suffix="]">
+                <text variable="medium"/>
+                <text variable="genre"/>
+              </group>
+              <group delimiter=" : ">
+                <text term="scale" text-case="capitalize-first"/>
+                <text variable="scale"/>
+              </group>
+              <number variable="number-of-pages"/>
+            </group>
+          </if>
+        </choose>
+      </else>
+    </choose>
+  </macro>
+  <macro name="container-title-extra">
+    <choose>
+      <if type="map" match="all">
+        <text variable="collection-title" prefix=". "/>
+        <text variable="number" prefix=", "/>
+      </if>
+      <else-if type="article" match="any">
+        <text variable="number" prefix=" (" suffix=")"/>
+        <choose>
+          <if match="none" variable="author editor">
+            <text variable="genre" prefix=". [" suffix="]"/>
+          </if>
+          <else>
+            <text variable="genre" prefix=" [" suffix="]"/>
+          </else>
+        </choose>
+      </else-if>
+    </choose>
+  </macro>
+  <citation et-al-min="3" et-al-use-first="1" et-al-subsequent-min="3" et-al-subsequent-use-first="1" disambiguate-add-year-suffix="true" collapse="year">
+    <sort>
+      <key macro="author-short"/>
+      <key macro="issued-sort"/>
+    </sort>
+    <layout prefix="(" suffix=")" delimiter=" ; ">
+      <group delimiter=", ">
+        <text macro="author-short"/>
+        <text macro="issued-year"/>
+        <text macro="citation-locator"/>
+      </group>
+    </layout>
+  </citation>
+  <bibliography delimiter-precedes-last="never" et-al-min="21" et-al-use-first="19" et-al-use-last="true" hanging-indent="true">
+    <sort>
+      <key macro="author"/>
+      <key macro="issued-sort" sort="ascending"/>
+      <key macro="title"/>
+    </sort>
+    <layout>
+      <group suffix=".">
+        <group delimiter=". ">
+          <text macro="author"/>
+          <text macro="issued"/>
+          <text macro="title" prefix=" "/>
+        </group>
+        <text macro="title-extra" prefix=" "/>
+        <text macro="container" prefix=". "/>
+        <text macro="container-title-extra"/>
+        <text macro="locators"/>
+        <group delimiter=", " prefix=". ">
+          <text macro="event"/>
+          <text macro="publisher"/>
+        </group>
+      </group>
+      <text macro="extra" prefix=" " suffix="."/>
+      <text macro="access" prefix=" "/>
+      <text macro="original-date" prefix=" "/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/buildres/csl/csl-styles/universite-du-quebec-a-montreal.csl b/buildres/csl/csl-styles/universite-du-quebec-a-montreal.csl
index fe647fab2f9..8f79c35c9ae 100644
--- a/buildres/csl/csl-styles/universite-du-quebec-a-montreal.csl
+++ b/buildres/csl/csl-styles/universite-du-quebec-a-montreal.csl
@@ -353,7 +353,7 @@
     <choose>
       <if match="any" variable="original-date">
         <choose>
-          <if type="musical_score book song" match="any">
+          <if type="musical_score book song chapter" match="any">
             <group prefix="(" suffix=")">
               <date date-parts="year" form="text" variable="issued"/>
               <text variable="year-suffix"/>
@@ -721,7 +721,7 @@
   </macro>
   <macro name="original-date">
     <choose>
-      <if type="song musical_score book" match="any">
+      <if type="song musical_score book chapter" match="any">
         <group prefix="(" suffix=")">
           <text value="Publication originale en "/>
           <date variable="original-date">
diff --git a/buildres/csl/csl-styles/university-of-hull-harvard.csl b/buildres/csl/csl-styles/university-of-hull-harvard.csl
new file mode 100644
index 00000000000..bf4022edecb
--- /dev/null
+++ b/buildres/csl/csl-styles/university-of-hull-harvard.csl
@@ -0,0 +1,315 @@
+<?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-GB">
+  <!-- This style was edited with the Visual CSL Editor (https://editor.citationstyles.org/visualEditor/) -->
+  <info>
+    <title>University of Hull Harvard</title>
+    <id>http://www.zotero.org/styles/university-of-hull-harvard</id>
+    <link href="http://www.zotero.org/styles/university-of-hull-harvard" rel="self"/>
+    <link href="http://www.zotero.org/styles/harvard-cite-them-right" rel="template"/>
+    <link href="https://libguides.hull.ac.uk/referencing/harvard" rel="documentation"/>
+    <author>
+      <name>Graham Wyatt</name>
+    </author>
+    <category citation-format="author-date"/>
+    <summary>University of Hull Harvard</summary>
+    <updated>2022-07-18T16:00:01+00:00</updated>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
+  </info>
+  <locale xml:lang="en-GB">
+    <terms>
+      <term name="editor" form="short">
+        <single>ed.</single>
+        <multiple>eds</multiple>
+      </term>
+      <term name="editortranslator" form="verb">edited and translated by</term>
+      <term name="edition" form="short">edn.</term>
+    </terms>
+  </locale>
+  <macro name="editor">
+    <choose>
+      <if type="chapter paper-conference" match="any">
+        <names variable="container-author" delimiter=", " suffix=", ">
+          <name and="text" initialize-with=". " name-as-sort-order="all"/>
+        </names>
+        <choose>
+          <if variable="container-author" match="none">
+            <names variable="editor translator" delimiter=", ">
+              <name and="symbol" initialize-with="." name-as-sort-order="all"/>
+              <label form="short" prefix=" (" suffix=")"/>
+            </names>
+          </if>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <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" initialize-with="."/>
+        </names>
+      </if>
+      <else-if variable="container-author" match="any">
+        <names variable="editor translator" delimiter=". ">
+          <label form="verb" text-case="capitalize-first" suffix=" "/>
+          <name and="text" initialize-with=". " delimiter=", "/>
+        </names>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name and="symbol" delimiter-precedes-last="never" initialize-with="." name-as-sort-order="all"/>
+      <label form="short" prefix=" (" suffix=")"/>
+      <et-al font-style="italic"/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <choose>
+          <if type="article-newspaper article-magazine" match="any">
+            <text variable="container-title" text-case="title" font-style="italic"/>
+          </if>
+          <else>
+            <text macro="title"/>
+          </else>
+        </choose>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="author-short">
+    <names variable="author">
+      <name form="short" and="symbol" delimiter-precedes-last="never" initialize-with=". "/>
+      <et-al font-style="normal" font-weight="normal"/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <choose>
+          <if type="article-newspaper article-magazine" match="any">
+            <text variable="container-title" text-case="title" font-style="italic"/>
+          </if>
+          <else>
+            <text macro="title"/>
+          </else>
+        </choose>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if variable="DOI">
+        <text variable="DOI" prefix="Available online: https://doi.org/"/>
+      </if>
+      <else-if variable="URL">
+        <text variable="URL" prefix="Available online: "/>
+        <group delimiter=" " prefix=" [" suffix="]">
+          <text term="accessed" text-case="capitalize-first"/>
+          <date form="numeric" variable="accessed">
+            <date-part name="day"/>
+            <date-part name="month"/>
+            <date-part name="year"/>
+          </date>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="number-volumes">
+    <choose>
+      <if variable="volume" match="none">
+        <group delimiter=" " prefix="(" suffix=")">
+          <text variable="number-of-volumes"/>
+          <label variable="volume" form="short" strip-periods="true"/>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="bill book legal_case legislation motion_picture report song thesis webpage graphic patent" match="any">
+        <group delimiter=". ">
+          <group delimiter=" ">
+            <group delimiter=" ">
+              <text variable="title" text-case="capitalize-first" font-style="italic"/>
+              <text variable="medium" text-case="capitalize-first" prefix="[" suffix="]"/>
+            </group>
+            <text macro="number-volumes"/>
+          </group>
+          <text macro="edition"/>
+        </group>
+      </if>
+      <else>
+        <text variable="title" text-case="capitalize-first" strip-periods="false" quotes="false" suffix="."/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <choose>
+      <if type="thesis">
+        <group delimiter=". ">
+          <text variable="genre"/>
+          <text variable="publisher"/>
+        </group>
+      </if>
+      <else-if type="report">
+        <group delimiter=". ">
+          <group delimiter=" ">
+            <text variable="genre"/>
+            <text variable="number" prefix="(" suffix=")"/>
+          </group>
+          <group delimiter=": ">
+            <text variable="publisher-place"/>
+            <text variable="publisher"/>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="article-journal article-newspaper article-magazine" match="none">
+        <group delimiter=" ">
+          <group delimiter=", ">
+            <choose>
+              <if type="speech" variable="event" match="any">
+                <text variable="event" font-style="italic"/>
+              </if>
+            </choose>
+            <group delimiter=": ">
+              <text variable="publisher-place"/>
+              <text variable="publisher"/>
+            </group>
+          </group>
+          <group prefix="(" suffix=")" delimiter=", ">
+            <text variable="collection-title"/>
+            <text variable="collection-number"/>
+          </group>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="year-date">
+    <choose>
+      <if variable="issued">
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
+        <text variable="year-suffix"/>
+      </if>
+      <else>
+        <text term="no date"/>
+        <text variable="year-suffix" prefix=" "/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="locator">
+    <choose>
+      <if type="article-journal">
+        <text variable="volume"/>
+        <text variable="issue" prefix="(" suffix=")"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="published-date">
+    <choose>
+      <if type="article-newspaper article-magazine post-weblog speech" match="any">
+        <date variable="issued">
+          <date-part name="day" suffix=" "/>
+          <date-part name="month" form="long"/>
+        </date>
+      </if>
+    </choose>
+  </macro>
+  <macro name="pages">
+    <choose>
+      <if type="chapter paper-conference article-journal article article-magazine article-newspaper book review review-book report" match="any">
+        <group delimiter=" ">
+          <label variable="page-first" form="short"/>
+          <text variable="page"/>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="container-title">
+    <choose>
+      <if variable="container-title">
+        <group delimiter=". ">
+          <group delimiter=" ">
+            <text variable="container-title" text-case="title" font-style="italic"/>
+            <choose>
+              <if type="article article-journal" match="any">
+                <choose>
+                  <if match="none" variable="page volume">
+                    <text value="Preprint" text-case="title" prefix="[" suffix="]"/>
+                  </if>
+                </choose>
+              </if>
+            </choose>
+          </group>
+          <text macro="edition"/>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number vertical-align="baseline" variable="edition" form="ordinal"/>
+          <text term="edition" strip-periods="true"/>
+        </group>
+      </if>
+      <else>
+        <text variable="edition"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="container-prefix">
+    <choose>
+      <if type="chapter paper-conference" match="any">
+        <text term="in" text-case="capitalize-first"/>
+      </if>
+    </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">
+    <sort>
+      <key macro="year-date"/>
+    </sort>
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <group delimiter=", ">
+        <text macro="author-short"/>
+        <text macro="year-date"/>
+        <group>
+          <label variable="locator" form="short" suffix=" "/>
+          <text variable="locator"/>
+        </group>
+      </group>
+    </layout>
+  </citation>
+  <bibliography>
+    <sort>
+      <key macro="author"/>
+      <key macro="year-date"/>
+      <key variable="title"/>
+    </sort>
+    <layout suffix=".">
+      <group delimiter=". ">
+        <group delimiter=" ">
+          <text macro="author"/>
+          <text macro="year-date" prefix="(" suffix=")"/>
+          <group delimiter=" ">
+            <text macro="title"/>
+            <group delimiter=" ">
+              <text macro="container-prefix"/>
+              <text macro="editor"/>
+              <text macro="container-title"/>
+            </group>
+          </group>
+        </group>
+        <text macro="secondary-contributors"/>
+        <text macro="publisher"/>
+      </group>
+      <group delimiter=", " prefix=", ">
+        <text macro="locator"/>
+        <text macro="published-date"/>
+        <text macro="pages"/>
+      </group>
+      <text macro="access" prefix=". "/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/buildres/csl/csl-styles/university-of-pretoria-harvard-theology-religion.csl b/buildres/csl/csl-styles/university-of-pretoria-harvard-theology-religion.csl
new file mode 100644
index 00000000000..f59a9edfa0a
--- /dev/null
+++ b/buildres/csl/csl-styles/university-of-pretoria-harvard-theology-religion.csl
@@ -0,0 +1,347 @@
+<?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-GB">
+  <info>
+    <title>University of Pretoria - Harvard (Theology and Religion)</title>
+    <title-short>UPTHEO</title-short>
+    <id>http://www.zotero.org/styles/university-of-pretoria-harvard-theology-religion</id>
+    <link href="http://www.zotero.org/styles/university-of-pretoria-harvard-theology-religion" rel="self"/>
+    <link href="http://www.zotero.org/styles/university-of-south-africa-harvard" rel="template"/>
+    <link href="https://library.up.ac.za/ld.php?content_id=64865239" rel="documentation"/>
+    <author>
+      <name>Micha Schlittenhardt</name>
+      <email>micha.schlittenhardt@tuks.co.za</email>
+    </author>
+    <category citation-format="author-date"/>
+    <category field="generic-base"/>
+    <updated>2022-06-22T00:06:00+00:00</updated>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
+  </info>
+  <locale xml:lang="en-GB">
+    <terms>
+      <term name="volume" form="short">v.</term>
+      <term name="available at">from</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>
+  <macro name="editor-translator">
+    <choose>
+      <if variable="editor">
+        <names variable="editor">
+          <name and="symbol" initialize-with="." delimiter=", "/>
+          <label form="short" prefix=", " text-case="capitalize-first"/>
+        </names>
+      </if>
+    </choose>
+    <choose>
+      <if variable="translator">
+        <names variable="translator">
+          <label form="verb" text-case="capitalize-first" suffix=" "/>
+          <name and="symbol" delimiter=", "/>
+        </names>
+      </if>
+    </choose>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name and="symbol" delimiter-precedes-last="never" initialize-with="." name-as-sort-order="all"/>
+      <label form="short" prefix=" " text-case="capitalize-first"/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <choose>
+          <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+            <text variable="title" font-style="italic"/>
+          </if>
+          <else-if type="webpage" match="any">
+            <text variable="container-title" text-case="capitalize-first"/>
+          </else-if>
+          <else>
+            <text variable="title" quotes="true" text-case="capitalize-first"/>
+          </else>
+        </choose>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="author-short">
+    <names variable="author">
+      <name form="short" and="symbol" delimiter-precedes-last="never" initialize-with="."/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <choose>
+          <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+            <text variable="title" form="short" font-style="italic"/>
+          </if>
+          <else-if type="webpage" match="any">
+            <text variable="container-title" form="short"/>
+          </else-if>
+          <else>
+            <text variable="title" form="short" quotes="true" text-case="capitalize-first"/>
+          </else>
+        </choose>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="author-count">
+    <names variable="author">
+      <name form="count"/>
+    </names>
+  </macro>
+  <macro name="date-issued">
+    <choose>
+      <if type="article-journal" match="none">
+        <text macro="date-issued-year"/>
+      </if>
+      <else-if variable="issued" match="any">
+        <text macro="date-issued-year"/>
+      </else-if>
+      <else>
+        <text variable="status"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="date-issued-no-parentheses">
+    <choose>
+      <if type="article-journal" match="none">
+        <text macro="date-issued-year"/>
+      </if>
+      <else-if variable="page" match="none">
+        <text macro="date-issued-year"/>
+      </else-if>
+      <else-if is-numeric="page">
+        <text macro="date-issued-year"/>
+      </else-if>
+      <else>
+        <text term="in press"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="date-issued-year">
+    <choose>
+      <if variable="issued">
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
+      </if>
+      <else>
+        <text term="no date" form="short"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if variable="DOI">
+        <text variable="DOI" prefix="doi.org/"/>
+      </if>
+      <else-if variable="URL">
+        <group delimiter=", ">
+          <text macro="date-access"/>
+          <group>
+            <text term="available at" suffix=" "/>
+            <text variable="URL"/>
+          </group>
+        </group>
+      </else-if>
+      <else-if variable="source accessed" match="all">
+        <group delimiter=", ">
+          <text macro="date-access"/>
+          <text variable="source"/>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="date-access">
+    <date variable="accessed" prefix="viewed ">
+      <date-part name="day" suffix=" "/>
+      <date-part name="month"/>
+      <date-part name="year" prefix=" "/>
+    </date>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+        <text variable="title" font-style="italic"/>
+      </if>
+      <else>
+        <text variable="title"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="book-details">
+    <group delimiter=", ">
+      <group delimiter=" ">
+        <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>
+      </group>
+      <group delimiter=" ">
+        <label variable="volume" form="short" text-case="capitalize-first"/>
+        <text variable="volume"/>
+      </group>
+      <text macro="editor-translator"/>
+      <group delimiter=" " prefix="(" suffix=")">
+        <text variable="collection-title"/>
+        <group delimiter=" ">
+          <label variable="issue" form="short"/>
+          <text variable="collection-number"/>
+        </group>
+      </group>
+      <text macro="publisher"/>
+    </group>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=", ">
+      <text variable="publisher"/>
+      <text variable="publisher-place"/>
+    </group>
+  </macro>
+  <citation et-al-min="6" et-al-use-first="1" et-al-subsequent-min="3" et-al-subsequent-use-first="1" disambiguate-add-names="true" disambiguate-add-year-suffix="true" collapse="year-suffix" year-suffix-delimiter=",">
+    <sort>
+      <key macro="date-issued-no-parentheses" sort="descending"/>
+      <key macro="author"/>
+    </sort>
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <group delimiter=" ">
+        <text macro="author-short"/>
+        <text macro="date-issued-no-parentheses"/>
+      </group>
+      <group>
+        <choose>
+          <if locator="page" match="any">
+            <text variable="locator" prefix=":"/>
+          </if>
+          <else>
+            <label variable="locator" form="short" prefix=", "/>
+            <text variable="locator" prefix=" "/>
+          </else>
+        </choose>
+      </group>
+    </layout>
+  </citation>
+  <bibliography entry-spacing="1" et-al-min="9" et-al-use-first="8" hanging-indent="true">
+    <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="date-issued-no-parentheses"/>
+    </sort>
+    <layout suffix=".">
+      <choose>
+        <if type="webpage" match="none">
+          <group delimiter=", ">
+            <text macro="author"/>
+            <text macro="date-issued"/>
+            <choose>
+              <if type="bill book graphic legal_case legislation motion_picture post-weblog song" match="any">
+                <text macro="title"/>
+                <text macro="book-details"/>
+              </if>
+              <else-if type="article-journal article-magazine" match="any">
+                <text prefix="‘" suffix="’" macro="title"/>
+                <text variable="container-title" font-style="italic"/>
+                <group delimiter=", ">
+                  <choose>
+                    <if variable="volume issue" match="any">
+                      <group>
+                        <text variable="volume"/>
+                        <text variable="issue" prefix="(" suffix=")"/>
+                      </group>
+                    </if>
+                    <else>
+                      <date variable="issued" prefix="(" suffix=")">
+                        <date-part name="month" form="long"/>
+                        <date-part name="day" prefix=", "/>
+                      </date>
+                    </else>
+                  </choose>
+                  <text variable="page"/>
+                </group>
+              </else-if>
+              <else-if type="article-newspaper" match="any">
+                <text macro="title"/>
+                <group delimiter=" ">
+                  <text variable="container-title" font-style="italic"/>
+                  <text variable="publisher-place" prefix="(" suffix=")"/>
+                </group>
+                <group delimiter=": ">
+                  <date variable="issued">
+                    <date-part name="day" suffix=" "/>
+                    <date-part name="month" form="long"/>
+                  </date>
+                  <text variable="page"/>
+                </group>
+              </else-if>
+              <else-if type="thesis" match="any">
+                <text macro="title"/>
+                <text variable="genre"/>
+                <text variable="publisher"/>
+              </else-if>
+              <else-if type="chapter paper-conference entry-encyclopedia entry-dictionary" match="any">
+                <text prefix="‘" suffix="’" macro="title"/>
+                <group delimiter=" ">
+                  <text term="in" suffix=""/>
+                  <text variable="container-title" font-style="italic"/>
+                </group>
+                <text macro="book-details"/>
+                <text prefix="pp. " variable="page"/>
+              </else-if>
+              <else-if type="patent" match="any">
+                <group font-style="italic">
+                  <text variable="number" prefix="Patent No. "/>
+                </group>
+                <group delimiter=": ">
+                  <text macro="publisher"/>
+                  <text variable="authority"/>
+                </group>
+              </else-if>
+              <else-if type="report" match="any">
+                <text macro="title"/>
+                <group delimiter=" " prefix="(" suffix=")">
+                  <text variable="genre" text-case="capitalize-first"/>
+                  <text variable="number"/>
+                </group>
+                <text macro="publisher"/>
+              </else-if>
+            </choose>
+            <text macro="access"/>
+          </group>
+        </if>
+        <else>
+          <group delimiter=" ">
+            <choose>
+              <if variable="author editor" match="any">
+                <group delimiter=", ">
+                  <text macro="author"/>
+                  <text macro="date-issued"/>
+                  <text prefix="‘" suffix="’" macro="title"/>
+                  <group delimiter=" ">
+                    <text term="in" suffix=""/>
+                    <text variable="container-title" font-style="italic" suffix=","/>
+                  </group>
+                </group>
+              </if>
+              <else>
+                <text macro="author"/>
+                <text macro="date-issued" suffix=","/>
+                <text macro="title" suffix=","/>
+              </else>
+            </choose>
+            <text macro="book-details" suffix=","/>
+            <text macro="access"/>
+          </group>
+        </else>
+      </choose>
+    </layout>
+  </bibliography>
+</style>
diff --git a/buildres/csl/csl-styles/urad-rs-za-makroekonomske-analize-in-razvoj.csl b/buildres/csl/csl-styles/urad-rs-za-makroekonomske-analize-in-razvoj.csl
index 8e31a491175..6a17d01c056 100644
--- a/buildres/csl/csl-styles/urad-rs-za-makroekonomske-analize-in-razvoj.csl
+++ b/buildres/csl/csl-styles/urad-rs-za-makroekonomske-analize-in-razvoj.csl
@@ -13,7 +13,7 @@
     </author>
     <category citation-format="author-date"/>
     <category field="generic-base"/>
-    <updated>2021-09-22T16:14:55+00:00</updated>
+    <updated>2022-03-15T10:15: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>
   <macro name="container-contributors-booklike">
@@ -446,9 +446,15 @@
           <else-if type="post post-weblog webpage" variable="container-title" match="any">
             <text variable="title"/>
           </else-if>
-          <else-if type="legislation book" match="any">
+          <else-if type="book" match="any">
             <text variable="title" font-style="italic"/>
           </else-if>
+          <else-if type="legislation" match="any">
+            <group delimiter=" &#8211; ">
+              <text variable="title-short"/>
+              <text variable="title"/>
+            </group>
+          </else-if>
           <else>
             <text variable="title" font-style="normal"/>
           </else>
@@ -809,9 +815,9 @@
         <choose>
           <if variable="collection-editor editor issue page volume" match="none">
             <group delimiter=" ">
-              <group delimiter=" ">
+              <group>
                 <text term="presented at" text-case="capitalize-first"/>
-                <text variable="event"/>
+                <text variable="event" prefix=" "/>
                 <choose>
                   <if match="any" variable="note">
                     <group delimiter=" ">
@@ -823,9 +829,9 @@
                     </group>
                   </if>
                   <else>
-                    <group>
+                    <group delimiter=", " prefix=", ">
                       <text variable="genre"/>
-                      <text variable="event-place" prefix=", "/>
+                      <text variable="event-place"/>
                     </group>
                   </else>
                 </choose>
diff --git a/buildres/csl/csl-styles/vancouver-author-date.csl b/buildres/csl/csl-styles/vancouver-author-date.csl
index 27ad015cbe5..4bd51dd6b9d 100644
--- a/buildres/csl/csl-styles/vancouver-author-date.csl
+++ b/buildres/csl/csl-styles/vancouver-author-date.csl
@@ -1,5 +1,5 @@
 <?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">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only" initialize-with-hyphen="false" page-range-format="minimal">
   <info>
     <title>Vancouver (author-date)</title>
     <id>http://www.zotero.org/styles/vancouver-author-date</id>
@@ -7,6 +7,7 @@
     <link href="http://www.zotero.org/styles/vancouver" rel="template"/>
     <link href="http://www.zotero.org/styles/cell" rel="template"/>
     <link href="http://www.nlm.nih.gov/bsd/uniform_requirements.html" rel="documentation"/>
+    <link href="https://www.icmje.org/recommendations/browse/manuscript-preparation/preparing-for-submission.html#g" rel="documentation"/>
     <author>
       <name>Charles Parnot</name>
       <email>charles.parnot@gmail.com</email>
@@ -15,7 +16,7 @@
     <category citation-format="author-date"/>
     <category field="medicine"/>
     <summary>Vancouver style as outlined by International Committee of Medical Journal Editors Uniform Requirements for Manuscripts Submitted to Biomedical Journals: Sample References</summary>
-    <updated>2012-11-09T12:00:00+00:00</updated>
+    <updated>2022-07-18T16:49: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">
@@ -47,6 +48,16 @@
       <label form="long" prefix=", "/>
       <substitute>
         <names variable="editor"/>
+        <text variable="title" form="short"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="author-short">
+    <names variable="author">
+      <name form="short" and="text"/>
+      <substitute>
+        <names variable="editor"/>
+        <text variable="title" form="short"/>
       </substitute>
     </names>
   </macro>
@@ -253,25 +264,29 @@
       </if>
     </choose>
   </macro>
-  <macro name="author-short">
-    <names variable="author">
-      <name form="short" and="text"/>
-    </names>
-  </macro>
   <macro name="issued">
     <date variable="issued">
       <date-part name="year"/>
     </date>
   </macro>
+  <macro name="point-locators">
+    <group delimiter=" ">
+      <label plural="never" variable="locator" form="short"/>
+      <text variable="locator"/>
+    </group>
+  </macro>
   <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" collapse="year">
     <sort>
       <key macro="issued"/>
       <key macro="author-short"/>
     </sort>
     <layout prefix="(" suffix=")" delimiter="; ">
-      <group delimiter=" ">
-        <text macro="author-short"/>
-        <text macro="issued"/>
+      <group delimiter=", ">
+        <group delimiter=" ">
+          <text macro="author-short"/>
+          <text macro="issued"/>
+        </group>
+        <text macro="point-locators"/>
       </group>
     </layout>
   </citation>
diff --git a/buildres/csl/csl-styles/vancouver-brackets-no-et-al.csl b/buildres/csl/csl-styles/vancouver-brackets-no-et-al.csl
index 6c4b746c887..9a814ecf897 100644
--- a/buildres/csl/csl-styles/vancouver-brackets-no-et-al.csl
+++ b/buildres/csl/csl-styles/vancouver-brackets-no-et-al.csl
@@ -1,5 +1,5 @@
 <?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">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only" initialize-with-hyphen="false" page-range-format="minimal">
   <info>
     <title>Vancouver (brackets, no "et al.")</title>
     <id>http://www.zotero.org/styles/vancouver-brackets-no-et-al</id>
diff --git a/buildres/csl/csl-styles/vancouver-brackets-only-year-no-issue.csl b/buildres/csl/csl-styles/vancouver-brackets-only-year-no-issue.csl
index d7f26d1185a..34b3f33e2d3 100644
--- a/buildres/csl/csl-styles/vancouver-brackets-only-year-no-issue.csl
+++ b/buildres/csl/csl-styles/vancouver-brackets-only-year-no-issue.csl
@@ -1,5 +1,5 @@
 <?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">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only" initialize-with-hyphen="false" page-range-format="minimal">
   <!-- This style was edited with the Visual CSL Editor (http://editor.citationstyles.org/visualEditor/) -->
   <info>
     <title>Vancouver (brackets, only year in date, no issue numbers)</title>
diff --git a/buildres/csl/csl-styles/vancouver-brackets.csl b/buildres/csl/csl-styles/vancouver-brackets.csl
index 7e3025719b2..8314208e5bf 100644
--- a/buildres/csl/csl-styles/vancouver-brackets.csl
+++ b/buildres/csl/csl-styles/vancouver-brackets.csl
@@ -1,5 +1,5 @@
 <?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">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only" initialize-with-hyphen="false" page-range-format="minimal">
   <info>
     <title>Vancouver (brackets)</title>
     <id>http://www.zotero.org/styles/vancouver-brackets</id>
diff --git a/buildres/csl/csl-styles/vancouver-fr-ca.csl b/buildres/csl/csl-styles/vancouver-fr-ca.csl
index 1b9bbff2bb5..e625f525e41 100644
--- a/buildres/csl/csl-styles/vancouver-fr-ca.csl
+++ b/buildres/csl/csl-styles/vancouver-fr-ca.csl
@@ -1,5 +1,5 @@
 <?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="fr-CA">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only" initialize-with-hyphen="false" page-range-format="minimal" default-locale="fr-CA">
   <info>
     <title>Vancouver (Français - Canada)</title>
     <id>http://www.zotero.org/styles/vancouver-fr-ca</id>
diff --git a/buildres/csl/csl-styles/vancouver-imperial-college-london.csl b/buildres/csl/csl-styles/vancouver-imperial-college-london.csl
index 6d55fb8c1f1..0fa942ac06d 100644
--- a/buildres/csl/csl-styles/vancouver-imperial-college-london.csl
+++ b/buildres/csl/csl-styles/vancouver-imperial-college-london.csl
@@ -1,5 +1,5 @@
 <?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-GB">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only" initialize-with-hyphen="false" page-range-format="expanded" default-locale="en-GB">
   <info>
     <title>Imperial College London - Vancouver</title>
     <id>http://www.zotero.org/styles/vancouver-imperial-college-london</id>
diff --git a/buildres/csl/csl-styles/vancouver-superscript-brackets-only-year.csl b/buildres/csl/csl-styles/vancouver-superscript-brackets-only-year.csl
index e1ddddae06d..18eee883b62 100644
--- a/buildres/csl/csl-styles/vancouver-superscript-brackets-only-year.csl
+++ b/buildres/csl/csl-styles/vancouver-superscript-brackets-only-year.csl
@@ -1,5 +1,5 @@
 <?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">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only" initialize-with-hyphen="false" page-range-format="minimal">
   <info>
     <title>Vancouver (superscript, brackets, only year in date)</title>
     <id>http://www.zotero.org/styles/vancouver-superscript-brackets-only-year</id>
diff --git a/buildres/csl/csl-styles/vancouver-superscript-only-year.csl b/buildres/csl/csl-styles/vancouver-superscript-only-year.csl
index c08731870f1..0130fccc31c 100644
--- a/buildres/csl/csl-styles/vancouver-superscript-only-year.csl
+++ b/buildres/csl/csl-styles/vancouver-superscript-only-year.csl
@@ -1,5 +1,5 @@
 <?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">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only" initialize-with-hyphen="false" page-range-format="minimal">
   <info>
     <title>Vancouver (superscript, only year in date, no issue numbers)</title>
     <id>http://www.zotero.org/styles/vancouver-superscript-only-year</id>
diff --git a/buildres/csl/csl-styles/vancouver-superscript.csl b/buildres/csl/csl-styles/vancouver-superscript.csl
index 86a4bd217d8..881a228e59f 100644
--- a/buildres/csl/csl-styles/vancouver-superscript.csl
+++ b/buildres/csl/csl-styles/vancouver-superscript.csl
@@ -1,5 +1,5 @@
 <?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">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only" initialize-with-hyphen="false" page-range-format="minimal">
   <info>
     <title>Vancouver (superscript)</title>
     <id>http://www.zotero.org/styles/vancouver-superscript</id>
diff --git a/buildres/csl/csl-styles/vancouver.csl b/buildres/csl/csl-styles/vancouver.csl
index edbb69b411a..71c92032289 100644
--- a/buildres/csl/csl-styles/vancouver.csl
+++ b/buildres/csl/csl-styles/vancouver.csl
@@ -1,5 +1,5 @@
 <?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">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only" initialize-with-hyphen="false" page-range-format="minimal">
   <info>
     <title>Vancouver</title>
     <id>http://www.zotero.org/styles/vancouver</id>
diff --git a/buildres/csl/csl-styles/vox-sanguinis.csl b/buildres/csl/csl-styles/vox-sanguinis.csl
new file mode 100644
index 00000000000..fe9537e4767
--- /dev/null
+++ b/buildres/csl/csl-styles/vox-sanguinis.csl
@@ -0,0 +1,178 @@
+<?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" page-range-format="minimal">
+  <info>
+    <title>Vox Sanguinis</title>
+    <id>http://www.zotero.org/styles/vox-sanguinis</id>
+    <link rel="self" href="http://www.zotero.org/styles/vox-sanguinis"/>
+    <link href="http://www.zotero.org/styles/biomed-central" rel="template"/>
+    <link href="https://onlinelibrary.wiley.com/page/journal/14230410/homepage/forauthors.html#preparing" rel="documentation"/>
+    <author>
+      <name>Patrick O'Brien</name>
+    </author>
+    <category citation-format="numeric"/>
+    <category field="medicine"/>
+    <category field="biology"/>
+    <issn>0042-9007</issn>
+    <eissn>1423-0410</eissn>
+    <updated>2022-06-06T08:16:31+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">
+    <date form="text" delimiter=" ">
+      <date-part name="day"/>
+      <date-part name="month" form="short" strip-periods="true"/>
+      <date-part name="year"/>
+    </date>
+    <terms>
+      <term name="collection-editor" form="long">
+        <single>Series editor</single>
+        <multiple>Series editors</multiple>
+      </term>
+    </terms>
+  </locale>
+  <macro name="author">
+    <names variable="author">
+      <name sort-separator=" " initialize-with="" name-as-sort-order="all" delimiter=", " delimiter-precedes-last="always"/>
+      <label prefix=", "/>
+      <substitute>
+        <names variable="editor"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="editor">
+    <names variable="editor" suffix=".">
+      <name sort-separator=" " initialize-with="" name-as-sort-order="all" delimiter=", " delimiter-precedes-last="always"/>
+      <label prefix=", "/>
+    </names>
+  </macro>
+  <macro name="publisher">
+    <group delimiter="; ">
+      <group delimiter=": ">
+        <choose>
+          <if type="thesis" match="none">
+            <text variable="publisher-place"/>
+          </if>
+        </choose>
+        <text variable="publisher"/>
+      </group>
+      <text macro="year-date"/>
+    </group>
+  </macro>
+  <macro name="container-title">
+    <choose>
+      <if type="article-journal" match="any">
+        <text variable="container-title" form="short" strip-periods="true"/>
+      </if>
+      <else>
+        <text variable="container-title"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <text term="edition" form="long" suffix="."/>
+        </group>
+      </if>
+      <else>
+        <text variable="edition" suffix="."/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="year-date">
+    <date variable="issued" form="numeric" date-parts="year"/>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if type="article-journal">
+        <choose>
+          <if match="none" variable="page volume">
+            <text variable="DOI" prefix="https://doi.org/"/>
+          </if>
+        </choose>
+      </if>
+      <else-if type="webpage post-weblog post" match="any">
+        <group delimiter=". ">
+          <group delimiter=" ">
+            <text term="cited" text-case="capitalize-first"/>
+            <date variable="accessed">
+              <date-part name="year"/>
+              <date-part name="month" strip-periods="true" prefix=" "/>
+              <date-part name="day" prefix=" "/>
+            </date>
+          </group>
+          <group delimiter=" ">
+            <text term="available at" text-case="capitalize-first"/>
+            <text variable="URL"/>
+          </group>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <citation collapse="citation-number">
+    <sort>
+      <key variable="citation-number"/>
+    </sort>
+    <layout prefix="[" suffix="]" delimiter=", ">
+      <text variable="citation-number"/>
+    </layout>
+  </citation>
+  <bibliography et-al-min="7" et-al-use-first="6" second-field-align="flush">
+    <layout suffix=".">
+      <text variable="citation-number" suffix=". "/>
+      <group>
+        <group delimiter=". ">
+          <text macro="author"/>
+          <text variable="title"/>
+          <choose>
+            <if type="bill book graphic legal_case legislation motion_picture report song thesis" match="any">
+              <group delimiter=". " prefix=" ">
+                <text macro="edition"/>
+                <text variable="genre"/>
+                <text macro="publisher"/>
+              </group>
+            </if>
+            <else-if type="chapter paper-conference" match="any">
+              <group delimiter=". ">
+                <group delimiter=": ">
+                  <text term="in" text-case="capitalize-first"/>
+                  <group delimiter=". ">
+                    <text macro="editor"/>
+                    <text macro="container-title"/>
+                  </group>
+                </group>
+                <text macro="edition"/>
+                <group delimiter=": ">
+                  <text macro="publisher"/>
+                  <group delimiter=" ">
+                    <label variable="page" form="short" plural="never"/>
+                    <text variable="page"/>
+                  </group>
+                </group>
+              </group>
+            </else-if>
+            <else>
+              <text macro="container-title"/>
+              <group delimiter=";">
+                <text macro="year-date"/>
+                <group>
+                  <text variable="volume"/>
+                  <choose>
+                    <if is-numeric="issue"/>
+                    <else>
+                      <text variable="issue" prefix=" "/>
+                    </else>
+                  </choose>
+                  <text variable="page" prefix=":"/>
+                </group>
+              </group>
+            </else>
+          </choose>
+          <text macro="access"/>
+        </group>
+      </group>
+    </layout>
+  </bibliography>
+</style>
diff --git a/buildres/linux/jabrefHost.py b/buildres/linux/jabrefHost.py
index aedf2d81580..557768fc9f6 100755
--- a/buildres/linux/jabrefHost.py
+++ b/buildres/linux/jabrefHost.py
@@ -74,7 +74,7 @@ def send_message(message):
 
 def add_jabref_entry(data):
     """Send string via cli as literal to preserve special characters"""
-    cmd = str(JABREF_PATH).split() + ["--importBibtex", r"{}".format(data)]
+    cmd = str(JABREF_PATH).split() + ["--importBibtex", r"'{}'".format(data)]
     logging.info("Try to execute command {}".format(cmd))
     response = subprocess.check_output(cmd, stderr=subprocess.STDOUT)
     logging.info("Called JabRef and got: {}".format(response))
diff --git a/buildres/windows/JabRefHost.bat b/buildres/windows/JabRefHost.bat
index 8561a8dedd1..1da03167e39 100644
--- a/buildres/windows/JabRefHost.bat
+++ b/buildres/windows/JabRefHost.bat
@@ -2,13 +2,14 @@
 pushd %~dp0
 
 :: Test if pwsh exists
+setlocal enabledelayedexpansion
 where /q pwsh.exe
-if %errorlevel%==0 (
+if !ERRORLEVEL!==0 (
     @pwsh.exe -ExecutionPolicy Bypass -NoLogo -NonInteractive -NoProfile -WindowStyle Hidden -File ".\JabRefHost.ps1"
 ) else (
     :: If not, test if powershell exists
     where /q powershell.exe
-    if %errorlevel%==0 (
+    if !ERRORLEVEL!==0 (
         @powershell.exe -ExecutionPolicy Bypass -NoLogo -NonInteractive -NoProfile -WindowStyle Hidden -File ".\JabRefHost.ps1"
     ) else (
         echo "Could not find pwsh.exe or powershell.exe" 1>&2
@@ -16,3 +17,4 @@ if %errorlevel%==0 (
         exit /b 1
     )
 )
+endlocal
diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
index 5d75c732bed..b40e6b25d37 100644
--- a/config/checkstyle/checkstyle.xml
+++ b/config/checkstyle/checkstyle.xml
@@ -21,6 +21,18 @@
     <module name="FileTabCharacter"/>
     <module name="NewlineAtEndOfFile"/>
 
+    <!-- Prevent empty start and end of blocks - source: comments to https://stackoverflow.com/a/48027770/873282 -->
+    <module name="RegexpMultiline">
+        <property name="message" value="Blank line at start of block should be removed" />
+        <property name="format" value="(\(.*\)|else)\s*\{\s*[\r]?\n\s*[\r]?\n" />
+        <property name="fileExtensions" value="groovy,java" />
+    </module>
+    <module name="RegexpMultiline">
+        <property name="message" value="Blank line at end of block should be removed" />
+        <property name="format" value="[\r]?\n\s*[\r]?\n\s*\}" />
+        <property name="fileExtensions" value="groovy,java" />
+    </module>
+
     <!-- Checks for size violations: https://checkstyle.sourceforge.io/config_sizes.html -->
 
     <!-- LineLength not in place as PreviewerViewer and RelatedArticlesTab have line length with more than 500 charachters -->
@@ -32,6 +44,8 @@
             <property name="allowMissingParamTags" value="true"/>
             <property name="allowMissingReturnTag" value="true"/>
         </module>
+        <module name="RequireEmptyLineBeforeBlockTagGroup"/>
+        <module name="JavadocMissingLeadingAsteriskCheck"/>
 
         <!-- Checks for imports: https://checkstyle.org/config_import.html -->
 
@@ -67,6 +81,7 @@
             <property name="tokens" value="COMMA, SEMI, ELLIPSIS, ARRAY_DECLARATOR, RBRACK, METHOD_REF"/>
         </module>
         <module name="SingleSpaceSeparator"/>
+        <module name="NoWhitespaceBeforeCaseDefaultColon"/>
         <module name="WhitespaceAfter"/>
         <module name="WhitespaceAround">
             <!-- RCULRY causes issues if classes are nested within arrays, therefore not activated -->
@@ -83,6 +98,8 @@
         <module name="ConstantName">
             <property name="format" value="^log(ger)?|[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$"/>
         </module>
+        <module name="PatternVariableName" />
+        <module name="RecordComponentName"/>
 
         <!-- Checks for blocks: https://checkstyle.org/config_blocks.html -->
 
@@ -137,5 +154,9 @@
 
         <module name="MissingDeprecated"/>
 
+        <!-- Checks for illegal usage of reserved names as identifier names, such as "var", "record" - https://checkstyle.sourceforge.io/config_naming.html#IllegalIdentifierName -->
+        <module name="IllegalIdentifierName"/>
+
+        <module name="RecordTypeParameterNameCheck"/>
     </module>
 </module>
diff --git a/config/checkstyle/checkstyle_reviewdog.xml b/config/checkstyle/checkstyle_reviewdog.xml
index 23d41f035e1..0f5e3ebefa8 100644
--- a/config/checkstyle/checkstyle_reviewdog.xml
+++ b/config/checkstyle/checkstyle_reviewdog.xml
@@ -21,6 +21,18 @@
     <module name="FileTabCharacter"/>
     <module name="NewlineAtEndOfFile"/>
 
+    <!-- Prevent empty start and end of blocks - source: comments to https://stackoverflow.com/a/48027770/873282 -->
+    <module name="RegexpMultiline">
+        <property name="message" value="Blank line at start of block should be removed" />
+        <property name="format" value="(\(.*\)|else)\s*\{\s*[\r]?\n\s*[\r]?\n" />
+        <property name="fileExtensions" value="groovy,java" />
+    </module>
+    <module name="RegexpMultiline">
+        <property name="message" value="Blank line at end of block should be removed" />
+        <property name="format" value="[\r]?\n\s*[\r]?\n\s*\}" />
+        <property name="fileExtensions" value="groovy,java" />
+    </module>
+
     <!-- Checks for size violations: https://checkstyle.sourceforge.io/config_sizes.html -->
 
     <!-- LineLength not in place as PreviewerViewer and RelatedArticlesTab have line length with more than 500 charachters -->
@@ -32,6 +44,8 @@
             <property name="allowMissingParamTags" value="true"/>
             <property name="allowMissingReturnTag" value="true"/>
         </module>
+        <module name="RequireEmptyLineBeforeBlockTagGroup"/>
+        <module name="JavadocMissingLeadingAsteriskCheck"/>
 
         <!-- Checks for imports: https://checkstyle.org/config_import.html -->
 
@@ -67,6 +81,7 @@
             <property name="tokens" value="COMMA, SEMI, ELLIPSIS, ARRAY_DECLARATOR, RBRACK, METHOD_REF"/>
         </module>
         <module name="SingleSpaceSeparator"/>
+        <module name="NoWhitespaceBeforeCaseDefaultColon"/>
         <module name="WhitespaceAfter"/>
         <module name="WhitespaceAround">
             <!-- RCULRY causes issues if classes are nested within arrays, therefore not activated -->
@@ -83,6 +98,8 @@
         <module name="ConstantName">
             <property name="format" value="^log(ger)?|[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$"/>
         </module>
+        <module name="PatternVariableName" />
+        <module name="RecordComponentName"/>
 
         <!-- Checks for blocks: https://checkstyle.org/config_blocks.html -->
 
@@ -137,5 +154,9 @@
 
         <module name="MissingDeprecated"/>
 
+        <!-- Checks for illegal usage of reserved names as identifier names, such as "var", "record" - https://checkstyle.sourceforge.io/config_naming.html#IllegalIdentifierName -->
+        <module name="IllegalIdentifierName"/>
+
+        <module name="RecordTypeParameterNameCheck"/>
     </module>
 </module>
diff --git a/crowdin.yml b/crowdin.yml
index 1ec4fb7a69c..90c30e89519 100644
--- a/crowdin.yml
+++ b/crowdin.yml
@@ -4,6 +4,5 @@ files:
     languages_mapping:
       two_letters_code:
         pt-BR: pt_BR
-        id: in
         zh-CN: zh_CN
         zh-TW: zh_TW
diff --git a/docs/.gitbook/assets/contribution-process-reviews (2) (2) (2) (2) (2) (3).svg b/docs/.gitbook/assets/contribution-process-reviews (2) (2) (2) (2) (2) (3).svg
deleted file mode 100644
index 39951a21137..00000000000
--- a/docs/.gitbook/assets/contribution-process-reviews (2) (2) (2) (2) (2) (3).svg	
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- created with bpmn-js / http://bpmn.io -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="1102" height="742" viewBox="154 74 1102 742" version="1.1"><defs><marker id="sequenceflow-end-white-black-8hlpjcvyj0e4nmjcqq255ek8l" viewBox="0 0 20 20" refX="11" refY="10" markerWidth="10" markerHeight="10" orient="auto"><path d="M 1 5 L 11 10 L 1 15 Z" style="fill: black; stroke-width: 1px; stroke-linecap: round; stroke-dasharray: 10000px, 1px; stroke: black;"/></marker><marker id="messageflow-end-white-black-8hlpjcvyj0e4nmjcqq255ek8l" viewBox="0 0 20 20" refX="8.5" refY="5" markerWidth="20" markerHeight="20" orient="auto"><path d="m 1 5 l 0 -3 l 7 3 l -7 3 z" style="fill: white; stroke-width: 1px; stroke-linecap: butt; stroke-dasharray: 10000px, 1px; stroke: black;"/></marker><marker id="messageflow-start-white-black-8hlpjcvyj0e4nmjcqq255ek8l" viewBox="0 0 20 20" refX="6" refY="6" markerWidth="20" markerHeight="20" orient="auto"><circle cx="6" cy="6" r="3.5" style="fill: white; stroke-width: 1px; stroke-linecap: round; stroke-dasharray: 10000px, 1px; stroke: black;"/></marker></defs><g class="djs-group"><g class="djs-element djs-shape new-parent" data-element-id="Participant_0fyjhlu" transform="matrix(1, 0, 0, 1, 160, 80)" style="display: block;"><g class="djs-visual"><rect x="0" y="0" width="1090" height="250" rx="0" ry="0" style="stroke: black; stroke-width: 2px; fill: white; fill-opacity: 0.95;"/><polyline points="30,0 30,250 " style="fill: none; stroke: black; stroke-width: 2px;"/><text style="font-family: Arial, sans-serif; font-size: 12px; font-weight: normal; fill: black;" lineHeight="1.2" class="djs-label" transform="matrix(-1.83697e-16, -1, 1, -1.83697e-16, 0, 250)"><tspan x="94" y="18.6">Contributor</tspan></text></g><rect x="-6" y="-6" width="1102" height="262" style="fill: none;" class="djs-outline"/><rect style="fill: none; stroke-opacity: 0; stroke: white; stroke-width: 15px;" class="djs-hit djs-hit-click-stroke" x="0" y="0" width="1090" height="250"/><rect style="fill: none; stroke-opacity: 0; stroke: white; stroke-width: 15px;" class="djs-hit djs-hit-all" x="0" y="0" width="30" height="250"/></g><g class="djs-children"><g class="djs-group"><g class="djs-element djs-shape" data-element-id="Lane_0hs0sz6" transform="matrix(1, 0, 0, 1, 190, 80)" style="display: block;"><g class="djs-visual"><rect x="0" y="0" width="1060" height="250" rx="0" ry="0" style="stroke: black; stroke-width: 2px; fill: white; fill-opacity: 0.35;"/><text style="font-family: Arial, sans-serif; font-size: 12px; font-weight: normal; fill: black;" lineHeight="1.2" class="djs-label" transform="matrix(-1.83697e-16, -1, 1, -1.83697e-16, 0, 250)"><tspan x="125" y="18.6"/></text></g><rect x="-6" y="-6" width="1072" height="262" style="fill: none;" class="djs-outline"/><rect style="fill: none; stroke-opacity: 0; stroke: white; stroke-width: 15px;" class="djs-hit djs-hit-click-stroke" x="0" y="0" width="1060" height="250"/><rect style="fill: none; stroke-opacity: 0; stroke: white; stroke-width: 15px;" class="djs-hit djs-hit-all" x="0" y="0" width="30" height="250"/></g></g><g class="djs-group"><g class="djs-element djs-connection" data-element-id="Flow_0xnbekr" style="display: block;"><g class="djs-visual"><path d="m  248,130L300,130 " style="fill: none; stroke-width: 2px; stroke: black; stroke-linejoin: round; marker-end: url('#sequenceflow-end-white-black-8hlpjcvyj0e4nmjcqq255ek8l');"/></g><polyline points="248,130 300,130 " style="fill: none; stroke-opacity: 0; stroke: white; stroke-width: 15px;" class="djs-hit djs-hit-stroke"/><rect x="242" y="124" width="64" height="12" style="fill: none;" class="djs-outline"/></g></g><g class="djs-group"><g class="djs-element djs-connection" data-element-id="Flow_19d4vb4" style="display: block;"><g class="djs-visual"><path d="m  400,130L460,130 " style="fill: none; stroke-width: 2px; stroke: black; stroke-linejoin: round; marker-end: url('#sequenceflow-end-white-black-8hlpjcvyj0e4nmjcqq255ek8l');"/></g><polyline points="400,130 460,130 " style="fill: none; stroke-opacity: 0; stroke: white; stroke-width: 15px;" class="djs-hit djs-hit-stroke"/><rect x="394" y="124" width="72" height="12" style="fill: none;" class="djs-outline"/></g></g><g class="djs-group"><g class="djs-element djs-connection" data-element-id="Flow_0gk2fm4" style="display: block;"><g class="djs-visual"><path d="m  560,130L595,130 " style="fill: none; stroke-width: 2px; stroke: black; stroke-linejoin: round; marker-end: url('#sequenceflow-end-white-black-8hlpjcvyj0e4nmjcqq255ek8l');"/></g><polyline points="560,130 595,130 " style="fill: none; stroke-opacity: 0; stroke: white; stroke-width: 15px;" class="djs-hit djs-hit-stroke"/><rect x="554" y="124" width="47" height="12" style="fill: none;" class="djs-outline"/></g></g><g class="djs-group"><g class="djs-element djs-connection" data-element-id="Flow_0qg5vp0" style="display: block;"><g class="djs-visual"><path d="m  645,130L685,130 " style="fill: none; stroke-width: 2px; stroke: black; stroke-linejoin: round; marker-end: url('#sequenceflow-end-white-black-8hlpjcvyj0e4nmjcqq255ek8l');"/></g><polyline points="645,130 685,130 " style="fill: none; stroke-opacity: 0; stroke: white; stroke-width: 15px;" class="djs-hit djs-hit-stroke"/><rect x="639" y="124" width="52" height="12" style="fill: none;" class="djs-outline"/></g></g><g class="djs-group"><g class="djs-element djs-connection" data-element-id="Flow_0agupxr" style="display: block;"><g class="djs-visual"><path d="m  735,130L802,130 " style="fill: none; stroke-width: 2px; stroke: black; stroke-linejoin: round; marker-end: url('#sequenceflow-end-white-black-8hlpjcvyj0e4nmjcqq255ek8l');"/></g><polyline points="735,130 802,130 " style="fill: none; stroke-opacity: 0; stroke: white; stroke-width: 15px;" class="djs-hit djs-hit-stroke"/><rect x="729" y="124" width="79" height="12" style="fill: none;" class="djs-outline"/></g></g><g class="djs-group"><g class="djs-element djs-connection" data-element-id="Flow_1ddwsfq" style="display: block;"><g class="djs-visual"><path d="m  710,155L710,240 L802,240 " style="fill: none; stroke-width: 2px; stroke: black; stroke-linejoin: round; marker-end: url('#sequenceflow-end-white-black-8hlpjcvyj0e4nmjcqq255ek8l');"/></g><polyline points="710,155 710,240 802,240 " style="fill: none; stroke-opacity: 0; stroke: white; stroke-width: 15px;" class="djs-hit djs-hit-stroke"/><rect x="704" y="149" width="104" height="97" style="fill: none;" class="djs-outline"/></g></g><g class="djs-group"><g class="djs-element djs-connection" data-element-id="Flow_0jf3ewz" style="display: block;"><g class="djs-visual"><path d="m  838,130L1192,130 " style="fill: none; stroke-width: 2px; stroke: black; stroke-linejoin: round; marker-end: url('#sequenceflow-end-white-black-8hlpjcvyj0e4nmjcqq255ek8l');"/></g><polyline points="838,130 1192,130 " style="fill: none; stroke-opacity: 0; stroke: white; stroke-width: 15px;" class="djs-hit djs-hit-stroke"/><rect x="832" y="124" width="366" height="12" style="fill: none;" class="djs-outline"/></g></g><g class="djs-group"><g class="djs-element djs-connection" data-element-id="Flow_1umge8n" style="display: block;"><g class="djs-visual"><path d="m  980,240L1030,240 " style="fill: none; stroke-width: 2px; stroke: black; stroke-linejoin: round; marker-end: url('#sequenceflow-end-white-black-8hlpjcvyj0e4nmjcqq255ek8l');"/></g><polyline points="980,240 1030,240 " style="fill: none; stroke-opacity: 0; stroke: white; stroke-width: 15px;" class="djs-hit djs-hit-stroke"/><rect x="974" y="234" width="62" height="12" style="fill: none;" class="djs-outline"/></g></g><g class="djs-group"><g class="djs-element djs-connection" data-element-id="Flow_1ys4n2y" style="display: block;"><g class="djs-visual"><path d="m  838,240L880,240 " style="fill: none; stroke-width: 2px; stroke: black; stroke-linejoin: round; marker-end: url('#sequenceflow-end-white-black-8hlpjcvyj0e4nmjcqq255ek8l');"/></g><polyline points="838,240 880,240 " style="fill: none; stroke-opacity: 0; stroke: white; stroke-width: 15px;" class="djs-hit djs-hit-stroke"/><rect x="832" y="234" width="54" height="12" style="fill: none;" class="djs-outline"/></g></g><g class="djs-group"><g class="djs-element djs-connection" data-element-id="Flow_03itv3s" style="display: block;"><g class="djs-visual"><path d="m  1080,280L1080,310 L620,310 L620,155 " style="fill: none; stroke-width: 2px; stroke: black; stroke-linejoin: round; marker-end: url('#sequenceflow-end-white-black-8hlpjcvyj0e4nmjcqq255ek8l');"/></g><polyline points="1080,280 1080,310 620,310 620,155 " style="fill: none; stroke-opacity: 0; stroke: white; stroke-width: 15px;" class="djs-hit djs-hit-stroke"/><rect x="614" y="149" width="472" height="167" style="fill: none;" class="djs-outline"/></g></g><g class="djs-group"><g class="djs-element djs-shape" data-element-id="Event_12e1v92" transform="matrix(1, 0, 0, 1, 212, 112)" style="display: block;"><g class="djs-visual"><circle cx="18" cy="18" r="18" style="stroke: black; stroke-width: 2px; fill: white; fill-opacity: 0.95;"/></g><rect style="fill: none; stroke-opacity: 0; stroke: white; stroke-width: 15px;" class="djs-hit djs-hit-all" x="0" y="0" width="36" height="36"/><rect x="-6" y="-6" width="48" height="48" style="fill: none;" class="djs-outline"/></g></g><g class="djs-group"><g class="djs-element djs-shape" data-element-id="Activity_1xkda0e" transform="matrix(1, 0, 0, 1, 300, 90)" style="display: block;"><g class="djs-visual"><rect x="0" y="0" width="100" height="80" rx="10" ry="10" style="stroke: black; stroke-width: 2px; fill: white; fill-opacity: 0.95;"/><text style="font-family: Arial, sans-serif; font-size: 12px; font-weight: normal; fill: black;" lineHeight="1.2" class="djs-label"><tspan x="31" y="36.4">Create </tspan><tspan x="16" y="50.8">Contribution</tspan></text></g><rect style="fill: none; stroke-opacity: 0; stroke: white; stroke-width: 15px;" class="djs-hit djs-hit-all" x="0" y="0" width="100" height="80"/><rect x="-6" y="-6" width="112" height="92" style="fill: none;" class="djs-outline"/></g></g><g class="djs-group"><g class="djs-element djs-shape" data-element-id="Activity_1u4hroq" transform="matrix(1, 0, 0, 1, 460, 90)" style="display: block;"><g class="djs-visual"><rect x="0" y="0" width="100" height="80" rx="10" ry="10" style="stroke: black; stroke-width: 2px; fill: white; fill-opacity: 0.95;"/><text style="font-family: Arial, sans-serif; font-size: 12px; font-weight: normal; fill: black;" lineHeight="1.2" class="djs-label"><tspan x="30" y="36.4">Submit </tspan><tspan x="16" y="50.8">Contribution</tspan></text><path d="m 5.984999999999999,4.997999999999999 l 0,14 l 21,0 l 0,-14 z l 10.5,6 l 10.5,-6" style="fill: black; stroke-width: 1px; stroke: white;"/></g><rect style="fill: none; stroke-opacity: 0; stroke: white; stroke-width: 15px;" class="djs-hit djs-hit-all" x="0" y="0" width="100" height="80"/><rect x="-6" y="-6" width="112" height="92" style="fill: none;" class="djs-outline"/></g></g><g class="djs-group"><g class="djs-element djs-shape" data-element-id="Gateway_0gv16ci" transform="matrix(1, 0, 0, 1, 595, 105)" style="display: block;"><g class="djs-visual"><polygon points="25,0 50,25 25,50 0,25" style="stroke: black; stroke-width: 2px; fill: white; fill-opacity: 0.95;"/><path d="m 16,15 7.42857142857143,9.714285714285715 -7.42857142857143,9.714285714285715 3.428571428571429,0 5.714285714285715,-7.464228571428572 5.714285714285715,7.464228571428572 3.428571428571429,0 -7.42857142857143,-9.714285714285715 7.42857142857143,-9.714285714285715 -3.428571428571429,0 -5.714285714285715,7.464228571428572 -5.714285714285715,-7.464228571428572 -3.428571428571429,0 z" style="fill: black; stroke-width: 1px; stroke: black;"/></g><rect style="fill: none; stroke-opacity: 0; stroke: white; stroke-width: 15px;" class="djs-hit djs-hit-all" x="0" y="0" width="50" height="50"/><rect x="-6" y="-6" width="62" height="62" style="fill: none;" class="djs-outline"/></g></g><g class="djs-group"><g class="djs-element djs-shape" data-element-id="Gateway_05tk0q6" transform="matrix(1, 0, 0, 1, 685, 105)" style="display: block;"><g class="djs-visual"><polygon points="25,0 50,25 25,50 0,25" style="stroke: black; stroke-width: 2px; fill: white; fill-opacity: 0.95;"/><circle cx="25" cy="25" r="15" style="stroke: black; stroke-width: 1px; fill: none;"/><circle cx="25" cy="25" r="12" style="stroke: black; stroke-width: 1px; fill: none;"/><path d="m 18,22 7.363636363636364,-4.909090909090909 7.363636363636364,4.909090909090909 -2.4545454545454546,9.818181818181818 -9.818181818181818,0 z" style="fill: none; stroke-width: 2px; stroke: black;"/></g><rect style="fill: none; stroke-opacity: 0; stroke: white; stroke-width: 15px;" class="djs-hit djs-hit-all" x="0" y="0" width="50" height="50"/><rect x="-6" y="-6" width="62" height="62" style="fill: none;" class="djs-outline"/></g></g><g class="djs-group"><g class="djs-element djs-shape" data-element-id="Event_1d57wd9" transform="matrix(1, 0, 0, 1, 802, 112)" style="display: block;"><g class="djs-visual"><circle cx="18" cy="18" r="18" style="stroke: black; stroke-width: 1px; fill: white; fill-opacity: 0.95;"/><circle cx="18" cy="18" r="15" style="stroke: black; stroke-width: 1px; fill: none;"/><path d="m 8.459999999999999,11.34 l 0,12.6 l 18.900000000000002,0 l 0,-12.6 z l 9.450000000000001,5.4 l 9.450000000000001,-5.4" style="fill: white; stroke-width: 1px; stroke: black;"/></g><rect style="fill: none; stroke-opacity: 0; stroke: white; stroke-width: 15px;" class="djs-hit djs-hit-all" x="0" y="0" width="36" height="36"/><rect x="-6" y="-6" width="48" height="48" style="fill: none;" class="djs-outline"/></g></g><g class="djs-group"><g class="djs-element djs-shape" data-element-id="Event_14530lv" transform="matrix(1, 0, 0, 1, 802, 222)" style="display: block;"><g class="djs-visual"><circle cx="18" cy="18" r="18" style="stroke: black; stroke-width: 1px; fill: white; fill-opacity: 0.95;"/><circle cx="18" cy="18" r="15" style="stroke: black; stroke-width: 1px; fill: none;"/><path d="m 8.459999999999999,11.34 l 0,12.6 l 18.900000000000002,0 l 0,-12.6 z l 9.450000000000001,5.4 l 9.450000000000001,-5.4" style="fill: white; stroke-width: 1px; stroke: black;"/></g><rect style="fill: none; stroke-opacity: 0; stroke: white; stroke-width: 15px;" class="djs-hit djs-hit-all" x="0" y="0" width="36" height="36"/><rect x="-6" y="-6" width="48" height="48" style="fill: none;" class="djs-outline"/></g></g><g class="djs-group"><g class="djs-element djs-shape" data-element-id="Activity_0ho6twy" transform="matrix(1, 0, 0, 1, 880, 200)" style="display: block;"><g class="djs-visual"><rect x="0" y="0" width="100" height="80" rx="10" ry="10" style="stroke: black; stroke-width: 2px; fill: white; fill-opacity: 0.95;"/><text style="font-family: Arial, sans-serif; font-size: 12px; font-weight: normal; fill: black;" lineHeight="1.2" class="djs-label"><tspan x="13" y="43.599999999999994">Update Code</tspan></text></g><rect style="fill: none; stroke-opacity: 0; stroke: white; stroke-width: 15px;" class="djs-hit djs-hit-all" x="0" y="0" width="100" height="80"/><rect x="-6" y="-6" width="112" height="92" style="fill: none;" class="djs-outline"/></g></g><g class="djs-group"><g class="djs-element djs-shape" data-element-id="Event_17bbxgk" transform="matrix(1, 0, 0, 1, 1192, 112)" style="display: block;"><g class="djs-visual"><circle cx="18" cy="18" r="18" style="stroke: black; stroke-width: 4px; fill: white; fill-opacity: 0.95;"/></g><rect style="fill: none; stroke-opacity: 0; stroke: white; stroke-width: 15px;" class="djs-hit djs-hit-all" x="0" y="0" width="36" height="36"/><rect x="-6" y="-6" width="48" height="48" style="fill: none;" class="djs-outline"/></g></g><g class="djs-group"><g class="djs-element djs-shape" data-element-id="Activity_0l2aoea" transform="matrix(1, 0, 0, 1, 1030, 200)" style="display: block;"><g class="djs-visual"><rect x="0" y="0" width="100" height="80" rx="10" ry="10" style="stroke: black; stroke-width: 2px; fill: white; fill-opacity: 0.95;"/><text style="font-family: Arial, sans-serif; font-size: 12px; font-weight: normal; fill: black;" lineHeight="1.2" class="djs-label"><tspan x="10" y="36.4">Comment Pull </tspan><tspan x="26" y="50.8">Request</tspan></text><path d="m 5.984999999999999,4.997999999999999 l 0,14 l 21,0 l 0,-14 z l 10.5,6 l 10.5,-6" style="fill: black; stroke-width: 1px; stroke: white;"/></g><rect style="fill: none; stroke-opacity: 0; stroke: white; stroke-width: 15px;" class="djs-hit djs-hit-all" x="0" y="0" width="100" height="80"/><rect x="-6" y="-6" width="112" height="92" style="fill: none;" class="djs-outline"/></g></g></g></g><g class="djs-group"><g class="djs-element djs-shape" data-element-id="Participant_11uvk6g" transform="matrix(1, 0, 0, 1, 160, 370)" style="display: block;"><g class="djs-visual"><rect x="0" y="0" width="1090" height="440" rx="0" ry="0" style="stroke: black; stroke-width: 2px; fill: white; fill-opacity: 0.95;"/><polyline points="30,0 30,440 " style="fill: none; stroke: black; stroke-width: 2px;"/><text style="font-family: Arial, sans-serif; font-size: 12px; font-weight: normal; fill: black;" lineHeight="1.2" class="djs-label" transform="matrix(-1.83697e-16, -1, 1, -1.83697e-16, 0, 440)"><tspan x="183" y="18.6">JabRef Team</tspan></text></g><rect x="-6" y="-6" width="1102" height="452" style="fill: none;" class="djs-outline"/><rect style="fill: none; stroke-opacity: 0; stroke: white; stroke-width: 15px;" class="djs-hit djs-hit-click-stroke" x="0" y="0" width="1090" height="440"/><rect style="fill: none; stroke-opacity: 0; stroke: white; stroke-width: 15px;" class="djs-hit djs-hit-all" x="0" y="0" width="30" height="440"/></g><g class="djs-children"><g class="djs-group"><g class="djs-element djs-shape" data-element-id="Lane_0li7fq4" transform="matrix(1, 0, 0, 1, 190, 370)" style="display: block;"><g class="djs-visual"><rect x="0" y="0" width="1060" height="300" rx="0" ry="0" style="stroke: black; stroke-width: 2px; fill: white; fill-opacity: 0.35;"/><text style="font-family: Arial, sans-serif; font-size: 12px; font-weight: normal; fill: black;" lineHeight="1.2" class="djs-label" transform="matrix(-1.83697e-16, -1, 1, -1.83697e-16, 0, 300)"><tspan x="108" y="18.6">Frist Developer</tspan></text></g><rect x="-6" y="-6" width="1072" height="312" style="fill: none;" class="djs-outline"/><rect style="fill: none; stroke-opacity: 0; stroke: white; stroke-width: 15px;" class="djs-hit djs-hit-click-stroke" x="0" y="0" width="1060" height="300"/><rect style="fill: none; stroke-opacity: 0; stroke: white; stroke-width: 15px;" class="djs-hit djs-hit-all" x="0" y="0" width="30" height="300"/></g></g><g class="djs-group"><g class="djs-element djs-shape" data-element-id="Lane_1xa20pj" transform="matrix(1, 0, 0, 1, 190, 670)" style="display: block;"><g class="djs-visual"><rect x="0" y="0" width="1060" height="140" rx="0" ry="0" style="stroke: black; stroke-width: 2px; fill: white; fill-opacity: 0.35;"/><text style="font-family: Arial, sans-serif; font-size: 12px; font-weight: normal; fill: black;" lineHeight="1.2" class="djs-label" transform="matrix(-1.83697e-16, -1, 1, -1.83697e-16, 0, 140)"><tspan x="19" y="18.6">Second Developer</tspan></text></g><rect x="-6" y="-6" width="1072" height="152" style="fill: none;" class="djs-outline"/><rect style="fill: none; stroke-opacity: 0; stroke: white; stroke-width: 15px;" class="djs-hit djs-hit-click-stroke" x="0" y="0" width="1060" height="140"/><rect style="fill: none; stroke-opacity: 0; stroke: white; stroke-width: 15px;" class="djs-hit djs-hit-all" x="0" y="0" width="30" height="140"/></g></g><g class="djs-group"><g class="djs-element djs-connection" data-element-id="Flow_17vz23d" style="display: block;"><g class="djs-visual"><path d="m  468,510L488,510 " style="fill: none; stroke-width: 2px; stroke: black; stroke-linejoin: round; marker-end: url('#sequenceflow-end-white-black-8hlpjcvyj0e4nmjcqq255ek8l');"/></g><polyline points="468,510 488,510 " style="fill: none; stroke-opacity: 0; stroke: white; stroke-width: 15px;" class="djs-hit djs-hit-stroke"/><rect x="462" y="504" width="32" height="12" style="fill: none;" class="djs-outline"/></g></g><g class="djs-group"><g class="djs-element djs-connection" data-element-id="Flow_092pmqs" style="display: block;"><g class="djs-visual"><path d="m  718,745L768,745 " style="fill: none; stroke-width: 2px; stroke: black; stroke-linejoin: round; marker-end: url('#sequenceflow-end-white-black-8hlpjcvyj0e4nmjcqq255ek8l');"/></g><polyline points="718,745 768,745 " style="fill: none; stroke-opacity: 0; stroke: white; stroke-width: 15px;" class="djs-hit djs-hit-stroke"/><rect x="712" y="739" width="62" height="12" style="fill: none;" class="djs-outline"/></g></g><g class="djs-group"><g class="djs-element djs-connection" data-element-id="Flow_0oegfa3" style="display: block;"><g class="djs-visual"><path d="m  953,745L1028,745 " style="fill: none; stroke-width: 2px; stroke: black; stroke-linejoin: round; marker-end: url('#sequenceflow-end-white-black-8hlpjcvyj0e4nmjcqq255ek8l');"/></g><polyline points="953,745 1028,745 " style="fill: none; stroke-opacity: 0; stroke: white; stroke-width: 15px;" class="djs-hit djs-hit-stroke"/><rect x="947" y="739" width="87" height="12" style="fill: none;" class="djs-outline"/></g></g><g class="djs-group"><g class="djs-element djs-connection" data-element-id="Flow_1nn75tr" style="display: block;"><g class="djs-visual"><path d="m  1128,745L1190,745 " style="fill: none; stroke-width: 2px; stroke: black; stroke-linejoin: round; marker-end: url('#sequenceflow-end-white-black-8hlpjcvyj0e4nmjcqq255ek8l');"/></g><polyline points="1128,745 1190,745 " style="fill: none; stroke-opacity: 0; stroke: white; stroke-width: 15px;" class="djs-hit djs-hit-stroke"/><rect x="1122" y="739" width="74" height="12" style="fill: none;" class="djs-outline"/></g></g><g class="djs-group"><g class="djs-element djs-connection" data-element-id="Flow_0lgsoh4" style="display: block;"><g class="djs-visual"><path d="m  668,535L668,705 " style="fill: none; stroke-width: 2px; stroke: black; stroke-linejoin: round; marker-end: url('#sequenceflow-end-white-black-8hlpjcvyj0e4nmjcqq255ek8l');"/></g><polyline points="668,535 668,705 " style="fill: none; stroke-opacity: 0; stroke: white; stroke-width: 15px;" class="djs-hit djs-hit-stroke"/><rect x="662" y="529" width="12" height="182" style="fill: none;" class="djs-outline"/></g></g><g class="djs-group"><g class="djs-element djs-connection" data-element-id="Flow_02lh9ep" style="display: block;"><g class="djs-visual"><path d="m  868,745L903,745 " style="fill: none; stroke-width: 2px; stroke: black; stroke-linejoin: round; marker-end: url('#sequenceflow-end-white-black-8hlpjcvyj0e4nmjcqq255ek8l');"/></g><polyline points="868,745 903,745 " style="fill: none; stroke-opacity: 0; stroke: white; stroke-width: 15px;" class="djs-hit djs-hit-stroke"/><rect x="862" y="739" width="47" height="12" style="fill: none;" class="djs-outline"/></g></g><g class="djs-group"><g class="djs-element djs-connection" data-element-id="Flow_0r3g541" style="display: block;"><g class="djs-visual"><path d="m  276,510L293,510 " style="fill: none; stroke-width: 2px; stroke: black; stroke-linejoin: round; marker-end: url('#sequenceflow-end-white-black-8hlpjcvyj0e4nmjcqq255ek8l');"/></g><polyline points="276,510 293,510 " style="fill: none; stroke-opacity: 0; stroke: white; stroke-width: 15px;" class="djs-hit djs-hit-stroke"/><rect x="270" y="504" width="29" height="12" style="fill: none;" class="djs-outline"/></g></g><g class="djs-group"><g class="djs-element djs-connection" data-element-id="Flow_0eye3fk" style="display: block;"><g class="djs-visual"><path d="m  343,510L368,510 " style="fill: none; stroke-width: 2px; stroke: black; stroke-linejoin: round; marker-end: url('#sequenceflow-end-white-black-8hlpjcvyj0e4nmjcqq255ek8l');"/></g><polyline points="343,510 368,510 " style="fill: none; stroke-opacity: 0; stroke: white; stroke-width: 15px;" class="djs-hit djs-hit-stroke"/><rect x="337" y="504" width="37" height="12" style="fill: none;" class="djs-outline"/></g></g><g class="djs-group"><g class="djs-element djs-connection" data-element-id="Flow_0c4fwpj" style="display: block;"><g class="djs-visual"><path d="m  588,510L643,510 " style="fill: none; stroke-width: 2px; stroke: black; stroke-linejoin: round; marker-end: url('#sequenceflow-end-white-black-8hlpjcvyj0e4nmjcqq255ek8l');"/></g><polyline points="588,510 643,510 " style="fill: none; stroke-opacity: 0; stroke: white; stroke-width: 15px;" class="djs-hit djs-hit-stroke"/><rect x="582" y="504" width="67" height="12" style="fill: none;" class="djs-outline"/></g></g><g class="djs-group"><g class="djs-element djs-connection" data-element-id="Flow_03i2ivp" style="display: block;"><g class="djs-visual"><path d="m  693,510L878,510 " style="fill: none; stroke-width: 2px; stroke: black; stroke-linejoin: round; marker-end: url('#sequenceflow-end-white-black-8hlpjcvyj0e4nmjcqq255ek8l');"/></g><polyline points="693,510 878,510 " style="fill: none; stroke-opacity: 0; stroke: white; stroke-width: 15px;" class="djs-hit djs-hit-stroke"/><rect x="687" y="504" width="197" height="12" style="fill: none;" class="djs-outline"/></g></g><g class="djs-group"><g class="djs-element djs-connection" data-element-id="Flow_1m35o86" style="display: block;"><g class="djs-visual"><path d="m  928,720L928,550 " style="fill: none; stroke-width: 2px; stroke: black; stroke-linejoin: round; marker-end: url('#sequenceflow-end-white-black-8hlpjcvyj0e4nmjcqq255ek8l');"/></g><polyline points="928,720 928,550 " style="fill: none; stroke-opacity: 0; stroke: white; stroke-width: 15px;" class="djs-hit djs-hit-stroke"/><rect x="922" y="544" width="12" height="182" style="fill: none;" class="djs-outline"/></g></g><g class="djs-group"><g class="djs-element djs-connection" data-element-id="Flow_1d4hm5u" style="display: block;"><g class="djs-visual"><path d="m  878,510L782,510 L782,400 L686,400 " style="fill: none; stroke-width: 2px; stroke: black; stroke-linejoin: round; marker-end: url('#sequenceflow-end-white-black-8hlpjcvyj0e4nmjcqq255ek8l');"/></g><polyline points="878,510 782,510 782,400 686,400 " style="fill: none; stroke-opacity: 0; stroke: white; stroke-width: 15px;" class="djs-hit djs-hit-stroke"/><rect x="680" y="394" width="204" height="122" style="fill: none;" class="djs-outline"/></g></g><g class="djs-group"><g class="djs-element djs-connection" data-element-id="Flow_0dhe45e" style="display: block;"><g class="djs-visual"><path d="m  650,400L318,400 L318,485 " style="fill: none; stroke-width: 2px; stroke: black; stroke-linejoin: round; marker-end: url('#sequenceflow-end-white-black-8hlpjcvyj0e4nmjcqq255ek8l');"/></g><polyline points="650,400 318,400 318,485 " style="fill: none; stroke-opacity: 0; stroke: white; stroke-width: 15px;" class="djs-hit djs-hit-stroke"/><rect x="312" y="394" width="344" height="97" style="fill: none;" class="djs-outline"/></g></g><g class="djs-group"><g class="djs-element djs-shape" data-element-id="StartEvent_1y45yut" transform="matrix(1, 0, 0, 1, 240, 492)" style="display: block;"><g class="djs-visual"><circle cx="18" cy="18" r="18" style="stroke: black; stroke-width: 2px; fill: white; fill-opacity: 0.95;"/><path d="m 8.459999999999999,11.34 l 0,12.6 l 18.900000000000002,0 l 0,-12.6 z l 9.450000000000001,5.4 l 9.450000000000001,-5.4" style="fill: white; stroke-width: 1px; stroke: black;"/></g><rect style="fill: none; stroke-opacity: 0; stroke: white; stroke-width: 15px;" class="djs-hit djs-hit-all" x="0" y="0" width="36" height="36"/><rect x="-6" y="-6" width="48" height="48" style="fill: none;" class="djs-outline"/></g></g><g class="djs-group"><g class="djs-element djs-shape" data-element-id="Activity_1s07thr" transform="matrix(1, 0, 0, 1, 488, 470)" style="display: block;"><g class="djs-visual"><rect x="0" y="0" width="100" height="80" rx="10" ry="10" style="stroke: black; stroke-width: 2px; fill: white; fill-opacity: 0.95;"/><text style="font-family: Arial, sans-serif; font-size: 12px; font-weight: normal; fill: black;" lineHeight="1.2" class="djs-label"><tspan x="29" y="36.4">Provide </tspan><tspan x="22.5" y="50.8">Feedback</tspan></text></g><rect style="fill: none; stroke-opacity: 0; stroke: white; stroke-width: 15px;" class="djs-hit djs-hit-all" x="0" y="0" width="100" height="80"/><rect x="-6" y="-6" width="112" height="92" style="fill: none;" class="djs-outline"/></g></g><g class="djs-group"><g class="djs-element djs-shape" data-element-id="Gateway_0ynhdad" transform="matrix(1, 0, 0, 1, 643, 485)" style="display: block;"><g class="djs-visual"><polygon points="25,0 50,25 25,50 0,25" style="stroke: black; stroke-width: 2px; fill: white; fill-opacity: 0.95;"/><path d="m 16,15 7.42857142857143,9.714285714285715 -7.42857142857143,9.714285714285715 3.428571428571429,0 5.714285714285715,-7.464228571428572 5.714285714285715,7.464228571428572 3.428571428571429,0 -7.42857142857143,-9.714285714285715 7.42857142857143,-9.714285714285715 -3.428571428571429,0 -5.714285714285715,7.464228571428572 -5.714285714285715,-7.464228571428572 -3.428571428571429,0 z" style="fill: black; stroke-width: 1px; stroke: black;"/></g><rect style="fill: none; stroke-opacity: 0; stroke: white; stroke-width: 15px;" class="djs-hit djs-hit-all" x="0" y="0" width="50" height="50"/><rect x="-6" y="-6" width="62" height="62" style="fill: none;" class="djs-outline"/></g></g><g class="djs-group"><g class="djs-element djs-shape" data-element-id="Activity_128gn0k" transform="matrix(1, 0, 0, 1, 618, 705)" style="display: block;"><g class="djs-visual"><rect x="0" y="0" width="100" height="80" rx="10" ry="10" style="stroke: black; stroke-width: 2px; fill: white; fill-opacity: 0.95;"/><text style="font-family: Arial, sans-serif; font-size: 12px; font-weight: normal; fill: black;" lineHeight="1.2" class="djs-label"><tspan x="13" y="43.599999999999994">Review Code</tspan></text></g><rect style="fill: none; stroke-opacity: 0; stroke: white; stroke-width: 15px;" class="djs-hit djs-hit-all" x="0" y="0" width="100" height="80"/><rect x="-6" y="-6" width="112" height="92" style="fill: none;" class="djs-outline"/></g></g><g class="djs-group"><g class="djs-element djs-shape" data-element-id="Activity_1igjavi" transform="matrix(1, 0, 0, 1, 768, 705)" style="display: block;"><g class="djs-visual"><rect x="0" y="0" width="100" height="80" rx="10" ry="10" style="stroke: black; stroke-width: 2px; fill: white; fill-opacity: 0.95;"/><text style="font-family: Arial, sans-serif; font-size: 12px; font-weight: normal; fill: black;" lineHeight="1.2" class="djs-label"><tspan x="29" y="36.4">Provide </tspan><tspan x="22.5" y="50.8">Feedback</tspan></text></g><rect style="fill: none; stroke-opacity: 0; stroke: white; stroke-width: 15px;" class="djs-hit djs-hit-all" x="0" y="0" width="100" height="80"/><rect x="-6" y="-6" width="112" height="92" style="fill: none;" class="djs-outline"/></g></g><g class="djs-group"><g class="djs-element djs-shape" data-element-id="Event_19nae0c" transform="matrix(1, 0, 0, 1, 1190, 727)" style="display: block;"><g class="djs-visual"><circle cx="18" cy="18" r="18" style="stroke: black; stroke-width: 4px; fill: white; fill-opacity: 0.95;"/></g><rect style="fill: none; stroke-opacity: 0; stroke: white; stroke-width: 15px;" class="djs-hit djs-hit-all" x="0" y="0" width="36" height="36"/><rect x="-6" y="-6" width="48" height="48" style="fill: none;" class="djs-outline"/></g></g><g class="djs-group"><g class="djs-element djs-shape" data-element-id="Task_1hcentk" transform="matrix(1, 0, 0, 1, 368, 470)" style="display: block;"><g class="djs-visual"><rect x="0" y="0" width="100" height="80" rx="10" ry="10" style="stroke: black; stroke-width: 2px; fill: white; fill-opacity: 0.95;"/><text style="font-family: Arial, sans-serif; font-size: 12px; font-weight: normal; fill: black;" lineHeight="1.2" class="djs-label"><tspan x="13" y="43.599999999999994">Review Code</tspan></text></g><rect style="fill: none; stroke-opacity: 0; stroke: white; stroke-width: 15px;" class="djs-hit djs-hit-all" x="0" y="0" width="100" height="80"/><rect x="-6" y="-6" width="112" height="92" style="fill: none;" class="djs-outline"/></g></g><g class="djs-group"><g class="djs-element djs-shape" data-element-id="Gateway_02k1xqy" transform="matrix(1, 0, 0, 1, 293, 485)" style="display: block;"><g class="djs-visual"><polygon points="25,0 50,25 25,50 0,25" style="stroke: black; stroke-width: 2px; fill: white; fill-opacity: 0.95;"/><path d="m 16,15 7.42857142857143,9.714285714285715 -7.42857142857143,9.714285714285715 3.428571428571429,0 5.714285714285715,-7.464228571428572 5.714285714285715,7.464228571428572 3.428571428571429,0 -7.42857142857143,-9.714285714285715 7.42857142857143,-9.714285714285715 -3.428571428571429,0 -5.714285714285715,7.464228571428572 -5.714285714285715,-7.464228571428572 -3.428571428571429,0 z" style="fill: black; stroke-width: 1px; stroke: black;"/></g><rect style="fill: none; stroke-opacity: 0; stroke: white; stroke-width: 15px;" class="djs-hit djs-hit-all" x="0" y="0" width="50" height="50"/><rect x="-6" y="-6" width="62" height="62" style="fill: none;" class="djs-outline"/></g></g><g class="djs-group"><g class="djs-element djs-shape" data-element-id="Gateway_05556xu" transform="matrix(1, 0, 0, 1, 903, 720)" style="display: block;"><g class="djs-visual"><polygon points="25,0 50,25 25,50 0,25" style="stroke: black; stroke-width: 2px; fill: white; fill-opacity: 0.95;"/><path d="m 16,15 7.42857142857143,9.714285714285715 -7.42857142857143,9.714285714285715 3.428571428571429,0 5.714285714285715,-7.464228571428572 5.714285714285715,7.464228571428572 3.428571428571429,0 -7.42857142857143,-9.714285714285715 7.42857142857143,-9.714285714285715 -3.428571428571429,0 -5.714285714285715,7.464228571428572 -5.714285714285715,-7.464228571428572 -3.428571428571429,0 z" style="fill: black; stroke-width: 1px; stroke: black;"/></g><rect style="fill: none; stroke-opacity: 0; stroke: white; stroke-width: 15px;" class="djs-hit djs-hit-all" x="0" y="0" width="50" height="50"/><rect x="-6" y="-6" width="62" height="62" style="fill: none;" class="djs-outline"/></g></g><g class="djs-group"><g class="djs-element djs-shape" data-element-id="Activity_0khk6qw" transform="matrix(1, 0, 0, 1, 878, 470)" style="display: block;"><g class="djs-visual"><rect x="0" y="0" width="100" height="80" rx="10" ry="10" style="stroke: black; stroke-width: 2px; fill: white; fill-opacity: 0.95;"/><text style="font-family: Arial, sans-serif; font-size: 12px; font-weight: normal; fill: black;" lineHeight="1.2" class="djs-label"><tspan x="26" y="36.4">Request </tspan><tspan x="24" y="50.8">Changes</tspan></text><path d="m 5.984999999999999,4.997999999999999 l 0,14 l 21,0 l 0,-14 z l 10.5,6 l 10.5,-6" style="fill: black; stroke-width: 1px; stroke: white;"/></g><rect style="fill: none; stroke-opacity: 0; stroke: white; stroke-width: 15px;" class="djs-hit djs-hit-all" x="0" y="0" width="100" height="80"/><rect x="-6" y="-6" width="112" height="92" style="fill: none;" class="djs-outline"/></g></g><g class="djs-group"><g class="djs-element djs-shape" data-element-id="Activity_1btqbs6" transform="matrix(1, 0, 0, 1, 1028, 705)" style="display: block;"><g class="djs-visual"><rect x="0" y="0" width="100" height="80" rx="10" ry="10" style="stroke: black; stroke-width: 2px; fill: white; fill-opacity: 0.95;"/><text style="font-family: Arial, sans-serif; font-size: 12px; font-weight: normal; fill: black;" lineHeight="1.2" class="djs-label"><tspan x="20.5" y="36.4">Merge Pull </tspan><tspan x="22.5" y="50.8">Reuquest</tspan></text><path d="m 5.984999999999999,4.997999999999999 l 0,14 l 21,0 l 0,-14 z l 10.5,6 l 10.5,-6" style="fill: black; stroke-width: 1px; stroke: white;"/></g><rect style="fill: none; stroke-opacity: 0; stroke: white; stroke-width: 15px;" class="djs-hit djs-hit-all" x="0" y="0" width="100" height="80"/><rect x="-6" y="-6" width="112" height="92" style="fill: none;" class="djs-outline"/></g></g><g class="djs-group"><g class="djs-element djs-shape hover" data-element-id="Event_1u5dh9a" transform="matrix(1, 0, 0, 1, 650, 382)" style="display: block;"><g class="djs-visual"><circle cx="18" cy="18" r="18" style="stroke: black; stroke-width: 1px; fill: white; fill-opacity: 0.95;"/><circle cx="18" cy="18" r="15" style="stroke: black; stroke-width: 1px; fill: none;"/><path d="m 8.459999999999999,11.34 l 0,12.6 l 18.900000000000002,0 l 0,-12.6 z l 9.450000000000001,5.4 l 9.450000000000001,-5.4" style="fill: white; stroke-width: 1px; stroke: black;"/></g><rect style="fill: none; stroke-opacity: 0; stroke: white; stroke-width: 15px;" class="djs-hit djs-hit-all" x="0" y="0" width="36" height="36"/><rect x="-6" y="-6" width="48" height="48" style="fill: none;" class="djs-outline"/></g></g></g></g><g class="djs-group"><g class="djs-element djs-shape" data-element-id="Flow_0lgsoh4_label" transform="matrix(1, 0, 0, 1, 657, 617)" style="display: block;"><g class="djs-visual"><text style="font-family: Arial, sans-serif; font-size: 11px; font-weight: normal; fill: black;" lineHeight="1.2" class="djs-label"><tspan x="0" y="9.899999999999999">Quality OK</tspan></text></g><rect style="fill: none; stroke-opacity: 0; stroke: white; stroke-width: 15px;" class="djs-hit djs-hit-all" x="0" y="0" width="52" height="14"/><rect x="-6" y="-6" width="64" height="26" style="fill: none;" class="djs-outline"/></g></g><g class="djs-group"><g class="djs-element djs-shape" data-element-id="Flow_03i2ivp_label" transform="matrix(1, 0, 0, 1, 739, 529)" style="display: block;"><g class="djs-visual"><text style="font-family: Arial, sans-serif; font-size: 11px; font-weight: normal; fill: black;" lineHeight="1.2" class="djs-label"><tspan x="0" y="9.899999999999999">Quality does not </tspan><tspan x="5" y="23.099999999999998">meet JabRef's </tspan><tspan x="7.5" y="36.3">requirements</tspan></text></g><rect style="fill: none; stroke-opacity: 0; stroke: white; stroke-width: 15px;" class="djs-hit djs-hit-all" x="0" y="0" width="79" height="40"/><rect x="-6" y="-6" width="91" height="52" style="fill: none;" class="djs-outline"/></g></g><g class="djs-group"><g class="djs-element djs-shape" data-element-id="Flow_1m35o86_label" transform="matrix(1, 0, 0, 1, 938, 572)" style="display: block;"><g class="djs-visual"><text style="font-family: Arial, sans-serif; font-size: 11px; font-weight: normal; fill: black;" lineHeight="1.2" class="djs-label"><tspan x="0" y="9.899999999999999">Quality does not </tspan><tspan x="5" y="23.099999999999998">meet JabRef's </tspan><tspan x="7.5" y="36.3">requirements</tspan></text></g><rect style="fill: none; stroke-opacity: 0; stroke: white; stroke-width: 15px;" class="djs-hit djs-hit-all" x="0" y="0" width="79" height="40"/><rect x="-6" y="-6" width="91" height="52" style="fill: none;" class="djs-outline"/></g></g><g class="djs-group"><g class="djs-element djs-shape" data-element-id="Event_1hhm5p6_label" transform="matrix(1, 0, 0, 1, 229, 535)" style="display: block;"><g class="djs-visual"><text style="font-family: Arial, sans-serif; font-size: 11px; font-weight: normal; fill: black;" lineHeight="1.2" class="djs-label"><tspan x="0" y="9.899999999999999">Pull Request </tspan><tspan x="8.5" y="23.099999999999998">incoming</tspan></text></g><rect style="fill: none; stroke-opacity: 0; stroke: white; stroke-width: 15px;" class="djs-hit djs-hit-all" x="0" y="0" width="60" height="27"/><rect x="-6" y="-6" width="72" height="39" style="fill: none;" class="djs-outline"/></g></g><g class="djs-group"><g class="djs-element djs-shape" data-element-id="Gateway_0ynhdad_label" transform="matrix(1, 0, 0, 1, 637, 461)" style="display: block;"><g class="djs-visual"><text style="font-family: Arial, sans-serif; font-size: 11px; font-weight: normal; fill: black;" lineHeight="1.2" class="djs-label"><tspan x="0" y="9.899999999999999">Quality OK`?</tspan></text></g><rect style="fill: none; stroke-opacity: 0; stroke: white; stroke-width: 15px;" class="djs-hit djs-hit-all" x="0" y="0" width="62" height="14"/><rect x="-6" y="-6" width="74" height="26" style="fill: none;" class="djs-outline"/></g></g><g class="djs-group"><g class="djs-element djs-shape" data-element-id="Gateway_05556xu_label" transform="matrix(1, 0, 0, 1, 899, 777)" style="display: block;"><g class="djs-visual"><text style="font-family: Arial, sans-serif; font-size: 11px; font-weight: normal; fill: black;" lineHeight="1.2" class="djs-label"><tspan x="0" y="9.899999999999999">Quality OK?</tspan></text></g><rect style="fill: none; stroke-opacity: 0; stroke: white; stroke-width: 15px;" class="djs-hit djs-hit-all" x="0" y="0" width="58" height="14"/><rect x="-6" y="-6" width="70" height="26" style="fill: none;" class="djs-outline"/></g></g><g class="djs-group"><g class="djs-element djs-shape" data-element-id="Flow_0oegfa3_label" transform="matrix(1, 0, 0, 1, 965, 727)" style="display: block;"><g class="djs-visual"><text style="font-family: Arial, sans-serif; font-size: 11px; font-weight: normal; fill: black;" lineHeight="1.2" class="djs-label"><tspan x="0" y="9.899999999999999">Quality OK</tspan></text></g><rect style="fill: none; stroke-opacity: 0; stroke: white; stroke-width: 15px;" class="djs-hit djs-hit-all" x="0" y="0" width="52" height="14"/><rect x="-6" y="-6" width="64" height="26" style="fill: none;" class="djs-outline"/></g></g><g class="djs-group"><g class="djs-element djs-shape" data-element-id="Event_1d57wd9_label" transform="matrix(1, 0, 0, 1, 785, 158)" style="display: block;"><g class="djs-visual"><text style="font-family: Arial, sans-serif; font-size: 11px; font-weight: normal; fill: black;" lineHeight="1.2" class="djs-label"><tspan x="0" y="9.899999999999999">Everything OK</tspan></text></g><rect style="fill: none; stroke-opacity: 0; stroke: white; stroke-width: 15px;" class="djs-hit djs-hit-all" x="0" y="0" width="70" height="14"/><rect x="-6" y="-6" width="82" height="26" style="fill: none;" class="djs-outline"/></g></g><g class="djs-group"><g class="djs-element djs-shape" data-element-id="Event_14530lv_label" transform="matrix(1, 0, 0, 1, 793, 184.5)" style="display: block;"><g class="djs-visual"><text style="font-family: Arial, sans-serif; font-size: 11px; font-weight: normal; fill: black;" lineHeight="1.2" class="djs-label"><tspan x="4.5" y="9.899999999999999">Changes </tspan><tspan x="0" y="23.099999999999998">Requested</tspan></text></g><rect style="fill: none; stroke-opacity: 0; stroke: white; stroke-width: 15px;" class="djs-hit djs-hit-all" x="0" y="0" width="53" height="27"/><rect x="-6" y="-6" width="65" height="39" style="fill: none;" class="djs-outline"/></g></g><g class="djs-group"><g class="djs-element djs-connection" data-element-id="Flow_1o18udb" style="display: block;"><g class="djs-visual"><path d="m  510,170L510,351 L258,351 L258,492 " style="fill: none; stroke-width: 1.5px; stroke: black; marker-end: url('#messageflow-end-white-black-8hlpjcvyj0e4nmjcqq255ek8l'); marker-start: url('#messageflow-start-white-black-8hlpjcvyj0e4nmjcqq255ek8l'); stroke-dasharray: 10px, 12px; stroke-linecap: round; stroke-linejoin: round;"/></g><polyline points="510,170 510,351 258,351 258,492 " style="fill: none; stroke-opacity: 0; stroke: white; stroke-width: 15px;" class="djs-hit djs-hit-stroke"/><rect x="252" y="164" width="264" height="334" style="fill: none;" class="djs-outline"/></g></g><g class="djs-group"><g class="djs-element djs-connection" data-element-id="Flow_0zo1sqz" style="display: block;"><g class="djs-visual"><path d="m  1090,700L1090,460 L1150,460 L1150,90 L820,90 L820,112 " style="fill: none; stroke-width: 1.5px; stroke: black; marker-end: url('#messageflow-end-white-black-8hlpjcvyj0e4nmjcqq255ek8l'); marker-start: url('#messageflow-start-white-black-8hlpjcvyj0e4nmjcqq255ek8l'); stroke-dasharray: 10px, 12px; stroke-linecap: round; stroke-linejoin: round;"/></g><polyline points="1090,700 1090,460 1150,460 1150,90 820,90 820,112 " style="fill: none; stroke-opacity: 0; stroke: white; stroke-width: 15px;" class="djs-hit djs-hit-stroke"/><rect x="814" y="84" width="342" height="622" style="fill: none;" class="djs-outline"/></g></g><g class="djs-group"><g class="djs-element djs-connection" data-element-id="Flow_0nh44ui" style="display: block;"><g class="djs-visual"><path d="m  928,470L928,290 L820,290 L820,258 " style="fill: none; stroke-width: 1.5px; stroke: black; marker-end: url('#messageflow-end-white-black-8hlpjcvyj0e4nmjcqq255ek8l'); marker-start: url('#messageflow-start-white-black-8hlpjcvyj0e4nmjcqq255ek8l'); stroke-dasharray: 10px, 12px; stroke-linecap: round; stroke-linejoin: round;"/></g><polyline points="928,470 928,290 820,290 820,258 " style="fill: none; stroke-opacity: 0; stroke: white; stroke-width: 15px;" class="djs-hit djs-hit-stroke"/><rect x="814" y="252" width="120" height="224" style="fill: none;" class="djs-outline"/></g></g><g class="djs-group"><g class="djs-element djs-connection" data-element-id="Flow_16ydhxp" style="display: block;"><g class="djs-visual"><path d="m  1080,280L1080,350 L668,350 L668,380 " style="fill: none; stroke-width: 1.5px; stroke: black; marker-end: url('#messageflow-end-white-black-8hlpjcvyj0e4nmjcqq255ek8l'); marker-start: url('#messageflow-start-white-black-8hlpjcvyj0e4nmjcqq255ek8l'); stroke-dasharray: 10px, 12px; stroke-linecap: round; stroke-linejoin: round;"/></g><polyline points="1080,280 1080,350 668,350 668,380 " style="fill: none; stroke-opacity: 0; stroke: white; stroke-width: 15px;" class="djs-hit djs-hit-stroke"/><rect x="662" y="274" width="424" height="112" style="fill: none;" class="djs-outline"/></g></g></svg>
\ No newline at end of file
diff --git a/docs/.gitbook/assets/contribution-process-reviews-with-instructor (1) (2) (2) (2) (2) (2) (3).svg b/docs/.gitbook/assets/contribution-process-reviews-with-instructor (1) (2) (2) (2) (2) (2) (3).svg
deleted file mode 100644
index 7e196fe5e1a..00000000000
--- a/docs/.gitbook/assets/contribution-process-reviews-with-instructor (1) (2) (2) (2) (2) (2) (3).svg	
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- created with bpmn-js / http://bpmn.io -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="644" height="242" viewBox="150 74 644 242" version="1.1"><defs><marker id="sequenceflow-end-white-black-8hlpjcvyj0e4nmjcqq255ek8l" viewBox="0 0 20 20" refX="11" refY="10" markerWidth="10" markerHeight="10" orient="auto"><path d="M 1 5 L 11 10 L 1 15 Z" style="fill: black; stroke-width: 1px; stroke-linecap: round; stroke-dasharray: 10000px, 1px; stroke: black;"/></marker><marker id="messageflow-end-white-black-8hlpjcvyj0e4nmjcqq255ek8l" viewBox="0 0 20 20" refX="8.5" refY="5" markerWidth="20" markerHeight="20" orient="auto"><path d="m 1 5 l 0 -3 l 7 3 l -7 3 z" style="fill: white; stroke-width: 1px; stroke-linecap: butt; stroke-dasharray: 10000px, 1px; stroke: black;"/></marker><marker id="messageflow-start-white-black-8hlpjcvyj0e4nmjcqq255ek8l" viewBox="0 0 20 20" refX="6" refY="6" markerWidth="20" markerHeight="20" orient="auto"><circle cx="6" cy="6" r="3.5" style="fill: white; stroke-width: 1px; stroke-linecap: round; stroke-dasharray: 10000px, 1px; stroke: black;"/></marker></defs><g class="djs-group"><g class="djs-element djs-shape" data-element-id="Participant_1fl2htu" transform="matrix(1, 0, 0, 1, 156, 80)" style="display: block;"><g class="djs-visual"><rect x="0" y="0" width="632" height="110" rx="0" ry="0" style="stroke: black; stroke-width: 2px; fill: white; fill-opacity: 0.95;"/><polyline points="30,0 30,110 " style="fill: none; stroke: black; stroke-width: 2px;"/><text style="font-family: Arial, sans-serif; font-size: 12px; font-weight: normal; fill: black;" lineHeight="1.2" class="djs-label" transform="matrix(-1.83697e-16, -1, 1, -1.83697e-16, 0, 110)"><tspan x="24" y="18.6">Contributor</tspan></text></g><rect x="-6" y="-6" width="644" height="122" style="fill: none;" class="djs-outline"/><rect style="fill: none; stroke-opacity: 0; stroke: white; stroke-width: 15px;" class="djs-hit djs-hit-click-stroke" x="0" y="0" width="632" height="110"/><rect style="fill: none; stroke-opacity: 0; stroke: white; stroke-width: 15px;" class="djs-hit djs-hit-all" x="0" y="0" width="30" height="110"/></g><g class="djs-children"><g class="djs-group"><g class="djs-element djs-connection" data-element-id="Flow_1rx5tid" style="display: block;"><g class="djs-visual"><path d="m  248,129L270,129 " style="fill: none; stroke-width: 2px; stroke: black; stroke-linejoin: round; marker-end: url('#sequenceflow-end-white-black-8hlpjcvyj0e4nmjcqq255ek8l');"/></g><polyline points="248,129 270,129 " style="fill: none; stroke-opacity: 0; stroke: white; stroke-width: 15px;" class="djs-hit djs-hit-stroke"/><rect x="242" y="123" width="34" height="12" style="fill: none;" class="djs-outline"/></g></g><g class="djs-group"><g class="djs-element djs-connection" data-element-id="Flow_1590snp" style="display: block;"><g class="djs-visual"><path d="m  370,129L590,129 " style="fill: none; stroke-width: 2px; stroke: black; stroke-linejoin: round; marker-end: url('#sequenceflow-end-white-black-8hlpjcvyj0e4nmjcqq255ek8l');"/></g><polyline points="370,129 590,129 " style="fill: none; stroke-opacity: 0; stroke: white; stroke-width: 15px;" class="djs-hit djs-hit-stroke"/><rect x="364" y="123" width="232" height="12" style="fill: none;" class="djs-outline"/></g></g><g class="djs-group"><g class="djs-element djs-connection" data-element-id="Flow_1j0t6uk" style="display: block;"><g class="djs-visual"><path d="m  690,129L732,129 " style="fill: none; stroke-width: 2px; stroke: black; stroke-linejoin: round; marker-end: url('#sequenceflow-end-white-black-8hlpjcvyj0e4nmjcqq255ek8l');"/></g><polyline points="690,129 732,129 " style="fill: none; stroke-opacity: 0; stroke: white; stroke-width: 15px;" class="djs-hit djs-hit-stroke"/><rect x="684" y="123" width="54" height="12" style="fill: none;" class="djs-outline"/></g></g><g class="djs-group"><g class="djs-element djs-shape" data-element-id="Event_0yjgnh2" transform="matrix(1, 0, 0, 1, 212, 111)" style="display: block;"><g class="djs-visual"><circle cx="18" cy="18" r="18" style="stroke: black; stroke-width: 2px; fill: white; fill-opacity: 0.95;"/></g><rect style="fill: none; stroke-opacity: 0; stroke: white; stroke-width: 15px;" class="djs-hit djs-hit-all" x="0" y="0" width="36" height="36"/><rect x="-6" y="-6" width="48" height="48" style="fill: none;" class="djs-outline"/></g></g><g class="djs-group"><g class="djs-element djs-shape" data-element-id="Event_0f7la8k" transform="matrix(1, 0, 0, 1, 732, 111)" style="display: block;"><g class="djs-visual"><circle cx="18" cy="18" r="18" style="stroke: black; stroke-width: 4px; fill: white; fill-opacity: 0.95;"/></g><rect style="fill: none; stroke-opacity: 0; stroke: white; stroke-width: 15px;" class="djs-hit djs-hit-all" x="0" y="0" width="36" height="36"/><rect x="-6" y="-6" width="48" height="48" style="fill: none;" class="djs-outline"/></g></g><g class="djs-group"><g class="djs-element djs-shape" data-element-id="Activity_03cdrdp" transform="matrix(1, 0, 0, 1, 270, 89)" style="display: block;"><g class="djs-visual"><rect x="0" y="0" width="100" height="80" rx="10" ry="10" style="stroke: black; stroke-width: 2px; fill: white; fill-opacity: 0.95;"/><text style="font-family: Arial, sans-serif; font-size: 12px; font-weight: normal; fill: black;" lineHeight="1.2" class="djs-label"><tspan x="27.5" y="36.4">Prepare </tspan><tspan x="16" y="50.8">Submission</tspan></text><rect x="0" y="0" width="14" height="14" rx="0" ry="0" style="stroke: black; stroke-width: 1px; fill: white;" transform="matrix(1, 0, 0, 1, 42.5, 60)"/><path d="m42.5,60 m 7,2 l 0,10 m -5,-5 l 10,0" style="fill: white; stroke-width: 2px; stroke: black;" data-marker="sub-process"/></g><rect x="-6" y="-6" width="112" height="92" style="fill: none;" class="djs-outline"/><rect style="fill: none; stroke-opacity: 0; stroke: white; stroke-width: 15px;" class="djs-hit djs-hit-all" x="0" y="0" width="100" height="80"/></g></g><g class="djs-group"><g class="djs-element djs-shape" data-element-id="Activity_0k0sfqz" transform="matrix(1, 0, 0, 1, 590, 89)" style="display: block;"><g class="djs-visual"><rect x="0" y="0" width="100" height="80" rx="10" ry="10" style="stroke: black; stroke-width: 2px; fill: white; fill-opacity: 0.95;"/><text style="font-family: Arial, sans-serif; font-size: 12px; font-weight: normal; fill: black;" lineHeight="1.2" class="djs-label"><tspan x="28.5" y="29.200000000000003">Submit </tspan><tspan x="19.5" y="43.6">and Refine </tspan><tspan x="16" y="58">Contribution</tspan></text><rect x="0" y="0" width="14" height="14" rx="0" ry="0" style="stroke: black; stroke-width: 1px; fill: white;" transform="matrix(1, 0, 0, 1, 42.5, 60)"/><path d="m42.5,60 m 7,2 l 0,10 m -5,-5 l 10,0" style="fill: white; stroke-width: 2px; stroke: black;" data-marker="sub-process"/></g><rect x="-6" y="-6" width="112" height="92" style="fill: none;" class="djs-outline"/><rect style="fill: none; stroke-opacity: 0; stroke: white; stroke-width: 15px;" class="djs-hit djs-hit-all" x="0" y="0" width="100" height="80"/></g></g></g></g><g class="djs-group"><g class="djs-element djs-shape" data-element-id="Participant_1fqorip" transform="matrix(1, 0, 0, 1, 480, 200)" style="display: block;"><g class="djs-visual"><rect x="0" y="0" width="308" height="110" rx="0" ry="0" style="stroke: black; stroke-width: 2px; fill: white; fill-opacity: 0.95;"/><polyline points="30,0 30,110 " style="fill: none; stroke: black; stroke-width: 2px;"/><text style="font-family: Arial, sans-serif; font-size: 12px; font-weight: normal; fill: black;" lineHeight="1.2" class="djs-label" transform="matrix(-1.83697e-16, -1, 1, -1.83697e-16, 0, 110)"><tspan x="18" y="18.6">JabRef Team</tspan></text></g><rect x="-6" y="-6" width="320" height="122" style="fill: none;" class="djs-outline"/><rect style="fill: none; stroke-opacity: 0; stroke: white; stroke-width: 15px;" class="djs-hit djs-hit-click-stroke" x="0" y="0" width="308" height="110"/><rect style="fill: none; stroke-opacity: 0; stroke: white; stroke-width: 15px;" class="djs-hit djs-hit-all" x="0" y="0" width="30" height="110"/></g><g class="djs-children"><g class="djs-group"><g class="djs-element djs-shape" data-element-id="Activity_15p4cv2" transform="matrix(1, 0, 0, 1, 590, 220)" style="display: block;"><g class="djs-visual"><rect x="0" y="0" width="100" height="80" rx="10" ry="10" style="stroke: black; stroke-width: 2px; fill: white; fill-opacity: 0.95;"/><text style="font-family: Arial, sans-serif; font-size: 12px; font-weight: normal; fill: black;" lineHeight="1.2" class="djs-label"><tspan x="6" y="36.4">Check, Support,</tspan><tspan x="20.5" y="50.8">and Merge</tspan></text><rect x="0" y="0" width="14" height="14" rx="0" ry="0" style="stroke: black; stroke-width: 1px; fill: white;" transform="matrix(1, 0, 0, 1, 42.5, 60)"/><path d="m42.5,60 m 7,2 l 0,10 m -5,-5 l 10,0" style="fill: white; stroke-width: 2px; stroke: black;" data-marker="sub-process"/></g><rect x="-6" y="-6" width="112" height="92" style="fill: none;" class="djs-outline"/><rect style="fill: none; stroke-opacity: 0; stroke: white; stroke-width: 15px;" class="djs-hit djs-hit-all" x="0" y="0" width="100" height="80"/></g></g></g></g><g class="djs-group"><g class="djs-element djs-shape" data-element-id="Participant_1yhqjas" transform="matrix(1, 0, 0, 1, 156, 200)" style="display: block;"><g class="djs-visual"><rect x="0" y="0" width="304" height="110" rx="0" ry="0" style="stroke: black; stroke-width: 2px; fill: white; fill-opacity: 0.95;"/><polyline points="30,0 30,110 " style="fill: none; stroke: black; stroke-width: 2px;"/><text style="font-family: Arial, sans-serif; font-size: 12px; font-weight: normal; fill: black;" lineHeight="1.2" class="djs-label" transform="matrix(-1.83697e-16, -1, 1, -1.83697e-16, 0, 110)"><tspan x="29" y="18.6">Instructor</tspan></text></g><rect x="-6" y="-6" width="316" height="122" style="fill: none;" class="djs-outline"/><rect style="fill: none; stroke-opacity: 0; stroke: white; stroke-width: 15px;" class="djs-hit djs-hit-click-stroke" x="0" y="0" width="304" height="110"/><rect style="fill: none; stroke-opacity: 0; stroke: white; stroke-width: 15px;" class="djs-hit djs-hit-all" x="0" y="0" width="30" height="110"/></g><g class="djs-children"><g class="djs-group"><g class="djs-element djs-shape" data-element-id="Activity_10vyq90" transform="matrix(1, 0, 0, 1, 270, 220)" style="display: block;"><g class="djs-visual"><rect x="0" y="0" width="100" height="80" rx="10" ry="10" style="stroke: black; stroke-width: 2px; fill: white; fill-opacity: 0.95;"/><text style="font-family: Arial, sans-serif; font-size: 12px; font-weight: normal; fill: black;" lineHeight="1.2" class="djs-label"><tspan x="17.5" y="29.200000000000003">Review and </tspan><tspan x="28" y="43.6">Support </tspan><tspan x="16" y="58">Submission</tspan></text><rect x="0" y="0" width="14" height="14" rx="0" ry="0" style="stroke: black; stroke-width: 1px; fill: white;" transform="matrix(1, 0, 0, 1, 42.5, 60)"/><path d="m42.5,60 m 7,2 l 0,10 m -5,-5 l 10,0" style="fill: white; stroke-width: 2px; stroke: black;" data-marker="sub-process"/></g><rect x="-6" y="-6" width="112" height="92" style="fill: none;" class="djs-outline"/><rect style="fill: none; stroke-opacity: 0; stroke: white; stroke-width: 15px;" class="djs-hit djs-hit-all" x="0" y="0" width="100" height="80"/></g></g></g></g><g class="djs-group"><g class="djs-element djs-connection" data-element-id="Flow_0j1yvmu" style="display: block;"><g class="djs-visual"><path d="m  340,220L340,169 " style="fill: none; stroke-width: 1.5px; stroke: black; marker-end: url('#messageflow-end-white-black-8hlpjcvyj0e4nmjcqq255ek8l'); marker-start: url('#messageflow-start-white-black-8hlpjcvyj0e4nmjcqq255ek8l'); stroke-dasharray: 10px, 12px; stroke-linecap: round; stroke-linejoin: round;"/></g><polyline points="340,220 340,169 " style="fill: none; stroke-opacity: 0; stroke: white; stroke-width: 15px;" class="djs-hit djs-hit-stroke"/><rect x="334" y="163" width="12" height="63" style="fill: none;" class="djs-outline"/></g></g><g class="djs-group"><g class="djs-element djs-connection" data-element-id="Flow_1g9m6hs" style="display: block;"><g class="djs-visual"><path d="m  300,169L300,220 " style="fill: none; stroke-width: 1.5px; stroke: black; marker-end: url('#messageflow-end-white-black-8hlpjcvyj0e4nmjcqq255ek8l'); marker-start: url('#messageflow-start-white-black-8hlpjcvyj0e4nmjcqq255ek8l'); stroke-dasharray: 10px, 12px; stroke-linecap: round; stroke-linejoin: round;"/></g><polyline points="300,169 300,220 " style="fill: none; stroke-opacity: 0; stroke: white; stroke-width: 15px;" class="djs-hit djs-hit-stroke"/><rect x="294" y="163" width="12" height="63" style="fill: none;" class="djs-outline"/></g></g><g class="djs-group"><g class="djs-element djs-connection" data-element-id="Flow_1x80oft" style="display: block;"><g class="djs-visual"><path d="m  660,220L660,169 " style="fill: none; stroke-width: 1.5px; stroke: black; marker-end: url('#messageflow-end-white-black-8hlpjcvyj0e4nmjcqq255ek8l'); marker-start: url('#messageflow-start-white-black-8hlpjcvyj0e4nmjcqq255ek8l'); stroke-dasharray: 10px, 12px; stroke-linecap: round; stroke-linejoin: round;"/></g><polyline points="660,220 660,169 " style="fill: none; stroke-opacity: 0; stroke: white; stroke-width: 15px;" class="djs-hit djs-hit-stroke"/><rect x="654" y="163" width="12" height="63" style="fill: none;" class="djs-outline"/></g></g><g class="djs-group"><g class="djs-element djs-connection" data-element-id="Flow_14lhoys" style="display: block;"><g class="djs-visual"><path d="m  620,169L620,220 " style="fill: none; stroke-width: 1.5px; stroke: black; marker-end: url('#messageflow-end-white-black-8hlpjcvyj0e4nmjcqq255ek8l'); marker-start: url('#messageflow-start-white-black-8hlpjcvyj0e4nmjcqq255ek8l'); stroke-dasharray: 10px, 12px; stroke-linecap: round; stroke-linejoin: round;"/></g><polyline points="620,169 620,220 " style="fill: none; stroke-opacity: 0; stroke: white; stroke-width: 15px;" class="djs-hit djs-hit-stroke"/><rect x="614" y="163" width="12" height="63" style="fill: none;" class="djs-outline"/></g></g></svg>
\ No newline at end of file
diff --git a/docs/.gitbook/assets/eclipse-create-run-config (1) (3) (3) (4) (4) (3) (10).png b/docs/.gitbook/assets/eclipse-create-run-config (1) (3) (3) (4) (4) (3) (10).png
deleted file mode 100644
index 1412291a55a..00000000000
Binary files a/docs/.gitbook/assets/eclipse-create-run-config (1) (3) (3) (4) (4) (3) (10).png and /dev/null differ
diff --git a/docs/.gitbook/assets/eclipse-create-run-config (1) (3) (3) (4) (4) (3) (11).png b/docs/.gitbook/assets/eclipse-create-run-config (1) (3) (3) (4) (4) (3) (11).png
deleted file mode 100644
index 1412291a55a..00000000000
Binary files a/docs/.gitbook/assets/eclipse-create-run-config (1) (3) (3) (4) (4) (3) (11).png and /dev/null differ
diff --git a/docs/.gitbook/assets/eclipse-create-run-config (1) (3) (3) (4) (4) (3) (2).png b/docs/.gitbook/assets/eclipse-create-run-config (1) (3) (3) (4) (4) (3) (2).png
deleted file mode 100644
index 1412291a55a..00000000000
Binary files a/docs/.gitbook/assets/eclipse-create-run-config (1) (3) (3) (4) (4) (3) (2).png and /dev/null differ
diff --git a/docs/.gitbook/assets/eclipse-create-run-config (1) (3) (3) (4) (4) (3) (3).png b/docs/.gitbook/assets/eclipse-create-run-config (1) (3) (3) (4) (4) (3) (3).png
deleted file mode 100644
index 1412291a55a..00000000000
Binary files a/docs/.gitbook/assets/eclipse-create-run-config (1) (3) (3) (4) (4) (3) (3).png and /dev/null differ
diff --git a/docs/.gitbook/assets/eclipse-create-run-config (1) (3) (3) (4) (4) (3) (4).png b/docs/.gitbook/assets/eclipse-create-run-config (1) (3) (3) (4) (4) (3) (4).png
deleted file mode 100644
index 1412291a55a..00000000000
Binary files a/docs/.gitbook/assets/eclipse-create-run-config (1) (3) (3) (4) (4) (3) (4).png and /dev/null differ
diff --git a/docs/.gitbook/assets/eclipse-create-run-config (1) (3) (3) (4) (4) (3) (5).png b/docs/.gitbook/assets/eclipse-create-run-config (1) (3) (3) (4) (4) (3) (5).png
deleted file mode 100644
index 1412291a55a..00000000000
Binary files a/docs/.gitbook/assets/eclipse-create-run-config (1) (3) (3) (4) (4) (3) (5).png and /dev/null differ
diff --git a/docs/.gitbook/assets/eclipse-create-run-config (1) (3) (3) (4) (4) (3) (6).png b/docs/.gitbook/assets/eclipse-create-run-config (1) (3) (3) (4) (4) (3) (6).png
deleted file mode 100644
index 1412291a55a..00000000000
Binary files a/docs/.gitbook/assets/eclipse-create-run-config (1) (3) (3) (4) (4) (3) (6).png and /dev/null differ
diff --git a/docs/.gitbook/assets/eclipse-create-run-config (1) (3) (3) (4) (4) (3) (7).png b/docs/.gitbook/assets/eclipse-create-run-config (1) (3) (3) (4) (4) (3) (7).png
deleted file mode 100644
index 1412291a55a..00000000000
Binary files a/docs/.gitbook/assets/eclipse-create-run-config (1) (3) (3) (4) (4) (3) (7).png and /dev/null differ
diff --git a/docs/.gitbook/assets/eclipse-create-run-config (1) (3) (3) (4) (4) (3) (8).png b/docs/.gitbook/assets/eclipse-create-run-config (1) (3) (3) (4) (4) (3) (8).png
deleted file mode 100644
index 1412291a55a..00000000000
Binary files a/docs/.gitbook/assets/eclipse-create-run-config (1) (3) (3) (4) (4) (3) (8).png and /dev/null differ
diff --git a/docs/.gitbook/assets/eclipse-create-run-config (1) (3) (3) (4) (4) (3) (9).png b/docs/.gitbook/assets/eclipse-create-run-config (1) (3) (3) (4) (4) (3) (9).png
deleted file mode 100644
index 1412291a55a..00000000000
Binary files a/docs/.gitbook/assets/eclipse-create-run-config (1) (3) (3) (4) (4) (3) (9).png and /dev/null differ
diff --git a/docs/.gitbook/assets/eclipse-create-run-config (1) (3) (3) (4) (4) (3).png b/docs/.gitbook/assets/eclipse-create-run-config (1) (3) (3) (4) (4) (3).png
deleted file mode 100644
index 1412291a55a..00000000000
Binary files a/docs/.gitbook/assets/eclipse-create-run-config (1) (3) (3) (4) (4) (3).png and /dev/null differ
diff --git a/docs/.gitbook/assets/github-flow (1).png b/docs/.gitbook/assets/github-flow (1).png
deleted file mode 100644
index dc9fdeb82bc..00000000000
Binary files a/docs/.gitbook/assets/github-flow (1).png and /dev/null differ
diff --git a/docs/.gitbook/assets/github-flow.png b/docs/.gitbook/assets/github-flow.png
deleted file mode 100644
index dc9fdeb82bc..00000000000
Binary files a/docs/.gitbook/assets/github-flow.png and /dev/null differ
diff --git a/docs/.gitbook/assets/intellij-checkstyle-settings (1).png b/docs/.gitbook/assets/intellij-checkstyle-settings (1).png
deleted file mode 100644
index e5f0c027190..00000000000
Binary files a/docs/.gitbook/assets/intellij-checkstyle-settings (1).png and /dev/null differ
diff --git a/docs/.gitbook/assets/intellij-enable-annotation-processing (1).png b/docs/.gitbook/assets/intellij-enable-annotation-processing (1).png
deleted file mode 100644
index 784ce6cd19e..00000000000
Binary files a/docs/.gitbook/assets/intellij-enable-annotation-processing (1).png and /dev/null differ
diff --git a/docs/.gitbook/assets/intellij-gradle-config (1).png b/docs/.gitbook/assets/intellij-gradle-config (1).png
deleted file mode 100644
index deb452c88b8..00000000000
Binary files a/docs/.gitbook/assets/intellij-gradle-config (1).png and /dev/null differ
diff --git a/docs/.gitbook/assets/intellij-gradle-config-ignore-buildSrc (1) (1).png b/docs/.gitbook/assets/intellij-gradle-config-ignore-buildSrc (1) (1).png
deleted file mode 100644
index 30fd74bba1c..00000000000
Binary files a/docs/.gitbook/assets/intellij-gradle-config-ignore-buildSrc (1) (1).png and /dev/null differ
diff --git a/docs/.gitbook/assets/intellij-gradle-config-ignore-buildSrc (1).png b/docs/.gitbook/assets/intellij-gradle-config-ignore-buildSrc (1).png
deleted file mode 100644
index 30fd74bba1c..00000000000
Binary files a/docs/.gitbook/assets/intellij-gradle-config-ignore-buildSrc (1).png and /dev/null differ
diff --git a/docs/.gitbook/assets/intellij-run-configuration-command-line (2) (2) (1).png b/docs/.gitbook/assets/intellij-run-configuration-command-line (2) (2) (1).png
deleted file mode 100644
index cc71d5d068e..00000000000
Binary files a/docs/.gitbook/assets/intellij-run-configuration-command-line (2) (2) (1).png and /dev/null differ
diff --git a/docs/.gitbook/assets/intellij-run-configuration-command-line (2) (2) (2).png b/docs/.gitbook/assets/intellij-run-configuration-command-line (2) (2) (2).png
deleted file mode 100644
index cc71d5d068e..00000000000
Binary files a/docs/.gitbook/assets/intellij-run-configuration-command-line (2) (2) (2).png and /dev/null differ
diff --git a/docs/.gitbook/assets/intellij-run-configuration-command-line (2) (2) (3).png b/docs/.gitbook/assets/intellij-run-configuration-command-line (2) (2) (3).png
deleted file mode 100644
index cc71d5d068e..00000000000
Binary files a/docs/.gitbook/assets/intellij-run-configuration-command-line (2) (2) (3).png and /dev/null differ
diff --git a/docs/.gitbook/assets/intellij-run-configuration-command-line (2) (2) (4).png b/docs/.gitbook/assets/intellij-run-configuration-command-line (2) (2) (4).png
deleted file mode 100644
index cc71d5d068e..00000000000
Binary files a/docs/.gitbook/assets/intellij-run-configuration-command-line (2) (2) (4).png and /dev/null differ
diff --git a/docs/.gitbook/assets/intellij-run-configuration-command-line (2) (2).png b/docs/.gitbook/assets/intellij-run-configuration-command-line (2) (2).png
deleted file mode 100644
index cc71d5d068e..00000000000
Binary files a/docs/.gitbook/assets/intellij-run-configuration-command-line (2) (2).png and /dev/null differ
diff --git a/docs/.gitignore b/docs/.gitignore
new file mode 100644
index 00000000000..b4dfc49b992
--- /dev/null
+++ b/docs/.gitignore
@@ -0,0 +1,2 @@
+.jekyll-cache
+_site/
diff --git a/docs/CNAME b/docs/CNAME
new file mode 100644
index 00000000000..e8ffe057213
--- /dev/null
+++ b/docs/CNAME
@@ -0,0 +1 @@
+devdocs.jabref.org
diff --git a/docs/Gemfile b/docs/Gemfile
new file mode 100644
index 00000000000..fc24bb93bf6
--- /dev/null
+++ b/docs/Gemfile
@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+gem 'github-pages', group: :jekyll_plugins
+gem "webrick", "~> 1.7"
diff --git a/docs/README.md b/docs/README.md
index 6ac52b97842..5539f1e3e5a 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -1,52 +1 @@
-# Overview on Developing
-
-This page presents all development information around JabRef.
-
-## Starting point for newcomers
-
-Go to [Setting up a local workspace](https://devdocs.jabref.org/getting-into-the-code/guidelines-for-setting-up-a-local-workspace)
-
-## User documentation
-
-For users documentation, please head to [https://docs.jabref.org](https://docs.jabref.org).
-
-## How tos
-
-* External: [Sync your fork with the JabRef repository](https://help.github.com/articles/syncing-a-fork/)
-* External (🇩🇪): Branches and pull requests: [https://github.com/unibas-marcelluethi/software-engineering/blob/master/docs/week2/exercises/practical-exercises.md](https://github.com/unibas-marcelluethi/software-engineering/blob/master/docs/week2/exercises/practical-exercises.md)
-
-## Teaching Exercises
-
-We are very happy that JabRef is part of [Software Engineering](https://en.wikipedia.org/wiki/Software_engineering) trainings. Please head to [Teaching](teaching.md) for more information on using JabRef as a teaching object and on previous courses where JabRef was used.
-
-## Miscellaneous Hints
-
-### Command Line
-
-The package `org.jabref.cli` is responsible for handling the command line options.
-
-During development, one can configure IntelliJ to pass command line parameters:
-
-![IntelliJ-run-configuration](<.gitbook/assets/intellij-run-configuration-command-line (2) (2) (3).png>)
-
-Passing command line arguments using gradle is currently not possible as all arguments (such as `-Dfile.encoding=windows-1252`) are passed to the application.
-
-Without jlink, it is not possible to generate a fat jar any more. During development, the capabilities of the IDE has to be used.
-
-### Groups
-
-Diagram showing aspects of groups: [Groups.uml](https://github.com/JabRef/jabref/tree/3b3716b1e05a0d3273c886e102a8efe5e96472e0/docs/Groups.uml).
-
-## Architectural Decision Records
-
-[Architectural decisions for JabRef](adr.md) are recorded.
-
-For new ADRs, please use [template.md](https://github.com/JabRef/jabref/tree/3b3716b1e05a0d3273c886e102a8efe5e96472e0/docs/adr/template.md) as basis. More information on MADR is available at [https://adr.github.io/madr/](https://adr.github.io/madr/). General information about architectural decision records is available at [https://adr.github.io/](https://adr.github.io). Add them to the [list of architectural decision records](adr.md).
-
-## FAQ
-
-*   Q: I get `java: package org.jabref.logic.journals does not exist`.
-
-    A: You have to ignore `buildSrc/src/main` as source directory in IntelliJ as indicated in our [setup guide](https://devdocs.jabref.org/getting-into-the-code/guidelines-for-setting-up-a-local-workspace).
-
-    Also filed as IntelliJ issue [IDEA-240250](https://youtrack.jetbrains.com/issue/IDEA-240250).
+# JabRef Developer Documentation
diff --git a/docs/SUMMARY.md b/docs/SUMMARY.md
deleted file mode 100644
index f66102da3a8..00000000000
--- a/docs/SUMMARY.md
+++ /dev/null
@@ -1,22 +0,0 @@
-# Table of contents
-
-* [Overview on Developing](README.md)
-* [Contributing](contributing.md)
-* [Architectural Decisions](adr.md)
-* [Getting into the code](getting-into-the-code/README.md)
-  * [Set up a local workspace](getting-into-the-code/guidelines-for-setting-up-a-local-workspace.md)
-  * [High-level documentation](getting-into-the-code/high-level-documentation.md)
-  * [How to test](getting-into-the-code/testing.md)
-  * [Code Howtos](getting-into-the-code/code-howtos.md)
-  * [JabRef's development strategy](getting-into-the-code/development-strategy.md)
-* [Advanced reading](advanced-reading/README.md)
-  * [Code Quality](advanced-reading/code-quality.md)
-  * [Recommendations for UI design](advanced-reading/ui-recommendations.md)
-  * [Custom SVG icons](advanced-reading/custom-svg-icons.md)
-  * [Working on fetchers](advanced-reading/fetchers.md)
-  * [Creating a binary and debug it](advanced-reading/jpackage.md)
-* [JabRef and Software Engineering Training](teaching.md)
-* [Readings on Coding](readings-on-coding/README.md)
-  * [Readings on JavaFX](readings-on-coding/javafx.md)
-  * [Useful development tooling](readings-on-coding/tools.md)
-
diff --git a/docs/_config.yml b/docs/_config.yml
new file mode 100644
index 00000000000..e095d2c62c8
--- /dev/null
+++ b/docs/_config.yml
@@ -0,0 +1,37 @@
+repository: JabRef/jabref
+title: "Developer Documentation"
+remote_theme: just-the-docs/just-the-docs
+color_scheme: light
+
+# Hint by https://github.com/just-the-docs/just-the-docs/issues/374#issuecomment-680273258
+# Theme read from https://github.com/StylishThemes/Syntax-Themes/blob/master/pygments/css-github/
+# Browse alternative themes at https://stylishthemes.github.io/Syntax-Themes/pygments/
+highlight_theme: jellybeans
+
+search_enabled: true
+button: true
+aux_links:
+  "Gitter Chat":
+    - "https://gitter.im/JabRef/jabref"
+  "Discussion Forum":
+    - "https://discourse.jabref.org/"
+  "Code Repository":
+    - "https://github.com/jabref/jabref/"
+aux_links_new_tab: false
+last_edit_timestamp: false # show or hide edit time - page must have `last_modified_date` defined in the frontmatter
+last_edit_time_format: "%b %e %Y at %I:%M %p" # uses ruby's time format: https://ruby-doc.org/stdlib-2.7.0/libdoc/time/rdoc/Time.html
+gh_edit_link: true
+gh_edit_link_text: "Edit this page on GitHub."
+gh_edit_repository: "https://github.com/jabref/jabref"
+gh_edit_branch: "main"
+gh_edit_source: "docs"
+gh_edit_view_mode: "edit"
+
+# ga_tracking: UA-5555555-55
+# ga_tracking_anonymize_ip: true
+
+baseurl: ""
+url: ""
+
+plugins:
+  - jekyll-remote-theme
diff --git a/docs/adr.md b/docs/adr.md
deleted file mode 100644
index 856d60a72b9..00000000000
--- a/docs/adr.md
+++ /dev/null
@@ -1,31 +0,0 @@
-# Architectural Decisions
-
-Architectural decisions for JabRef:
-
-* [ADR-0000](https://github.com/JabRef/jabref/tree/main/docs/adr/0000-use-markdown-architectural-decision-records.md) - Use Markdown Architectural Decision Records
-* [ADR-0001](https://github.com/JabRef/jabref/tree/main/docs/adr/0001-use-crowdin-for-translations.md) - Use Crowdin for translations
-* [ADR-0002](https://github.com/JabRef/jabref/tree/main/docs/adr/0002-use-slf4j-for-logging.md) - Use slf4j together with log4j2 for logging
-* [ADR-0003](https://github.com/JabRef/jabref/tree/main/docs/adr/0003-use-gradle-as-build-tool.md) - Use Gradle as build tool
-* [ADR-0004](https://github.com/JabRef/jabref/tree/main/docs/adr/0004-use-mariadb-connector.md) - Use MariaDB Connector
-* [ADR-0005](https://github.com/JabRef/jabref/tree/main/docs/adr/0005-fully-support-utf8-only-for-latex-files.md) - Fully Support UTF-8 Only For LaTeX Files
-* [ADR-0006](https://github.com/JabRef/jabref/tree/main/docs/adr/0006-only-translated-strings-in-language-file.md) - Only translated strings in language file
-* [ADR-0007](https://github.com/JabRef/jabref/tree/main/docs/adr/0007-human-readable-changelog.md) - Provide a human-readable changelog
-* [ADR-0008](https://github.com/JabRef/jabref/tree/main/docs/adr/0008-use-public-final-instead-of-getters.md) - Use public final instead of getters to offer access to immutable variables
-* [ADR-0009](https://github.com/JabRef/jabref/tree/main/docs/adr/0009-use-plain-junit5-for-testing.md) - Use Plain JUnit5 for advanced test assertions
-* [ADR-0010](https://github.com/JabRef/jabref/tree/main/docs/adr/0010-use-h2-as-internal-database.md) - Use H2 as Internal SQL Database
-* [ADR-0011](https://github.com/JabRef/jabref/tree/main/docs/adr/0011-test-external-links-in-documentation.md) - Test external links in documentation
-* [ADR-0012](https://github.com/JabRef/jabref/tree/main/docs/adr/0012-handle-different-bibEntry-formats-of-fetchers.md) - Handle different bibentry formats of fetchers by adding a layer
-* [ADR-0013](https://github.com/JabRef/jabref/tree/main/docs/adr/0013-add-native-support-biblatex-software.md) - Add Native Support for BibLatex-Software
-* [ADR-0014](https://github.com/JabRef/jabref/tree/main/docs/adr/0014-separate-URL-creation-to-enable-proper-logging.md) - Separate URL creation to enable proper logging
-* [ADR-0015](https://github.com/JabRef/jabref/tree/main/docs/adr/0015-support-an-abstract-query-syntax-for-query-conversion.md) - Query syntax design
-* [ADR-0016](https://github.com/JabRef/jabref/tree/main/docs/adr/0016-mutable-preferences-objects.md) - Mutable preferences objects
-* [ADR-0017](https://github.com/JabRef/jabref/tree/main/docs/adr/0017-allow-model-access-logic.md) - Allow org.jabref.model to access org.jabref.logic
-* [ADR-0018](https://github.com/JabRef/jabref/blob/main/docs/adr/0018-use-regular-expression-to-split-multiple-sentence-titles.md) - Use regular expression to split multiple-sentence titles
-* [ADR-0019](https://github.com/JabRef/jabref/blob/main/docs/adr/0019-implement-special-fields-as-seperate-fields.md) - Implement special fields as separate fields
-* [ADR-0020](https://github.com/JabRef/jabref/blob/main/docs/adr/0020-use-Jackson-to-parse-study-yml.md) - Use Jackson to parse study.yml
-* [ADR-0021](https://github.com/JabRef/jabref/blob/main/docs/adr/0021-keep-study-as-a-dto.md) - Keep study as a DTO
-* [ADR-0022](https://github.com/JabRef/jabref/blob/main/docs/adr/0022-remove-stop-words-during-query-transformation.md) - Remove stop words during query transformation
-* [ADR-0023](https://github.com/JabRef/jabref/blob/main/docs/adr/0023-localized-preferences.md) - Localized Preferences
-* [ADR-0024](https://github.com/JabRef/jabref/blob/main/docs/adr/0024-use-#-as-indicator-for-BibTeX-string-constants.md) - Use `#` as indicator for BibTeX string constants
-
-For new ADRs, please use [template.md](https://github.com/JabRef/jabref/tree/main/docs/adr/template.md) as basis. More information on the used format is available at [https://adr.github.io/madr/](https://adr.github.io/madr/). General information about architectural decision records is available at [https://adr.github.io/](https://adr.github.io/). Then add them to the above list.
diff --git a/docs/adr/0022-remove-stop-words-during-query-transformation.md b/docs/adr/0022-remove-stop-words-during-query-transformation.md
deleted file mode 100644
index cd66b098ca4..00000000000
--- a/docs/adr/0022-remove-stop-words-during-query-transformation.md
+++ /dev/null
@@ -1,33 +0,0 @@
-# Remove stop words during query transformation
-
-## Context and Problem Statement
-
-When quering for a title of a paper, the title might contain stop words such as "a", "for", "and". Some data providers return 0 results when querying for a stop word. When transforming a query to the lucene syntax, the default Boolean operator `and` is used. When using IEEE, this often leads to zero search results.
-
-## Decision Drivers
-
-* Consistent to the Google search engine
-* Allow reproducible searches
-* Avoid WTFs on the user's side
-
-## Considered Options
-
-* Remove stop words from the query
-* Automatically enclose in quotes if no Boolean operator is contained
-
-## Decision Outcome
-
-Chosen option: "Remove stop words from the query", because comes out best.
-
-## Pros and Cons of the Options
-
-### Remove stop words from the query
-
-* Good, because Good search results if no Boolean operators are used
-* Bad, because When using complex queries and stop words are used alone, they are silently removed
-
-### Automatically enclose in quotes if no Boolean operator is contained
-
-* Good, because Good search results if no Boolean operators are used
-* Bad, because Silently leads to different results
-* Bad, because Inconsistent to Google behavior
diff --git a/docs/adr/template.md b/docs/adr/template.md
deleted file mode 100644
index 255de8595c9..00000000000
--- a/docs/adr/template.md
+++ /dev/null
@@ -1,67 +0,0 @@
-# MADR Template
-
-The template of [MADR](https://adr.github.io/madr/) is available at <https://github.com/adr/madr#the-template>.
-You can omit the `<-- optional -->` parts, which lead to a very minimal ADR:
-
-```markdown
-# [short title of solved problem and solution]
-
-## Context and Problem Statement
-
-[Describe the context and problem statement, e.g., in free form using two to three sentences. You may want to articulate the problem in form of a question.]
-
-## Considered Options
-
-* [option 1]
-* [option 2]
-* [option 3]
-* … <!-- numbers of options can vary -->
-
-## Decision Outcome
-
-Chosen option: "[option 1]", because [justification. e.g., only option, which meets k.o. criterion decision driver | which resolves force force | … ].
-```
-
-In case you want to include the pros and cons of the options, the template is as follows:
-
-```markdown
-# [short title of solved problem and solution]
-
-## Context and Problem Statement
-
-[Describe the context and problem statement, e.g., in free form using two to three sentences. You may want to articulate the problem in form of a question.]
-
-## Considered Options
-
-* [option 1]
-* [option 2]
-* [option 3]
-* … <!-- numbers of options can vary -->
-
-## Decision Outcome
-
-Chosen option: "[option 1]", because comes out best (see below).
-
-## Pros and Cons of the Options
-
-### [option 1]
-
-* Good, because [argument a]
-* Good, because [argument b]
-* Bad, because [argument c]
-* … <!-- numbers of pros and cons can vary -->
-
-### [option 2]
-
-* Good, because [argument a]
-* Good, because [argument b]
-* Bad, because [argument c]
-* … <!-- numbers of pros and cons can vary -->
-
-### [option 3]
-
-* Good, because [argument a]
-* Good, because [argument b]
-* Bad, because [argument c]
-* … <!-- numbers of pros and cons can vary -->
-```
diff --git a/docs/advanced-reading/README.md b/docs/advanced-reading/README.md
deleted file mode 100644
index ed248e7ce51..00000000000
--- a/docs/advanced-reading/README.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# Advanced reading
-
diff --git a/docs/advanced-reading/code-quality.md b/docs/code-howtos/code-quality.md
similarity index 52%
rename from docs/advanced-reading/code-quality.md
rename to docs/code-howtos/code-quality.md
index 415b8e65372..30d55d56f72 100644
--- a/docs/advanced-reading/code-quality.md
+++ b/docs/code-howtos/code-quality.md
@@ -1,10 +1,14 @@
+---
+parent: Code Howtos
+nav_order: 1
+---
 # Code Quality
 
 We monitor the general source code quality at three places:
 
-* [codacy](https://www.codacy.com/) is a hosted service to monitor code quality. It thereby combines the results of available open source code quality checkers such as [Checkstyle](https://checkstyle.sourceforge.io/) or [PMD](https://pmd.github.io/). The code quality analysis for JabRef is available at [https://app.codacy.com/gh/JabRef/jabref/dashboard](https://app.codacy.com/gh/JabRef/jabref/dashboard), especially the [list of open issues](https://app.codacy.com/gh/JabRef/jabref/issues/index). In case a rule feels wrong, it is most likely a PMD rule. The JabRef team can change the configuration at [https://app.codacy.com/p/306789/patterns/list?engine=9ed24812-b6ee-4a58-9004-0ed183c45b8f](https://app.codacy.com/p/306789/patterns/list?engine=9ed24812-b6ee-4a58-9004-0ed183c45b8f).
-* [codecov](https://codecov.io/) is a solution to check code coverage of test cases. The code coverage metrics for JabRef are available at [https://codecov.io/github/JabRef/jabref](https://codecov.io/github/JabRef/jabref).
-* [Teamscale](https://www.cqse.eu/de/produkte/teamscale/landing/) is a popular German product analyzing code quality. The analysis results are available at [https://demo.teamscale.com/findings.html\#/jabref/?](https://demo.teamscale.com/findings.html#/jabref/?).
+* [codacy](https://www.codacy.com) is a hosted service to monitor code quality. It thereby combines the results of available open source code quality checkers such as [Checkstyle](https://checkstyle.sourceforge.io) or [PMD](https://pmd.github.io). The code quality analysis for JabRef is available at [https://app.codacy.com/gh/JabRef/jabref/dashboard](https://app.codacy.com/gh/JabRef/jabref/dashboard), especially the [list of open issues](https://app.codacy.com/gh/JabRef/jabref/issues/index). In case a rule feels wrong, it is most likely a PMD rule. The JabRef team can change the configuration at [https://app.codacy.com/p/306789/patterns/list?engine=9ed24812-b6ee-4a58-9004-0ed183c45b8f](https://app.codacy.com/p/306789/patterns/list?engine=9ed24812-b6ee-4a58-9004-0ed183c45b8f).
+* [codecov](https://codecov.io) is a solution to check code coverage of test cases. The code coverage metrics for JabRef are available at [https://codecov.io/github/JabRef/jabref](https://codecov.io/github/JabRef/jabref).
+* [Teamscale](https://www.cqse.eu/de/produkte/teamscale/landing/) is a popular German product analyzing code quality. The analysis results are available at [https://demo.teamscale.com/findings.html#/jabref/?](https://demo.teamscale.com/findings.html#/jabref/?).
 
 We strongly recommend to read following two books on code quality:
 
@@ -12,4 +16,3 @@ We strongly recommend to read following two books on code quality:
 * [Effective Java](https://www.oreilly.com/library/view/effective-java-3rd/9780134686097/) is the standard book for advanced Java programming. Did you know that `enum` is the [recommended way to enforce a singleton instance of a class](https://learning.oreilly.com/library/view/effective-java-3rd/9780134686097/ch2.xhtml#lev3)? Did you know that one should [refer to objects by their interfaces](https://learning.oreilly.com/library/view/effective-java-3rd/9780134686097/ch9.xhtml#lev64)?
 
 The principles we follow to ensure high code quality in JabRef is stated at our [Development Strategy](../getting-into-the-code/development-strategy.md).
-
diff --git a/docs/advanced-reading/custom-svg-icons.md b/docs/code-howtos/custom-svg-icons.md
similarity index 69%
rename from docs/advanced-reading/custom-svg-icons.md
rename to docs/code-howtos/custom-svg-icons.md
index 90d0b3214bc..6e94b1dbee3 100644
--- a/docs/advanced-reading/custom-svg-icons.md
+++ b/docs/code-howtos/custom-svg-icons.md
@@ -1,10 +1,14 @@
+---
+parent: Code Howtos
+nav_order: 2
+---
 # Custom SVG icons
 
-JabRef uses [Material Design Icons](https://materialdesignicons.com/) for most buttons on toolbars and panels. While most required icons are available, some specific ones cannot be found in the standard set, like Vim, Emacs, etc. Although custom icons might not fit the existing icons perfectly in style and level of detail, they will fit much better into JabRef than having a color pixel icon between all Material Design Icons.
+JabRef uses [Material Design Icons](https://materialdesignicons.com) for most buttons on toolbars and panels. While most required icons are available, some specific ones cannot be found in the standard set, like Vim, Emacs, etc. Although custom icons might not fit the existing icons perfectly in style and level of detail, they will fit much better into JabRef than having a color pixel icon between all Material Design Icons.
 
 ![toolbar](http://i.imgur.com/KlyYrNn.png)
 
-This tutorial aims to describe the process of adding missing icons created in a vector drawing tool like Adobe Illustrator and packing them into a _true type font_ \(TTF\) to fit seamlessly into the JabRef framework. Already existing custom icons will be published \(link is coming soon\) as they need to be repacked as well.
+This tutorial aims to describe the process of adding missing icons created in a vector drawing tool like Adobe Illustrator and packing them into a _true type font_ (TTF) to fit seamlessly into the JabRef framework. Already existing custom icons will be published (link is coming soon) as they need to be repacked as well.
 
 The process consists of 5 steps:
 
@@ -28,7 +32,7 @@ Unpack the downloaded font-package and copy the `.ttf` file under `fonts` to `sr
 
 ## Step 4. Adapt the class `org.jabref.gui.JabRefMaterialDesignIcon`
 
-Inside the font-package will be a CSS file that specifies which icon \(glyph\) is at which code point. If you have ordered them correctly, you newly designed icon\(s\) will be at the end and you can simply append them to `org.jabref.gui.JabRefMaterialDesignIcon`:
+Inside the font-package will be a CSS file that specifies which icon (glyph) is at which code point. If you have ordered them correctly, you newly designed icon(s) will be at the end and you can simply append them to `org.jabref.gui.JabRefMaterialDesignIcon`:
 
 ```java
     TEX_STUDIO("\ue900"),
@@ -43,9 +47,8 @@ Inside the font-package will be a CSS file that specifies which icon \(glyph\) i
 
 ## Step 5. Adapt the class `org.jabref.gui.IconTheme`
 
-If you added an icon that already existed \(but not as flat Material Design Icon\), then you need to change the appropriate line in `org.jabref.gui.IconTheme`, where the icon is assigned. If you created a new one, then you need to add a line. You can specify the icon like this:
+If you added an icon that already existed (but not as flat Material Design Icon), then you need to change the appropriate line in `org.jabref.gui.IconTheme`, where the icon is assigned. If you created a new one, then you need to add a line. You can specify the icon like this:
 
 ```java
 APPLICATION_EMACS(JabRefMaterialDesignIcon.EMACS)
 ```
-
diff --git a/docs/code-howtos/error-handling.md b/docs/code-howtos/error-handling.md
new file mode 100644
index 00000000000..2df80219ed0
--- /dev/null
+++ b/docs/code-howtos/error-handling.md
@@ -0,0 +1,40 @@
+---
+parent: Code Howtos
+nav_order: 3
+---
+# Error Handling in JabRef
+
+## Throwing and Catching Exceptions
+
+Principles:
+
+* All exceptions we throw should be or extend `JabRefException`; This is especially important if the message stored in the Exception should be shown to the user. `JabRefException` has already implemented the `getLocalizedMessage()` method which should be used for such cases (see details below!).
+* Catch and wrap all API exceptions (such as `IOExceptions`) and rethrow them
+    *   Example:
+
+        ```java
+           try {
+               // ...
+           } catch (IOException ioe) {
+               throw new JabRefException("Something went wrong...",
+                   Localization.lang("Something went wrong...", ioe);
+           }
+        ```
+* Never, ever throw and catch `Exception` or `Throwable`
+* Errors should only be logged when they are finally caught (i.e., logged only once). See **Logging** for details.
+* If the Exception message is intended to be shown to the User in the UI (see below) provide also a localizedMessage (see `JabRefException`).
+
+_(Rationale and further reading:_ [https://www.baeldung.com/java-exceptions](https://www.baeldung.com/java-exceptions)_)_
+
+## Outputting Errors in the UI
+
+Principle: Error messages shown to the User should not contain technical details (e.g., underlying exceptions, or even stack traces). Instead, the message should be concise, understandable for non-programmers and localized. The technical reasons (and stack traces) for a failure should only be logged.
+
+To show error message two different ways are usually used in JabRef:
+
+* showing an error dialog
+* updating the status bar at the bottom of the main window
+
+```
+TODO: Usage of status bar and Swing Dialogs
+```
diff --git a/docs/code-howtos/eventbus.md b/docs/code-howtos/eventbus.md
new file mode 100644
index 00000000000..5d90d47b22c
--- /dev/null
+++ b/docs/code-howtos/eventbus.md
@@ -0,0 +1,71 @@
+---
+parent: Code Howtos
+nav_order: 4
+---
+# Event Bus and Event System
+
+## What the EventSystem is used for
+
+Many times there is a need to provide an object on many locations simultaneously. This design pattern is quite similar to Java's Observer, but it is much simpler and readable while having the same functional sense.
+
+## Main principle
+
+`EventBus` represents a communication line between multiple components. Objects can be passed through the bus and reach the listening method of another object which is registered on that `EventBus` instance. Hence, the passed object is available as a parameter in the listening method.
+
+## Register to the `EventBus`
+
+Any listening method has to be annotated with `@Subscribe` keyword and must have only one accepting parameter. Furthermore, the object which contains such listening method(s) has to be registered using the `register(Object)` method provided by `EventBus`. The listening methods can be overloaded by using different parameter types.
+
+## Posting an object
+
+`post(object)` posts an object through the `EventBus` which has been used to register the listening/subscribing methods.
+
+## Short example
+
+```java
+/* Listener.java */
+
+import com.google.common.eventbus.Subscribe;
+
+public class Listener {
+
+   private int value = 0;
+
+   @Subscribe
+   public void listen(int value) {
+      this.value = value;
+   }
+
+   public int getValue() {
+      return this.value;
+   }
+}
+```
+
+```java
+/* Main.java */
+
+import com.google.common.eventbus.EventBus;
+
+public class Main {
+   private static EventBus eventBus = new EventBus();
+
+   public static void main(String[] args) {
+      Main main = new Main();
+      Listener listener = new Listener();
+      eventBus.register(listener);
+      eventBus.post(1); // 1 represents the passed event
+
+      // Output should be 1
+      System.out.println(listener.getValue());
+   }
+}
+```
+
+## Event handling in JabRef
+
+The `event` package contains some specific events which occur in JabRef.
+
+For example: Every time an entry was added to the database a new `EntryAddedEvent` is sent through the `eventBus` which is located in `BibDatabase`.
+
+If you want to catch the event you'll have to register your listener class with the `registerListener(Object listener)` method in `BibDatabase`. `EntryAddedEvent` provides also methods to get the inserted `BibEntry`.
diff --git a/docs/advanced-reading/fetchers.md b/docs/code-howtos/fetchers.md
similarity index 67%
rename from docs/advanced-reading/fetchers.md
rename to docs/code-howtos/fetchers.md
index 0540e391050..5c4edf7225f 100644
--- a/docs/advanced-reading/fetchers.md
+++ b/docs/code-howtos/fetchers.md
@@ -1,16 +1,20 @@
-# Working on fetchers
+---
+parent: Code Howtos
+nav_order: 5
+---
+# Fetchers
 
 Fetchers are the implementation of the [search using online services](https://docs.jabref.org/collect/import-using-online-bibliographic-database). Some fetchers require API keys to get them working. To get the fetchers running in a JabRef development setup, the keys need to be placed in the respective environment variable. The following table lists the respective fetchers, where to get the key from and the environment variable where the key has to be placed.
 
-| Service                                                                                                                                           | Key Source                                                   | Environment Variable           | Rate Limit                       |
-| ------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------ | ------------------------------ | -------------------------------- |
-| [IEEEXplore](https://docs.jabref.org/collect/import-using-online-bibliographic-database#ieeexplore)                                               | [IEEE Xplore API portal](https://developer.ieee.org)         | `IEEEAPIKey`                   | 200 calls/day                    |
-| [MathSciNet](http://www.ams.org/mathscinet)                                                                                                       | (none)                                                       | (none)                         | Depending on the current network |
-| [SAO/NASA Astrophysics Data System](https://docs.jabref.org/collect/import-using-online-bibliographic-database#sao-nasa-astrophysics-data-system) | [ADS UI](https://ui.adsabs.harvard.edu/user/settings/token)  | `AstrophysicsDataSystemAPIKey` | 5000 calls/day                   |
-| [ScienceDirect](https://www.sciencedirect.com)                                                                                                    |                                                              | `ScienceDirectApiKey`          |                                  |
-| [Springer Nature](https://docs.jabref.org/collect/import-using-online-bibliographic-database#springer)                                            | [Springer Nature API Portal](https://dev.springernature.com) | `SpringerNatureAPIKey`         | 5000 calls/day                   |
-| [Zentralblatt Math](https://www.zbmath.org)                                                                                                       | (none)                                                       | (none)                         | Depending on the current network |
-
+| Service                                                                                                                                              | Key Source                                                                                                     | Environment Variable           | Rate Limit                       |
+|------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------|--------------------------------| -------------------------------- |
+| [IEEEXplore](https://docs.jabref.org/collect/import-using-online-bibliographic-database#ieeexplore)                                                  | [IEEE Xplore API portal](https://developer.ieee.org)                                                           | `IEEEAPIKey`                   | 200 calls/day                    |
+| [MathSciNet](http://www.ams.org/mathscinet)                                                                                                          | (none)                                                                                                         | (none)                         | Depending on the current network |
+| [SAO/NASA Astrophysics Data System](https://docs.jabref.org/collect/import-using-online-bibliographic-database#sao-nasa-astrophysics-data-system)    | [ADS UI](https://ui.adsabs.harvard.edu/user/settings/token)                                                    | `AstrophysicsDataSystemAPIKey` | 5000 calls/day                   |
+| [ScienceDirect](https://www.sciencedirect.com)                                                                                                       |                                                                                                                | `ScienceDirectApiKey`          |                                  |
+| [Springer Nature](https://docs.jabref.org/collect/import-using-online-bibliographic-database#springer)                                               | [Springer Nature API Portal](https://dev.springernature.com)                                                   | `SpringerNatureAPIKey`         | 5000 calls/day                   |
+| [Zentralblatt Math](https://www.zbmath.org)                                                                                                          | (none)                                                                                                         | (none)                         | Depending on the current network |
+ | [Biodiversity Heritage Library](https://www.biodiversitylibrary.org/)                                                                                | [Biodiversitylibrary](https://about.biodiversitylibrary.org/tools-and-services/developer-and-data-tools/#APIs) | `BiodiversityHeritageApiKey`   |         |
 "Depending on the current network" means that it depends on whether your request is routed through a network having paid access. For instance, some universities have subscriptions to MathSciNet.
 
 On Windows, you have to log off and log on to let IntelliJ know about the environment variable change. Execute the gradle task `processResources` in the group "others" within IntelliJ to ensure the values have been correctly written. Now, the fetcher tests should run without issues.
@@ -31,11 +35,11 @@ There are more fetchers supported by JabRef. Investigate the package `org.jabref
 
 ### Trust Levels
 
-* `SOURCE `(highest): definitive URL for a particular paper
+* `SOURCE` (highest): definitive URL for a particular paper
 * `PUBLISHER`: any publisher library
 * `PREPRINT`: any preprint library that might include non final publications of a paper
 * `META_SEARCH`: meta search engines
-* `UNKNOWN `(lowest): anything else not fitting the above categories
+* `UNKNOWN` (lowest): anything else not fitting the above categories
 
 ### Current trust levels
 
@@ -46,9 +50,9 @@ All fetchers are contained in the package `org.jabref.logic.importer.fetcher`. H
 * Springer: Publisher
 * ACS: Publisher
 * IEEE: Publisher
-* Google Scholar: META_SEARCH, because it is a search engine
+* Google Scholar: META\_SEARCH, because it is a search engine
 * Arxiv: PREPRINT, because preprints are published there
-* OpenAccessDOI: META_SEARCH
+* OpenAccessDOI: META\_SEARCH
 
 Reasoning:
 
@@ -61,7 +65,7 @@ Code was first introduced at [PR#3882](https://github.com/JabRef/jabref/pull/388
 
 The keys are placed into the `build.properties` file.
 
-```
+```groovy
 springerNatureAPIKey=${springerNatureAPIKey}
 ```
 
diff --git a/docs/code-howtos/index.md b/docs/code-howtos/index.md
new file mode 100644
index 00000000000..94ca60ff51a
--- /dev/null
+++ b/docs/code-howtos/index.md
@@ -0,0 +1,106 @@
+---
+nav_order: 6
+has_children: true
+---
+# Code Howtos
+
+This page provides some development support in the form of howtos.
+See also [High Level Documentation](../getting-into-thecode/high-level-documentation.md).
+
+## Generic code how tos
+
+We really recommend reading the book [Java by Comparison](http://java.by-comparison.com).
+
+Please read [https://github.com/cxxr/better-java](https://github.com/cxxr/better-java)
+
+* try not to abbreviate names of variables, classes or methods
+* use lowerCamelCase instead of snake\_case
+* name enums in singular, e.g. `Weekday` instead of `Weekdays` (except if they represent flags)
+
+## Cleanup and Formatters
+
+We try to build a cleanup mechanism based on formatters. The idea is that we can register these actions in arbitrary places, e.g., onSave, onImport, onExport, cleanup, etc. and apply them to different fields. The formatters themselves are independent of any logic and therefore easy to test.
+
+Example: [NormalizePagesFormatter](https://github.com/JabRef/jabref/blob/master/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizePagesFormatter.java)
+
+## Drag and Drop
+
+Drag and Drop makes usage of the Dragboard. For JavaFX the following [tutorial](https://docs.oracle.com/javafx/2/drag\_drop/jfxpub-drag\_drop.htm) is helpful. Note that the data has to be serializable which is put on the dragboard. For drag and drop of Bib-entries between the maintable and the groups panel, a custom Dragboard is used, `CustomLocalDragboard` which is a generic alternative to the system one.
+
+For accessing or putting data into the Clipboard use the `ClipboardManager`.
+
+## Get the JabRef frame panel
+
+`JabRefFrame` and `BasePanel` are the two main classes. You should never directly call them, instead pass them as parameters to the class.
+
+## Get Absolute Filename or Path for file in File directory
+
+```java
+Optional<Path> file = FileHelper.expandFilename(database, fileText, preferences.getFilePreferences());
+```
+
+`String path` Can be the files name or a relative path to it. The Preferences should only be directly accessed in the GUI. For the usage in logic pass them as parameter
+
+## Setting a Database Directory for a .bib File
+
+* `@comment{jabref-meta: fileDirectory:<directory>`
+* “fileDirectory” is determined by Globals.pref.get(“userFileDir”) (which defaults to “fileDirectory”
+* There is also “fileDirectory-\<username>”, which is determined by Globals.prefs.get(“userFileDirIndividual”)
+* Used at DatabasePropertiesDialog
+
+## How to work with Preferences
+
+`model` and `logic` must not know `JabRefPreferences`. See `ProxyPreferences` for encapsulated preferences and [https://github.com/JabRef/jabref/pull/658](https://github.com/JabRef/jabref/pull/658) for a detailed discussion.
+
+See [https://github.com/JabRef/jabref/blob/master/src/main/java/org/jabref/logic/preferences/TimestampPreferences.java](https://github.com/JabRef/jabref/blob/master/src/main/java/org/jabref/logic/preferences/TimestampPreferences.java) (via [https://github.com/JabRef/jabref/pull/3092](https://github.com/JabRef/jabref/pull/3092)) for the current way how to deal with preferences.
+
+Defaults should go into the model package. See [Comments in this Commit](https://github.com/JabRef/jabref/commit/2f553e6557bddf7753b618b0f4edcaa6e873f719#commitcomment-15779484)
+
+## UI
+
+Global variables should be avoided. Try to pass them as dependency.
+
+## "Special Fields"
+
+### keywords sync
+
+Database.addDatabaseChangeListener does not work as the DatabaseChangedEvent does not provide the field information. Therefore, we have to use BibtexEntry.addPropertyChangeListener(VetoableChangeListener listener)
+
+## Working with BibTeX data
+
+### Working with authors
+
+You can normalize the authors using `org.jabref.model.entry.AuthorList.fixAuthor_firstNameFirst(String)`. Then the authors always look nice. The only alternative containing all data of the names is `org.jabref.model.entry.AuthorList.fixAuthor_lastNameFirst(String)`. The other `fix...` methods omit data (like the von parts or the junior information).
+
+## Benchmarks
+
+* Benchmarks can be executed by running the `jmh` gradle task (this functionality uses the [JMH Gradle plugin](https://github.com/melix/jmh-gradle-plugin))
+* Best practices:
+    * Read test input from `@State` objects
+    * Return result of calculations (either explicitly or via a `BlackHole` object)
+* [List of examples](https://github.com/melix/jmh-gradle-example/tree/master/src/jmh/java/org/openjdk/jmh/samples)
+
+## Measure performance
+
+Try out the [YourKit JAva Profiler](https://www.yourkit.com).
+
+## equals
+
+When creating an `equals` method follow:
+
+1. Use the `==` operator to check if the argument is a reference to this object. If so, return `true`.
+2. Use the `instanceof` operator to check if the argument has the correct type. If not, return `false`.
+3. Cast the argument to the correct type.
+4. For each “significant” field in the class, check if that field of the argument matches the corresponding field of this object. If all these tests succeed, return `true` otherwise, return `false`.
+5. When you are finished writing your equals method, ask yourself three questions: Is it symmetric? Is it transitive? Is it consistent?
+
+Also, note:
+
+* Always override `hashCode` when you override equals (`hashCode` also has very strict rules) (Item 9 of[Effective Java](https://www.oreilly.com/library/view/effective-java-3rd/9780134686097/))
+* Don’t try to be too clever
+* Don’t substitute another type for `Object` in the equals declaration
+
+## Files and Paths
+
+Always try to use the methods from the nio-package. For interoperability, they provide methods to convert between file and path. [https://docs.oracle.com/javase/tutorial/essential/io/path.html](https://docs.oracle.com/javase/tutorial/essential/io/path.html) Mapping between old methods and new methods [https://docs.oracle.com/javase/tutorial/essential/io/legacy.html#mapping](https://docs.oracle.com/javase/tutorial/essential/io/legacy.html#mapping)
+
diff --git a/docs/readings-on-coding/javafx.md b/docs/code-howtos/javafx.md
similarity index 53%
rename from docs/readings-on-coding/javafx.md
rename to docs/code-howtos/javafx.md
index 5b34441e8ee..b67e04cafea 100644
--- a/docs/readings-on-coding/javafx.md
+++ b/docs/code-howtos/javafx.md
@@ -1,8 +1,58 @@
-# Readings on JavaFX
+---
+parent: Code Howtos
+nav_order: 6
+---
+# JavaFX
+
+## FXML
+
+The following expressions can be used in FXML attributes, according to the [official documentation](https://docs.oracle.com/javase/8/javafx/api/javafx/fxml/doc-files/introduction\_to\_fxml.html#attributes)
+
+| Type                             | Expression                                       | Value point to                                                         | Remark                                                                                                                                             |
+| -------------------------------- | ------------------------------------------------ | ---------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------- |
+| Location                         | `@image.png`                                     | path relative to the current FXML file                                 |                                                                                                                                                    |
+| Resource                         | `%textToBeTranslated`                            | key in ResourceBundle                                                  |                                                                                                                                                    |
+| Attribute variable               | `$idOfControl` or `$variable`                    | named control or variable in controller (may be path in the namespace) | resolved only once at load time                                                                                                                    |
+| Expression binding               | `${expression}`                                  | expression, for example `textField.text`                               | changes to source are propagated                                                                                                                   |
+| Bidirectional expression binding | `#{expression}`                                  | expression                                                             | changes are propagated in both directions (not yet implemented in JavaFX, see [feature request](https://bugs.openjdk.java.net/browse/JDK-8090665)) |
+| Event handler                    | `#nameOfEventHandler`                            | name of the event handler method in the controller                     |                                                                                                                                                    |
+| Constant                         | `<text><Strings fx:constant="MYSTRING"/></text>` | constant (here `MYSTRING` in the `Strings` class)                      |                                                                                                                                                    |
+
+## JavaFX Radio Buttons example
+
+All radio buttons that should be grouped together need to have a ToggleGroup defined in the FXML code Example:
+
+```markup
+<VBox>
+            <fx:define>
+                <ToggleGroup fx:id="citeToggleGroup"/>
+            </fx:define>
+            <children>
+                <RadioButton fx:id="inPar" minWidth="-Infinity" mnemonicParsing="false"
+                             text="%Cite selected entries between parenthesis" toggleGroup="$citeToggleGroup"/>
+                <RadioButton fx:id="inText" minWidth="-Infinity" mnemonicParsing="false"
+                             text="%Cite selected entries with in-text citation" toggleGroup="$citeToggleGroup"/>
+                <Label minWidth="-Infinity" text="%Extra information (e.g. page number)"/>
+                <TextField fx:id="pageInfo"/>
+            </children>
+</VBox>
+```
+
+## JavaFX Dialogs
+
+All dialogs should be displayed to the user via `DialogService` interface methods. `DialogService` provides methods to display various dialogs (including custom ones) to the user. It also ensures the displayed dialog opens on the correct window via `initOwner()` (for cases where the user has multiple screens). The following code snippet demonstrates how a custom dialog is displayed to the user:
 
-JabRef's recommendations about JavaFX
+```java
+dialogService.showCustomDialog(new DocumentViewerView());
+```
+
+If an instance of `DialogService` is unavailable within current class/scope in which the dialog needs to be displayed, `DialogService` can be instantiated via the code snippet shown as follows:
+
+```java
+DialogService dialogService = Injector.instantiateModelOrService(DialogService.class);
+```
 
-## Architecture: Model - View - \(Controller\) - ViewModel  \(MV\(C\)VM\)
+## Architecture: Model - View - (Controller) - ViewModel (MV(C)VM)
 
 The goal of the MVVM architecture is to separate the state/behavior from the appearance of the ui. This is archived by dividing JabRef into different layers, each having a clear responsibility.
 
@@ -26,7 +76,7 @@ public class MyDialogViewModel extends AbstractViewModel {
 }
 ```
 
-* Add a \(readonly\) property as a private field and generate the getters according to the [JavaFX bean conventions](https://docs.oracle.com/javafx/2/binding/jfxpub-binding.htm):
+* Add a (readonly) property as a private field and generate the getters according to the [JavaFX bean conventions](https://docs.oracle.com/javafx/2/binding/jfxpub-binding.htm):
 
 ```java
 private final ReadOnlyStringWrapper heading = new ReadOnlyStringWrapper();
@@ -79,13 +129,13 @@ public class AboutDialogView extends BaseDialog<Void>
 @Inject private DialogService dialogService;
 ```
 
-* It is convenient to load the FXML-view directly from the controller class.
+*   It is convenient to load the FXML-view directly from the controller class.
 
-  The FXML file is loaded using `ViewLoader` based on the name of the class passed to `view`. To make this convention-over-configuration approach work, both the FXML file and the View class should have the same name and should be located in the same package.
+    The FXML file is loaded using `ViewLoader` based on the name of the class passed to `view`. To make this convention-over-configuration approach work, both the FXML file and the View class should have the same name and should be located in the same package.
 
-  Note that fields annotated with `@FXML` or `@Inject` only become accessible after `ViewLoader.load()` is called.
+    Note that fields annotated with `@FXML` or `@Inject` only become accessible after `ViewLoader.load()` is called.
 
-  a `View` class that loads the FXML file.
+    a `View` class that loads the FXML file.
 
 ```java
 private Dependency dependency;
@@ -143,14 +193,14 @@ The view consists a FXML file `MyDialog.fxml` which defines the structure and th
 * [Undo manager](https://github.com/FXMisc/UndoFX)
 * [Docking manager](https://github.com/alexbodogit/AnchorFX) [or](https://github.com/RobertBColton/DockFX)
 * [additional bindings](https://github.com/lestard/advanced-bindings) or [EasyBind](https://github.com/TomasMikula/EasyBind)
-* [Kubed](https://github.com/hudsonb/kubed): data visualization \(inspired by d3\)
+* [Kubed](https://github.com/hudsonb/kubed): data visualization (inspired by d3)
 * [Validation framework](https://github.com/sialcasa/mvvmFX/wiki/Validation)
 * [mvvm framework](https://github.com/sialcasa/mvvmFX/wiki)
 * [CSS Reference](http://docs.oracle.com/javafx/2/api/javafx/scene/doc-files/cssref.html)
 * [JFoenix](https://github.com/jfoenixadmin/JFoenix) Material Designs look & feel
 * [JavaFX Documentation project](https://fxdocs.github.io/docs/html5/index.html): Collected information on JavaFX in a central place
-* [FXExperience](http://fxexperience.com/) JavaFX Links of the week
-* [Foojay](https://foojay.io/) Java and JavaFX tutorials
+* [FXExperience](http://fxexperience.com) JavaFX Links of the week
+* [Foojay](https://foojay.io) Java and JavaFX tutorials
 * [FXTutorials](https://github.com/AlmasB/FXTutorials) A wide range of practical tutorials focusing on Java, JavaFX and FXGL
 
 ## Features missing in JavaFX
diff --git a/docs/advanced-reading/jpackage.md b/docs/code-howtos/jpackage.md
similarity index 65%
rename from docs/advanced-reading/jpackage.md
rename to docs/code-howtos/jpackage.md
index cb12ad25225..8a527bcd70e 100644
--- a/docs/advanced-reading/jpackage.md
+++ b/docs/code-howtos/jpackage.md
@@ -1,13 +1,17 @@
-# Creating a binary and debug it
+---
+parent: Code Howtos
+nav_order: 7
+---
+# JPackage: Creating a binary and debug it
 
 JabRef uses [jpackage](https://docs.oracle.com/en/java/javase/14/jpackage/) to build binary application bundles and installers for Windows, Linux, and macOS. For Gradle, we use the [Badass JLink Plugin](https://badass-jlink-plugin.beryx.org/releases/latest/).
 
 ## Build Windows binaries locally
 
-Preparation: Install [WiX Toolset](https://wixtoolset.org/)
+Preparation: Install [WiX Toolset](https://wixtoolset.org)
 
 1. Open administrative shell
-2. Use [Chocolatey](https://chocolatey.org/) to install it: `choco install wixtoolset`
+2. Use [Chocolatey](https://chocolatey.org) to install it: `choco install wixtoolset`
 
 Create the application image:
 
@@ -24,14 +28,12 @@ Sometimes issues with modularity only arise in the installed version and do not
 ### Debugging on Windows
 
 1. Open `build.gradle`, under jlink options remove `--strip-debug`
-2. Build using `jpackageImage` \(or let the CI build a new version\)
-3. Modify the `build\image\JabRef\runtime\bin\Jabref.bat` file, replace the last line with
-
-   ```text
-   pushd %DIR% & %JAVA_EXEC% -Xdebug -Xrunjdwp:server=y,transport=dt_socket,address=8000,suspend=n -p "%~dp0/../app" -m org.jabref/org.jabref.gui.JabRefLauncher  %* & popd
-   ```
+2. Build using `jpackageImage` (or let the CI build a new version)
+3.  Modify the `build\image\JabRef\runtime\bin\Jabref.bat` file, replace the last line with
 
+    ```
+    pushd %DIR% & %JAVA_EXEC% -Xdebug -Xrunjdwp:server=y,transport=dt_socket,address=8000,suspend=n -p "%~dp0/../app" -m org.jabref/org.jabref.gui.JabRefLauncher  %* & popd
+    ```
 4. Open your IDE and add a "Remote Debugging Configuration" for `localhost:8000`
 5. Start JabRef by running the above bat file
 6. Connect with your IDE using remote debugging
-
diff --git a/docs/code-howtos/localization.md b/docs/code-howtos/localization.md
new file mode 100644
index 00000000000..ed0b3567641
--- /dev/null
+++ b/docs/code-howtos/localization.md
@@ -0,0 +1,52 @@
+---
+parent: Code Howtos
+nav_order: 8
+---
+# Localization
+
+More information about this topic from the translator side is provided at [Translating JabRef Interface](https://docs.jabref.org/faqcontributing/how-to-translate-the-ui).
+
+All labeled UI elements, descriptions and messages shown to the user should be localized, i.e., should be displayed in the chosen language.
+
+JabRef uses ResourceBundles ([see Oracle Tutorial](https://docs.oracle.com/javase/tutorial/i18n/resbundle/concept.html)) to store `key=value` pairs for each String to be localized.
+
+To show an localized String the following `org.jabref.logic.l10n.Localization` has to be used. The Class currently provides three methods to obtain translated strings:
+
+```java
+    public static String lang(String key);
+
+    public static String lang(String key, String... params);
+
+    public static String menuTitle(String key, String... params);
+```
+
+The actual usage might look like:
+
+```java
+    Localization.lang("Get me a translated String");
+    Localization.lang("Using %0 or more %1 is also possible", "one", "parameter");
+    Localization.menuTitle("Used for Menus only");
+```
+
+General hints:
+
+* Use the String you want to localize directly, do not use members or local variables: `Localization.lang("Translate me");` instead of `Localization.lang(someVariable)` (possibly in the form `someVariable = Localization.lang("Translate me")`
+* Use `%x`-variables where appropriate: `Localization.lang("Exported %0 entries.", number)` instead of `Localization.lang("Exported ") + number + Localization.lang(" entries.");`
+* Use a full stop/period (".") to end full sentences
+
+The tests check whether translation strings appear correctly in the resource bundles.
+
+1.  Add new `Localization.lang("KEY")` to Java file. Run the `LocalizationConsistencyTest`under (src/test/org.jabref.logic.
+
+    )
+2. Tests fail. In the test output a snippet is generated which must be added to the English translation file.
+3. Add snippet to English translation file located at `src/main/resources/l10n/JabRef_en.properties`
+4. Please do not add translations for other languages directly in the properties. They will be overwritten by [Crowdin](https://crowdin.com/project/jabref)
+
+## Adding a new Language
+
+1. Add the new Language to the Language enum in [https://github.com/JabRef/jabref/blob/master/src/main/java/org/jabref/logic/l10n/Language.java](https://github.com/JabRef/jabref/blob/master/src/main/java/org/jabref/logic/l10n/Language.java)
+2. Create an empty \<locale code>.properties file
+3. Configure the new language in [Crowdin](https://crowdin.com/project/jabref)
+
+If the language is a variant of a language `zh_CN` or `pt_BR` it is necessary to add a language mapping for Crowdin to the crowdin.yml file in the root. Of course the properties file also has to be named according to the language code and locale.
diff --git a/docs/code-howtos/logging.md b/docs/code-howtos/logging.md
new file mode 100644
index 00000000000..ca16897502e
--- /dev/null
+++ b/docs/code-howtos/logging.md
@@ -0,0 +1,24 @@
+---
+parent: Code Howtos
+nav_order: 9
+---
+## Logging
+
+JabRef uses the logging facade [SLF4j](https://www.slf4j.org). All log messages are passed internally to [tinylog](https://tinylog.org/v2/) which handles any filtering, formatting and writing of log messages.
+
+*   Obtaining a logger for a class:
+
+    ```java
+    private static final Logger LOGGER = LoggerFactory.getLogger(<ClassName>.class);
+    ```
+*   If the logging event is caused by an exception, please add the exception to the log message as:
+
+    ```java
+      catch (SomeException e) {
+         LOGGER.warn("Warning text.", e);
+         ...
+      }
+    ```
+* SLF4J also support parameterized logging, e.g. if you want to print out multiple arguments in a log statement use a pair of curly braces. [Examples](https://www.slf4j.org/faq.html#logging\_performance)
+* When running tests, `tinylog-test.properties` is used. It is located under `src/test/resources`. As default, only `info` is logged. When developing, it makes sense to use `debug` as log level. One can change the log level per class using the pattern `level@class=debug` is set to `debug`. In the `.properties` file, this is done for `org.jabref.model.entry.BibEntry`.
+
diff --git a/docs/code-howtos/openoffice/code-reorganization.md b/docs/code-howtos/openoffice/code-reorganization.md
new file mode 100644
index 00000000000..c9c37fe47d8
--- /dev/null
+++ b/docs/code-howtos/openoffice/code-reorganization.md
@@ -0,0 +1,143 @@
+---
+nav_order: 4
+parent: The LibreOffice Panel
+grand_parent: Code Howtos
+---
+# Code reorganization
+
+Why
+
+* Separate backend
+* Separate GUI code (dialogs) and logic
+* Data is now organized around `Citation`, `CitationGroup` instead of arrays for citation group fields, and arrays of arrays for citation fields.\
+  Also take `citationKey` as the central data unit, this is what we start with: unresolved `citationKeys` do not stop processing. Although we cannot sort them by author and year, we can still emit a marker that acts as a placeholder and shows the user the problematic key.
+
+## Result
+
+### Layers
+
+![Layers](layers-v1.svg)
+
+### By directories
+
+* `model`
+  * `util` : general utilities
+    * (`OOPair`, `OOTuple3`) collect two or three objects without creating a new class
+    * `OOResult` : while an Optional.empty can comunicate failure, it cannot provide details.\
+      `OOResult` allows an arbitrary error object to be provided in case of failure.
+    * `OOVoidResult` : for functions returning no result on success, only diagnostics on failure.
+    * `OOListUtil`: some utilities working on List
+  * `uno` : helpers for various tasks via UNO.\
+    These are conceptually independent of JabRef code and logic.
+  * `ootext` : to separate decisions on the format of references and citation marks from the actual insertion into the document, the earlier method [OOUtil.insertOOFormattedTextAtCurrentLocation](https://github.com/JabRef/jabref/blob/475b2989ffa8ec61c3327c62ed8f694149f83220/src/main/java/org/jabref/logic/openoffice/OOUtil.java#L112) was extended to handle new tags that describe actions earlier done in code.
+    * This became [OOTextIntoOO.write](https://github.com/antalk2/jabref/blob/122d5133fa6c7b44245c5ba5600d398775718664/src/main/java/org/jabref/model/openoffice/ootext/OOTextIntoOO.java#L149)
+      * `(change)` Now all output to the document goes through this, not only those from Layout. This allows the citation markers and `jstyle:Title` to use these tags.
+        * This allows some backward-compatible extensions to jstyle.\
+          `(change)` [Added](https://github.com/antalk2/jabref/blob/122d5133fa6c7b44245c5ba5600d398775718664/src/main/java/org/jabref/logic/openoffice/style/OOBibStyle.java#L92) some extra keywords, in `{prefix}_MARKUP_BEFORE`, `{prefix}_MARKUP_AFTER` pairs to allow bracketing some parts of citation marks with text and/or open/close tag pairs.
+    * [OOFormat](https://github.com/antalk2/jabref/blob/improve-reversibility-rebased-03/src/main/java/org/jabref/model/openoffice/ootext/OOFormat.java) contains helpers to create the appropriate tags
+    * [OOText](https://github.com/antalk2/jabref/blob/improve-reversibility-rebased-03/src/main/java/org/jabref/model/openoffice/ootext/OOText.java) formalizes the distinction from `String`. I did not change `String` to `OOText` in old code, (in particular in OOStyle).
+  * `rangesort` : ordering objects that have an `XTextRange`, optionally with an extra integer to break ties.
+    * `RangeSort.partitionAndSortRanges` : since `XTextRangeCompare` can only compare `XTextRange` values in the same `XText`, we partition them accordingly and only sort within each partiion.
+    * `RangeSortable` (interface), `RangeSortEntry` (implements) :\
+      When we replace `XTextRange` of citation marks in footnotes with the range of the footnote mark, multiple citation marks may be mapped to the same location. To preserve the order between these, `RangeSortable` allows this order to be indicated by returning appropriate indices from `getIndexInPosition`
+    * `RangeSortVisual` : sort in top-to-bottom left-to-right order.\
+      Needs a functional `XTextViewCursor`.\
+      Works on `RangeSortable` values.
+    * `FunctionalTextViewCursor` : helper to get a functional `XTextViewCursor` (cannot always)
+    * `RangeOverlapWithin` : check for overlaps within a set of `XTextRange` values. Probably O(n\*log(n)). Used for all-to-all check of protected ranges.
+    * `RangeOverlapBetween` : check for overlaps between two sets of `XTextRange` values. Assumes one set is small. O(n\*k). Used for checking if the cursor is in a protected range.
+  * `backend` : interfaces to be provided by backends.\
+    May change as new backends may need different APIs.
+  * `style` : data structures and interfaces used while going from ordered list of citation groups to formatted citation markers and bibliography. Does not communicate with the document. Too long to fit here, starting a new section.
+
+## model/style
+
+At the core,
+
+* we have `Citation` values
+  * represented in the document by their `citationKey`
+  * each may have a `pageInfo`
+* A citation group (`CitationGroup`) has
+  * a list of citations (`citationsInStorageOrder`)
+  * an identifier `CitationGroupId cgid`
+    * this allows to refer to the group
+    * also used to associate the group to its citation markers location (outside the style part, in [Backend](https://github.com/antalk2/jabref/blob/fed0952cbdaf7a76bcb09b3db5ac48f34f5ca388/src/main/java/org/jabref/logic/openoffice/backend/Backend52.java#L46))
+  * `OODataModel dataModel` is here, in order to handle old (Jabref5.2) structure where pageInfo belonged to CitationGroup not Citation
+  * `referenceMarkNameForLinking` is optional: can be used to crosslink to the citation marker from the bibliography.
+* `CitationGroups` represents the collection of citation groups.\
+  Processing starts with creating a `CitationGroups` instance from the data stored in the document.
+* `CitedKey` represents a cited source, with ordered backreferences (using `CitationPath`) to the correponding citations.
+* `CitedKeys` is just an order-preserving collection of `CitedKeys` that also supports lookup by `citationKey`. While producing citation markers, we also create a corresponding `CitedKeys` instance, and store it in `CitationGroups.bibliography`. This is already sorted, its entries have `uniqueLetter` or `number` assigned, but not converted to markup yet.
+
+Common processing steps:
+
+* We need `globalOrder` for the citation groups (provided externally) `CitationGroups.setGlobalOrder()`
+* We need to look up each citationKey in the bibliography databases:
+  * `CitationGroups.lookupCitations` collects the cited keys, looks up each, then distributes the results to the citations. Uses a temporary `CitedKeys` instance, based on unsorted citations and citation groups.
+* `CitationGroups.imposeLocalOrder` fills `localOrder` in each `CitationGroup`
+* Now we have order of appearance for the citations (`globalOrder` and `localOrder`).\
+  We can create a `CitedKeys` instance (`bibliography`) according to this order.
+* For citations numbered in order of first appearance we number the sources and distribute the numbers to the corresponding citations.
+* For citations numbered in order of bibliography, we sort the bibliography, number, distribute.
+* For author-year citations we have to decide on the letters `uniqueLetter` used to distinguish sources. This needs order of first appearance of the sources and recognizing clashing citation markers. This is done in logic, in [`OOProcessAuthorYearMarkers.createUniqueLetters()`](https://github.com/antalk2/jabref/blob/122d5133fa6c7b44245c5ba5600d398775718664/src/main/java/org/jabref/logic/openoffice/style/OOProcessAuthorYearMarkers.java#L49)
+* We also mark first appearance of each source ([`setIsFirstAppearanceOfSourceInCitations`](https://github.com/antalk2/jabref/blob/fed0952cbdaf7a76bcb09b3db5ac48f34f5ca388/src/main/java/org/jabref/logic/openoffice/style/OOProcessAuthorYearMarkers.java#L146))
+
+The entry point for this processing is: [`OOProcess.produceCitationMarkers`](https://github.com/antalk2/jabref/blob/fed0952cbdaf7a76bcb09b3db5ac48f34f5ca388/src/main/java/org/jabref/logic/openoffice/style/OOProcess.java#L69).\
+It fills
+
+* each `CitationGroup.citationMarker`
+* `CitationGroups.bibliography`
+  * From bibliography `OOFormatBibliography.formatBibliography()` creates an `OOText` ready to be written to the document.
+
+## logic/style
+
+* `StyleLoader` : not changed (knows about default styles) Used by GUI
+* `OOPreFormatter` : LaTeX code to unicode and OOText tags. (not changed)
+* `OOBibStyle` : is mostly concerned by loading/parsing jstyle files and presenting its pieces to the rest. Originally it also contains code to format numeric and author-year citation markers.
+  * Details of their new implementations are in [`OOBibStyleGetNumCitationMarker`](https://github.com/antalk2/jabref/blob/improve-reversibility-rebased-03/src/main/java/org/jabref/logic/openoffice/style/OOBibStyleGetNumCitationMarker.java) and [`OOBibStyleGetCitationMarker`](https://github.com/antalk2/jabref/blob/improve-reversibility-rebased-03/src/main/java/org/jabref/logic/openoffice/style/OOBibStyleGetCitationMarker.java)
+  * The new implementations
+    * support pageInfo for each citation
+    * support unresolved citations
+    * instead of `List<Integer>` and (`List<BibEntry>` plus arrays and database) they expect more self-contained entries `List<CitationMarkerNumericEntry>`, `List<CitationMarkerEntry>`.
+    * We have distinct methods for `getNormalizedCitationMarker(CitationMarkerNormEntry)` and `getNumCitationMarkerForBibliography(CitationMarkerNumericBibEntry)`.
+    * The corresponding interfaces in model/style:
+      * `CitationMarkerNumericEntry`
+      * `CitationMarkerEntry`
+      * `CitationMarkerNumericBibEntry`
+      * `CitationMarkerNormEntry`\
+        describe their expected input entries.
+* [`OOProcess.produceCitationMarkers`](https://github.com/antalk2/jabref/blob/fed0952cbdaf7a76bcb09b3db5ac48f34f5ca388/src/main/java/org/jabref/logic/openoffice/style/OOProcess.java#L69) is the main entry point for style application. Calls to specific implementations in `OOProcessCitationKeyMarkers`, `OOProcessNumericMarkers` and `OOProcessAuthorYearMarkers` according to jstyle flags.
+
+## logic/backend
+
+Details of encoding and retrieving data stored in a document as well as the citation maker locations. Also contains dataModel-dependent code (which could probably be moved out once the datamodel is settled).
+
+Creating and finding the bibliography (providing a cursor to write at) should be here too.\
+These are currently in `UpdateBibliography`
+
+## logic/frontend
+
+* `OOFrontend` : has a `Backend` and `CitationGroups`
+  * Its constructor creates a backend, reads data from the document and creates a CitationGroups instance.
+  * provides functionality that requires both access to the document and the CitationGroups instance
+* `RangeForOverlapCheck` used in `OOFrontend`
+* `UpdateBibliography` : Create, find and update the bibliography in the document using output from `produceCitationMarkers()`
+* `UpdateCitationMarkers` create `CitationGroup`, update citation markers using output from `produceCitationMarkers()`
+
+## logic/action
+
+GUI-independent part of implementations of GUI actions.
+
+## gui
+
+* `OOError` : common error messages and dialog titles
+  * adds `title` to `Jabrefexception`
+  * converts from some common exception types using type-specific message
+  * contains some dialog messages that do not correspond to exceptions
+* `OOBibBase2` : most activity was moved out from here to parts discussed above.
+  * connecting / selecting a document moved to `OOBibBaseConnect`
+  * the rest connects higher parts of the GUI to actions in logic
+    * does argument and precondition checking
+    * catches all exceptions
+    * shows error and warning dialogs
+    * adds `enterUndoContext`, `leaveUndoContext` around action code
diff --git a/docs/code-howtos/openoffice/index.md b/docs/code-howtos/openoffice/index.md
new file mode 100644
index 00000000000..a36a86fd2b5
--- /dev/null
+++ b/docs/code-howtos/openoffice/index.md
@@ -0,0 +1,6 @@
+---
+parent: Code Howtos
+nav_order: 12
+has_children: true
+---
+# The LibreOffice Panel
diff --git a/docs/code-howtos/openoffice/layers-v1.svg b/docs/code-howtos/openoffice/layers-v1.svg
new file mode 100644
index 00000000000..f9b8239d504
--- /dev/null
+++ b/docs/code-howtos/openoffice/layers-v1.svg
@@ -0,0 +1,915 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="196.37332mm"
+   height="148.27042mm"
+   viewBox="0 0 196.37331 148.27042"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
+   sodipodi:docname="layers-v1.svg"
+   inkscape:export-filename="/home/antalk/d/tmp/jabref/jabref-src/jabref/docs/openoffice/layers-v1.png"
+   inkscape:export-xdpi="150"
+   inkscape:export-ydpi="150">
+  <defs
+     id="defs2">
+    <marker
+       inkscape:isstock="true"
+       style="overflow:visible"
+       id="marker23233"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="Arrow2Mend">
+      <path
+         transform="scale(-0.6)"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         style="fill:#800000;fill-opacity:1;fill-rule:evenodd;stroke:#800000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         id="path23231"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker22945"
+       style="overflow:visible"
+       inkscape:isstock="true"
+       inkscape:collect="always">
+      <path
+         inkscape:connector-curvature="0"
+         id="path22943"
+         style="fill:#800000;fill-opacity:1;fill-rule:evenodd;stroke:#800000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="scale(-0.6)" />
+    </marker>
+    <marker
+       inkscape:isstock="true"
+       style="overflow:visible"
+       id="marker22849"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="Arrow2Mend"
+       inkscape:collect="always">
+      <path
+         transform="scale(-0.6)"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         style="fill:#008080;fill-opacity:1;fill-rule:evenodd;stroke:#008080;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         id="path22847"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:isstock="true"
+       style="overflow:visible"
+       id="marker12261"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="DotM">
+      <path
+         transform="matrix(0.4,0,0,0.4,2.96,0.4)"
+         style="fill:#0000ff;fill-opacity:1;fill-rule:evenodd;stroke:#0000ff;stroke-width:1.00000003pt;stroke-opacity:1"
+         d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+         id="path12259"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Mend"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path1380"
+         style="fill:#008080;fill-opacity:1;fill-rule:evenodd;stroke:#008080;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="scale(-0.6)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Mend-5"
+       style="overflow:visible"
+       inkscape:isstock="true"
+       inkscape:collect="always">
+      <path
+         inkscape:connector-curvature="0"
+         id="path1380-0"
+         style="fill:#0000ff;fill-opacity:1;fill-rule:evenodd;stroke:#0000ff;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="scale(-0.6)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Mend-5-4"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         inkscape:connector-curvature="0"
+         id="path1380-0-6"
+         style="fill:#0000ff;fill-opacity:1;fill-rule:evenodd;stroke:#0000ff;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="scale(-0.6)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Mend-5-4-5"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         inkscape:connector-curvature="0"
+         id="path1380-0-6-8"
+         style="fill:#0000ff;fill-opacity:1;fill-rule:evenodd;stroke:#0000ff;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="scale(-0.6)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Mend-5-2"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         inkscape:connector-curvature="0"
+         id="path1380-0-8"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="scale(-0.6)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Mend-5-4-5-7"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         inkscape:connector-curvature="0"
+         id="path1380-0-6-8-2"
+         style="fill:#0000ff;fill-opacity:1;fill-rule:evenodd;stroke:#0000ff;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="scale(-0.6)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Mend-5-4-5-7-0"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         inkscape:connector-curvature="0"
+         id="path1380-0-6-8-2-6"
+         style="fill:#0000ff;fill-opacity:1;fill-rule:evenodd;stroke:#0000ff;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="scale(-0.6)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Mend-5-4-5-7-0-9"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         inkscape:connector-curvature="0"
+         id="path1380-0-6-8-2-6-9"
+         style="fill:#0000ff;fill-opacity:1;fill-rule:evenodd;stroke:#0000ff;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="scale(-0.6)" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.3742956"
+     inkscape:cx="371.09919"
+     inkscape:cy="280.19606"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer3"
+     showgrid="false"
+     inkscape:window-width="1567"
+     inkscape:window-height="1051"
+     inkscape:window-x="33"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:snap-to-guides="true"
+     inkscape:snap-nodes="true"
+     inkscape:snap-global="false"
+     inkscape:snap-bbox="true"
+     inkscape:snap-others="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:object-paths="false"
+     fit-margin-top="1"
+     fit-margin-left="1"
+     fit-margin-bottom="1"
+     fit-margin-right="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid1005"
+       originx="35.135016"
+       originy="-149.08581" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(35.135016,0.3562198)"
+     style="display:inline" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="input types from GUI"
+     transform="translate(43.194071,32.504535)">
+    <rect
+       style="display:inline;opacity:0.95099996;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#050c13;stroke-width:0.0934983;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect815-0"
+       width="137.11093"
+       height="18.246836"
+       x="-36.951267"
+       y="88.201111"
+       ry="1.5206668" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.3499999px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.95249993px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="-34.28867"
+       y="95.510643"
+       id="text819-4"><tspan
+         sodipodi:role="line"
+         id="tspan817-8"
+         x="-34.28867"
+         y="95.510643"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.3499999px;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.95249993px">document content (UNO)</tspan></text>
+    <rect
+       style="display:inline;opacity:0.95099996;fill:#faffbf;fill-opacity:1;fill-rule:evenodd;stroke:#050c13;stroke-width:0.0934983;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect815-7"
+       width="183.09265"
+       height="18.246836"
+       x="-36.951267"
+       y="42.731419"
+       ry="1.5206668" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.3499999px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.95249993px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="-34.388443"
+       y="49.346863"
+       id="text819-7"><tspan
+         sodipodi:role="line"
+         id="tspan817-6"
+         x="-34.388443"
+         y="49.346863"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.3499999px;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.95249993px">frontend</tspan></text>
+    <rect
+       style="display:inline;opacity:0.95099996;fill:#faffbf;fill-opacity:1;fill-rule:evenodd;stroke:#050c13;stroke-width:0.0934983;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect815-3"
+       width="183.09265"
+       height="18.092909"
+       x="-36.951267"
+       y="18.918875"
+       ry="1.5206668" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.3499999px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.95249993px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="-33.746418"
+       y="25.709284"
+       id="text819-0"><tspan
+         sodipodi:role="line"
+         id="tspan817-3"
+         x="-33.746418"
+         y="25.709284"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.3499999px;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.95249993px">actions</tspan></text>
+    <rect
+       style="display:inline;opacity:0.95099996;fill:#faffbf;fill-opacity:1;fill-rule:evenodd;stroke:#050c13;stroke-width:0.0934983;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect815-3-92"
+       width="183.09265"
+       height="18.246807"
+       x="-36.951267"
+       y="-4.8935795"
+       ry="1.5206668" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.3499999px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.58437586px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="-33.732162"
+       y="2.6568017"
+       id="text819-0-24"><tspan
+         sodipodi:role="line"
+         id="tspan817-3-7"
+         x="-33.732162"
+         y="2.6568017"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.3499999px;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.58437586px">OOBibBase2</tspan></text>
+    <rect
+       style="display:inline;opacity:0.95099996;fill:#faffbf;fill-opacity:1;fill-rule:evenodd;stroke:#050c13;stroke-width:0.0934983;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect815"
+       width="43.554756"
+       height="18.246836"
+       x="-36.951267"
+       y="65.87645"
+       ry="1.5206668" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.3499999px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.95249993px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="-34.073212"
+       y="72.666855"
+       id="text819"><tspan
+         sodipodi:role="line"
+         id="tspan817"
+         x="-34.073212"
+         y="72.666855"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.3499999px;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.95249993px">backend</tspan></text>
+    <rect
+       style="display:inline;opacity:0.95099996;fill:#faffbf;fill-opacity:1;fill-rule:evenodd;stroke:#050c13;stroke-width:0.0934983;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect815-3-9"
+       width="42.948044"
+       height="18.421999"
+       x="103.19336"
+       y="65.538101"
+       ry="1.5206668" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.3499999px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.95249993px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="105.23129"
+       y="71.803619"
+       id="text819-0-2"><tspan
+         sodipodi:role="line"
+         id="tspan817-3-5"
+         x="105.23129"
+         y="71.803619"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.3499999px;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.95249993px">style</tspan></text>
+    <rect
+       style="display:inline;opacity:0.95099996;fill:#faffbf;fill-opacity:1;fill-rule:evenodd;stroke:#050c13;stroke-width:0.0934983;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect815-3-0"
+       width="42.53968"
+       height="18.58371"
+       x="56.849758"
+       y="65.538101"
+       ry="1.5206668" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.3499999px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.56307739px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="58.016205"
+       y="72.297386"
+       id="text819-0-5"><tspan
+         sodipodi:role="line"
+         id="tspan817-3-9"
+         x="58.016205"
+         y="72.297386"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.3499999px;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.56307739px">OOTextIntoOO</tspan></text>
+    <rect
+       style="display:inline;opacity:0.95099996;fill:#faffbf;fill-opacity:1;fill-rule:evenodd;stroke:#050c13;stroke-width:0.0934983;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect815-3-0-5"
+       width="42.53968"
+       height="18.246838"
+       x="11.159797"
+       y="65.87645"
+       ry="1.5206668" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.3499999px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.56307739px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="13.376028"
+       y="72.285805"
+       id="text819-0-5-4"><tspan
+         sodipodi:role="line"
+         id="tspan817-3-9-8"
+         x="13.376028"
+         y="72.285805"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.3499999px;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.56307739px">rangesort</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.07999992px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#808080;fill-opacity:1;stroke:none;stroke-width:0.47624996px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="-34.005562"
+       y="79.155693"
+       id="text1267"><tspan
+         sodipodi:role="line"
+         id="tspan1265"
+         x="-34.005562"
+         y="79.155693"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.07999992px;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#808080;stroke-width:0.47624996px">data in doc, ranges</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.07999992px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#808080;fill-opacity:1;stroke:none;stroke-width:0.47624996px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="13.409392"
+       y="79.155708"
+       id="text1271"><tspan
+         sodipodi:role="line"
+         id="tspan1269"
+         x="13.409392"
+         y="79.155708"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.07999992px;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#808080;stroke-width:0.47624996px">order ranges</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.07999992px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#808080;fill-opacity:1;stroke:none;stroke-width:0.47624996px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="59.052654"
+       y="78.796471"
+       id="text1271-6"><tspan
+         sodipodi:role="line"
+         id="tspan1269-8"
+         x="59.052654"
+         y="78.796471"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.07999992px;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#808080;stroke-width:0.47624996px">fill ranges</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.07999992px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#808080;fill-opacity:1;stroke:none;stroke-width:0.47624996px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="104.82719"
+       y="78.271584"
+       id="text1271-6-0"><tspan
+         sodipodi:role="line"
+         id="tspan1269-8-2"
+         x="104.82719"
+         y="78.271584"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.07999992px;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#808080;stroke-width:0.47624996px">markup text</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.07999992px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#800000;fill-opacity:1;stroke:none;stroke-width:0.47624996px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="5.3610897"
+       y="1.997059"
+       id="text1311"><tspan
+         sodipodi:role="line"
+         id="tspan1309"
+         x="5.3610897"
+         y="1.997059"
+         style="fill:#800000;stroke-width:0.47624996px">XTextDocument</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.07999992px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#800000;fill-opacity:1;stroke:none;stroke-width:0.47624996px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="-7.5290732"
+       y="49.346863"
+       id="text1311-1"><tspan
+         sodipodi:role="line"
+         id="tspan1309-0"
+         x="-7.5290732"
+         y="49.346863"
+         style="fill:#800000;stroke-width:0.47624996px">Backend, CitationGroups</tspan></text>
+    <rect
+       style="display:inline;opacity:0.95099996;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#808080;stroke-width:0.18000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3976"
+       width="194.19331"
+       height="146.09041"
+       x="-42.104073"
+       y="-31.414536"
+       ry="2.7845526" />
+    <g
+       id="g24116"
+       transform="matrix(1.8,0,0,1.8,-43.994071,-35.209536)">
+      <rect
+         ry="0.8448149"
+         y="36.683681"
+         x="12.384912"
+         height="10.137131"
+         width="76.172737"
+         id="rect815-0-9"
+         style="display:inline;opacity:0.95099996;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#050c13;stroke-width:0.0519435;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         transform="translate(-8.0590546,-32.148314)" />
+      <text
+         id="text1311-5-3"
+         y="8.3449545"
+         x="5.0887189"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.82222223px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         xml:space="preserve"><tspan
+           style="fill:#000000;stroke-width:0.26458332px"
+           y="8.3449545"
+           x="5.0887189"
+           id="tspan1309-1-4"
+           sodipodi:role="line">GUI:</tspan></text>
+      <text
+         id="text1311-5-3-0"
+         y="8.3449545"
+         x="12.73384"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.82222223px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#800000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         xml:space="preserve"><tspan
+           style="fill:#800000;stroke-width:0.26458332px"
+           y="8.3449545"
+           x="12.73384"
+           id="tspan1309-1-4-3"
+           sodipodi:role="line">BibEntry, BibDatabase, OOBibStyle</tspan></text>
+      <text
+         id="text23892"
+         y="12.762286"
+         x="13.195879"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.82222223px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#666666;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         xml:space="preserve"><tspan
+           style="fill:#666666;stroke-width:0.26458332px"
+           y="12.762286"
+           x="13.195879"
+           id="tspan23890"
+           sodipodi:role="line">provides input in terms of these types </tspan></text>
+    </g>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.07999992px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#666666;fill-opacity:1;stroke:none;stroke-width:0.47624996px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="41.337749"
+       y="1.8470242"
+       id="text23892-9"><tspan
+         sodipodi:role="line"
+         id="tspan23890-6"
+         x="41.337749"
+         y="1.8470242"
+         style="fill:#666666;stroke-width:0.47624996px">provides connection to doc</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.03525543px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000080;fill-opacity:1;stroke:none;stroke-width:0.3783052px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="-10.485328"
+       y="25.316629"
+       id="text24120"><tspan
+         sodipodi:role="line"
+         id="tspan24118"
+         x="-10.485328"
+         y="25.316629"
+         style="fill:#000080;stroke-width:0.3783052px">Cite, Update, Merge, Separate, Manage, Export</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.03525543px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000080;fill-opacity:1;stroke:none;stroke-width:0.3783052px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="5.7747917"
+       y="8.5604258"
+       id="text24120-9"><tspan
+         sodipodi:role="line"
+         id="tspan24118-8"
+         x="5.7747917"
+         y="8.5604258"
+         style="fill:#000080;stroke-width:0.3783052px">Connect</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.03525543px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000080;fill-opacity:1;stroke:none;stroke-width:0.3783052px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="105.53105"
+       y="82.529007"
+       id="text24120-9-7"><tspan
+         sodipodi:role="line"
+         id="tspan24118-8-2"
+         x="105.53105"
+         y="82.529007"
+         style="fill:#000080;stroke-width:0.3783052px">Load Style</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.27971148px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#666666;fill-opacity:1;stroke:none;stroke-width:0.40996245px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="101.04594"
+       y="-0.62424481"
+       id="text23892-9-3"><tspan
+         sodipodi:role="line"
+         id="tspan1163"
+         x="101.04594"
+         y="-0.62424481"
+         style="stroke-width:0.40996245px">Create OOFrontend instance</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.27971148px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#666666;fill-opacity:1;stroke:none;stroke-width:0.40996245px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="101.04594"
+       y="10.582888"
+       id="text23892-9-3-8"><tspan
+         sodipodi:role="line"
+         id="tspan1169"
+         x="101.04594"
+         y="10.582888"
+         style="stroke-width:0.40996245px">Catch exceptions, Undo</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.27971148px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#666666;fill-opacity:1;stroke:none;stroke-width:0.40996245px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="101.1116"
+       y="6.8471761"
+       id="text23892-9-3-6"><tspan
+         sodipodi:role="line"
+         id="tspan1167"
+         x="101.1116"
+         y="6.8471761"
+         style="stroke-width:0.40996245px">Forward requests to actions</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.27971148px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#666666;fill-opacity:1;stroke:none;stroke-width:0.40996245px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="101.04594"
+       y="3.1114674"
+       id="text23892-9-3-09"><tspan
+         sodipodi:role="line"
+         id="tspan1165"
+         x="101.04594"
+         y="3.1114674"
+         style="stroke-width:0.40996245px">Check preconditions</tspan></text>
+    <g
+       id="g1267"
+       transform="matrix(2.3623607,0,0,2.3623607,-52.083935,-66.373795)">
+      <text
+         id="text23892-9-3-0-0-7"
+         y="57.031704"
+         x="17.883856"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:1.06682765px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#666666;fill-opacity:1;stroke:none;stroke-width:0.13335297px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         xml:space="preserve"><tspan
+           style="stroke-width:0.13335297px"
+           y="57.031704"
+           x="17.883856"
+           id="tspan1217"
+           sodipodi:role="line">locations</tspan></text>
+      <text
+         id="text23892-9-3-0-0-7-4"
+         y="57.961243"
+         x="17.879168"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:1.06683528px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#666666;fill-opacity:1;stroke:none;stroke-width:0.13335297px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         xml:space="preserve"><tspan
+           y="57.961243"
+           x="17.879168"
+           id="tspan1257"
+           sodipodi:role="line">citation keys</tspan></text>
+      <text
+         id="text23892-9-3-0-0-7-2"
+         y="59.820324"
+         x="17.919277"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:1.06682765px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#666666;fill-opacity:1;stroke:none;stroke-width:0.13335297px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         xml:space="preserve"><tspan
+           style="stroke-width:0.13335297px"
+           y="59.820324"
+           x="17.919277"
+           id="tspan1221"
+           sodipodi:role="line">pageInfo</tspan></text>
+      <text
+         id="text23892-9-3-0-0-7-4-1"
+         y="58.890785"
+         x="17.879168"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:1.06683528px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#666666;fill-opacity:1;stroke:none;stroke-width:0.13335297px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         xml:space="preserve"><tspan
+           y="58.890785"
+           x="17.879168"
+           id="tspan1255"
+           sodipodi:role="line">citation type</tspan></text>
+    </g>
+    <g
+       id="g1649"
+       transform="matrix(1.1450969,0,0,1.1450969,-21.072094,-10.046352)">
+      <text
+         id="text23892-9-3-0"
+         y="68.140526"
+         x="122.66064"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:1.76829851px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#666666;fill-opacity:1;stroke:none;stroke-width:0.22103475px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         xml:space="preserve"><tspan
+           y="68.140526"
+           x="122.66064"
+           id="tspan1624"
+           sodipodi:role="line">lookup, localOrder, number,</tspan></text>
+      <text
+         id="text23892-9-3-0-8"
+         y="69.955353"
+         x="122.71158"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:1.76829851px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#666666;fill-opacity:1;stroke:none;stroke-width:0.22103477px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         xml:space="preserve"><tspan
+           y="69.955353"
+           x="122.71158"
+           id="tspan1626"
+           sodipodi:role="line">uniqueLetter, sort bibliography,</tspan></text>
+      <text
+         id="text23892-9-3-0-2"
+         y="71.77018"
+         x="122.6451"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:1.76829851px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#666666;fill-opacity:1;stroke:none;stroke-width:0.22103477px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         xml:space="preserve"><tspan
+           y="71.77018"
+           x="122.6451"
+           id="tspan1628"
+           sodipodi:role="line">format citationMarkers,</tspan><tspan
+           y="73.980553"
+           x="122.6451"
+           id="tspan1630"
+           sodipodi:role="line"></tspan><tspan
+           y="76.190926"
+           x="122.6451"
+           id="tspan1632"
+           sodipodi:role="line"></tspan></text>
+      <text
+         id="text23892-9-3-0-08"
+         y="73.585007"
+         x="122.6451"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:1.76829851px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#666666;fill-opacity:1;stroke:none;stroke-width:0.22103477px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         xml:space="preserve"><tspan
+           y="73.585007"
+           x="122.6451"
+           id="tspan1634"
+           sodipodi:role="line">format bibliography</tspan><tspan
+           y="75.79538"
+           x="122.6451"
+           id="tspan1636"
+           sodipodi:role="line"></tspan></text>
+    </g>
+    <g
+       id="g1680"
+       transform="translate(0.08711402,5.2268409)">
+      <text
+         id="text23892-9-3-0-0"
+         y="74.441177"
+         x="40.053444"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.22595716px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#666666;fill-opacity:1;stroke:none;stroke-width:0.27824375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         xml:space="preserve"><tspan
+           y="74.441177"
+           x="40.053444"
+           id="tspan1674"
+           sodipodi:role="line">or visually</tspan></text>
+      <text
+         id="text23892-9-3-0-0-5"
+         y="72.313141"
+         x="40.114311"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.22595716px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#666666;fill-opacity:1;stroke:none;stroke-width:0.27824375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         xml:space="preserve"><tspan
+           y="72.313141"
+           x="40.114311"
+           id="tspan1672"
+           sodipodi:role="line">within XText</tspan></text>
+    </g>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.22595716px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#666666;fill-opacity:1;stroke:none;stroke-width:0.27824375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="47.68161"
+       y="54.36618"
+       id="text23892-9-3-0-0-8"><tspan
+         y="54.36618"
+         x="47.68161"
+         id="tspan1713"
+         sodipodi:role="line">checkRangeOverlaps, checkRangeOverlapsWithCursor</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.07999992px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#666666;fill-opacity:1;stroke:none;stroke-width:0.27824375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="47.292217"
+       y="49.346863"
+       id="text23892-9-3-0-0-5-7"><tspan
+         sodipodi:role="line"
+         id="tspan1741"
+         x="47.292217"
+         y="49.346863">connects the parts below</tspan></text>
+    <text
+       id="text23892-9-3-0-0-8-0"
+       y="56.857639"
+       x="47.691391"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.22595716px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#666666;fill-opacity:1;stroke:none;stroke-width:0.27824375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       xml:space="preserve"><tspan
+         sodipodi:role="line"
+         id="tspan1739"
+         x="47.691391"
+         y="56.857639">getVisuallySortedCitationGroups, imposeGlobalOrder</tspan></text>
+    <text
+       id="text23892-9-3-0-0-8-0-8"
+       y="59.349098"
+       x="47.745735"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.22595716px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#666666;fill-opacity:1;stroke:none;stroke-width:0.27824375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       xml:space="preserve"><tspan
+         sodipodi:role="line"
+         id="tspan1761"
+         x="47.745735"
+         y="59.349098">UpdateCitationMarkers, UpdateBibliography</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.27971172px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#666666;fill-opacity:1;stroke:none;stroke-width:0.40996245px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="69.50473"
+       y="30.303537"
+       id="text23892-9-3-8-3"><tspan
+         sodipodi:role="line"
+         id="tspan1169-1"
+         x="69.50473"
+         y="30.303537"
+         style="stroke-width:0.40996245px">lock screen refresh</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.02166653px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#666666;fill-opacity:1;stroke:none;stroke-width:0.47624996px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="69.422882"
+       y="25.316629"
+       id="text23892-9-1"><tspan
+         sodipodi:role="line"
+         id="tspan23890-6-0"
+         x="69.422882"
+         y="25.316629"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.02166653px;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#666666;stroke-width:0.47624996px">GUI-independent part of actions  </tspan></text>
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="arrows"
+     style="display:none"
+     transform="translate(43.194071,32.504535)">
+    <path
+       transform="translate(-8.0590546,-32.148314)"
+       style="opacity:0.281;fill:none;fill-rule:evenodd;stroke:#0000ff;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Mend-5)"
+       d="m 36.221557,52.941103 4.901789,26.370295"
+       id="path1351-6"
+       inkscape:connector-type="polyline"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cscc" />
+    <path
+       style="opacity:0.831;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#008080;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#marker22849)"
+       d="m 38.683752,47.078685 c 0,0 -8.222514,20.338553 -0.82387,21.328016 7.530373,1.00708 3.825198,-21.328016 3.825198,-21.328016"
+       id="path22797"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="csc" />
+    <path
+       style="opacity:0.92400004;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#eab200;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 42.288901,47.331044 c 0,0 5.685408,2.324298 11.149094,2.831158 5.982552,0.554995 13.150037,1.290116 19.143428,1.675056 6.202436,0.398367 17.791829,4.412147 17.791829,4.412147"
+       id="path22929"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cssc" />
+    <path
+       style="opacity:0.92400004;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#eab200;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 68.530268,10.229075 c 0.680366,20.154564 1.911289,39.872118 21.509503,45.853587"
+       id="path22931"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="opacity:0.92400004;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#eab200;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#marker22945)"
+       d="m 90.22196,56.244317 c 0,0 13.65994,5.692759 2.850421,-1.858969 C 82.262861,46.83362 45.234912,47.321266 45.234912,47.321266"
+       id="path22935"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="czc" />
+    <path
+       style="opacity:0.59200003;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#800000;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#marker23233)"
+       d="m 50.192161,45.462298 c 0,0 9.653711,6.442461 12.496099,12.348956 1.612217,3.350196 2.87138,11.074053 2.87138,11.074053"
+       id="path23223"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="csc" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.11666656px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;opacity:0.44100001;fill:#0000ff;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="28.086821"
+       y="23.816538"
+       id="text23549"><tspan
+         sodipodi:role="line"
+         id="tspan23547"
+         x="28.086821"
+         y="23.816538"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.11666656px;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#0000ff;stroke:none;stroke-width:0.26458332px">1. collect data from doc</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.11666656px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;opacity:0.76099997;fill:#008080;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="37.152584"
+       y="54.202911"
+       id="text23549-8"><tspan
+         sodipodi:role="line"
+         id="tspan23575"
+         x="37.152584"
+         y="54.202911">2. globalOrder</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.11666656px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;opacity:0.76099997;fill:#c88c00;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="43.655754"
+       y="51.507404"
+       id="text23549-8-3"><tspan
+         sodipodi:role="line"
+         id="tspan23595"
+         x="43.655754"
+         y="51.507404">3. markup</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.11666656px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;opacity:0.76099997;fill:#800000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="51.346542"
+       y="45.947517"
+       id="text23549-8-3-1"><tspan
+         sodipodi:role="line"
+         id="tspan23615"
+         x="51.346542"
+         y="45.947517">4. write</tspan></text>
+    <text
+       transform="translate(-8.0590546,-32.148314)"
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.82222223px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#800000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="60.034172"
+       y="40.913937"
+       id="text1311-5"><tspan
+         sodipodi:role="line"
+         id="tspan1309-1"
+         x="60.034172"
+         y="40.913937"
+         style="fill:#800000;stroke-width:0.26458332px">BibDatabase, OOBibStyle</tspan></text>
+  </g>
+</svg>
diff --git a/docs/code-howtos/openoffice/ooresult-ooerror/index.md b/docs/code-howtos/openoffice/ooresult-ooerror/index.md
new file mode 100644
index 00000000000..3260928b9b3
--- /dev/null
+++ b/docs/code-howtos/openoffice/ooresult-ooerror/index.md
@@ -0,0 +1,168 @@
+---
+nav_order: 5
+parent: The LibreOffice Panel
+has_children: true
+---
+# About OOError, OOResult, and OOVoidResult
+
+## Context
+
+### Relieve GUI panel code
+
+On the question of where should we catch exceptions in relation to GUI code it was suggested (Jonatan Asketorp [here](https://github.com/koppor/jabref/pull/496#discussion\_r629695493), "most of them (all?) should be handled latest in the ViewModel.") that catching them early could help simplifying the higher levels.
+
+### Same messages in different contexts
+
+Some types of exceptions are caught in _different GUI actions_, often resulting in basically the same error dialog, possibly only differing in the indicated context (which GUI action).
+
+Problems found during _precondition checking_ (for example: do we have a connection to a document) and error conditions (for example: lost connection to a document during an action) can overlap.
+
+### OOBibBase as a precondition and exception handling layer
+
+Since most of the code originally in `OOBibBase` was moved to `logic` and almost all GUI actions go through `OOBibBase`, it seemed a good location to collect precondition checking and exception handling code.
+
+Note: some of the precondition checking still needs to stay in `OpenOfficePanel`: for example to provide a list of selected `BibEntry` instances, it needs to go through some steps from `frame.getCurrentLibraryTab()` to `(!entries.isEmpty() && checkThatEntriesHaveKeys(entries))`
+
+To avoid `OOBibBase` depending on the higher level `OpenOfficePanel` message texts needed in `OOBibBase` were moved from `OpenOfficePanel` to `OOError`. (Others stayed, but could be moved if that seems worthwile)
+
+## OOError
+
+* `OOError` is a collection of data used in error dialogs.
+  * It is a `JabRefException` with an added field: `localizedTitle`
+  * It can store: a dialog title, a localized message (optionally a non-localized message as well) and a `Throwable`
+  * I used it in `OOBibBase` as a unified format for errors to be shown in an error dialog.
+  * Static constructors in `OOError` provide uniform translation from some exception types to `OOError` with the corresponding localized messages:\
+    `public static OOError from(SomeException ex)`\
+    There is also `public static OOError fromMisc(Exception ex)` for exception types not handled individually. (It has a different name, to avoid ambiguity)
+  * Another set of contructors provide messages for some preconditions.\
+    For example `public static OOError noDataBaseIsOpenForCiting()`
+
+Some questions:
+
+* Should we use static data instead of static methods for the precondition-related messages?
+  * pro: why create a new instance for each error?
+  * con: `OOError.setTitle()` currently just sets `this.localizedTitle` and returns `this`. For static instances this would modify a shared resource unless we create a new copy in `setTitle`. However `setTitle` can be called repeatedly on the same object: as we bubble up, we can be more specific about the context.
+* Should we remove title from `OOError`?
+  * pro: we almost always override its original value
+  * con: may need to duplicate the title in different files (preconditions for an action in OpenOfficePanel and in OOBibBase)
+* Should we include `OOError.showErrorDialog` ?
+  * pro: since it was intended _for_ error dialogs, it is nice to provide this.
+  * con: the reference to `DialogService` forces it to `gui`, thus it cannot be used in `logic` or `model`
+* Should we use `JabRefException` as base?
+  * pro: `JabRefException` is mentioned as the standard form of errors in the developers guide.\
+    [All Exceptions we throw should be or extend JabRefException](https://jabref.readthedocs.io/en/latest/getting-into-the-code/code-howtos/#throwing-and-catching-exceptions)
+  * against: `JabRefException` is in `logic` cannot be used in model.\
+    (Could this be resolved by moving `JabRefException` to `model`?)
+
+## OOResult
+
+During precondition checking
+
+1. some tests return no data, only report problems
+2. we may need to get some resources that might not be available (for example: connection to a document, a functional textview cursor)
+3. some test depend on these resources
+
+While concentrating on these and on "do not throw exceptions here" ... using a [Result type](https://en.wikipedia.org/wiki/Result\_type) as a return value from precondition checking code seemed a good fit:
+
+* Instead of throwing an exception, we can return some data describing the problem.
+* Conceptually it is a data structure that either holds the result (of a computation) or and error value.
+* It can be considered as an extended `Optional`, that can provide details on "why empty"?
+* It can be considered as an alternative to throwing an exception: we return an `error` instead.
+* Methods throwing checked exceptions cannot be used with for example `List.map`.\
+  Methods returning a Result could.
+* `Result` shares the problem (with any other solutions) that in a function several types of errors may occur, but we can only return a single error type. Java solves this using checked exceptions being all descendants of Exception. (Also adds try/catch/catch to select cases based on the exceptions type, and some checking against forgotten cases of checked exception types)
+
+In `OOBibBase` I used `OOError` as the unified error type: it can store error messages and wrap exceptions. It contains everything we need for an error dialog. On the other hand it does not support programmatic dissection.
+
+### Implementation
+
+Unlike `Optional` and `List`, `Result` (in the sense used here) did not get into java standard libraries. There are some implementations of this idea for java on the net:
+
+* [bgerstle/result-java](https://github.com/bgerstle/result-java/)
+* [MrKloan/result-type](https://github.com/MrKloan/result-type)
+* [david-bakin](https://gist.github.com/david-bakin/35d55daeeaee1eb71cea)
+* [vavr-try](https://www.baeldung.com/vavr-try)
+
+Generics allow an implementation built around
+
+```java
+class OOResult<R, E> {
+    private final Optional<R> result;
+    private final Optional<E> error;
+}
+```
+
+with an assumption that at any time exactly one of `result` and `error` is present.
+
+> `class X<R,E> { boolean isOK; Object data; }` expresses this assumption more directly, (but omits the relation between the type parameters `<R,E>` and the type in `data`)
+
+* Since `OOResult` encodes the state `isOK` in `result.isPresent()` (and equivalently in `errror.isEmpty()`), we cannot allow construction of instances where both values are `isEmpty`.\
+  In particular, `OOResult.ok(null)` and `OOResult.error(null)` are not allowed: it would make the state `isOK` ambiguous.\
+  It would also break the similarity to `Optional` to allow both `isEmpty` and `isOK` to be true.
+*   Not allowing null, has a consequence on `OOResult<Void,E>`\
+    According to [baeldung.com/java-void-type](https://www.baeldung.com/java-void-type), the only possible value for `Void` is `null` which we excluded.
+
+    `OOResult<Void,E>.ok(null)` would look strange: in this case we need `ok()` without arguments.
+
+To solve this problem, I introduced
+
+```java
+class OOVoidResult<E> {
+    private final Optional<E> error;
+    ...
+}
+```
+
+with methods on the error side similar to those in `OOError<R,E>`, and `OOVoidResult.ok()` to construct the success case with no data.
+
+### The relation between `Optional<E>` and `OOVoidResult<E>`
+
+* Both `Optional` and `OOVoidResult` can store 0 or 1 values, in this respect they are equivalent
+  * Actually, `OOVoidResult` is just a wrapper around an `Optional`
+* In terms of communication to human readers when used, their connotation in respect to success and failure is the opposite:
+  * `Optional.empty()` normally suggests failure, `OOVoidResult.ok()` mean success.
+  * `Optional.of(something)` probably means success, `OOVoidResult.error(something)` indicates failure.
+  * `OOVoidResult` is "the other half" (the failure branch) of `OOResult`
+    * its content is accessed through `getError`, `mapError`, `ifError`, not `get`, `map`, `ifPresent`
+
+`OOVoidResult` allows
+
+* a clear distinction between success and failure when calls to "get" something that might not be available (`Optional`) and calls to precondition checking where we can only get reasons for failure (`OOVoidResult`) appear together.\
+  Using `Optional` for both is possible, but is more error-prone.
+* it also allows using uniform verbs (`isError`, `getError`, `ifError`, return `OO{Void}Result.error`) for "we have a problem" when
+  * checking preconditions (`OOVoidResult`) is mixed with
+  * "I need an X" orelse "we have a problem" (`OOResult`)
+* at a functions head:
+  * `OOVoidResult<String> function()` says: no result, but may get an error message
+  * `Optional<String> function()` says: a `String` result or nothing.
+
+**Summary**: technically could use `Optional` for both situation, but it would be less precise, leaving more room for confusion and bugs. `OOVoidResult` forces use of `getError` instead of `get`, and `isError` or `isOk` instead of `isPresent`or `isEmpty`.
+
+## What does OOResult buy us?
+
+The promise of `Result` is that we can avoid throwing exceptions and return errors instead. This allows the caller to handle these latter as data, for example may summarize / collect them for example into a single message dialog.
+
+Handling the result needs some code in the caller. If we only needed checks that return only errors (not results), the code could look like this (with possibly more tests listed):
+
+```java
+OOResult<XTextDocument, OOError> odoc = getXTextDocument();
+if (testDialog(title,
+               odoc,
+               styleIsRequired(style),
+               selectedBibEntryIsRequired(entries, OOError::noEntriesSelectedForCitation))) {
+    return;
+}
+```
+
+with a reasonably small footstep.
+
+Dependencies of tests on earlier results complicates this: now we repeat the
+
+```java
+if (testDialog(title,
+               ...)) {
+    return;
+}
+```
+
+part several times.
diff --git a/docs/code-howtos/openoffice/ooresult-ooerror/ooresult-alternatives.md b/docs/code-howtos/openoffice/ooresult-ooerror/ooresult-alternatives.md
new file mode 100644
index 00000000000..544e7036a24
--- /dev/null
+++ b/docs/code-howtos/openoffice/ooresult-ooerror/ooresult-alternatives.md
@@ -0,0 +1,467 @@
+---
+parent: About OOError, OOResult, and OOVoidResult
+---
+# Alternatives to using OOResult and OOVoidResult in OOBibBase
+
+(Talk about ADRs prompted me to think about alternatives to what I used.)
+
+Situation:
+
+* some tests return no data, only report problems
+* we may need to get some resources that might not be available (for example: connection to a document, a functional textview cursor)
+* some test depend on these resources
+
+One strategy could be to use a single try-catch around the whole body, then showing a message based on the type of exceptions thrown.
+
+## \[base case]
+
+```java
+try {
+   A a = f();
+   B b = g(a);
+   realAction(a,b);
+} catch (FirstExceptionType ex) {
+   showDialog( title, messageForFirstExceptionType(ex) );
+} catch (SecondExceptionType ex) {
+   showDialog( title, messageForSecondExceptionType(ex) );
+} catch (Exception ex) {
+   showDialog( title, messageForOtherExceptions(ex) );
+}
+```
+
+This our base case.
+
+It is not clear from the code, nor within the catch branches (unless we start looking into stack traces) which call (`f()`, `g(a)` or `realAction(a,b)`) resulted in the exception. This limits the specificity of the message and makes it hard to think about the "why" can we get this exception here?
+
+## Catch around each call?
+
+A more detailed strategy would be to try-catch around each call.\
+In case we need a result from the call, this means either increasingly indented code (try-in-try).
+
+```java
+try {
+   A a = f();
+   try {
+      B b = g(a);
+      try {
+         realAction(ab);
+      } catch (...){
+         showDialog();
+      }
+   } catch (G ex) {
+     showDialog(title, ex); // title describes which GUI action we are in
+   }
+} catch (F ex) {
+   // could an F be thrown in g?
+    showDialog( title, ex );
+}
+```
+
+or (declare and fill later)
+
+```java
+A a = null;
+try {
+   a = f();
+} catch (F ex) {
+    showDialog(title, ex);
+    return;
+}
+B b = null;
+try {
+   b = g(a);
+} catch (G ex) {
+    showDialog(title, ex);
+    return;
+}
+try {
+    realAction(ab);
+} catch (...){
+    showDialog();
+}
+```
+
+In either case, the code becomes littered with exception handling code.
+
+## Catch in wrappers?
+
+We might push the try-catch into its own function.\
+If the wrapper is called multiple times, this may reduce duplication of the catch-and-assign-message part.
+
+We can show an error dialog here: `title` carries some information from the caller, the exeption caught brings some from below.
+
+We still need to notify the action handler (the caller) about failure. Since we have shown the dialog, we do not need to provide a message.
+
+### Notify caller with `Optional` result
+
+With `Optional` we get something like this:
+
+#### \[dialog in wrap, return Optional]
+
+```java
+Optional<A> wrap_f(String title) {
+    try {
+      return Optional.of(f());
+    } catch (F ex) {
+      showDialog(title, ex);
+      return Optional.empty();
+    }
+}
+
+Optional<B> wrap_g(String title, A a) {
+    try {
+       return Optional.of(g(a));
+    } catch (G ex) {
+      showDialog(title, ex);
+      return Optional.empty();
+    }
+}
+```
+
+and use it like this:
+
+```java
+Optional<A> a = wrap_f(title);
+if (a.isEmpty()) { return; }
+
+Optional<B> b = wrap_g(title, a.get());
+if (b.isEmpty()) { return; }
+
+try {
+   realAction(a.get(), b.get());
+} catch (...) {
+}
+```
+
+This looks fairly regular.
+
+If `g` did not need `a`, we could simplify to
+
+```java
+Optional<A> a = wrap_f(title);
+Optional<B> b = wrap_g(title);
+if (a.isEmpty() || b.isEmpty()) { return; }
+
+try {
+   realAction(a.get(), b.get());
+} catch (...) {
+}
+```
+
+### Notify caller with `Result` result
+
+With `Result` we get something like this:
+
+#### \[dialog in wrap, return OOResult]
+
+```java
+OOResult<A, OOError> wrap_f() {
+    try {
+      return OOResult.ok(f());
+    } catch (F ex) {
+      return OOResult.error(OOError.from(ex));
+    } catch (F2 ex) {
+      String message = "...";
+      return OOResult.error(new OOError(message, ex)); // [1]
+    }
+}
+// [1] : this OOError constructor (explicit message but no title) is missing
+
+Optional<B, OOError> wrap_g(A a) {
+    try {
+       return OOResult.ok(g(a));
+    } catch (G ex) {
+      return OOResult.error(OOError.from(ex));
+    }
+}
+```
+
+and use it like this:
+
+```java
+OOResult<A, OOError> a = wrap_f();
+if (testDialog(title, a)) { // [1]
+    return;
+}
+
+// [1] needs boolean testDialog(String title, OOResultLike<OOError>... a);
+//     where OOResultLike<T> is an interface with `OOVoidResult<T> asVoidResult()`
+//     and is implemented by OOResult and OOVoidResult
+
+OOResult<B, OOError> b = wrap_g(a.get());
+if (testDialog(title, b)) { return; } // (checkstyle makes this 3 lines)
+
+try {
+   realAction(a.get(), b.get());
+} catch (...) {
+}
+```
+
+If `g` did not need `a`, we could simplify to
+
+```java
+Optional<A> a = wrap_f();
+Optional<B> b = wrap_g();
+if (testDialog(title, a, b)) { // a single dialog can show both messages
+  return;
+}
+
+try {
+   realAction(a.get(), b.get());
+} catch (...) {
+}
+```
+
+### Notify caller by throwing an exception
+
+Or we can throw an exception to notify the caller.
+
+To simplify code in the caller, I assume we are using an exception type not used elsewhere, but shared by all precondition checks.
+
+#### \[dialog in wrap, PreconditionException]
+
+```java
+A wrap_f(String title) throws PreconditionException {
+    try {
+       return f();
+    } catch (F ex) {
+      showDialog(title, ex)
+      throw new PreconditionException();
+    }
+}
+
+B wrap_g(String title, A a) throws PreconditionException {
+    try {
+       return g(a);
+    } catch (G ex) {
+      showDialog(title, ex);
+      throw new PreconditionException();
+    }
+}
+```
+
+use
+
+```java
+try {
+   A a = wrap_f(title);
+   B b = wrap_g(title, a);
+   try {
+     realAction(a, b);
+   } catch (...) {
+     showDialog(...)
+   }
+} catch( PreconditionException ) {
+   // Only precondition checks get us here.
+   return;
+}
+```
+
+or (since PreconditionException is not thrown from realAction)
+
+```java
+try {
+   A a = wrap_f(title);
+   B b = wrap_g(title, a);
+   realAction(a, b);
+} catch (...) {
+   // Only realAction gets us here
+   showDialog(...)
+} catch( PreconditionException ) {
+   // Only precondition checks get us here.
+   return;
+}
+```
+
+or (separate try-catch for preconditions and realAction)
+
+```java
+A a = null;
+B b = null;
+try {
+    a = wrap_f(title);
+    b = wrap_g(title, a);
+} catch( PreconditionException ) {
+     return;
+}
+try {
+     realAction(a, b);
+} catch (...) {
+}
+```
+
+or to reduce passing around the title part:
+
+#### \[PreconditionException, dialog in catch]
+
+```java
+A wrap_f() throws PreconditionException {
+    try {
+       return f();
+    } catch (F ex) {
+      throw new PreconditionException(message, ex);
+    }
+}
+
+B wrap_g(A a) throws PreconditionException {
+    try {
+       return g(a);
+    } catch (G ex) {
+      throw new PreconditionException(message, ex);
+    }
+}
+```
+
+use
+
+```java
+try {
+   A a = wrap_f();
+   B b = wrap_g(a);
+   try {
+     realAction(a, b);
+   } catch (...) {
+      showDialog(...);
+   }
+} catch(PreconditionException ex) {
+   showDialog(title, ex.message );
+   return;
+}
+```
+
+or
+
+```java
+try {
+   A a = wrap_f();
+   B b = wrap_g(a);
+   realAction(a, b);
+} catch (...) {
+   showDialog(...);
+} catch(PreconditionException ex) {
+   showDialog(title, ex.message );
+   return;
+}
+```
+
+## Push associating the message further down
+
+As [the developers guide](https://jabref.readthedocs.io/en/latest/getting-into-the-code/code-howtos/#throwing-and-catching-exceptions) suggest, we could "Catch and wrap all API exceptions" and rethrow them as a `JabRefException` or some exception derived from it. In this case the try-catch part goes even further down, and in principle we could just
+
+```java
+try {
+   A a = f();
+   B b = g(a);
+   realAction(a, b);
+} catch(JabRefException ex) {
+   showDialog(title, ex.message );
+   return;
+}
+```
+
+Constraints:
+
+* conversion to `JabRefException` cannot be done in `model` (since JabRefException is in `logic`)
+* `JabRefException` expects a localized message. Or we need to remember which `JabRefException` instances are localized and which need to be caught for localizing the message.
+* At the bottom we usually have very little information on higher level contexts: at a failure like `NoSuchProperty` we cannot tell which set of properties did we look in and why.\
+  For messages originating too deeply, we might want to override or extend the message anyway.
+* for each exeption we might want to handle programmatically, we need a variant based on `JabRefException`
+
+So we might end up:
+
+```java
+try {
+   A a = f();
+   B b = g(a);
+   realAction(a, b);
+} catch(FDerivedFromJabRefException ex) {
+   showDialog(title, messageForF );
+} catch(GDerivedFromJabRefException ex) {
+   showDialog(title, messageForG );
+} catch(JabRefException ex) {
+   showDialog(title, ex.message );
+} catch(Exception ex) { // [1]
+   showDialog(title, ex.message, ex );
+   // [1] does "never catch Exception or Throwable" apply at this point?
+   //     Probably should not: we are promising not to throw.
+}
+```
+
+which looks very similar to the original version.
+
+This again loses the information: can `GDerivedFromJabRefException` come from `realAction` or `f` or not? This is because we have pushed down the last catch/throw indefinitely (eliminating `wrap_f`) into a depth, where we cannot necessarily assign an appropriate message.
+
+To a lesser extent this also happens in `wrap_f`: it only knows about the action that called it what we provide (`title` or nothing). It knows the precondition it checks: probably an optimal location to assign a message.
+
+**Summary**: going from top to bottom, we move to increasingly more local context, our knowledge shifts towards the "in which part of the code did we have a problem" and away from the high level ("which action").
+
+One natural point to meet information from these to levels is the top level of action handlers. For precondition checking code a wrapper around code elsewhere may be considered. Using such wrappers may reduce duplication if called in multiple actions.
+
+We still have to signal failure to the action handler: the options considered above were using an `Optional` and throwing an exception with the appropriate message.
+
+The more promising variants were
+
+* **\[dialog in wrap, return Optional]**\
+  `Optional<A> wrap_f(String title)` (showDialog inside)
+  * pro: explicit return in caller
+  * con: explicit return in caller (boilerplate)
+  * con: passing in the title is repeated
+    * would be 'pro' if we wanted title to vary within an action
+* **\[PreconditionException, dialog in catch]**\
+  `A wrap_f() throws PreconditionException`\
+  (with `showDialog` under `catch(PreconditionException ex)`)
+  * con: hidden control flow
+  * pro: no repeated `if(){return}` boilerplate
+  * pro: title used only once
+
+### \[using OOResult]
+
+```java
+final String title = "Could not insert citation";
+
+OOResult<XTextDocument, OOError> odoc = getXTextDocument();
+if (testDialog(title,
+               odoc,
+               styleIsRequired(style),
+               selectedBibEntryIsRequired(entries, OOError::noEntriesSelectedForCitation))) {
+    return;
+}
+XTextDocument doc = odoc.get();
+
+OOResult<OOFrontend, OOError> ofr = getFrontend(doc);
+if (testDialog(title, ofr)) {
+    return;
+}
+OOFrontend fr = ofr.get();
+
+OOResult<XTextCursor, OOError> cursor = getUserCursorForTextInsertion(doc);
+if (testDialog(title, cursor)) {
+    return;
+}
+...
+```
+
+### \[using PreconditionException, dialog in catch]
+
+```java
+final String title = "Could not insert citation";
+
+try {
+  XTextDocument doc = getXTextDocument();
+  styleIsRequired(style);
+  selectedBibEntryIsRequired(entries, OOError::noEntriesSelectedForCitation);
+  OOFrontend fr = getFrontend(doc);
+  XTextCursor cursor = getUserCursorForTextInsertion(doc);
+  ...
+} catch (PreconditionException ex) {
+   showDialog(title, ex);
+} catch (...) {
+}
+```
+
+I would suggest using the latter,
+
+* probably using `OOError` for `PreconditionException`
+  * In this case `OOError` being in `gui` becomes an asset: we can be sure code in `logic` cannot throw it.
+* We lose the capability to collect mmessages in a single dialog (we stop processing at the first problem).
+* The division between precondition checking (only throws PreconditionException) and `realAction`becomes invisible in the action code.
diff --git a/docs/code-howtos/openoffice/order-of-appearance.md b/docs/code-howtos/openoffice/order-of-appearance.md
new file mode 100644
index 00000000000..2848b89c0e5
--- /dev/null
+++ b/docs/code-howtos/openoffice/order-of-appearance.md
@@ -0,0 +1,78 @@
+---
+nav_order: 2
+parent: The LibreOffice Panel
+grand_parent: Code Howtos
+---
+# Order of appearance of citation groups
+
+The order of appearance of citations is decided on two levels:
+
+1. their order within each citation group (`localOrder`), and
+2. the order of the citation groups that appear as citation markers in the text (`globalOrder`).
+
+This page is about the latter: how to decide the order of appearance (numbering sequence) of a set of citation markers?
+
+## Conceptually
+
+In a continuous text it is easy: take the textual order of citation markers.
+
+In the presence of figures, tables, footnotes/endnotes possibly far from the location they are referred to in the text or wrapped around with text it becomes less obvious what is the correct order.
+
+Examples:
+
+* References in footnotes: are they _after_ the page content, or number them as if they appeared at the footnote mark? (JabRef does the latter)
+* A figure with references in its caption. Text may flow on either or both sides.\
+  Where should we insert these in the sequence?
+* In a two-column layout, a text frame or figure mostly, but not fully in the second column: shall we consider it part of the second column?
+
+## Technically
+
+In LibreOffice, a document has a main text that supports the [XText](https://api.libreoffice.org/docs/idl/ref/interfacecom\_1\_1sun\_1\_1star\_1\_1text\_1\_1XText.html) interface.\
+This allows several types of [XTextContent](https://api.libreoffice.org/docs/idl/ref/interfacecom\_1\_1sun\_1\_1star\_1\_1text\_1\_1XTextContent.html) to be inserted.
+
+* Some of these allow text inside with further insertions.
+
+### Anchors
+
+* Many, but not all XTextContent types support getting a "technical" insertion point or text range through [getAnchor](https://api.libreoffice.org/docs/idl/ref/interfacecom\_1\_1sun\_1\_1star\_1\_1text\_1\_1XTextContent.html#ae82a8b42f6b2578549b68b4483a877d3).
+* In Libreoffice positioning both a frame and its anchor seems hard: moving the frame tends to also move the anchor.
+* Consequence: producing an order of appearance for the citation groups based solely on `getAnchor` calls may be impossible.
+  * Allowing or requiring the user to insert "logical anchors" for frames and other "floating" parts might help to alleviate these problems.
+
+### Sorting within a `Text`
+
+The text ranges occupied by the citation markers support the [XTextRange](https://api.libreoffice.org/docs/idl/ref/interfacecom\_1\_1sun\_1\_1star\_1\_1text\_1\_1XTextRange.html) interface.
+
+* These provide access to the XText they are contained in.
+* The [Text](https://api.libreoffice.org/docs/idl/ref/servicecom\_1\_1sun\_1\_1star\_1\_1text\_1\_1Text.html) service may support (optional) the [XTextRangeCompare](https://api.libreoffice.org/docs/idl/ref/interfacecom\_1\_1sun\_1\_1star\_1\_1text\_1\_1XTextRangeCompare.html) interface, that allows two XTextRange values to be compared if both belong to this `Text`
+
+### Visual ordering
+
+* The cursor used by the user is available as an [XTextViewCursor](https://api.libreoffice.org/docs/idl/ref/interfacecom\_1\_1sun\_1\_1star\_1\_1text\_1\_1XTextViewCursor.html)
+* If we can get it and can set its position in the document to each XTextRange to be sorted, and ask its [getPosition](https://api.libreoffice.org/docs/idl/ref/interfacecom\_1\_1sun\_1\_1star\_1\_1text\_1\_1XTextViewCursor.html#a9b2bafd342ef75b5d504a9313dbb1389) to provide coordinates "relative to the top left position of the first page of the document.", then we can sort by these coordinates in top-to-bottom left-to-right order.
+* Note: in some cases, for example when the cursor is in a comment (as in `Libreoffice:[menu:Insert]/[Comment]`), the XTextViewCursor is not available (I know of no way to get it).
+* In some other cases, for example when an image is selected, the XTextViewCursor we normally receive is not 'functional': we cannot position it for getting coordinates for the citation marks. The [FunctionalTextViewCursor](https://github.com/antalk2/jabref/blob/improve-reversibility-rebased-03/src/main/java/org/jabref/model/openoffice/rangesort/FunctionalTextViewCursor.java) class can solve this case by accessing and manipulating the cursor through [XSelectionSupplier](https://api.libreoffice.org/docs/idl/ref/interfacecom\_1\_1sun\_1\_1star\_1\_1view\_1\_1XSelectionSupplier.html)
+
+Consequences of getting these visual coordinates and using them to order the citation markers
+
+* allows uniform handling of the markers. Works in footnotes, tables, frames (apparently anywhere)
+* requires moving the user visible cursor to each position and with [screen refresh](https://github.com/antalk2/jabref/blob/improve-reversibility-rebased-03/src/main/java/org/jabref/model/openoffice/uno/UnoScreenRefresh.java) enabled.\
+  `(problem)` This results in some user-visible flashing and scrolling around in the document view.
+* The expression "relative to the top left position of the first page of the document" is understood literally, "as on the screen".\
+  `(problem)` Showing pages side by side or using a two-column layout will result in markers in the top half of the second column or page to be sorted before those on the bottom of the first column of the first page.
+
+## JabRef
+
+Jabref uses the following steps for sorting sorting citation markers (providing `globalOrder`):
+
+1. the textranges of citation marks in footnotes are replaced by the textranges of the footnote marks.
+2. get the positions (coordinates) of these marks
+3. sort in top-to-botton left-to-right order
+
+`(problem)` In JabRef5.2 the positions of citation marks within the same footnote become indistinguishable, thus their order after sorting may differ from their order in the footnote text.\
+This caused problems for
+
+1. numbering order\
+   `(solved)` by keeping track of the order-in-footnote of citation markers during sorting using [getIndexInPosition](https://github.com/antalk2/jabref/blob/122d5133fa6c7b44245c5ba5600d398775718664/src/main/java/org/jabref/model/openoffice/rangesort/RangeSortable.java#L21))
+2. `click:Merge`: It examines _consecutive_ pairs of citation groups if they can be merged. Wrong order may result in not discovering some mergeable pairs or attempting to merge in wrong order.\
+   `(solved)` by not using visual order, only XTextRangeCompare-based order within each XText [here](https://github.com/antalk2/jabref/blob/122d5133fa6c7b44245c5ba5600d398775718664/src/main/java/org/jabref/logic/openoffice/action/EditMerge.java#L325))
diff --git a/docs/code-howtos/openoffice/overview.md b/docs/code-howtos/openoffice/overview.md
new file mode 100644
index 00000000000..56ec4d857ce
--- /dev/null
+++ b/docs/code-howtos/openoffice/overview.md
@@ -0,0 +1,225 @@
+---
+nav_order: 1
+parent: The LibreOffice Panel
+grand_parent: Code Howtos
+---
+# Overview
+
+This is a partial overview of the OpenOffice/LibreOffice panel and the code behind.
+
+* To access the panel: `JabRef:/[menu:View]/[OpenOffice/LibreOffice]`
+* The user documentation is at [https://docs.jabref.org/cite/openofficeintegration](https://docs.jabref.org/cite/openofficeintegration)
+
+I am going to refer to OpenOffice Writer and LibreOffice Writer as LibreOffice or LO: their UNO APIs are still mostly identical, but I only tested with LibreOffice and differences do exist.
+
+## Subject
+
+* What is stored in a document, how.
+* Generating citation markers and bibliography
+  * (excluding the bibliography entries, which is delegated to the layout module)
+
+## The purpose of the panel
+
+* Allow the user to insert **citations** in a LibreOffice writer document.
+* Automatically format these according to some prescribed style as **citation markers**.
+* Generate a **bibliography**, also formatted according to the style.
+  * The bibliography consists of a title (e.g. "References") and a sorted list of formatted bibliography entries, possibly prefixed with a marker (e.g. "\[1]")
+* It also allows some related activities: connect to a document, select a style, group ("Merge") the citations for nicer output, ungroup ("Separate") them to move or delete them individually, edit ("Manage") their page-info parts, and collect the database entries of cited sources to a new database.
+
+## Citation types
+
+Citations (actually citation groups, see below) have three types depending on how the citation marker is intended to appear in the text:
+
+* **Parenthesized**: "(Smith, 2000)"
+* **In-text**: "Smith (2000)"
+* **Invisible**: no visible citation mark.
+  * An invisible citation mark lets the user to use any form for the citation by taking control (and responsibility) back from the style.
+  * Like the other two citation types, they have a location in the document.
+  * In the bibliography these behave as the other two citation types.
+  * In LibreOffice (`LibreOffice:[Ctrl-F8]` or`LibreOffice:[menu:View]/[Field Shadings]`) shows reference marks with gray background. Invisible citation marks appear as a thin gray rectangle.
+* These citation types correspond to `\citep{Smith2000}`, `\citet{Smith2000}` in [natbib](http://tug.ctan.org/macros/latex/contrib/natbib/natnotes.pdf) and `\nocite{Smith2000}`. I will use `\citep`, `\citet` and `\citen` in "LaTeX pseudocode" below.
+
+## PageInfo
+
+The citations can be augmented with a string detailing which part of a document is cited, for example "page 11" or "chapter 2".
+
+Sample citation markers (with LaTeX pseudocode):
+
+* `\citep[page 11]{Smith2000}` "(Smith, 2000; page 11)"
+* `\citet[page 11]{Smith2000}` "Smith (2000; page 11)"
+* `\citen[page 11]{Smith2000}` ""
+* This string is referred to as **`pageInfo`** in the code.
+* In the GUI the labels "Cite special", "Extra information (e.g. page number)" are used.
+
+## Citation groups
+
+Citations can be grouped.
+
+A group of parenthesized citations share the parentheses around, like this:\
+"(Smith, 2000; Jones 2001)".
+
+* Examples with pseudocode:
+  * `\citep{Smith2000,Jones2001}` "(Smith, 2000; Jones 2001)"
+  * `\citet{Smith2000,Jones2001}` "Smith (2000); Jones (2001)"
+  * `\citen{Smith2000,Jones2001}` ""
+
+From the user's point of view, citation groups can be created by
+
+1.  Selecting multiple entries in a bibliography database, then
+
+    * `[click:Cite]` or
+    * `[click:Cite in-text]` or
+    * `[click:Cite special]` or
+    * `[click:Insert empty citation]` in the panel.
+
+    This method allows any of the citation types to be used.
+2. `[click:Merge citations]` finds all sets of consecutive citations in the text and replaces each with a group.
+   * `(change)` The new code only merges consecutive [parenthesized](https://github.com/antalk2/jabref/blob/122d5133fa6c7b44245c5ba5600d398775718664/src/main/java/org/jabref/logic/openoffice/action/EditMerge.java#L183) citations.
+     * This is inconsistent with the solution used in `[click:Cite]`
+     * My impression is that
+       * groups of in-text or invisible citations are probably not useful
+       * mixed groups are even less. However, with a numbered style there is no visual difference between parenthesized and in-text citations, the user may be left wondering why did merge not work.
+         * One way out could be to merge as a "parenthesized" group. But then users switching between styles get a surprise, we have unexpectedly overridden their choice.
+         * I would prefer a visible log-like warning that does not require a click to close and lets me see multiple warnings. Could the main window have such an area at the bottom?
+   * Starting with JabRef 5.3 there is also `[click:Separate citations]` that breaks all groups to single citations.
+     * This allows
+       * deleting individual citations
+       * moving individual citations around (between citation groups)
+       * (copy does not work)
+       * (Moving a citation within a group has no effect on the final output due to sorting of citations within groups. See [Sorting within a citation group](overview.md#localOrder))
+
+In order to manage single citations and groups uniformly, we consider each citation in the document to belong to a citation group, even if it means a group containing a single citation.
+
+Citation groups correspond to citation markers in the document. The latter is empty for invisible citation groups. When creating the citation markers, the citations in the group are processed together.
+
+## Citation styles
+
+The details of how to format the bibliography and the citation markers are described in a text file.
+
+* These normally use `.jstyle` extension, and I will refer to them as jstyle files.
+* See the [User documentation](https://docs.jabref.org/cite/openofficeintegration#the-style-file) for details.
+* I will refer to keywords in jstyle files as `jstyle:keyword` below.
+
+Four major types citation of styles can be described by a jstyle.
+
+* (1) `jstyle:BibTeXKeyCitations`
+  * The citation markers show the citationKey.
+  * It is not fully implemented
+    * does not produce markers before the bibliography entries
+    * does not show pageInfo
+  * It is not advertised in the [User documentation](https://docs.jabref.org/cite/openofficeintegration#the-style-file).
+  * Its intended purpose may be
+    * (likely) a proper style, with "\[Smith2000]" style citation markers
+    * (possibly) a style for "draft mode" that
+      * can avoid lookup of citation markers in the database when only the citation markers are updated
+      * can produce unique citation markers trivially (only needs local information)
+      * makes the citation keys visible to the user
+      * can work without knowing the order of appearance of citation groups
+      * In case we expect to handle larger documents, a "draft mode" minimizing work during `[click:Cite]` may be useful.
+* There are two types of numbered (`jstyle:IsNumberEntries`) citation styles:
+  * (2) Citations numbered in order of first appearance (`jstyle:IsSortByPosition`)
+  * (3) Citations numbered according to their order in the sorted bibliography
+* (4) Author-year styles
+
+## Sorting
+
+### Sorting te bibliography
+
+The bibliography is sorted in (author, year, title) order
+
+* except for `jstyle:IsSortByPosition`, that uses the order of first appearance of the cited sources.
+
+### Ordering the citations
+
+The order of appearance of citations (as considered during numbering and adding letters after the year to ensure that citation markers uniquely identify sources in the bibliography) is decided on two levels.
+
+1. Their order within each citation group (`localOrder`), and
+2. the order of the citation groups (citation markers) in the text (`globalOrder`).
+
+#### Sorting within a citation group (`localOrder`) <a href="#localorder" id="localorder"></a>
+
+The order of citations within a citation group is controlled by `jstyle:MultiCiteChronological`.
+
+* true asks for (year, author, title) ordering,
+* false for (author, year, title).
+* (There is no option for "in the order provided by the user").
+
+For author-year citation styles this ordering is used directly.
+
+* The (author, year, title) order promotes discovering citations sharing authors and year and emitting them in a shorter form. For example as "(Smith 2000a,b)".
+
+For numbered styles, the citations within a group are sorted again during generation of the citation marker, now by the numbers themselves. The result of this sorting is not saved, only affects the citation marker.
+
+* Series of consecutive number are replaced with ranges: for example "\[1-5; 11]"
+
+#### Order of the citation groups (`globalOrder`)
+
+The location of each citation group in the document is provided by the user. In a text with no insets, footnotes, figures etc. this directly provides the order. In the presence of these, it becomes more complicated, see [Order of appearance of citation groups](order-of-appearance.md).
+
+#### Order of the citations
+
+* `globalOrder` and `localOrder` together provide the order of appearance of citations
+*   This also provides the order of first appearance of the cited sources.
+
+    First appearance order of sources is used
+
+    * in `jstyle:IsSortByPosition` numbered styles
+    * in author-year styles: first appearance of "Smith200a" should precede that of "Smith200b".\
+      To achieve this, the sources get the letters according the order of their first appearance.
+      * This seems to contradict the statement "The bibliography is sorted in (author, year, title) order" above.\
+        It does not. As of JabRef 5.3 both are true.\
+        Consequence: in the references Smith2000b may precede Smith2000a. ([reported](https://github.com/JabRef/jabref/issues/7805))
+    * Some author-year citation styles prescribe a higher threshold on the number of authors for switching to "FirstAuthor et al." form (`jstyle:MaxAuthors`) at the first citation of a source (`jstyle:MaxAuthorsFirst`)
+
+## What is stored in a document (JabRef5.2)
+
+*   Each group of citations has a reference mark.
+
+    (Reference marks are shown in LibreOffice in Navigator, under "References".\
+    To show the Navigator: `LibreOffice:[menu:View]/[Navigator]` or `LibreOffice:[key:F5]`)
+
+    Its purposes:
+
+    1. The text range of the reference mark tells where to write or update the citation mark.
+    2. The name of the reference mark
+       * Lets us select only those reference marks that belong to us
+       * Encodes the citation type
+       * Contains the list of citation keys that belong to this group
+       * It may contain an extra number, to make the name unique in the document
+       * Format: `"JR_cite{number}_{type}_{citationKeys}"`, where
+         * `{number}` is either empty or an unsigned integer (it can be zero) to make the name unique
+         * `{type}` is 1, 2, or 3 for parenthesized, in-text and invisible
+         * `{citationKeys}` contains the comma-separated list of citation keys
+         * Examples:
+           * `JR_cite_1_Smith2000` (empty number part, parenthesized, single citation)
+           * `JR_cite0_2_Smith2000,Jones2001` (number part is 0, in-text, two citations)
+           * `JR_cite1_3_Smith2000,Jones2001` (number part is 1, invisible, two citations)
+* Each group of citations may have an associated pageInfo.
+  * In LibreOffice, these can be found at\
+    `LibreOffice:/[menu:File]/[Properties]/[Custom Properties]`
+  * The property names are identical to the name of the reference mark corresponding to the citation group.
+  * JabRef 5.2 never cleans up these, they are left around.\
+    `(problem)` New citations may "pick up" these unexpectedly.
+* The bibliography, if not found, is created at the end of the document.
+  * The location and extent of the bibliography is the content of the Section named `"JR_bib"`.\
+    (In LibreOffice Sections are listed in the Navigator panel, under "Sections")
+  * JabRef 5.2 also creates a bookmark named `"JR_bib_end"`, but does not use it. During bibliography update it attempts to create it again without removing the old bookmark. The result is a new bookmark, with a number appended to its name (by LibreOffice, to ensure unique names of bookmarks).
+    * [Correction in new code](https://github.com/antalk2/jabref/blob/122d5133fa6c7b44245c5ba5600d398775718664/src/main/java/org/jabref/logic/openoffice/frontend/UpdateBibliography.java#L147): remove the old before creating the new.
+
+## How does it interact with the document?
+
+* "stateless"\
+  JabRef is only loosely coupled to the document.\
+  Between two GUI actions it does not receive any information from LibreOffice.\
+  It cannot distinguish between the user changing a single character in the document or rewriting everything.
+* Access data
+  * During a `[click:cite]` or `[click:Update]` we need the reference mark names.
+    * Get all reference mark names
+    * Filter (only ours)
+    * Parse: gives citation type (for the group), citation keys
+  * Access/store pageInfo: based on reference mark name and property name being equal
+  * Creating a citation group: (`[click:cite]`)
+    * Creates a reference mark at the cursor, with a name as described above.
+* Update (refreshing citation markers and bibliography):
+  * citation markers: the content of the reference mark
+  * bibliography: the content of the Section (in LibreOffice sense) named `"JR_bib"`.
diff --git a/docs/code-howtos/openoffice/problems.md b/docs/code-howtos/openoffice/problems.md
new file mode 100644
index 00000000000..4d11dc62966
--- /dev/null
+++ b/docs/code-howtos/openoffice/problems.md
@@ -0,0 +1,70 @@
+---
+nav_order: 3
+parent: The LibreOffice Panel
+grand_parent: Code Howtos
+---
+# Problems
+
+## pageInfo should belong to citations, not citation groups
+
+* Creating `[click:Separate]` revealed\
+  a `(problem)`: pageInfo strings are conceptually associated with citations, but the implementation associates them to citation groups.\
+  The number of available pageInfo slots changes during`[click:Merge]` and `[click:Separate]` while the number of citations remains fixed.
+  * The proposed solution was to change the association.
+    *   Not only reference marks (citation groups) need unique identifiers, but also citations.\
+        Possible encoding for reference mark names:\
+        `JR_cite{type}_{number1}_{citationKey1},{number2}_{citationKey2}`\
+        where `{type}` encodes the citation type (for the group), `{citationKey1}` is made unique by choosing an appropriate number for `{number1}`\
+        This would allow `JR_cite_{number1}_{citationKey1}` to be used as a property name for storing the pageInfo.
+
+        Changes required to
+
+        * reference mark search, name generation and parsing
+        * name generation and parsing for properties storing pageInfo values
+        * in-memory representation
+          * JabRef 5.2 does not collect pageInfo values, accesses only when needed.\
+            So it would be change to code accessing them.
+          * The proposed representation does collect, to allow separation of getting from the document and processing
+        * insertion of pageInfo into citation markers: JabRef 5.2 injects a single pageInfo before the closing parenthesis, now we need to handle several values
+        * `[click:Manage citations]` should work on citations, not citation groups.
+
+## Backend
+
+The choice of how do we represent the data and the citation marks in the document has consequences on usability.
+
+Reference marks have some features that make it easy to mess up citations in a document
+
+* They are **not visible** by default, the user is not aware of their boundaries\
+  (`LO:[key:Ctrl-F8]`, `LO:[View]/[Field shadings]` helps)
+* They are **not atomic**:
+  * the user can edit the content. This will be lost on `[click:Update]`\
+    If an `As character` or `To character` anchor is inserted, the corresponding frame or footnote is deleted.
+  * by pressing Enter within, the user can break a reference mark into two parts.\
+    The second part is now outside the reference mark: `[click:Update]` will leave it as is, and replace the first part with the full text for the citation mark.
+  * If the space separating to citation marks is deleted, the user cannot reliably type between the marks.\
+    The text typed usually becomes part of one of the marks. No visual clue as to which one.\
+    Note: `[click:Merge]` then `[click:Separate]` adds a single space between. The user can position the cursor before or after it. In either case the cursor is on a boundary: it is not clear if it is in or out of a reference mark.\
+    Special case: a reference mark at the start or end of a paragraph: the cursor is usually considered to be within at the coresponding edge.
+* (good) They can be moved (Ctrl-X,Ctrl-V)
+* They cannot be copied. (Ctrl-C, Ctrl-V) copies the text without the reference mark.
+* Reference marks are lost if the document is saved as docx.
+* I know of no way to insert text into an empty text range denoted by a reference mark
+  * JabRef 5.3 recreates the reference mark (using [insertReferenceMark](https://github.com/JabRef/jabref/blob/475b2989ffa8ec61c3327c62ed8f694149f83220/src/main/java/org/jabref/gui/openoffice/OOBibBase.java#L1072)) [here](https://github.com/JabRef/jabref/blob/475b2989ffa8ec61c3327c62ed8f694149f83220/src/main/java/org/jabref/gui/openoffice/OOBibBase.java#L706)
+  * `(change)` I preferred to (try to) avoid this: [NamedRangeReferenceMark.nrGetFillCursor](https://github.com/antalk2/jabref/blob/122d5133fa6c7b44245c5ba5600d398775718664/src/main/java/org/jabref/logic/openoffice/backend/NamedRangeReferenceMark.java#L225) returns a cursor between two invisible spaces, to provide the caller a location it can safely write some text. [NamedRangeReferenceMark.nrCleanFillCursor](https://github.com/antalk2/jabref/blob/122d5133fa6c7b44245c5ba5600d398775718664/src/main/java/org/jabref/logic/openoffice/backend/NamedRangeReferenceMark.java#L432) removes these invisible spaces unless the content would become empty or a single character. By keeping the content at least two characters, we avoid the ambiguity at the edges: a cursor positioned between two characters inside is always within the reference mark. (At the edges it may or may not be inside.)
+* `(change)` `[click:Cite]` at reference mark edges: [safeInsertSpacesBetweenReferenceMarks](https://github.com/antalk2/jabref/blob/122d5133fa6c7b44245c5ba5600d398775718664/src/main/java/org/jabref/logic/openoffice/backend/NamedRangeReferenceMark.java#L67) ensures the we are not inside, by starting two new paragraphs, inserting two spaces between them, then removing the new paragraph marks.
+* `(change)` [guiActionInsertEntry](https://github.com/antalk2/jabref/blob/122d5133fa6c7b44245c5ba5600d398775718664/src/main/java/org/jabref/gui/openoffice/OOBibBase2.java#L624) checks if the cursor is in a citation mark or the bibliography.
+* `(change)` `[click:Update]` does an [exhaustive check](https://github.com/antalk2/jabref/blob/122d5133fa6c7b44245c5ba5600d398775718664/src/main/java/org/jabref/gui/openoffice/OOBibBase2.java#L927) for overlaps between protected ranges (citation marks and bibliography). This can become slow if there are many citations.
+
+It would be nice if we could have a backend with better properties. We probably need multiple backends for different purposes. This would be made easier if the backend were separated from the rest of the code. This would be the purpose of [logic/openoffice/backend](https://github.com/antalk2/jabref/tree/improve-reversibility-rebased-03/src/main/java/org/jabref/logic/openoffice/backend).
+
+## Undo
+
+* JabRef 5.3 does not collect the effects of GUI actions on the document into larger Undo actions.\
+  This makes the Undo functionality of LO impractial.
+* `(change)` collect the effects of GUI actions into large chunks: now a GUI action can be undone with a single click.
+  * except the effect on pageInfo: that is stored at the document level and is not restored by Undo.
+
+## Block screen refresh
+
+* LibreOffice has support in [XModel](https://api.libreoffice.org/docs/idl/ref/interfacecom\_1\_1sun\_1\_1star\_1\_1frame\_1\_1XModel.html#a7b7d36374033ee9210ec0ac5c1a90d9f) to "suspend some notifications to the controllers which are used for display updates."
+* `(change)` Now we are using this facility.
diff --git a/docs/advanced-reading/remote-storage.md b/docs/code-howtos/remote-storage.md
similarity index 95%
rename from docs/advanced-reading/remote-storage.md
rename to docs/code-howtos/remote-storage.md
index 9fe71744a10..2f01a096452 100644
--- a/docs/advanced-reading/remote-storage.md
+++ b/docs/code-howtos/remote-storage.md
@@ -1,9 +1,11 @@
+---
+parent: Code Howtos
+nav_order: 11
+---
 # Remote Storage
 
 ## Using a shared PostgreSQL database
 
-...
-
 ## Handling large shared databases
 
 Synchronization times may get long when working with a large database containing several thousand entries. Therefore, synchronization only happens if several conditions are fulfilled:
@@ -17,4 +19,3 @@ Remaining changes that has not been synchronized yet are saved at closing the da
 
 * `pullChanges` synchronizes the database unconditionally.
 * `pullLastEntryChanges` synchronizes only if there are remaining entry changes. It is invoked when closing the shared database (`closeSharedDatabase`).
-
diff --git a/docs/code-howtos/telemetry.md b/docs/code-howtos/telemetry.md
new file mode 100644
index 00000000000..d070ee2d813
--- /dev/null
+++ b/docs/code-howtos/telemetry.md
@@ -0,0 +1,13 @@
+---
+parent: Code Howtos
+nav_order: 13
+---
+# Telemetry
+
+JabRef aims for improving user experience. For that, it employs telemetry and, for instance, checks for used features.
+
+The pull requests introducing the first version was [https://github.com/JabRef/jabref/pull/2283](https://github.com/JabRef/jabref/pull/2283). Self-hosted alternative [Matomo Java Tracker](https://github.com/matomo-org/matomo-java-tracker) where neglected, because the JabRef team currently does not have the resources to maintain a server.
+
+## Implementation hints
+
+The ApplicationInsights library that we use supports a special way to submit additional details: [https://docs.microsoft.com/en-us/azure/azure-monitor/app/api-custom-events-metrics#properties](https://docs.microsoft.com/en-us/azure/azure-monitor/app/api-custom-events-metrics#properties). Especially, one has to send `source` as property.
diff --git a/docs/code-howtos/testing.md b/docs/code-howtos/testing.md
new file mode 100644
index 00000000000..fe3493f6a3d
--- /dev/null
+++ b/docs/code-howtos/testing.md
@@ -0,0 +1,132 @@
+---
+parent: Code Howtos
+nav_order: 14
+---
+# Testing JabRef
+
+## Background on Java testing
+
+In JabRef, we mainly rely on basic JUnit tests to increase code coverage. There are other ways to test:
+
+| Type           | Techniques                                 | Tool (Java)                                                             | Kind of tests                                                  | Used In JabRef                                                |
+| -------------- | ------------------------------------------ | ----------------------------------------------------------------------- | -------------------------------------------------------------- | ------------------------------------------------------------- |
+| Functional     | Dynamics, black box, positive and negative | [JUnit-QuickCheck](https://github.com/pholser/junit-quickcheck)         | Random data generation                                         | No, not intended, because other test kinds seem more helpful. |
+| Functional     | Dynamics, black box, positive and negative | [GraphWalker](https://graphwalker.github.io)                            | Model-based                                                    | No, because the BibDatabase doesn't need to be tests          |
+| Functional     | Dynamics, black box, positive and negative | [TestFX](https://github.com/TestFX/TestFX)                              | GUI Tests                                                      | Yes                                                           |
+| Functional     | Dynamics, white box, negative              | [PIT](https://pitest.org)                                               | Mutation                                                       | No                                                            |
+| Functional     | Dynamics, white box, positive and negative | [Mockito](https://site.mockito.org)                                     | Mocking                                                        | Yes                                                           |
+| Non-functional | Dynamics, black box, positive and negative | [JETM](http://jetm.void.fm), [Apache JMeter](https://jmeter.apache.org) | Performance (performance testing vs load testing respectively) | No                                                            |
+| Structural     | Static, white box                          | [CheckStyle](https://checkstyle.sourceforge.io)                         | Constient formatting of the source code                        | Yes                                                           |
+| Structural     | Dynamics, white box                        | [SpotBugs](https://spotbugs.github.io)                                  | Reocurreing bugs (based on experience of other projects)       | No                                                            |
+
+## General hints on tests
+
+Imagine you want to test the method `format(String value)` in the class `BracesFormatter` which removes double braces in a given string.
+
+* _Placing:_ all tests should be placed in a class named `classTest`, e.g. `BracesFormatterTest`.
+* _Naming:_ the name should be descriptive enough to describe the whole test. Use the format `methodUnderTest_ expectedBehavior_context` (without the dashes). So for example `formatRemovesDoubleBracesAtBeginning`. Try to avoid naming the tests with a `test` prefix since this information is already contained in the class name. Moreover, starting the name with `test` leads often to inferior test names (see also the [Stackoverflow discussion about naming](http://stackoverflow.com/questions/155436/unit-test-naming-best-practices)).
+*   _Test only one thing per test:_ tests should be short and test only one small part of the method. So instead of
+
+    ```java
+    testFormat() {
+     assertEqual("test", format("test"));
+     assertEqual("{test", format("{test"));
+     assertEqual("test", format("test}}"));
+    }
+    ```
+
+    we would have five tests containing a single `assert` statement and named accordingly (`formatDoesNotChangeStringWithoutBraces`, `formatDoesNotRemoveSingleBrace`, , etc.). See [JUnit AntiPattern](https://exubero.com/junit/anti-patterns/#Multiple\_Assertions) for background.
+* Do _not just test happy paths_, but also wrong/weird input.
+* It is recommend to write tests _before_ you actually implement the functionality (test driven development).
+* _Bug fixing:_ write a test case covering the bug and then fix it, leaving the test as a security that the bug will never reappear.
+* Do not catch exceptions in tests, instead use the `assertThrows(Exception.class, ()->doSomethingThrowsEx())` feature of [junit-jupiter](https://junit.org/junit5/docs/current/user-guide/) to the test method.
+
+## Lists in tests
+
+* Use `assertEquals(Collections.emptyList(), actualList);` instead of `assertEquals(0, actualList.size());` to test whether a list is empty.
+*   Similarly, use `assertEquals(Arrays.asList("a", "b"), actualList);` to compare lists instead of
+
+    ```java
+           assertEquals(2, actualList.size());
+           assertEquals("a", actualList.get(0));
+           assertEquals("b", actualList.get(1));
+    ```
+
+## BibEntries in tests
+
+* Use the `assertEquals` methods in `BibtexEntryAssert` to check that the correct BibEntry is returned.
+
+## Files and folders in tests
+
+*   If you need a temporary file in tests, then add the following Annotation before the class:
+
+    ```java
+    @ExtendWith(TempDirectory.class)
+    class TestClass{
+
+      @BeforeEach
+      void setUp(@TempDirectory.TempDir Path temporaryFolder){
+      }
+    }
+    ```
+
+    to the test class. A temporary file is now created by `Files.createFile(path)`. Using this pattern automatically ensures that the test folder is deleted after the tests are run. See the [junit-pioneer doc](https://junit-pioneer.org/docs/temp-directory/) for more details.
+
+## Loading Files from Resources
+
+Sometimes it is necessary to load a specific resource or to access the resource directory
+
+```java
+Path resourceDir = Paths.get(MSBibExportFormatTestFiles.class.getResource("MsBibExportFormatTest1.bib").toURI()).getParent();
+```
+
+When the directory is needed, it is important to first point to an actual existing file. Otherwise the wrong directory will be returned.
+
+## Preferences in tests
+
+If you modify preference, use following pattern to ensure that the stored preferences of a developer are not affected:
+
+Or even better, try to mock the preferences and insert them via dependency injection.
+
+```java
+@Test
+public void getTypeReturnsBibLatexArticleInBibLatexMode() {
+     // Mock preferences
+     PreferencesService mockedPrefs = mock(PreferencesService.class);
+     GeneralPreferences mockedGeneralPrefs = mock(GeneralPReferences.class);
+     // Switch to BibLatex mode
+     when(mockedPrefs.getGeneralPrefs()).thenReturn(mockedGeneralPrefs);
+     when(mockedGeneralPrefs.getDefaultBibDatabaseMode())
+        .thenReturn(BibDatabaseMode.BIBLATEX);
+
+     // Now test
+     EntryTypes biblatexentrytypes = new EntryTypes(mockedPrefs);
+     assertEquals(BibLatexEntryTypes.ARTICLE, biblatexentrytypes.getType("article"));
+}
+```
+
+To test that a preferences migration works successfully, use the mockito method `verify`. See `PreferencesMigrationsTest` for an example.
+
+## Database tests
+
+### PostgreSQL
+
+To quickly host a local PostgreSQL database, execute following statement:
+
+```
+docker run -d -e POSTGRES_USER=postgres -e POSTGRES_PASSWORD=postgres -e POSTGRES_DB=postgres -p 5432:5432 --name db postgres:10 postgres -c log_statement=all
+```
+
+Set the environment variable `DBMS` to `postgres` (or leave it unset)
+
+Then, all DBMS Tests (annotated with `@org.jabref.testutils.category.DatabaseTest`) run properly.
+
+### MySQL
+
+A MySQL DBMS can be started using following command:
+
+```
+docker run -e MYSQL_ROOT_PASSWORD=root -e MYSQL_DATABASE=jabref -p 3800:3307 mysql:8.0 --port=3307
+```
+
+Set the environment variable `DBMS` to `mysql`.
diff --git a/docs/readings-on-coding/tools.md b/docs/code-howtos/tools.md
similarity index 70%
rename from docs/readings-on-coding/tools.md
rename to docs/code-howtos/tools.md
index ecd7545fbb0..1bb55d88feb 100644
--- a/docs/readings-on-coding/tools.md
+++ b/docs/code-howtos/tools.md
@@ -1,3 +1,7 @@
+---
+parent: Code Howtos
+nav_order: 100
+---
 # Useful development tooling
 
 This page lists some software we consider useful.
@@ -7,7 +11,7 @@ This page lists some software we consider useful.
 * [Refined GitHub](https://github.com/sindresorhus/refined-github) - GitHub on steroids
 * [GitHub Issue Link Status](https://github.com/fregante/github-issue-link-status) - proper coloring of linked issues and PRs.
 * [Codecov Browser Extension](https://github.com/codecov/browser-extension) - displaying code coverage directly when browsing GitHub
-* [Sourcegraph Browser Extension](https://docs.sourcegraph.com/integration/browser_extension) - Navigate through source on github
+* [Sourcegraph Browser Extension](https://docs.sourcegraph.com/integration/browser\_extension) - Navigate through source on github
 
 ## git hints
 
@@ -31,19 +35,19 @@ See also: [https://help.github.com/articles/syncing-a-fork/](https://help.github
 
 ## Tooling for Windows
 
-\(As Administrator - one time\)
+(As Administrator - one time)
 
-1. Install [chocolatey](https://chocolatey.org/)
+1. Install [chocolatey](https://chocolatey.org)
 2. `choco install git`
 3. `choco install conemu clink`
 4. `choco install notepadplusplus`
-5. If you want to have your jdk also managed via chocolatey: `choco install jdk8`
+5. If you want to have your jdk also managed via chocolatey: `choco install temurin`
 
 Then, each weak do `choco upgrade all` to ensure all tooling is uptodate.
 
 ### General git tooling on Windows
 
-* Use [git for windows](https://git-for-windows.github.io/), no additional git tooling required
+* Use [git for windows](https://git-for-windows.github.io), no additional git tooling required
   * [Git Credential Manager for Windows](https://github.com/Microsoft/Git-Credential-Manager-for-Windows) is included. Ensure that you include that in the installation. Aim: Store password for GitHub permanently for https repository locations
 * [Use notepad++ as editor](http://stackoverflow.com/a/2486342/873282) for `git rebase -i`
 
@@ -51,18 +55,18 @@ Then, each weak do `choco upgrade all` to ensure all tooling is uptodate.
 
 #### ConEmu plus clink
 
-* [ConEmu](http://conemu.github.io/) -&gt; Preview Version  - Aim: Colorful console with tabs
+* [ConEmu](http://conemu.github.io) -> Preview Version - Aim: Colorful console with tabs
   * At first start:
-    * "Choose your startup task ...": \`{Bash::Git bash}}
+    * "Choose your startup task ...": \`{Bash::Git bash\}}
     * `OK`
-    * Upper right corner: "Settings..." \(third entrry Eintrag\)
-    * Startup/Tasks: Choose task no. 7 \("Bash::Git bash"\). At "Task parameters" `/dir C:\git-repositories\jabref\jabref`
+    * Upper right corner: "Settings..." (third entrry Eintrag)
+    * Startup/Tasks: Choose task no. 7 ("Bash::Git bash"). At "Task parameters" `/dir C:\git-repositories\jabref\jabref`
     * `Save Settings`
-* [clink](http://mridgers.github.io/clink/) - Aim: Unix keys \(Alt+B, Ctrl+S, etc.\) also available at the prompt of `cmd.exe`
+* [clink](http://mridgers.github.io/clink/) - Aim: Unix keys (Alt+B, Ctrl+S, etc.) also available at the prompt of `cmd.exe`
 
 #### Other bundles
 
-* [Cmder](http://cmder.net/) - bundles ConEmu plus clink
+* [Cmder](http://cmder.net) - bundles ConEmu plus clink
 
 ### Tools for working with XMP
 
@@ -70,8 +74,7 @@ Then, each weak do `choco upgrade all` to ensure all tooling is uptodate.
 
 ### Some useful keyboard shortcuts
 
-* [AutoHotkey](http://autohotkey.com/) - Preparation for the next step
+* [AutoHotkey](http://autohotkey.com) - Preparation for the next step
 * [https://github.com/koppor/autohotkey-scripts](https://github.com/koppor/autohotkey-scripts) - Aim: Have Win+C opening ConEmu
   1. Clone the repository locally.
-  2. Then link `ConEmu.ahk` and `WindowsExplorer.ahk` at the startup menu \(Link creation works with drag'n'drop using the right mouse key and then choosing "Create link" when dropping\). Hint: Startup is in the folder `Startup` \(German: `Autostart`\) at `%APPDATA%\Microsoft\Windows\Start Menu\Programs\` - accessible via `Win+r`: `shell:startup`
-
+  2. Then link `ConEmu.ahk` and `WindowsExplorer.ahk` at the startup menu (Link creation works with drag'n'drop using the right mouse key and then choosing "Create link" when dropping). Hint: Startup is in the folder `Startup` (German: `Autostart`) at `%APPDATA%\Microsoft\Windows\Start Menu\Programs\` - accessible via `Win+r`: `shell:startup`
diff --git a/docs/advanced-reading/ui-recommendations.md b/docs/code-howtos/ui-recommendations.md
similarity index 66%
rename from docs/advanced-reading/ui-recommendations.md
rename to docs/code-howtos/ui-recommendations.md
index d37197cc99e..e81ea116f4a 100644
--- a/docs/advanced-reading/ui-recommendations.md
+++ b/docs/code-howtos/ui-recommendations.md
@@ -1,4 +1,8 @@
-# Recommendations for UI design
+---
+parent: Code Howtos
+nav_order: 15
+---
+# UI Design Recommendations
 
 * [Designing More Efficient Forms: Structure, Inputs, Labels and Actions](https://uxplanet.org/designing-more-efficient-forms-structure-inputs-labels-and-actions-e3a47007114f)
 * [Input form label alignment top or left?](https://ux.stackexchange.com/questions/8480/input-form-label-alignment-top-or-left)
@@ -16,9 +20,8 @@ More information: [http://ux.stackexchange.com/a/768](http://ux.stackexchange.co
 
 ## Form validation
 
-* Only validate input after leaving the field \(or after the user stopped typing for some time\)
+* Only validate input after leaving the field (or after the user stopped typing for some time)
 * The user shouldn't be able to submit the form if there are errors
 * However, disabling the submit button in case there are errors is also not optimal. Instead, clicking the submit button should highlight the errors.
-* Empty required files shouldn't be marked as invalid until the user a\) tries to submit the form or b\) focused the field, deleted it contents and then left the field \(see [Example](https://www.w3schools.com/tags/tryit.asp?filename=tryhtml5_input_required)
-* Ideally, the error message should be shown below the text field and not as a tooltip \(so that users quickly understand what's the problem\). For example as here [in Boostrap](https://mdbootstrap.com/docs/jquery/forms/validation/?#custom-styles)
-
+* Empty required files shouldn't be marked as invalid until the user a) tries to submit the form or b) focused the field, deleted it contents and then left the field (see [Example](https://www.w3schools.com/tags/tryit.asp?filename=tryhtml5\_input\_required)
+* Ideally, the error message should be shown below the text field and not as a tooltip (so that users quickly understand what's the problem). For example as here [in Boostrap](https://mdbootstrap.com/docs/jquery/forms/validation/?#custom-styles)
diff --git a/docs/contributing.md b/docs/contributing.md
index f9e028cb94a..5d026a7d0d3 100644
--- a/docs/contributing.md
+++ b/docs/contributing.md
@@ -1,3 +1,6 @@
+---
+nav_order: 2
+---
 # Contributing
 
 After reading through this guide, check out some good first issues to contribute to by clicking here: [Good First Issues](https://github.com/JabRef/jabref/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22)
@@ -16,7 +19,7 @@ We welcome contributions to JabRef and encourage you to follow the GitHub workfl
    1. Fork the JabRef into your GitHub account.
    2. Clone your forked repository on your local machine.
 2. **Create a new branch** (such as `fix-for-issue-121`). Be sure to create a **separate branch** for each improvement you implement.
-3. Do your work on the **new branch — not the master branch.** Refer to our [code how-tos](https://devdocs.jabref.org/getting-into-the-code/code-howtos) if you have questions about your implementation.
+3. Do your work on the **new branch — not the `main` branch.** Refer to our [code how-tos](https://devdocs.jabref.org/getting-into-the-code/code-howtos) if you have questions about your implementation.
 4. Create a pull request. For an overview of pull requests, take a look at GitHub's [pull request help documentation](https://help.github.com/articles/about-pull-requests/).
 5. In case your pull request is not yet complete or not yet ready for review, consider creating a [draft pull request](https://github.blog/2019-02-14-introducing-draft-pull-requests/) instead.
 
@@ -28,7 +31,7 @@ The main goal of the formal requirements is to provide credit to you and to be a
 
 #### Add your change to `CHANGELOG.md`
 
-You should edit the [`CHANGELOG.md`](https://github.com/JabRef/jabref/blob/master/CHANGELOG.md#changelog) file located in the root directory of the JabRef source. Add a line with your changes in the appropriate section.
+You should edit the [`CHANGELOG.md`](https://github.com/JabRef/jabref/blob/main/CHANGELOG.md#changelog) file located in the root directory of the JabRef source. Add a line with your changes in the appropriate section.
 
 If you did internal refactorings or improvements not visible to the user (e.g., UI, .bib file), then you don't need to put an entry there.
 
@@ -51,7 +54,7 @@ Your contribution is considered being made under [MIT license](https://tldrlegal
 
 #### Write a good commit message
 
-See [good commit message](https://github.com/joelparkerhenderson/git_commit_message) or [commit guidelines section of Pro Git](http://git-scm.com/book/en/Distributed-Git-Contributing-to-a-Project#Commit-Guidelines). The first line of your commit message is automatically taken as the title for the pull-request. All other lines make up the body of the pull request. Add the words `fixes #xxx` to your PR to auto-close the corresponding issue.
+See [good commit message](https://github.com/joelparkerhenderson/git\_commit\_message) or [commit guidelines section of Pro Git](http://git-scm.com/book/en/Distributed-Git-Contributing-to-a-Project#Commit-Guidelines). The first line of your commit message is automatically taken as the title for the pull-request. All other lines make up the body of the pull request. Add the words `fixes #xxx` to your PR to auto-close the corresponding issue.
 
 #### Test your code
 
@@ -79,7 +82,7 @@ You can also directly run the specific test in your IDE. The test "LocalizationC
 
 #### When adding a library
 
-Please try to use a version available at JCenter and add it to `build.gradle`. In any case, describe the library at [`external-libraries.md`](https://github.com/JabRef/jabref/blob/master/external-libraries.md#external-libraries). We need that information for our package maintainers (e.g., those of the [debian package](https://tracker.debian.org/pkg/jabref)). Also add a txt file stating the license in `libraries/`. It is used at `gradlew processResources` to generate the About.html files. You can see the result in `build\resources\main\help\en\About.html` or when clicking Help -> About.
+Please try to use a version available at JCenter and add it to `build.gradle`. In any case, describe the library at [`external-libraries.md`](https://github.com/JabRef/jabref/blob/main/external-libraries.md#external-libraries). We need that information for our package maintainers (e.g., those of the [debian package](https://tracker.debian.org/pkg/jabref)). Also add a txt file stating the license in `libraries/`. It is used at `gradlew processResources` to generate the About.html files. You can see the result in `build\resources\main\help\en\About.html` or when clicking Help -> About.
 
 #### When making an architectural decision
 
@@ -107,12 +110,13 @@ If you want to indicate that a pull request is not yet complete **before** creat
 
 ## How to improve the developer's documentation
 
-For improving developer's documentation, go on at the [docs/ subdirectory of JabRef's code](https://github.com/JabRef/jabref/tree/master/docs) and edit the file. GitHub offers a good guide at [Editing files in another user's repository](https://help.github.com/en/github/managing-files-in-a-repository/editing-files-in-another-users-repository).
+For improving developer's documentation, go on at the [docs/ subdirectory of JabRef's code](https://github.com/JabRef/jabref/tree/main/docs) and edit the file.
+GitHub offers a good guide at [Editing files in another user's repository](https://help.github.com/en/github/managing-files-in-a-repository/editing-files-in-another-users-repository).
 
-In case you use some gitbook special features, and you want to test them, checkout JabRef's code locally, and execute following steps:
+You can also host Jekyll locally.
 
-1. `npm install -g gitbook`
-2. `cd docs`
-3. `gitbook serve`
+    docker run --rm -it \
+      --volume="$pwd:/srv/jekyll" \
+      jekyll/builder:latest /bin/bash -c "gem install && bundle exec jekyll build && bundle exec rake search:init && jekyll serve"
 
-Then, you can see a near-to-reality rendering of the development documentation at [http://localhost:4000](http://localhost:4000).
+Then, you can see a near-to-reality rendering of the development documentation at <http://localhost:4000>.
diff --git a/docs/adr/0000-use-markdown-architectural-decision-records.md b/docs/decisions/0000-use-markdown-any-decision-records.md
similarity index 64%
rename from docs/adr/0000-use-markdown-architectural-decision-records.md
rename to docs/decisions/0000-use-markdown-any-decision-records.md
index b3e14b61a41..508c6461700 100644
--- a/docs/adr/0000-use-markdown-architectural-decision-records.md
+++ b/docs/decisions/0000-use-markdown-any-decision-records.md
@@ -1,29 +1,29 @@
-# Use Markdown Architectural Decision Records
+---
+parent: Decision Records
+nav_order: 0
+---
+# Use Markdown Any Decision Records
 
 ## Context and Problem Statement
 
-We want to record architectural decisions made in this project. Which format and structure should these records follow?
+We want to record any decisions made in this project independent whether decisions concern the architecture ("architectural decision record"), the code, or other fields.
+Which format and structure should these records follow?
 
 ## Considered Options
 
-* [MADR](https://adr.github.io/madr/) 2.1.2 – The Markdown Architectural Decision Records
 * [Michael Nygard's template](http://thinkrelevance.com/blog/2011/11/15/documenting-architecture-decisions) – The first incarnation of the term "ADR"
 * [Sustainable Architectural Decisions](https://www.infoq.com/articles/sustainable-architectural-design-decisions) – The Y-Statements
-* Other templates listed at [https://github.com/joelparkerhenderson/architecture\_decision\_record](https://github.com/joelparkerhenderson/architecture_decision_record)
+* Other templates listed at <https://github.com/joelparkerhenderson/architecture_decision_record>
 * Formless – No conventions for file format and structure
 
 ## Decision Outcome
 
-Chosen option: "MADR 2.1.2", because
+Chosen option: "MADR", because
 
 * Implicit assumptions should be made explicit.
-
   Design documentation is important to enable people understanding the decisions later on.
-
   See also [A rational design process: How and why to fake it](https://doi.org/10.1109/TSE.1986.6312940).
-
+* MADR allows for structured capturing of any decision.
 * The MADR format is lean and fits our development style.
 * The MADR structure is comprehensible and facilitates usage & maintenance.
 * The MADR project is vivid.
-* Version 2.1.2 is the latest one available when starting to document ADRs.
-
diff --git a/docs/adr/0001-use-crowdin-for-translations.md b/docs/decisions/0001-use-crowdin-for-translations.md
similarity index 84%
rename from docs/adr/0001-use-crowdin-for-translations.md
rename to docs/decisions/0001-use-crowdin-for-translations.md
index 7287b27a264..af8ba405b1b 100644
--- a/docs/adr/0001-use-crowdin-for-translations.md
+++ b/docs/decisions/0001-use-crowdin-for-translations.md
@@ -1,3 +1,7 @@
+---
+parent: Decision Records
+nav_order: 1
+---
 # Use Crowdin for translations
 
 ## Context and Problem Statement
@@ -9,7 +13,7 @@ The JabRef UI is offered in multiple languages. It should be easy for translator
 * Use [Crowdin](http://crowdin.com/)
 * Use [popeye](https://github.com/JabRef/popeye)
 * Use [Lingohub](https://lingohub.com/)
-* Keep current GitHub flow. See the [Step-by-step guide](https://docs.jabref.org/faq/how-to-translate-the-ui).
+* Keep current GitHub flow. See the [Step-by-step guide](https://docs.jabref.org/contributing/how-to-translate-the-ui).
 
 ## Decision Outcome
 
diff --git a/docs/adr/0002-use-slf4j-for-logging.md b/docs/decisions/0002-use-slf4j-for-logging.md
similarity index 97%
rename from docs/adr/0002-use-slf4j-for-logging.md
rename to docs/decisions/0002-use-slf4j-for-logging.md
index d85a8a74887..0edd6ca4bb2 100644
--- a/docs/adr/0002-use-slf4j-for-logging.md
+++ b/docs/decisions/0002-use-slf4j-for-logging.md
@@ -1,3 +1,7 @@
+---
+parent: Decision Records
+nav_order: 2
+---
 # Use slf4j together with log4j2 for logging
 
 ## Context and Problem Statement
diff --git a/docs/adr/0003-use-gradle-as-build-tool.md b/docs/decisions/0003-use-gradle-as-build-tool.md
similarity index 98%
rename from docs/adr/0003-use-gradle-as-build-tool.md
rename to docs/decisions/0003-use-gradle-as-build-tool.md
index 72dca30407c..995ad60c781 100644
--- a/docs/adr/0003-use-gradle-as-build-tool.md
+++ b/docs/decisions/0003-use-gradle-as-build-tool.md
@@ -1,3 +1,7 @@
+---
+parent: Decision Records
+nav_order: 3
+---
 # Use Gradle as build tool
 
 ## Context and Problem Statement
diff --git a/docs/adr/0004-use-mariadb-connector.md b/docs/decisions/0004-use-mariadb-connector.md
similarity index 97%
rename from docs/adr/0004-use-mariadb-connector.md
rename to docs/decisions/0004-use-mariadb-connector.md
index 7d02b15aa6a..f45f5d6bc66 100644
--- a/docs/adr/0004-use-mariadb-connector.md
+++ b/docs/decisions/0004-use-mariadb-connector.md
@@ -1,3 +1,7 @@
+---
+parent: Decision Records
+nav_order: 4
+---
 # Use MariaDB Connector
 
 ## Context and Problem Statement
diff --git a/docs/adr/0005-fully-support-utf8-only-for-latex-files.md b/docs/decisions/0005-fully-support-utf8-only-for-latex-files.md
similarity index 97%
rename from docs/adr/0005-fully-support-utf8-only-for-latex-files.md
rename to docs/decisions/0005-fully-support-utf8-only-for-latex-files.md
index a4d3d736710..44d98cf8a0d 100644
--- a/docs/adr/0005-fully-support-utf8-only-for-latex-files.md
+++ b/docs/decisions/0005-fully-support-utf8-only-for-latex-files.md
@@ -1,3 +1,7 @@
+---
+parent: Decision Records
+nav_order: 5
+---
 # Fully Support UTF-8 Only For LaTeX Files
 
 ## Context and Problem Statement
diff --git a/docs/adr/0006-only-translated-strings-in-language-file.md b/docs/decisions/0006-only-translated-strings-in-language-file.md
similarity index 97%
rename from docs/adr/0006-only-translated-strings-in-language-file.md
rename to docs/decisions/0006-only-translated-strings-in-language-file.md
index d7db17c5fac..609af7ef1ca 100644
--- a/docs/adr/0006-only-translated-strings-in-language-file.md
+++ b/docs/decisions/0006-only-translated-strings-in-language-file.md
@@ -1,3 +1,7 @@
+---
+parent: Decision Records
+nav_order: 6
+---
 # Only translated strings in language file
 
 ## Context and Problem Statement
diff --git a/docs/adr/0007-human-readable-changelog.md b/docs/decisions/0007-human-readable-changelog.md
similarity index 94%
rename from docs/adr/0007-human-readable-changelog.md
rename to docs/decisions/0007-human-readable-changelog.md
index a77d412b602..3fec7c2b680 100644
--- a/docs/adr/0007-human-readable-changelog.md
+++ b/docs/decisions/0007-human-readable-changelog.md
@@ -1,3 +1,7 @@
+---
+parent: Decision Records
+nav_order: 7
+---
 # Provide a human-readable changelog
 
 ## Context and Problem Statement
diff --git a/docs/adr/0008-use-public-final-instead-of-getters.md b/docs/decisions/0008-use-public-final-instead-of-getters.md
similarity index 94%
rename from docs/adr/0008-use-public-final-instead-of-getters.md
rename to docs/decisions/0008-use-public-final-instead-of-getters.md
index 498fdd8c52b..e18becde55c 100644
--- a/docs/adr/0008-use-public-final-instead-of-getters.md
+++ b/docs/decisions/0008-use-public-final-instead-of-getters.md
@@ -1,3 +1,7 @@
+---
+parent: Decision Records
+nav_order: 8
+---
 # Use `public final` instead of getters to offer access to immutable variables
 
 ## Context and Problem Statement
diff --git a/docs/adr/0009-use-plain-junit5-for-testing.md b/docs/decisions/0009-use-plain-junit5-for-testing.md
similarity index 97%
rename from docs/adr/0009-use-plain-junit5-for-testing.md
rename to docs/decisions/0009-use-plain-junit5-for-testing.md
index 65f4046f3b6..3d88c5989e3 100644
--- a/docs/adr/0009-use-plain-junit5-for-testing.md
+++ b/docs/decisions/0009-use-plain-junit5-for-testing.md
@@ -1,3 +1,7 @@
+---
+parent: Decision Records
+nav_order: 9
+---
 # Use Plain JUnit5 for advanced test assertions
 
 ## Context and Problem Statement
diff --git a/docs/adr/0010-use-h2-as-internal-database.md b/docs/decisions/0010-use-h2-as-internal-database.md
similarity index 92%
rename from docs/adr/0010-use-h2-as-internal-database.md
rename to docs/decisions/0010-use-h2-as-internal-database.md
index 471bcf21332..e19640fbb1f 100644
--- a/docs/adr/0010-use-h2-as-internal-database.md
+++ b/docs/decisions/0010-use-h2-as-internal-database.md
@@ -1,3 +1,7 @@
+---
+parent: Decision Records
+nav_order: 10
+---
 # Use H2 as Internal SQL Database
 
 ## Context and Problem Statement
diff --git a/docs/adr/0011-test-external-links-in-documentation.md b/docs/decisions/0011-test-external-links-in-documentation.md
similarity index 97%
rename from docs/adr/0011-test-external-links-in-documentation.md
rename to docs/decisions/0011-test-external-links-in-documentation.md
index 070efb81550..d77ac25ea29 100644
--- a/docs/adr/0011-test-external-links-in-documentation.md
+++ b/docs/decisions/0011-test-external-links-in-documentation.md
@@ -1,3 +1,7 @@
+---
+parent: Decision Records
+nav_order: 11
+---
 # Test external links in documentation
 
 ## Context and Problem Statement
diff --git a/docs/adr/0012-handle-different-bibEntry-formats-of-fetchers.md b/docs/decisions/0012-handle-different-bibEntry-formats-of-fetchers.md
similarity index 98%
rename from docs/adr/0012-handle-different-bibEntry-formats-of-fetchers.md
rename to docs/decisions/0012-handle-different-bibEntry-formats-of-fetchers.md
index 4a689e51e74..3f454d61bbe 100644
--- a/docs/adr/0012-handle-different-bibEntry-formats-of-fetchers.md
+++ b/docs/decisions/0012-handle-different-bibEntry-formats-of-fetchers.md
@@ -1,3 +1,7 @@
+---
+parent: Decision Records
+nav_order: 12
+---
 # Handle different bibentry formats of fetchers by adding a layer
 
 ## Context and Problem Statement
diff --git a/docs/adr/0013-add-native-support-biblatex-software.md b/docs/decisions/0013-add-native-support-biblatex-software.md
similarity index 97%
rename from docs/adr/0013-add-native-support-biblatex-software.md
rename to docs/decisions/0013-add-native-support-biblatex-software.md
index 4c5fd3cf999..cedc2a75178 100644
--- a/docs/adr/0013-add-native-support-biblatex-software.md
+++ b/docs/decisions/0013-add-native-support-biblatex-software.md
@@ -1,3 +1,7 @@
+---
+parent: Decision Records
+nav_order: 13
+---
 # Add Native Support for BibLatex-Software
 
 * Deciders: Oliver Kopp
diff --git a/docs/adr/0014-separate-URL-creation-to-enable-proper-logging.md b/docs/decisions/0014-separate-URL-creation-to-enable-proper-logging.md
similarity index 98%
rename from docs/adr/0014-separate-URL-creation-to-enable-proper-logging.md
rename to docs/decisions/0014-separate-URL-creation-to-enable-proper-logging.md
index 13ce0bde380..8a13e206a45 100644
--- a/docs/adr/0014-separate-URL-creation-to-enable-proper-logging.md
+++ b/docs/decisions/0014-separate-URL-creation-to-enable-proper-logging.md
@@ -1,3 +1,7 @@
+---
+parent: Decision Records
+nav_order: 14
+---
 # Separate URL creation to enable proper logging
 
 ## Context and Problem Statement
diff --git a/docs/adr/0015-support-an-abstract-query-syntax-for-query-conversion.md b/docs/decisions/0015-support-an-abstract-query-syntax-for-query-conversion.md
similarity index 98%
rename from docs/adr/0015-support-an-abstract-query-syntax-for-query-conversion.md
rename to docs/decisions/0015-support-an-abstract-query-syntax-for-query-conversion.md
index 69b9664be8f..5b51e0cc062 100644
--- a/docs/adr/0015-support-an-abstract-query-syntax-for-query-conversion.md
+++ b/docs/decisions/0015-support-an-abstract-query-syntax-for-query-conversion.md
@@ -1,3 +1,7 @@
+---
+parent: Decision Records
+nav_order: 15
+---
 # Query syntax design
 
 ## Context and Problem Statement
diff --git a/docs/adr/0016-mutable-preferences-objects.md b/docs/decisions/0016-mutable-preferences-objects.md
similarity index 93%
rename from docs/adr/0016-mutable-preferences-objects.md
rename to docs/decisions/0016-mutable-preferences-objects.md
index 98934527ee2..74822d48712 100644
--- a/docs/adr/0016-mutable-preferences-objects.md
+++ b/docs/decisions/0016-mutable-preferences-objects.md
@@ -1,3 +1,7 @@
+---
+parent: Decision Records
+nav_order: 16
+---
 # Mutable preferences objects
 
 ## Context and Problem Statement
diff --git a/docs/adr/0017-allow-model-access-logic.md b/docs/decisions/0017-allow-model-access-logic.md
similarity index 97%
rename from docs/adr/0017-allow-model-access-logic.md
rename to docs/decisions/0017-allow-model-access-logic.md
index bccb6650978..d254d0b1b27 100644
--- a/docs/adr/0017-allow-model-access-logic.md
+++ b/docs/decisions/0017-allow-model-access-logic.md
@@ -1,3 +1,7 @@
+---
+parent: Decision Records
+nav_order: 17
+---
 # Allow org.jabref.model to access org.jabref.logic
 
 ## Context and Problem Statement
diff --git a/docs/adr/0018-use-regular-expression-to-split-multiple-sentence-titles.md b/docs/decisions/0018-use-regular-expression-to-split-multiple-sentence-titles.md
similarity index 96%
rename from docs/adr/0018-use-regular-expression-to-split-multiple-sentence-titles.md
rename to docs/decisions/0018-use-regular-expression-to-split-multiple-sentence-titles.md
index 36d84f81b19..21d6a269656 100644
--- a/docs/adr/0018-use-regular-expression-to-split-multiple-sentence-titles.md
+++ b/docs/decisions/0018-use-regular-expression-to-split-multiple-sentence-titles.md
@@ -1,3 +1,7 @@
+---
+parent: Decision Records
+nav_order: 18
+---
 # Use regular expression to split multiple-sentence titles
 
 ## Context and Problem Statement
diff --git a/docs/adr/0019-implement-special-fields-as-separate-fields.md b/docs/decisions/0019-implement-special-fields-as-separate-fields.md
similarity index 92%
rename from docs/adr/0019-implement-special-fields-as-separate-fields.md
rename to docs/decisions/0019-implement-special-fields-as-separate-fields.md
index 2083c9eb73b..77188d32ed3 100644
--- a/docs/adr/0019-implement-special-fields-as-separate-fields.md
+++ b/docs/decisions/0019-implement-special-fields-as-separate-fields.md
@@ -1,8 +1,12 @@
+---
+parent: Decision Records
+nav_order: 19
+---
 # Implement special fields as separate fields
 
 ## Context and Problem Statement
 
-How to implement special fields in bibtex databases?
+How to implement special fields in BibTeX databases?
 
 ## Considered Options
 
@@ -48,7 +52,7 @@ keywords = {prio1, printed, read}
 ```
 
 * Good, because does not bloat the BibTeX file. Typically, 50% of the lines are special fields
-* Good, because the user can easily assign a special field. E.g, typing “, prio1” into keywords instead of “\n  priority = {prio1},”
+* Good, because the user can easily assign a special field. E.g, typing “, prio1” into keywords instead of “`\n  priority = {prio1},`”
 * Bad, because they need to be synchronized to fields (because otherwise, the maintable cannot render it)
 * Bad, because keywords are related to the actual content
 * Bad, because some users want to keep publisher keywords
@@ -66,7 +70,7 @@ jabrefspecial = {prio1, printed, red}
 
 ### Special fields as sub-feature of groups
 
-* Good, because one concept rulez them all
+* Good, because one concept rules them all
 * Good, because groups already provide [explicit handling of certain cases](https://docs.jabref.org/finding-sorting-and-cleaning-entries/groups#types-of-groups): groups based on keywords and groups based on author's last names
 * Bad, because main table implementation changes: Currently, each column in the main table represents a field. The main may [mark entries belonging to certain groups](https://docs.jabref.org/finding-sorting-and-cleaning-entries/groups#group-color-bars-in-the-entry-table), but does offer an explicit rendering of groups
 * Bad, because groups are more a query on data of the entries instead of explicitly assigning entries to a group
diff --git a/docs/adr/0020-use-Jackson-to-parse-study-yml.md b/docs/decisions/0020-use-Jackson-to-parse-study-yml.md
similarity index 89%
rename from docs/adr/0020-use-Jackson-to-parse-study-yml.md
rename to docs/decisions/0020-use-Jackson-to-parse-study-yml.md
index 70903544d58..ac58c3f7689 100644
--- a/docs/adr/0020-use-Jackson-to-parse-study-yml.md
+++ b/docs/decisions/0020-use-Jackson-to-parse-study-yml.md
@@ -1,9 +1,13 @@
+---
+parent: Decision Records
+nav_order: 20
+---
 # Use Jackson to parse study.yml
 
 ## Context and Problem Statement
 
 The study definition file is formulated as a YAML document.
-To accessed the definition within JabRef this document has to be parsed.
+To access the definition within JabRef this document has to be parsed.
 What parser should be used to parse YAML files?
 
 ## Considered Options
@@ -16,7 +20,7 @@ What parser should be used to parse YAML files?
 
 ## Decision Outcome
 
-Chosen option: Jackson, because as it is a dedicated library for parsing YAML. yamlbeans also seem to be viable. They all offer similar functionality
+Chosen option: Jackson, because as it is a dedicated library for parsing YAML. `yamlbeans` also seem to be viable. They all offer similar functionality.
 
 ## Pros and Cons of the Options
 
diff --git a/docs/adr/0021-keep-study-as-a-dto.md b/docs/decisions/0021-keep-study-as-a-dto.md
similarity index 77%
rename from docs/adr/0021-keep-study-as-a-dto.md
rename to docs/decisions/0021-keep-study-as-a-dto.md
index e1dc6a5fbab..94ff587450d 100644
--- a/docs/adr/0021-keep-study-as-a-dto.md
+++ b/docs/decisions/0021-keep-study-as-a-dto.md
@@ -1,9 +1,13 @@
+---
+parent: Decision Records
+nav_order: 21
+---
 # Keep study as a DTO
 
 ## Context and Problem Statement
 
 The study holds query and library entries that could be replaced respectively with complex query and fetcher instances.
-This poses the question: should the study remain a pure DTO object or should it contain direct object instances?
+This poses the question: should the study remain a pure DTO object, or should it contain direct object instances?
 
 ## Considered Options
 
@@ -12,7 +16,7 @@ This poses the question: should the study remain a pure DTO object or should it
 
 ## Decision Outcome
 
-Chosen option: "Keep study as DTO and use transformators", because comes out best (see below).
+Chosen option: "Keep study as DTO and use transformers", because comes out best (see below).
 
 ## Pros and Cons of the Options
 
@@ -26,5 +30,5 @@ Chosen option: "Keep study as DTO and use transformators", because comes out bes
 
 * Good, because no need for database and query entries
 * Bad, because custom de-/serializers for fetchers and complex queries needed
-* Bad, because harder to maintain than using "vanilla" jackson de-/serialization
+* Bad, because harder to maintain than using "vanilla" Jackson de-/serialization
 * … <!-- numbers of pros and cons can vary -->
diff --git a/docs/decisions/0022-remove-stop-words-during-query-transformation.md b/docs/decisions/0022-remove-stop-words-during-query-transformation.md
new file mode 100644
index 00000000000..f8331410aec
--- /dev/null
+++ b/docs/decisions/0022-remove-stop-words-during-query-transformation.md
@@ -0,0 +1,37 @@
+---
+parent: Decision Records
+nav_order: 22
+---
+# Remove stop words during query transformation
+
+## Context and Problem Statement
+
+When querying for a title of a paper, the title might contain stop words such as "a", "for", "and". Some data providers return 0 results when querying for a stop word. When transforming a query to the Lucene syntax, the default Boolean operator `and` is used. When using IEEE, this often leads to zero search results.
+
+## Decision Drivers
+
+* Consistent to the Google search engine
+* Allow reproducible searches
+* Avoid WTFs on the user's side
+
+## Considered Options
+
+* Remove stop words from the query
+* Automatically enclose in quotes if no Boolean operator is contained
+
+## Decision Outcome
+
+Chosen option: "Remove stop words from the query", because comes out best.
+
+## Pros and Cons of the Options
+
+### Remove stop words from the query
+
+* Good, because good search results if no Boolean operators are used
+* Bad, because when using complex queries and stop words are used alone, they are silently removed
+
+### Automatically enclose in quotes if no Boolean operator is contained
+
+* Good, because good search results if no Boolean operators are used
+* Bad, because silently leads to different results
+* Bad, because inconsistent to Google behavior
diff --git a/docs/adr/0023-localized-preferences.md b/docs/decisions/0023-localized-preferences.md
similarity index 85%
rename from docs/adr/0023-localized-preferences.md
rename to docs/decisions/0023-localized-preferences.md
index c8ffe8c3803..ab0701dae3a 100644
--- a/docs/adr/0023-localized-preferences.md
+++ b/docs/decisions/0023-localized-preferences.md
@@ -1,3 +1,7 @@
+---
+parent: Decision Records
+nav_order: 23
+---
 # Localized Preferences
 
 * Status: proposed
@@ -5,7 +9,7 @@
 
 ## Context and Problem Statement
 
-Currently, JabRef uses some localized preferences. We want to remove the Localization-dependency from the JabRefPreferences and move the Localization to where the String is used.
+Currently, JabRef uses some localized preferences. We want to remove the Localization-dependency from the `JabRefPreferences` and move the Localization to where the String is used.
 The problem is how to store the default values.
 
 ## Considered Options
diff --git a/docs/adr/0024-use-#-as-indicator-for-BibTeX-string-constants.md b/docs/decisions/0024-use-#-as-indicator-for-BibTeX-string-constants.md
similarity index 87%
rename from docs/adr/0024-use-#-as-indicator-for-BibTeX-string-constants.md
rename to docs/decisions/0024-use-#-as-indicator-for-BibTeX-string-constants.md
index edeb27c150c..881408c56ab 100644
--- a/docs/adr/0024-use-#-as-indicator-for-BibTeX-string-constants.md
+++ b/docs/decisions/0024-use-#-as-indicator-for-BibTeX-string-constants.md
@@ -1,3 +1,7 @@
+---
+parent: Decision Records
+nav_order: 24
+---
 # Use `#` as indicator for BibTeX string constants
 
 Bibtex supports string constants. The entry editor should support that, too.
@@ -21,7 +25,7 @@ Affected code is (at least) `org.jabref.logic.importer.fileformat.BibtexParser#p
 
 ## Decision Outcome
 
-Chosen option: "Wrap string constants in #", because already existing behavior
+Chosen option: "Wrap string constants in #", because already existing behavior.
 
 ## Pros and Cons of the Options
 
@@ -62,10 +66,10 @@ field2 = {value}   -> value
 field1 = value # value --> §value§ # §value§
 ```
 
-* Good, because Easy to implement
-* Good, because No conflict with BibTeX's `#` sign
-* Bad, because Documentation needs to be updated
-* Bad, because `§` is not available on an US keyboard
+* Good, because easy to implement
+* Good, because no conflict with BibTeX's `#` sign
+* Bad, because documentation needs to be updated
+* Bad, because `§` is not available on a US keyboard
 
 ### Replace the internal `#` in JabRef by the non-used character `%`
 
@@ -82,7 +86,7 @@ field2 = {value}   -> value
 field1 = value # value --> %value% # %value%
 ```
 
-* Good, because A user does not write LaTeX comments inside a string
+* Good, because a user does not write LaTeX comments inside a string
 * Bad, because `%` could be used in Markdown, too
 * Bad, because `%` is used for comments in LaTeX and thus migtht cause confusion
 * Bad, because `%` could appear in URLs: There is [url percent encoding](https://www.w3schools.com/tags/ref_urlencode.asp)
@@ -120,7 +124,7 @@ field2 = {value}   -> value
 field1 = value # value --> &value # &value
 ```
 
-* Good, because Near to C syntax
+* Good, because near to C syntax
 * Bad, because `&` is a LaTeX command for tables
 * Bad, because `&` could appear in URLs
 
@@ -128,6 +132,6 @@ field1 = value # value --> &value # &value
 
 `org.jabref.model.entry.BibEntry#setField(org.jabref.model.entry.field.Field, java.lang.String)` changes to `org.jabref.model.entry.BibEntry#setField(org.jabref.model.entry.field.Field, org.jabref.model.entry.field.Value)` (org.jabref.model.entry.BibEntry#setField(org.jabref.model.entry.field.Field, java.lang.String)). This would bring JabRef's internal data model even more close to BibTeX
 
-* Good, because More object-orientated design of BibTeX field storage
-* Good, because Easies implementation of an advanced field editor
-* Bad, because High effort to implement
+* Good, because more object-orientated design of BibTeX field storage
+* Good, because eases implementation of an advanced field editor
+* Bad, because high effort to implement
diff --git a/docs/decisions/0025-reviewdog-reviews.md b/docs/decisions/0025-reviewdog-reviews.md
new file mode 100644
index 00000000000..512aed39d13
--- /dev/null
+++ b/docs/decisions/0025-reviewdog-reviews.md
@@ -0,0 +1,33 @@
+---
+parent: Decision Records
+nav_order: 25
+---
+# Reviewdog findings are code reviews
+
+## Context and Problem Statement
+
+JabRef offers [guidelines to setup the local workspace](https://devdocs.jabref.org/getting-into-the-code/guidelines-for-setting-up-a-local-workspace).
+There is also a section on [JabRef's code style](https://devdocs.jabref.org/getting-into-the-code/guidelines-for-setting-up-a-local-workspace#using-jabrefs-code-style).
+There are pull requests by newcomers, which do not follow that style guide.
+
+How to quickly provide feedback to contributors that checkstyle was not matched?
+
+## Decision Drivers
+
+* Be friendly to newcomers
+* Provide fast feedback to contributors
+* Lower the workload of maintainers
+* Keep maintainers focused on the "real" challanges of the code changes
+
+## Considered Options
+
+* Use [Reviewdog's PullRequest review reporter](https://github.com/reviewdog/reviewdog#reporter-github-pullrequest-review-comment--reportergithub-pr-review)
+* Use [Reviewdog's check reporter](https://github.com/reviewdog/reviewdog#reporter-github-checks--reportergithub-check)
+* Use [comment-failure-action](https://github.com/quipper/comment-failure-action)
+
+## Decision Outcome
+
+Chosen option: "Use Reviewdog's PullRequest review reporter", because resolves force to provide fast feedback.
+We do not want to use `comment-failure-action`, because [it might procude too much comments](https://github.com/quipper/comment-failure-action/issues/224).
+We accept that newcomers might be annoyed if quick automatic feedback by a bot is given:
+We value the time of our maintainers and want to keep them focused on the real challanges of the code changes.
diff --git a/docs/decisions/adr-template.md b/docs/decisions/adr-template.md
new file mode 100644
index 00000000000..47b62f5a815
--- /dev/null
+++ b/docs/decisions/adr-template.md
@@ -0,0 +1,96 @@
+---
+# Configuration for the Jekyll template "Just the Docs"
+# Remove it when creating a new ADR
+title: ADR Template
+
+# Replace this with the number of the ADR
+nav_order: 100
+
+# Keep this
+parent: Decision Records
+
+# These are optional elements. Feel free to remove any of them.
+# status: {proposed | rejected | accepted | deprecated | … | superseded by [ADR-0005](0005-example.md)}
+# date: {YYYY-MM-DD when the decision was last updated}
+# deciders: {list everyone involved in the decision}
+# consulted: {list everyone whose opinions are sought (typically subject-matter experts); and with whom there is a two-way communication}
+# informed: {list everyone who is kept up-to-date on progress; and with whom there is a one-way communication}
+---
+<!-- we need to disable MD025, because we use the different heading "ADR Template" in the homepage (see above) than it is foreseen in the template -->
+<!-- markdownlint-disable-next-line MD025 -->
+# {short title of solved problem and solution}
+
+## Context and Problem Statement
+
+{Describe the context and problem statement, e.g., in free form using two to three sentences or in the form of an illustrative story.
+ You may want to articulate the problem in form of a question and add links to collaboration boards or issue management systems.}
+
+<!-- This is an optional element. Feel free to remove. -->
+## Decision Drivers
+
+* {decision driver 1, e.g., a force, facing concern, …}
+* {decision driver 2, e.g., a force, facing concern, …}
+* … <!-- numbers of drivers can vary -->
+
+## Considered Options
+
+* {title of option 1}
+* {title of option 2}
+* {title of option 3}
+* … <!-- numbers of options can vary -->
+
+## Decision Outcome
+
+Chosen option: "{title of option 1}", because
+{justification. e.g., only option, which meets k.o. criterion decision driver | which resolves force {force} | … | comes out best (see below)}.
+
+<!-- This is an optional element. Feel free to remove. -->
+### Positive Consequences
+
+* {e.g., improvement of one or more desired qualities, …}
+* …
+
+<!-- This is an optional element. Feel free to remove. -->
+### Negative Consequences
+
+* {e.g., compromising one or more desired qualities, …}
+* …
+
+<!-- This is an optional element. Feel free to remove. -->
+## Validation
+
+{describe how the implementation of/compliance with the ADR is validated. E.g., by a review or an ArchUnit test}
+
+<!-- This is an optional element. Feel free to remove. -->
+## Pros and Cons of the Options
+
+### {title of option 1}
+
+<!-- This is an optional element. Feel free to remove. -->
+{example | description | pointer to more information | …}
+
+* Good, because {argument a}
+* Good, because {argument b}
+<!-- use "neutral" if the given argument weights neither for good nor bad -->
+* Neutral, because {argument c}
+* Bad, because {argument d}
+* … <!-- numbers of pros and cons can vary -->
+
+### {title of other option}
+
+{example | description | pointer to more information | …}
+
+* Good, because {argument a}
+* Good, because {argument b}
+* Neutral, because {argument c}
+* Bad, because {argument d}
+* …
+
+<!-- This is an optional element. Feel free to remove. -->
+## More Information
+
+{You might want to provide additional evidence/confidence for the decision outcome here and/or
+ document the team agreement on the decision and/or
+ define when this decision when and how the decision should be realized and if/when it should be re-visited and/or
+ how the decision is validated.
+ Links to other decisions and resources might here appear as well.}
diff --git a/docs/decisions/index.md b/docs/decisions/index.md
new file mode 100644
index 00000000000..bab7c46aec3
--- /dev/null
+++ b/docs/decisions/index.md
@@ -0,0 +1,12 @@
+---
+nav_order: 4
+has_children: true
+---
+# Decision Records
+
+Below, all "any decision records" for JabRef are listed.
+This list uses the TOC functionality of the [Just the Docs Jekyll template](https://just-the-docs.github.io/just-the-docs/).
+
+For new ADRs, please use [adr-template.md](adr-template.md) as basis.
+More information on MADR is available at <https://adr.github.io/madr/>.
+General information about architectural decision records is available at <https://adr.github.io/>.
diff --git a/docs/getting-into-the-code/README.md b/docs/getting-into-the-code/README.md
deleted file mode 100644
index b2f10067f15..00000000000
--- a/docs/getting-into-the-code/README.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# Getting into the code
-
diff --git a/docs/getting-into-the-code/code-howtos.md b/docs/getting-into-the-code/code-howtos.md
deleted file mode 100644
index 42f96fc958f..00000000000
--- a/docs/getting-into-the-code/code-howtos.md
+++ /dev/null
@@ -1,431 +0,0 @@
-# Code Howtos
-
-This page provides some development support in the form of howtos. See also [High Level Documentation](high-level-documentation.md).
-
-## Generic code how tos
-
-We really recommend reading the book [Java by Comparison](http://java.by-comparison.com/).
-
-Please read [https://github.com/cxxr/better-java](https://github.com/cxxr/better-java)
-
-* try not to abbreviate names of variables, classes or methods
-* use lowerCamelCase instead of snake\_case
-* name enums in singular, e.g. `Weekday` instead of `Weekdays` \(except if they represent flags\)
-
-## Error Handling in JabRef
-
-### Throwing and Catching Exceptions
-
-Principles:
-
-* All Exceptions we throw should be or extend `JabRefException`; This is especially important if the message stored in the Exception should be shown to the user. `JabRefException` has already implemented the `getLocalizedMessage()` method which should be used for such cases \(see details below!\).
-* Catch and wrap all API exceptions \(such as `IOExceptions`\) and rethrow them
-  * Example:
-
-    ```java
-       try {
-           // ...
-       } catch (IOException ioe) {
-           throw new JabRefException("Something went wrong...",
-               Localization.lang("Something went wrong...", ioe);
-       }
-    ```
-* Never, ever throw and catch `Exception` or `Throwable`
-* Errors should only be logged when they are finally caught \(i.e., logged only once\). See **Logging** for details.
-* If the Exception message is intended to be shown to the User in the UI \(see below\) provide also a localizedMessage \(see `JabRefException`\).
-
-_\(Rationale and further reading:_ [https://www.baeldung.com/java-exceptions](https://www.baeldung.com/java-exceptions)_\)_
-
-### Outputting Errors in the UI
-
-Principle: Error messages shown to the User should not contain technical details \(e.g., underlying exceptions, or even stack traces\). Instead, the message should be concise, understandable for non-programmers and localized. The technical reasons \(and stack traces\) for a failure should only be logged.
-
-To show error message two different ways are usually used in JabRef:
-
-* showing an error dialog
-* updating the status bar at the bottom of the main window
-
-```text
-TODO: Usage of status bar and Swing Dialogs
-```
-
-## Using the EventSystem
-
-### What the EventSystem is used for
-
-Many times there is a need to provide an object on many locations simultaneously. This design pattern is quite similar to Java's Observer, but it is much simpler and readable while having the same functional sense.
-
-### Main principle
-
-`EventBus` represents a communication line between multiple components. Objects can be passed through the bus and reach the listening method of another object which is registered on that `EventBus` instance. Hence, the passed object is available as a parameter in the listening method.
-
-### Register to the `EventBus`
-
-Any listening method has to be annotated with `@Subscribe` keyword and must have only one accepting parameter. Furthermore, the object which contains such listening method\(s\) has to be registered using the `register(Object)` method provided by `EventBus`. The listening methods can be overloaded by using different parameter types.
-
-### Posting an object
-
-`post(object)` posts an object through the `EventBus` which has been used to register the listening/subscribing methods.
-
-### Short example
-
-```java
-/* Listener.java */
-
-import com.google.common.eventbus.Subscribe;
-
-public class Listener {
-
-   private int value = 0;
-
-   @Subscribe
-   public void listen(int value) {
-      this.value = value;
-   }
-
-   public int getValue() {
-      return this.value;
-   }
-}
-```
-
-```java
-/* Main.java */
-
-import com.google.common.eventbus.EventBus;
-
-public class Main {
-   private static EventBus eventBus = new EventBus();
-
-   public static void main(String[] args) {
-      Main main = new Main();
-      Listener listener = new Listener();
-      eventBus.register(listener);
-      eventBus.post(1); // 1 represents the passed event
-
-      // Output should be 1
-      System.out.println(listener.getValue());
-   }
-}
-```
-
-### Event handling in JabRef
-
-The `event` package contains some specific events which occur in JabRef.
-
-For example: Every time an entry was added to the database a new `EntryAddedEvent` is sent through the `eventBus` which is located in `BibDatabase`.
-
-If you want to catch the event you'll have to register your listener class with the `registerListener(Object listener)` method in `BibDatabase`. `EntryAddedEvent` provides also methods to get the inserted `BibEntry`.
-
-## Logging
-
-JabRef uses the logging facade [SLF4j](https://www.slf4j.org/). All log messages are passed internally to [log4j2](https://logging.apache.org/log4j/2.x/) which handles any filtering, formatting and writing of log messages.
-
-* Obtaining a logger for a class:
-
-  ```java
-  private static final Logger LOGGER = LoggerFactory.getLogger(<ClassName>.class);
-  ```
-
-* If the logging event is caused by an exception, please add the exception to the log message as:
-
-  ```java
-    catch (SomeException e) {
-       LOGGER.warn("Warning text.", e);
-       ...
-    }
-  ```
-
-* SLF4J also support parameterized logging, e.g. if you want to print out multiple arguments in a log statement use a pair of curly braces. [Examples](https://www.slf4j.org/faq.html#logging_performance)
-
-## Using Localization correctly
-
-More information about this topic from the translator side is provided at [Translating JabRef Interface](https://docs.jabref.org/faqcontributing/how-to-translate-the-ui).
-
-All labeled UI elements, descriptions and messages shown to the user should be localized, i.e., should be displayed in the chosen language.
-
-JabRef uses ResourceBundles \([see Oracle Tutorial](https://docs.oracle.com/javase/tutorial/i18n/resbundle/concept.html)\) to store `key=value` pairs for each String to be localized.
-
-To show an localized String the following `org.jabref.logic.l10n.Localization` has to be used. The Class currently provides three methods to obtain translated strings:
-
-```java
-    public static String lang(String key);
-
-    public static String lang(String key, String... params);
-
-    public static String menuTitle(String key, String... params);
-```
-
-The actual usage might look like:
-
-```java
-    Localization.lang("Get me a translated String");
-    Localization.lang("Using %0 or more %1 is also possible", "one", "parameter");
-    Localization.menuTitle("Used for Menus only");
-```
-
-General hints:
-
-* Use the String you want to localize directly, do not use members or local variables: `Localization.lang("Translate me");` instead of `Localization.lang(someVariable)` \(possibly in the form `someVariable = Localization.lang("Translate me")`
-* Use `%x`-variables where appropriate: `Localization.lang("Exported %0 entries.", number)` instead of `Localization.lang("Exported ") + number + Localization.lang(" entries.");`
-* Use a full stop/period \("."\) to end full sentences
-
-The tests check whether translation strings appear correctly in the resource bundles.
-
-1. Add new `Localization.lang("KEY")` to Java file. Run the `LocalizationConsistencyTest`under \(src/test/org.jabref.logic.
-
-   \)
-
-2. Tests fail. In the test output a snippet is generated which must be added to the English translation file.
-3. Add snippet to English translation file located at `src/main/resources/l10n/JabRef_en.properties`
-4. Please do not add translations for other languages directly in the properties. They will be overwritten by [Crowdin](https://crowdin.com/project/jabref)
-
-## Adding a new Language
-
-1. Add the new Language to the Language enum in [https://github.com/JabRef/jabref/blob/master/src/main/java/org/jabref/logic/l10n/Language.java](https://github.com/JabRef/jabref/blob/master/src/main/java/org/jabref/logic/l10n/Language.java)
-2. Create an empty &lt;locale code&gt;.properties file
-3. Configure the new language in [Crowdin](https://crowdin.com/project/jabref)
-
-If the language is a variant of a language `zh_CN` or `pt_BR` it is necessary to add a language mapping for Crowdin to the crowdin.yml file in the root. Of course the properties file also has to be named according to the language code and locale.
-
-## Cleanup and Formatters
-
-We try to build a cleanup mechanism based on formatters. The idea is that we can register these actions in arbitrary places, e.g., onSave, onImport, onExport, cleanup, etc. and apply them to different fields. The formatters themselves are independent of any logic and therefore easy to test.
-
-Example: [NormalizePagesFormatter](https://github.com/JabRef/jabref/blob/master/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizePagesFormatter.java)
-
-## Drag and Drop
-
-Drag and Drop makes usage of the Dragboard. For JavaFX the following [tutorial](https://docs.oracle.com/javafx/2/drag_drop/jfxpub-drag_drop.htm) is helpful. Note that the data has to be serializable which is put on the dragboard. For drag and drop of Bib-entries between the maintable and the groups panel, a custom Dragboard is used, `CustomLocalDragboard` which is a generic alternative to the system one.
-
-For accessing or putting data into the Clipboard use the `ClipboardManager`.
-
-## Get the JabRef frame panel
-
-`JabRefFrame` and `BasePanel` are the two main classes. You should never directly call them, instead pass them as parameters to the class.
-
-## Get Absolute Filename or Path for file in File directory
-
-```java
-Optional<Path> file = FileHelper.expandFilename(database, fileText, preferences.getFilePreferences());
-```
-
-`String path` Can be the files name or a relative path to it. The Preferences should only be directly accessed in the GUI. For the usage in logic pass them as parameter
-
-## Setting a Database Directory for a .bib File
-
-* `@comment{jabref-meta: fileDirectory:<directory>`
-* “fileDirectory” is determined by Globals.pref.get\(“userFileDir”\) \(which defaults to “fileDirectory”
-* There is also “fileDirectory-&lt;username&gt;”, which is determined by Globals.prefs.get\(“userFileDirIndividual”\)
-* Used at DatabasePropertiesDialog
-
-## How to work with Preferences
-
-`model` and `logic` must not know `JabRefPreferences`. See `ProxyPreferences` for encapsulated preferences and [https://github.com/JabRef/jabref/pull/658](https://github.com/JabRef/jabref/pull/658) for a detailed discussion.
-
-See [https://github.com/JabRef/jabref/blob/master/src/main/java/org/jabref/logic/preferences/TimestampPreferences.java](https://github.com/JabRef/jabref/blob/master/src/main/java/org/jabref/logic/preferences/TimestampPreferences.java) \(via [https://github.com/JabRef/jabref/pull/3092](https://github.com/JabRef/jabref/pull/3092)\) for the current way how to deal with preferences.
-
-Defaults should go into the model package. See [Comments in this Commit](https://github.com/JabRef/jabref/commit/2f553e6557bddf7753b618b0f4edcaa6e873f719#commitcomment-15779484)
-
-## Test Cases
-
-### General hints on tests
-
-Imagine you want to test the method `format(String value)` in the class `BracesFormatter` which removes double braces in a given string.
-
-* _Placing:_ all tests should be placed in a class named `classTest`, e.g. `BracesFormatterTest`.
-* _Naming:_ the name should be descriptive enough to describe the whole test. Use the format `methodUnderTest_ expectedBehavior_context` \(without the dashes\). So for example `formatRemovesDoubleBracesAtBeginning`. Try to avoid naming the tests with a `test` prefix since this information is already contained in the class name. Moreover, starting the name with `test` leads often to inferior test names \(see also the [Stackoverflow discussion about naming](http://stackoverflow.com/questions/155436/unit-test-naming-best-practices)\).
-* _Test only one thing per test:_ tests should be short and test only one small part of the method. So instead of
-
-  ```java
-  testFormat() {
-   assertEqual("test", format("test"));
-   assertEqual("{test", format("{test"));
-   assertEqual("test", format("test}}"));
-  }
-  ```
-
-  we would have five tests containing a single `assert` statement and named accordingly \(`formatDoesNotChangeStringWithoutBraces`, `formatDoesNotRemoveSingleBrace`, , etc.\). See [JUnit AntiPattern](https://exubero.com/junit/anti-patterns/#Multiple_Assertions) for background.
-
-* Do _not just test happy paths_, but also wrong/weird input.
-* It is recommend to write tests _before_ you actually implement the functionality \(test driven development\).
-* _Bug fixing:_ write a test case covering the bug and then fix it, leaving the test as a security that the bug will never reappear.
-* Do not catch exceptions in tests, instead use the `assertThrows(Exception.class, ()->doSomethingThrowsEx())` feature of [junit-jupiter](https://junit.org/junit5/docs/current/user-guide/)  to the test method.
-
-### Lists in tests
-
-* Use `assertEquals(Collections.emptyList(), actualList);` instead of `assertEquals(0, actualList.size());` to test whether a list is empty.
-* Similarly, use `assertEquals(Arrays.asList("a", "b"), actualList);` to compare lists instead of
-
-  ```java
-         assertEquals(2, actualList.size());
-         assertEquals("a", actualList.get(0));
-         assertEquals("b", actualList.get(1));
-  ```
-
-### BibEntries in tests
-
-* Use the `assertEquals` methods in `BibtexEntryAssert` to check that the correct BibEntry is returned.
-
-### Files and folders in tests
-
-* If you need a temporary file in tests, then add the following Annotation before the class:
-
-  ```java
-  @ExtendWith(TempDirectory.class)
-  class TestClass{
-
-    @BeforeEach
-    void setUp(@TempDirectory.TempDir Path temporaryFolder){
-    }
-  }
-  ```
-
-  to the test class. A temporary file is now created by `Files.createFile(path)`. Using this pattern automatically ensures that the test folder is deleted after the tests are run. See the [junit-pioneer doc](https://junit-pioneer.org/docs/temp-directory/) for more details.
-
-### Loading Files from Resources
-
-Sometimes it is necessary to load a specific resource or to access the resource directory
-
-```java
-Path resourceDir = Paths.get(MSBibExportFormatTestFiles.class.getResource("MsBibExportFormatTest1.bib").toURI()).getParent();
-```
-
-When the directory is needed, it is important to first point to an actual existing file. Otherwise the wrong directory will be returned.
-
-### Preferences in tests
-
-If you modify preference, use following pattern to ensure that the stored preferences of a developer are not affected:
-
-Or even better, try to mock the preferences and insert them via dependency injection.
-
-```java
-@Test
-public void getTypeReturnsBibLatexArticleInBibLatexMode() {
-     // Mock preferences
-     PreferencesService mockedPrefs = mock(PreferencesService.class);
-     GeneralPreferences mockedGeneralPrefs = mock(GeneralPReferences.class);
-     // Switch to BibLatex mode
-     when(mockedPrefs.getGeneralPrefs()).thenReturn(mockedGeneralPrefs);
-     when(mockedGeneralPrefs.getDefaultBibDatabaseMode())
-        .thenReturn(BibDatabaseMode.BIBLATEX);
-
-     // Now test
-     EntryTypes biblatexentrytypes = new EntryTypes(mockedPrefs);
-     assertEquals(BibLatexEntryTypes.ARTICLE, biblatexentrytypes.getType("article"));
-}
-```
-
-To test that a preferences migration works successfully, use the mockito method `verify`. See `PreferencesMigrationsTest` for an example.
-
-### Background on Java testing
-
-In JabRef, we mainly rely to basic JUnit tests to increase code coverage. There are other ways to test:
-
-| Type | Techniques | Tool \(Java\) | Kind of tests | Used In JabRef |
-| :--- | :--- | :--- | :--- | :--- |
-| Functional | Dynamics, black box, positive and negative | [JUnit-QuickCheck](https://github.com/pholser/junit-quickcheck) | Random data generation | No, not intended, because other test kinds seem more helpful. |
-| Functional | Dynamics, black box, positive and negative | [GraphWalker](https://graphwalker.github.io/) | Model-based | No, because the BibDatabase doesn't need to be tests |
-| Functional | Dynamics, black box, positive and negative | [TestFX](https://github.com/TestFX/TestFX) | GUI Tests | Yes |
-| Functional | Dynamics, white box, negative | [PIT](https://pitest.org/) | Mutation | No |
-| Functional | Dynamics, white box, positive and negative | [Mockito](https://site.mockito.org/) | Mocking | Yes |
-| Non-functional | Dynamics, black box, positive and negative | [JETM](http://jetm.void.fm/), [Apache JMeter](https://jmeter.apache.org/) | Performance \(performance testing vs load testing respectively\) | No |
-| Structural | Static, white box | [CheckStyle](https://checkstyle.sourceforge.io/) | Constient formatting of the source code | Yes |
-| Structural | Dynamics, white box | [SpotBugs](https://spotbugs.github.io/) | Reocurreing bugs \(based on experience of other projects\) | No |
-
-## UI
-
-Global variables should be avoided. Try to pass them as dependency.
-
-## "Special Fields"
-
-### keywords sync
-
-Database.addDatabaseChangeListener does not work as the DatabaseChangedEvent does not provide the field information. Therefore, we have to use BibtexEntry.addPropertyChangeListener\(VetoableChangeListener listener\)
-
-## Working with BibTeX data
-
-### Working with authors
-
-You can normalize the authors using `org.jabref.model.entry.AuthorList.fixAuthor_firstNameFirst(String)`. Then the authors always look nice. The only alternative containing all data of the names is `org.jabref.model.entry.AuthorList.fixAuthor_lastNameFirst(String)`. The other `fix...` methods omit data \(like the von parts or the junior information\).
-
-## Benchmarks
-
-* Benchmarks can be executed by running the `jmh` gradle task \(this functionality uses the [JMH Gradle plugin](https://github.com/melix/jmh-gradle-plugin)\)
-* Best practices:
-  * Read test input from `@State` objects
-  * Return result of calculations \(either explicitly or via a `BlackHole` object\)
-* [List of examples](https://github.com/melix/jmh-gradle-example/tree/master/src/jmh/java/org/openjdk/jmh/samples)
-
-## Measure performance
-
-Try out the [YourKit JAva Profiler](https://www.yourkit.com/).
-
-## equals
-
-When creating an `equals` method follow:
-
-1. Use the `==` operator to check if the argument is a reference to this object. If so, return `true`.
-2. Use the `instanceof` operator to check if the argument has the correct type. If not, return `false`.
-3. Cast the argument to the correct type.
-4. For each “significant” field in the class, check if that field of the argument matches the corresponding field of this object. If all these tests succeed, return `true` otherwise, return `false`.
-5. When you are finished writing your equals method, ask yourself three questions: Is it symmetric? Is it transitive? Is it consistent?
-
-Also, note:
-
-* Always override `hashCode` when you override equals \(`hashCode` also has very strict rules\) \(Item 9 of[Effective Java](https://www.oreilly.com/library/view/effective-java-3rd/9780134686097/)\)
-* Don’t try to be too clever
-* Don’t substitute another type for `Object` in the equals declaration
-
-## Files and Paths
-
-Always try to use the methods from the nio-package. For interoperability, they provide methods to convert between file and path. [https://docs.oracle.com/javase/tutorial/essential/io/path.html](https://docs.oracle.com/javase/tutorial/essential/io/path.html) Mapping between old methods and new methods [https://docs.oracle.com/javase/tutorial/essential/io/legacy.html\#mapping](https://docs.oracle.com/javase/tutorial/essential/io/legacy.html#mapping)
-
-## JavaFX
-
-The following expressions can be used in FXML attributes, according to the [official documentation](https://docs.oracle.com/javase/8/javafx/api/javafx/fxml/doc-files/introduction_to_fxml.html#attributes)
-
-| Type | Expression | Value point to | Remark |
-| :--- | :--- | :--- | :--- |
-| Location | `@image.png` | path relative to the current FXML file |  |
-| Resource | `%textToBeTranslated` | key in ResourceBundle |  |
-| Attribute variable | `$idOfControl` or `$variable` | named control or variable in controller \(may be path in the namespace\) | resolved only once at load time |
-| Expression binding | `${expression}` | expression, for example `textField.text` | changes to source are propagated |
-| Bidirectional expression binding | `#{expression}` | expression | changes are propagated in both directions \(not yet implemented in JavaFX, see [feature request](https://bugs.openjdk.java.net/browse/JDK-8090665)\) |
-| Event handler | `#nameOfEventHandler` | name of the event handler method in the controller |  |
-| Constant | `<text><Strings fx:constant="MYSTRING"/></text>` | constant \(here `MYSTRING` in the `Strings` class\) |  |
-
-### JavaFX Radio Buttons example
-
-All radio buttons that should be grouped together need to have a ToggleGroup defined in the FXML code Example:
-
-```markup
-<VBox>
-            <fx:define>
-                <ToggleGroup fx:id="citeToggleGroup"/>
-            </fx:define>
-            <children>
-                <RadioButton fx:id="inPar" minWidth="-Infinity" mnemonicParsing="false"
-                             text="%Cite selected entries between parenthesis" toggleGroup="$citeToggleGroup"/>
-                <RadioButton fx:id="inText" minWidth="-Infinity" mnemonicParsing="false"
-                             text="%Cite selected entries with in-text citation" toggleGroup="$citeToggleGroup"/>
-                <Label minWidth="-Infinity" text="%Extra information (e.g. page number)"/>
-                <TextField fx:id="pageInfo"/>
-            </children>
-</VBox>
-```
-
-### JavaFX Dialogs
-
-All dialogs should be displayed to the user via `DialogService` interface methods. `DialogService` provides methods to display various dialogs \(including custom ones\) to the user. It also ensures the displayed dialog opens on the correct window via `initOwner()` \(for cases where the user has multiple screens\). The following code snippet demonstrates how a custom dialog is displayed to the user:
-
-```java
-dialogService.showCustomDialog(new DocumentViewerView());
-```
-
-If an instance of `DialogService` is unavailable within current class/scope in which the dialog needs to be displayed, `DialogService` can be instantiated via the code snippet shown as follows:
-
-```java
-DialogService dialogService = Injector.instantiateModelOrService(DialogService.class);
-```
-
diff --git a/docs/getting-into-the-code/development-strategy.md b/docs/getting-into-the-code/development-strategy.md
index 88393f7014c..84a6fea798b 100644
--- a/docs/getting-into-the-code/development-strategy.md
+++ b/docs/getting-into-the-code/development-strategy.md
@@ -1,3 +1,7 @@
+---
+parent: Getting into the code
+nav_order: 1
+---
 # JabRef's development strategy
 
 We aim to keep up to high-quality code standards and use code quality tools wherever possible.
@@ -8,9 +12,9 @@ To ensure high code-quality,
 * We follow the principles of [Effective Java](https://www.oreilly.com/library/view/effective-java-3rd/9780134686097/).
 * We use [Design Patterns](https://java-design-patterns.com/patterns/) when applicable.
 * We document our design decisions using the lightweight architectural decision records [MADR](https://adr.github.io/madr/).
-* We review each external pull request by at least two [JabRef Core Developers](../../MAINTAINERS).
+* We review each external pull request by at least two [JabRef Core Developers](https://github.com/JabRef/jabref/blob/main/MAINTAINERS/README.md).
 
-Read on about our automated quality checks at [Code Quality](../advanced-reading/code-quality.md).
+Read on about our automated quality checks at [Code Quality](../code-howtos/code-quality.md).
 
 ## Continuous integration
 
diff --git a/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace.md b/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace.md
index fdb3d51f311..409416b9e9b 100644
--- a/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace.md
+++ b/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace.md
@@ -1,12 +1,14 @@
+---
+parent: Getting into the code
+nav_order: 2
+---
 # Set up a local workspace
 
 This guide explains how to set up your environment for development of JabRef. It includes information about prerequisites, configuring your IDE, and running JabRef locally to verify your setup.
 
-```
-The most important step is to configure your IDE.
-In case you know how to install JDK 17 with JavaFX support and to fork JabRef's code,
-please scroll down to the IDE setup.
-```
+> **The most important step is to configure your IDE.**\
+> **In case you know how to install JDK 18 with JavaFX support and [to fork JabRef's code](#get-the-code),**\
+> **please scroll down to the [IDE setup](#configure-your-ide).**
 
 For a complete step-by-step guide for Linux using IntelliJ IDEA as the IDE, have a look at the following video instructions:
 
@@ -16,13 +18,13 @@ For a complete step-by-step guide for Linux using IntelliJ IDEA as the IDE, have
 
 This section list the prerequisites you need to get started to develop JabRef. After this section, you are ready to get the code.
 
-### Java Development Kit 17
+### Java Development Kit 18
 
-A working Java (Development Kit) 17 installation with Java FX support is required. In the command line (terminal in Linux, cmd in Windows) run `javac -version` and make sure that the reported version is Java 17 (e.g., `javac 17`). If `javac` is not found or a wrong version is reported, check your `PATH` environment variable, your `JAVA_HOME` environment variable or install the most recent JDK.
+A working Java (Development Kit) 18 installation with Java FX support is required. In the command line (terminal in Linux, cmd in Windows) run `javac -version` and make sure that the reported version is Java 18 (e.g., `javac 18`). If `javac` is not found or a wrong version is reported, check your `PATH` environment variable, your `JAVA_HOME` environment variable or install the most recent JDK.
 
-[JavaFX is not part of the default JDK any more](https://www.reddit.com/r/java/comments/82qm9x/javafx_will_be_removed_from_the_java_jdk_in_jdk\_11/), it needs to be installed separately if not using a special JDK.
+[JavaFX is not part of the default JDK any more](https://www.reddit.com/r/java/comments/82qm9x/javafx\_will\_be\_removed\_from\_the\_java\_jdk\_in\_jdk\_11/), it needs to be installed separately if not using a special JDK.
 
-Download and install the JDK from [https://jdk.java.net/](https://jdk.java.net). Afterwards, download the "jmods" JavaFX 17 zip archive from [https://gluonhq.com/products/javafx/](https://gluonhq.com/products/javafx/) and put the `.jmod` files into `C:\Program Files\OpenJDK\jdk-17\jmods`.
+Download and install the JDK from [https://jdk.java.net/](https://jdk.java.net). Afterwards, download the "jmods" JavaFX 18 zip archive from [https://gluonhq.com/products/javafx/](https://gluonhq.com/products/javafx/) and put the `.jmod` files into `C:\Program Files\OpenJDK\jdk-18\jmods`.
 
 ### GitHub Account
 
@@ -41,7 +43,7 @@ Most developers, though, do not hide their email address. They use one which may
 Examples:
 
 * Same login as in GitHub (see above). Example: `koppor@gmail.com`
-* "`it`" in the name. Example:  `kopp.it@gmail.com`
+* "`it`" in the name. Example: `kopp.it@gmail.com`
 * Use the university login. Example: `st342435@stud.uni-stuttgart.de`
 
 ### git
@@ -54,7 +56,7 @@ It is strongly recommend that you have git installed.
 
 ### IDE
 
-We suggest [IntelliJ IDEA](https://www.jetbrains.com/idea/?from=jabref). For advanced users, [Eclipse](https://eclipse.org) (`2020-09` or newer) is also possible.
+We suggest [IntelliJ IDEA](https://www.jetbrains.com/idea/?from=jabref). For advanced users, [Eclipse](https://eclipse.org) (`2022-03` or newer) is also possible.
 
 #### IntelliJ
 
@@ -62,13 +64,13 @@ We recommend to install IntelliJ IDEA using [JetBrains Toolbox App](https://www.
 
 #### Eclipse
 
-On Ubuntu Linux, you can follow the [documentation from the Ubuntu Community](https://help.ubuntu.com/community/EclipseIDE#Download_Eclipse) or the [step-by-step guideline from Krizna](https://www.krizna.com/ubuntu/install-eclipse-in-ubuntu-12-04/) to install Eclipse. On Windows, download it from [www.eclipse.org](http://www.eclipse.org/downloads/) and run the installer.
+On Ubuntu Linux, you can follow the [documentation from the Ubuntu Community](https://help.ubuntu.com/community/EclipseIDE#Download\_Eclipse) or the [step-by-step guideline from Krizna](https://www.krizna.com/ubuntu/install-eclipse-in-ubuntu-12-04/) to install Eclipse. On Windows, download it from [www.eclipse.org](http://www.eclipse.org/downloads/) and run the installer.
 
-Eclipse JEE 2020-12 or newer is required.
+Eclipse JEE 2022-03 or newer is required.
 
 ### Other Tooling
 
-See our [tool recommendations](../readings-on-coding/tools.md).
+See our [tool recommendations](../code-howtos/tools.md).
 
 ## Get the code
 
@@ -83,16 +85,20 @@ This section explains how you get the JabRef code onto your machine in a form al
 
 ### Clone your forked repository on your local machine
 
-* In a command line, navigate to the folder where you want to place the source code (parent folder of `jabref/`). To prevent issues along the way, it is strongly recommend to choose a path that does not contain any special (non-ASCII or whitespace) characters.
+* In a command line, navigate to the folder where you want to place the source code (parent folder of `jabref/`). To prevent issues along the way, it is strongly recommend to choose a path that does not contain any special (non-ASCII or whitespace) characters. Note that placing jabref folder directly in the disk root directory may cause an error.  
 * Run `git clone --depth=10 https://github.com/YOUR_USERNAME/jabref.git`. The `--depth--10` is used to limit the download to \~20 MB instead of downloading the complete history (\~800 MB). If you want to dig in our commit history, feel free to download everything.
 * Go to the newly created jabref folder: `cd jabref`
-* Generate additional source code: `./gradlew assemble`
-* Start JabRef: `./gradlew run`
-  * The JabRef's GUI should now start up.
+
+### Create generate source code
+
+1. Generate additional source code: `./gradlew assemble` (on Windows: `gradlew assemble`)
+2. Source code should now reside in `src-gen`.
+3. Start JabRef: `./gradlew run`
+4. JabRef's GUI should now start up.
 
 ## Configure your IDE
 
-These steps are very important. They allow you to focus on the content and ensure that the code formatting always goes well. Did you know that [IntelliJ allows for reformatting selected code](https://www.jetbrains.com/help/idea/reformat-and-rearrange-code.html#reformat_code) if you press Ctrl + Alt + L?
+These steps are very important. They allow you to focus on the content and ensure that the code formatting always goes well. Did you know that [IntelliJ allows for reformatting selected code](https://www.jetbrains.com/help/idea/reformat-and-rearrange-code.html#reformat\_code) if you press <kbd>Ctrl</kbd> + <kbd>Alt</kbd> + <kbd>L</kbd>?
 
 ### Configuration of IntelliJ IDEA
 
@@ -100,19 +106,19 @@ IntelliJ IDEA fully supports Gradle as a build tool, but also has an internal bu
 
 To configure IntelliJ IDEA for developing JabRef, you should first ensure that you have enabled both bundled plugins _Gradle_ and _Gradle Extension_:
 
-* Navigate to **File | Settings | Plugins | Installed** and check that you have the _Gradle_ and _Gradle Extension_ enabled.
+* Navigate to **File > Settings > Plugins > Installed** and check that you have the _Gradle_ and _Gradle Extension_ enabled.
 
-After that, you can open `jabref/build.gradle` as a project. It is crucial that Java 17 is used consistently for the JabRef project which includes ensuring the right settings for your project structure, Gradle build, and run configurations.
+After that, you can open `jabref/build.gradle` as a project. It is crucial that Java 18 is used consistently for the JabRef project which includes ensuring the right settings for your project structure, Gradle build, and run configurations.
 
-Ensure you have a Java 17 SDK configured by navigating to **File | Project Structure | Platform Settings | SDKs**. If you don't have one, add a new Java JDK and point it to the location of a JDK 17. ![Project Settings](../.gitbook/assets/intellij-choose-jdk-adoptopenjdk-on-windows-project-settings.png)
+Ensure you have a Java 18 SDK configured by navigating to **File > Project Structure > Platform Settings > SDKs**. If you don't have one, add a new Java JDK and point it to the location of a JDK 18. ![Project Settings](../images/intellij-choose-jdk-adoptopenjdk-on-windows-project-settings.png)
 
-Navigate to **File | Project Structure | Project** and ensure that the projects' SDK is Java 17 ![Use JDK 17 as project SDK](../.gitbook/assets/intellij-choose-jdk15-project-default.png)
+Navigate to **File > Project Structure > Project** and ensure that the projects' SDK is Java 18 ![Use JDK 18 as project SDK](../images/intellij-choose-jdk15-project-default.png)
 
-Navigate to **File | Settings | Build, Execution, Deployment | Build Tools | Gradle** and select the "Project SDK" as the Gradle JVM at the bottom.
+Navigate to **File > Settings > Build, Execution, Deployment > Build Tools > Gradle** and select the "Project SDK" as the Gradle JVM at the bottom. If that does not exist, just select a JDK 18.
 
 To prepare IntelliJ's build system two additional steps are required:
 
-*   Navigate to **File | Settings | Build, Execution, Deployment | Compiler | Java Compiler**, and under "Override compiler parameters per-module" add (\[+]) the following compiler arguments for the `JabRef.main` module. Otherwise, you will get: `java: package com.sun.javafx.scene.control is not visible (package com.sun.javafx.scene.control is declared in module javafx.controls, which does not export it to module org.jabref)`
+*   Navigate to **File > Settings > Build, Execution, Deployment > Compiler > Java Compiler**, and under "Override compiler parameters per-module" add (\[+]) the following compiler arguments for the `JabRef.main` module. Otherwise, you will get: `java: package com.sun.javafx.scene.control is not visible (package com.sun.javafx.scene.control is declared in module javafx.controls, which does not export it to module org.jabref)`
 
     ```
      --add-exports=javafx.controls/com.sun.javafx.scene.control=org.jabref
@@ -120,32 +126,30 @@ To prepare IntelliJ's build system two additional steps are required:
     ```
 
     Note that you need to focus another UI element before pressing OK. Otherwise, the setting will be empty.
-*   Enable annotation processors by navigating to **File | Settings | Build, Execution, Deployment | Compiler | Annotation processors** and check "Enable annotation processing"
+*   Enable annotation processors by navigating to **File > Settings > Build, Execution, Deployment > Compiler > Annotation processors** and check "Enable annotation processing"
 
-    ![Enable annotation processing](<../.gitbook/assets/intellij-enable-annotation-processing (1).png>)
+    ![Enable annotation processing](../images/intellij-enable-annotation-processing.png)
 
 To have autoformat working properly in the context of line wrapping, "Wrap at right margin" has to be disabled as shown below. Details are found in [IntelliJ issue 240517](https://youtrack.jetbrains.com/issue/IDEA-240517).
 
-![](<../.gitbook/assets/intellij-wrap-at-right-margin (4) (4) (4) (1).png>)
+![](../images/intellij-wrap-at-right-margin.png)
 
 To enable "magic" creation and auto cleanup of imports, enable both "Add unambiguous imports on the fly" and "Optimize imports on the fly":
 
-![](../.gitbook/assets/grafik.png)
+![](../images/grafik.png)
 
-Source: [https://www.jetbrains.com/help/idea/creating-and-optimizing-imports.html#automatically-add-import-statements](https://www.jetbrains.com/help/idea/creating-and-optimizing-imports.html#automatically-add-import-statements)
+Source: <https://www.jetbrains.com/help/idea/creating-and-optimizing-imports.html#automatically-add-import-statements>.
 
 #### Using Gradle from within IntelliJ IDEA
 
 Ensuring JabRef builds with Gradle should always the first step because, e.g. it generates additional sources that are required for compiling the code. After adjusting all settings mentioned earlier, your first step should be to
 
-* Open the Gradle Tool Window with the small button that can usually be found on the right side of IDEA or navigate to **View | Tool Windows | Gradle**.
-*   In the Gradle Tool Window, press the "Reload All Gradle Projects" button to ensure that all settings are up-to-date
-
-    with the setting changes.
+* Open the Gradle Tool Window with the small button that can usually be found on the right side of IDEA or navigate to **View > Tool Windows > Gradle**.
+* In the Gradle Tool Window, press the "Reload All Gradle Projects" button to ensure that all settings are up-to-date with the setting changes.
 
 After that, you can use the Gradle Tool Window to build all parts JabRef and run it. To do so, expand the JabRef project in the Gradle Tool Window and navigate to Tasks. From there, you can
 
-* Build and run JabRef by double-clicking **JabRef | Tasks | application | run**.
+* Build and run JabRef by double-clicking **JabRef > Tasks > application > run**.
 
 After that a new entry called "jabref \[run]" will appear in the run configurations. Now you can also select "jabref \[run]" and either run or debug the application from within IntelliJ. You can run any other development task in a similar way. Equivalently, this can also be executed from the terminal by running `./gradlew run`.
 
@@ -153,38 +157,23 @@ After that a new entry called "jabref \[run]" will appear in the run configurati
 
 You should use IntelliJ IDEA's internal build system for compiling and running JabRef during development, because it is usually more responsive. Thereby, **it is important** that you understand that JabRef relies on generated sources which are only build through Gradle. Therefore, to build or update these dependencies you need to run the `assemble` Gradle task at least once.
 
-To use IntelliJ IDEA's internal build system when you build JabRef through **Build | Build Project** or use the provided "JabRef Main" run configuration, ensure that
+To use IntelliJ IDEA's internal build system when you build JabRef through **Build > Build Project** or use the provided "JabRef Main" run configuration, ensure that
 
-* In **File | Settings | Build, Execution, Deployment | Build Tools | Gradle** the setting "Build and run using" and "Test using" is set to "IntelliJ IDEA".
+* In **File > Settings > Build, Execution, Deployment > Build Tools > Gradle** the setting "Build and run using" and "Test using" is set to "IntelliJ IDEA".
 *   Ignore the Gradle project "buildSrc" by clicking the button **Select Project Data To Import** in the Gradle Tool Window and unchecking the folder "buildSrc".
 
-    ![Ignore the Gradle project "buildSrc"](<../.gitbook/assets/intellij-gradle-config-ignore-buildSrc (2) (2) (2) (3) (3) (6) (4).png>)
+    ![Ignore the Gradle project "buildSrc"](<../images/intellij-gradle-config-ignore-buildSrc.png>)
 * Add `src-gen` as root:
-  1. Right click on the project "jabref".  
-  2. Select "Open Module Settings"  
-  3. Expand "JabRef"  
-  4. Select "main"  
-  5. Select tab "Sources"  
-  6. Click "+ Add Content Root"  
-  7. Select the `src-gen` directory  
-  8. Click "OK". When expanding "main", "java" should have been selected as source  
+  1. Right click on the project "jabref".
+  2. Select "Open Module Settings"
+  3. Expand "JabRef"
+  4. Select "main"
+  5. Select tab "Sources"
+  6. Click "+ Add Content Root"
+  7. Select the `src-gen` directory
+  8. Click "OK". When expanding "main", "java" should have been selected as source
   9. Click "OK" to save the changes
 * In case the above step does not work, run with gradle, import gradle project again, and try again.
-* Delete `org.jabref.gui.logging.plugins.Log4jPlugins` (location: `src-gen/main/java/org/jabref/gui/logging/plugins/Log4jPlugins.java`). \
-  \
-  Hint: You can use Ctrl+Shift+N to search for the name `Log4jPlugins`.  After opening the file, you can use Alt+F1 and then Enter to focus the file in the project explorer. Then press Del and confirm with Enter. -- In case you find two files, delete both files. \
-  \
-  If the class is not deleted, you will see following error:
-
-```
-Error:java: Unable to create Plugin Service Class org.jabref.gui.logging.plugins.Log4jPlugins
-```
-
-or following error:
-
-```
-Error:(16, 25) java: package org.jabref.search does not exist
-```
 
 Essentially, you now have the best of both worlds: You can run Gradle tasks using the Gradle Tool Window and unless you haven't made changes to input files that generate sources, you can compile and run with IntelliJ's faster internal build system.
 
@@ -197,26 +186,26 @@ In case all steps are followed, and there are still issues with `SearchBaseVisit
 Contributions to JabRef's source code need to have a code formatting that is consistent with existing source code. For that purpose, JabRef provides code-style and check-style definitions.
 
 * Install the [CheckStyle-IDEA plugin](http://plugins.jetbrains.com/plugin/1065?pr=idea), it can be found via the plug-in repository:
-  1. Navigate to **File | Settings | Plugins | Marketplace** and search for "Checkstyle" and choose "CheckStyle-IDEA"
+  1. Navigate to **File > Settings > Plugins > Marketplace** and search for "Checkstyle" and choose "CheckStyle-IDEA"
   2. Close the settings afterwards and restart IntelliJ
-* Go to **File | Settings | Editor | Code Style**
+* Go to **File > Settings > Editor > Code Style**
 * Click on the settings wheel (next to the scheme chooser), then click "Import Scheme"
 * Select the IntelliJ configuration file `config/IntelliJ Code Style.xml`
 
 Finally, ensure that the checkstyle configuration file is in place:
 
-1. Go to **File | Settings | Tools | Checkstyle | Configuration File**
+1. Go to **File > Settings > Tools > Checkstyle > Configuration File**
 2. Import the CheckStyle configuration file by clicking the \[+] button
 3. For the description provide "JabRef"
 4. Click "Browse" and choose `config/checkstyle/checkstyle.xml`
 5. Click "Next" and "Finish"
 6. Activate the CheckStyle configuration file by ticking it in the list
-7. Ensure that the [latest CheckStyle version](https://checkstyle.org/releasenotes.html) is selected (8.36 or higher). 9.21 is required for Java 17.
+7. Ensure that the [latest CheckStyle version](https://checkstyle.org/releasenotes.html) is selected (8.36 or higher). 9.3 is required for Java 18.
 8. Set the "Scan Scope" to "Only Java sources (including tests)
 9. Save settings by clicking "OK"
 10. Your configuration should now look like this:
 
-    ![checkstyle settings](<../.gitbook/assets/intellij-checkstyle-settings (1).png>)
+    ![checkstyle settings](<../images/intellij-checkstyle-settings.png>)
 
 ### Setup for Eclipse
 
@@ -233,13 +222,10 @@ Make sure your Eclipse installation us up to date.
 4. Create a run/debug configuration for the main class `org.jabref.gui.JabRefLauncher` and/or for `org.jabref.gui.JabRefMain` (both can be used equivalently)
    *   Remark: The run/debug configuration needs to be added by right clicking the class (e.g. JabRefLauncher or JabRefMain) otherwise it will not work.
 
-       ![Creating the run/debug configuration by right clicking on the class](<../.gitbook/assets/eclipse-create-run-config (1) (3) (3) (4) (4) (3) (11).png>)
+       ![Creating the run/debug configuration by right clicking on the class](<../images/eclipse-create-run-config.png>)
    *   In the tab "Arguments" of the run/debug configuration, enter the following runtime VM arguments:
 
        ```
-          --patch-module test=fastparse_2.12-1.0.0.jar
-          --patch-module test2=fastparse-utils_2.12-1.0.0.jar
-          --patch-module test3=sourcecode_2.12-0.1.4.jar
           --add-exports javafx.controls/com.sun.javafx.scene.control=org.jabref
           --add-exports org.controlsfx.controls/impl.org.controlsfx.skin=org.jabref
           --add-exports javafx.graphics/com.sun.javafx.scene=org.controlsfx.controls
@@ -295,7 +281,7 @@ Got it running? GREAT! You are ready to lurk the code and contribute to JabRef.
 
 ### Java installation
 
-An indication that `JAVA_HOME` is not correctly set or no JDK 17 is installed is following error message:
+An indication that `JAVA_HOME` is not correctly set or no JDK 18 is installed is following error message:
 
 ```
 compileJava FAILED
@@ -346,9 +332,9 @@ This can include different modules.
 There might be problems with building if you have openjfx libraries in local maven repository, resulting in errors like this:
 
 ```
- > Could not find javafx-fxml-17-mac.jar (org.openjfx:javafx-fxml:17).
+ > Could not find javafx-fxml-18-mac.jar (org.openjfx:javafx-fxml:18).
      Searched in the following locations:
-         file:<your local maven repository path>/repository/org/openjfx/javafx-fxml/17/javafx-fxml-17-mac.jar
+         file:<your local maven repository path>/repository/org/openjfx/javafx-fxml/18/javafx-fxml-18-mac.jar
 ```
 
 As a workaround, you can remove all local openjfx artifacts by deleting the whole openjfx folder from specified location.
@@ -365,10 +351,11 @@ If that does not help:
 4. Execute `./gradlew run`
 5. Start IntelliJ and try again.
 
-### Issue with org/jabref/build/JournalAbbreviationConverter$\_convert_closure1$\_closure2.class is a duplicate but no duplicate handling strategy has been set
+### Issue with `_closure2.class is a duplicate but no duplicate handling strategy has been set`
 
 After changing the contents of `build.gradle`, on might get following error:
 
-`Entry org/jabref/build/JournalAbbreviationConverter$_convert_closure1$_closure2.class is a duplicate but no duplicate handling strategy has been set.`
+    Entry org/jabref/build/JournalAbbreviationConverter$_convert_closure1$_closure2.class is a duplicate but no duplicate handling strategy has been set.
 
-Currently, no "real" solution is known. One has to start from scratch (`git clean -xdf`, ...).
+Please update to the latest development code.
+We applied the workaround from <https://github.com/gradle/gradle/issues/17236#issuecomment-923074298>.
diff --git a/docs/getting-into-the-code/high-level-documentation.md b/docs/getting-into-the-code/high-level-documentation.md
index 84e5295ae70..315246f062d 100644
--- a/docs/getting-into-the-code/high-level-documentation.md
+++ b/docs/getting-into-the-code/high-level-documentation.md
@@ -1,10 +1,14 @@
+---
+parent: Getting into the code
+nav_order: 3
+---
 # High-level documentation
 
 This page describes relevant information about the code structure of JabRef precisely and succinctly. Closer-to-code documentation is available at [Code HowTos](code-howtos.md).
 
-We have been successfully transitioning from a spaghetti to a more structured architecture with the `model` in the center, and the `logic` as an intermediate layer towards the `gui` which is the outer shell. There are additional utility packages for `preferences` and the `cli`. The dependencies are only directed towards the center. We have JUnit tests to detect violations of the most crucial dependencies \(between `logic`, `model`, and `gui`\), and the build will fail automatically in these cases.
+We have been successfully transitioning from a spaghetti to a more structured architecture with the `model` in the center, and the `logic` as an intermediate layer towards the `gui` which is the outer shell. There are additional utility packages for `preferences` and the `cli`. The dependencies are only directed towards the center. We have JUnit tests to detect violations of the most crucial dependencies (between `logic`, `model`, and `gui`), and the build will fail automatically in these cases.
 
-The `model` represents the most important data structures \(`BibDatases`, `BibEntries`, `Events`, and related aspects\) and has only a little bit of logic attached. The `logic` is responsible for reading/writing/importing/exporting and manipulating the `model`, and it is structured often as an API the `gui` can call and use. Only the `gui` knows the user and his preferences and can interact with him to help him solve tasks. For each layer, we form packages according to their responsibility, i.e., vertical structuring. The `model` should have no dependencies to other classes of JabRef and the `logic` should only depend on `model` classes. The `cli` package bundles classes that are responsible for JabRef's command line interface. The `preferences` represents all information customizable by a user for her personal needs.
+The `model` represents the most important data structures (`BibDatases`, `BibEntries`, `Events`, and related aspects) and has only a little bit of logic attached. The `logic` is responsible for reading/writing/importing/exporting and manipulating the `model`, and it is structured often as an API the `gui` can call and use. Only the `gui` knows the user and his preferences and can interact with him to help him solve tasks. For each layer, we form packages according to their responsibility, i.e., vertical structuring. The `model` should have no dependencies to other classes of JabRef and the `logic` should only depend on `model` classes. The `cli` package bundles classes that are responsible for JabRef's command line interface. The `preferences` represents all information customizable by a user for her personal needs.
 
 We use an event bus to publish events from the `model` to the other layers. This allows us to keep the architecture but still react upon changes within the core in the outer layers.
 
@@ -14,7 +18,7 @@ You can view up-to-date diagrams for model, gui, and logic packages [at sourcesp
 
 Permitted dependencies in our architecture are:
 
-```text
+```
 gui --> logic --> model
 gui ------------> model
 gui ------------> preferences
@@ -31,9 +35,8 @@ cli ------------> global classes
 cli ------------> preferences
 ```
 
-All packages and classes which are currently not part of these packages \(we are still in the process of structuring\) are considered as gui classes from a dependency stand of view.
+All packages and classes which are currently not part of these packages (we are still in the process of structuring) are considered as gui classes from a dependency stand of view.
 
 ## Most Important Classes and their Relation
 
-Both GUI and CLI are started via the `JabRefMain` which will in turn call `JabRef` which then decides whether the GUI \(`JabRefFrame`\) or the CLI \(`JabRefCLI` and a lot of code in `JabRef`\) will be started. The `JabRefFrame` represents the Window which contains a `SidePane` on the left used for the fetchers/groups Each tab is a `BasePanel` which has a `SearchBar` at the top, a `MainTable` at the center and a `PreviewPanel` or an `EntryEditor` at the bottom. Any right click on the `MainTable` is handled by the `RightClickMenu`. Each `BasePanel` holds a `BibDatabaseContext` consisting of a `BibDatabase` and the `MetaData`, which are the only relevant data of the currently shown database. A `BibDatabase` has a list of `BibEntries`. Each `BibEntry` has an ID, a citation key and a key/value store for the fields with their values. Interpreted data \(such as the type or the file field\) is stored in the `TypedBibentry` type. The user can change the `JabRefPreferences` through the `PreferencesDialog`.
-
+Both GUI and CLI are started via the `JabRefMain` which will in turn call `JabRef` which then decides whether the GUI (`JabRefFrame`) or the CLI (`JabRefCLI` and a lot of code in `JabRef`) will be started. The `JabRefFrame` represents the Window which contains a `SidePane` on the left used for the fetchers/groups Each tab is a `BasePanel` which has a `SearchBar` at the top, a `MainTable` at the center and a `PreviewPanel` or an `EntryEditor` at the bottom. Any right click on the `MainTable` is handled by the `RightClickMenu`. Each `BasePanel` holds a `BibDatabaseContext` consisting of a `BibDatabase` and the `MetaData`, which are the only relevant data of the currently shown database. A `BibDatabase` has a list of `BibEntries`. Each `BibEntry` has an ID, a citation key and a key/value store for the fields with their values. Interpreted data (such as the type or the file field) is stored in the `TypedBibentry` type. The user can change the `JabRefPreferences` through the `PreferencesDialog`.
diff --git a/docs/getting-into-the-code/index.md b/docs/getting-into-the-code/index.md
new file mode 100644
index 00000000000..7104747e918
--- /dev/null
+++ b/docs/getting-into-the-code/index.md
@@ -0,0 +1,5 @@
+---
+nav_order: 5
+has_children: true
+---
+# Getting into the code
diff --git a/docs/getting-into-the-code/testing.md b/docs/getting-into-the-code/testing.md
deleted file mode 100644
index 4883c8e7c37..00000000000
--- a/docs/getting-into-the-code/testing.md
+++ /dev/null
@@ -1,28 +0,0 @@
-# How to test
-
-For details on unit testing see [https://devdocs.jabref.org/getting-into-the-code/code-howtos\#test-cases](https://devdocs.jabref.org/getting-into-the-code/code-howtos#test-cases).
-
-## Database tests
-
-### PostgreSQL
-
-To quickly host a local PostgreSQL database, execute following statement:
-
-```text
-docker run -d -e POSTGRES_USER=postgres -e POSTGRES_PASSWORD=postgres -e POSTGRES_DB=postgres -p 5432:5432 --name db postgres:10 postgres -c log_statement=all
-```
-
-Set the environment variable `DBMS` to `postgres` \(or leave it unset\)
-
-Then, all DBMS Tests \(annotated with `@org.jabref.testutils.category.DatabaseTest`\) run properly.
-
-### MySQL
-
-A MySQL DBMS can be started using following command:
-
-```text
-docker run -e MYSQL_ROOT_PASSWORD=root -e MYSQL_DATABASE=jabref -p 3800:3307 mysql:8.0 --port=3307
-```
-
-Set the environment variable `DBMS` to `mysql`.
-
diff --git a/docs/.gitbook/assets/eclipse-create-run-config (1) (3) (3) (4) (4) (3) (1).png b/docs/images/eclipse-create-run-config.png
similarity index 100%
rename from docs/.gitbook/assets/eclipse-create-run-config (1) (3) (3) (4) (4) (3) (1).png
rename to docs/images/eclipse-create-run-config.png
diff --git a/docs/images/github-flow (1).png b/docs/images/github-flow (1).png
deleted file mode 100644
index dc9fdeb82bc..00000000000
Binary files a/docs/images/github-flow (1).png and /dev/null differ
diff --git a/docs/.gitbook/assets/grafik.png b/docs/images/grafik.png
similarity index 100%
rename from docs/.gitbook/assets/grafik.png
rename to docs/images/grafik.png
diff --git a/docs/.gitbook/assets/intellij-checkstyle-settings.png b/docs/images/intellij-checkstyle-settings.png
similarity index 100%
rename from docs/.gitbook/assets/intellij-checkstyle-settings.png
rename to docs/images/intellij-checkstyle-settings.png
diff --git a/docs/.gitbook/assets/intellij-choose-jdk-adoptopenjdk-on-windows-project-settings.png b/docs/images/intellij-choose-jdk-adoptopenjdk-on-windows-project-settings.png
similarity index 100%
rename from docs/.gitbook/assets/intellij-choose-jdk-adoptopenjdk-on-windows-project-settings.png
rename to docs/images/intellij-choose-jdk-adoptopenjdk-on-windows-project-settings.png
diff --git a/docs/.gitbook/assets/intellij-choose-jdk15-project-default.png b/docs/images/intellij-choose-jdk15-project-default.png
similarity index 100%
rename from docs/.gitbook/assets/intellij-choose-jdk15-project-default.png
rename to docs/images/intellij-choose-jdk15-project-default.png
diff --git a/docs/.gitbook/assets/intellij-enable-annotation-processing.png b/docs/images/intellij-enable-annotation-processing.png
similarity index 100%
rename from docs/.gitbook/assets/intellij-enable-annotation-processing.png
rename to docs/images/intellij-enable-annotation-processing.png
diff --git a/docs/.gitbook/assets/intellij-gradle-config-ignore-buildSrc (2) (2) (2) (3) (3) (6) (4).png b/docs/images/intellij-gradle-config-ignore-buildSrc.png
similarity index 100%
rename from docs/.gitbook/assets/intellij-gradle-config-ignore-buildSrc (2) (2) (2) (3) (3) (6) (4).png
rename to docs/images/intellij-gradle-config-ignore-buildSrc.png
diff --git a/docs/.gitbook/assets/intellij-gradle-config.png b/docs/images/intellij-gradle-config.png
similarity index 100%
rename from docs/.gitbook/assets/intellij-gradle-config.png
rename to docs/images/intellij-gradle-config.png
diff --git a/docs/.gitbook/assets/intellij-wrap-at-right-margin (4) (4) (4) (1).png b/docs/images/intellij-wrap-at-right-margin.png
similarity index 100%
rename from docs/.gitbook/assets/intellij-wrap-at-right-margin (4) (4) (4) (1).png
rename to docs/images/intellij-wrap-at-right-margin.png
diff --git a/docs/images/layers-v1.svg b/docs/images/layers-v1.svg
new file mode 100644
index 00000000000..f9b8239d504
--- /dev/null
+++ b/docs/images/layers-v1.svg
@@ -0,0 +1,915 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="196.37332mm"
+   height="148.27042mm"
+   viewBox="0 0 196.37331 148.27042"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
+   sodipodi:docname="layers-v1.svg"
+   inkscape:export-filename="/home/antalk/d/tmp/jabref/jabref-src/jabref/docs/openoffice/layers-v1.png"
+   inkscape:export-xdpi="150"
+   inkscape:export-ydpi="150">
+  <defs
+     id="defs2">
+    <marker
+       inkscape:isstock="true"
+       style="overflow:visible"
+       id="marker23233"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="Arrow2Mend">
+      <path
+         transform="scale(-0.6)"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         style="fill:#800000;fill-opacity:1;fill-rule:evenodd;stroke:#800000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         id="path23231"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker22945"
+       style="overflow:visible"
+       inkscape:isstock="true"
+       inkscape:collect="always">
+      <path
+         inkscape:connector-curvature="0"
+         id="path22943"
+         style="fill:#800000;fill-opacity:1;fill-rule:evenodd;stroke:#800000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="scale(-0.6)" />
+    </marker>
+    <marker
+       inkscape:isstock="true"
+       style="overflow:visible"
+       id="marker22849"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="Arrow2Mend"
+       inkscape:collect="always">
+      <path
+         transform="scale(-0.6)"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         style="fill:#008080;fill-opacity:1;fill-rule:evenodd;stroke:#008080;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         id="path22847"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:isstock="true"
+       style="overflow:visible"
+       id="marker12261"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="DotM">
+      <path
+         transform="matrix(0.4,0,0,0.4,2.96,0.4)"
+         style="fill:#0000ff;fill-opacity:1;fill-rule:evenodd;stroke:#0000ff;stroke-width:1.00000003pt;stroke-opacity:1"
+         d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+         id="path12259"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Mend"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path1380"
+         style="fill:#008080;fill-opacity:1;fill-rule:evenodd;stroke:#008080;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="scale(-0.6)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Mend-5"
+       style="overflow:visible"
+       inkscape:isstock="true"
+       inkscape:collect="always">
+      <path
+         inkscape:connector-curvature="0"
+         id="path1380-0"
+         style="fill:#0000ff;fill-opacity:1;fill-rule:evenodd;stroke:#0000ff;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="scale(-0.6)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Mend-5-4"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         inkscape:connector-curvature="0"
+         id="path1380-0-6"
+         style="fill:#0000ff;fill-opacity:1;fill-rule:evenodd;stroke:#0000ff;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="scale(-0.6)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Mend-5-4-5"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         inkscape:connector-curvature="0"
+         id="path1380-0-6-8"
+         style="fill:#0000ff;fill-opacity:1;fill-rule:evenodd;stroke:#0000ff;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="scale(-0.6)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Mend-5-2"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         inkscape:connector-curvature="0"
+         id="path1380-0-8"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="scale(-0.6)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Mend-5-4-5-7"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         inkscape:connector-curvature="0"
+         id="path1380-0-6-8-2"
+         style="fill:#0000ff;fill-opacity:1;fill-rule:evenodd;stroke:#0000ff;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="scale(-0.6)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Mend-5-4-5-7-0"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         inkscape:connector-curvature="0"
+         id="path1380-0-6-8-2-6"
+         style="fill:#0000ff;fill-opacity:1;fill-rule:evenodd;stroke:#0000ff;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="scale(-0.6)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Mend-5-4-5-7-0-9"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         inkscape:connector-curvature="0"
+         id="path1380-0-6-8-2-6-9"
+         style="fill:#0000ff;fill-opacity:1;fill-rule:evenodd;stroke:#0000ff;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="scale(-0.6)" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.3742956"
+     inkscape:cx="371.09919"
+     inkscape:cy="280.19606"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer3"
+     showgrid="false"
+     inkscape:window-width="1567"
+     inkscape:window-height="1051"
+     inkscape:window-x="33"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:snap-to-guides="true"
+     inkscape:snap-nodes="true"
+     inkscape:snap-global="false"
+     inkscape:snap-bbox="true"
+     inkscape:snap-others="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:object-paths="false"
+     fit-margin-top="1"
+     fit-margin-left="1"
+     fit-margin-bottom="1"
+     fit-margin-right="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid1005"
+       originx="35.135016"
+       originy="-149.08581" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(35.135016,0.3562198)"
+     style="display:inline" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="input types from GUI"
+     transform="translate(43.194071,32.504535)">
+    <rect
+       style="display:inline;opacity:0.95099996;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#050c13;stroke-width:0.0934983;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect815-0"
+       width="137.11093"
+       height="18.246836"
+       x="-36.951267"
+       y="88.201111"
+       ry="1.5206668" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.3499999px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.95249993px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="-34.28867"
+       y="95.510643"
+       id="text819-4"><tspan
+         sodipodi:role="line"
+         id="tspan817-8"
+         x="-34.28867"
+         y="95.510643"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.3499999px;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.95249993px">document content (UNO)</tspan></text>
+    <rect
+       style="display:inline;opacity:0.95099996;fill:#faffbf;fill-opacity:1;fill-rule:evenodd;stroke:#050c13;stroke-width:0.0934983;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect815-7"
+       width="183.09265"
+       height="18.246836"
+       x="-36.951267"
+       y="42.731419"
+       ry="1.5206668" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.3499999px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.95249993px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="-34.388443"
+       y="49.346863"
+       id="text819-7"><tspan
+         sodipodi:role="line"
+         id="tspan817-6"
+         x="-34.388443"
+         y="49.346863"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.3499999px;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.95249993px">frontend</tspan></text>
+    <rect
+       style="display:inline;opacity:0.95099996;fill:#faffbf;fill-opacity:1;fill-rule:evenodd;stroke:#050c13;stroke-width:0.0934983;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect815-3"
+       width="183.09265"
+       height="18.092909"
+       x="-36.951267"
+       y="18.918875"
+       ry="1.5206668" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.3499999px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.95249993px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="-33.746418"
+       y="25.709284"
+       id="text819-0"><tspan
+         sodipodi:role="line"
+         id="tspan817-3"
+         x="-33.746418"
+         y="25.709284"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.3499999px;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.95249993px">actions</tspan></text>
+    <rect
+       style="display:inline;opacity:0.95099996;fill:#faffbf;fill-opacity:1;fill-rule:evenodd;stroke:#050c13;stroke-width:0.0934983;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect815-3-92"
+       width="183.09265"
+       height="18.246807"
+       x="-36.951267"
+       y="-4.8935795"
+       ry="1.5206668" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.3499999px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.58437586px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="-33.732162"
+       y="2.6568017"
+       id="text819-0-24"><tspan
+         sodipodi:role="line"
+         id="tspan817-3-7"
+         x="-33.732162"
+         y="2.6568017"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.3499999px;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.58437586px">OOBibBase2</tspan></text>
+    <rect
+       style="display:inline;opacity:0.95099996;fill:#faffbf;fill-opacity:1;fill-rule:evenodd;stroke:#050c13;stroke-width:0.0934983;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect815"
+       width="43.554756"
+       height="18.246836"
+       x="-36.951267"
+       y="65.87645"
+       ry="1.5206668" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.3499999px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.95249993px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="-34.073212"
+       y="72.666855"
+       id="text819"><tspan
+         sodipodi:role="line"
+         id="tspan817"
+         x="-34.073212"
+         y="72.666855"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.3499999px;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.95249993px">backend</tspan></text>
+    <rect
+       style="display:inline;opacity:0.95099996;fill:#faffbf;fill-opacity:1;fill-rule:evenodd;stroke:#050c13;stroke-width:0.0934983;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect815-3-9"
+       width="42.948044"
+       height="18.421999"
+       x="103.19336"
+       y="65.538101"
+       ry="1.5206668" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.3499999px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.95249993px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="105.23129"
+       y="71.803619"
+       id="text819-0-2"><tspan
+         sodipodi:role="line"
+         id="tspan817-3-5"
+         x="105.23129"
+         y="71.803619"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.3499999px;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.95249993px">style</tspan></text>
+    <rect
+       style="display:inline;opacity:0.95099996;fill:#faffbf;fill-opacity:1;fill-rule:evenodd;stroke:#050c13;stroke-width:0.0934983;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect815-3-0"
+       width="42.53968"
+       height="18.58371"
+       x="56.849758"
+       y="65.538101"
+       ry="1.5206668" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.3499999px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.56307739px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="58.016205"
+       y="72.297386"
+       id="text819-0-5"><tspan
+         sodipodi:role="line"
+         id="tspan817-3-9"
+         x="58.016205"
+         y="72.297386"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.3499999px;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.56307739px">OOTextIntoOO</tspan></text>
+    <rect
+       style="display:inline;opacity:0.95099996;fill:#faffbf;fill-opacity:1;fill-rule:evenodd;stroke:#050c13;stroke-width:0.0934983;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect815-3-0-5"
+       width="42.53968"
+       height="18.246838"
+       x="11.159797"
+       y="65.87645"
+       ry="1.5206668" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.3499999px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.56307739px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="13.376028"
+       y="72.285805"
+       id="text819-0-5-4"><tspan
+         sodipodi:role="line"
+         id="tspan817-3-9-8"
+         x="13.376028"
+         y="72.285805"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.3499999px;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.56307739px">rangesort</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.07999992px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#808080;fill-opacity:1;stroke:none;stroke-width:0.47624996px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="-34.005562"
+       y="79.155693"
+       id="text1267"><tspan
+         sodipodi:role="line"
+         id="tspan1265"
+         x="-34.005562"
+         y="79.155693"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.07999992px;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#808080;stroke-width:0.47624996px">data in doc, ranges</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.07999992px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#808080;fill-opacity:1;stroke:none;stroke-width:0.47624996px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="13.409392"
+       y="79.155708"
+       id="text1271"><tspan
+         sodipodi:role="line"
+         id="tspan1269"
+         x="13.409392"
+         y="79.155708"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.07999992px;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#808080;stroke-width:0.47624996px">order ranges</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.07999992px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#808080;fill-opacity:1;stroke:none;stroke-width:0.47624996px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="59.052654"
+       y="78.796471"
+       id="text1271-6"><tspan
+         sodipodi:role="line"
+         id="tspan1269-8"
+         x="59.052654"
+         y="78.796471"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.07999992px;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#808080;stroke-width:0.47624996px">fill ranges</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.07999992px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#808080;fill-opacity:1;stroke:none;stroke-width:0.47624996px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="104.82719"
+       y="78.271584"
+       id="text1271-6-0"><tspan
+         sodipodi:role="line"
+         id="tspan1269-8-2"
+         x="104.82719"
+         y="78.271584"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.07999992px;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#808080;stroke-width:0.47624996px">markup text</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.07999992px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#800000;fill-opacity:1;stroke:none;stroke-width:0.47624996px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="5.3610897"
+       y="1.997059"
+       id="text1311"><tspan
+         sodipodi:role="line"
+         id="tspan1309"
+         x="5.3610897"
+         y="1.997059"
+         style="fill:#800000;stroke-width:0.47624996px">XTextDocument</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.07999992px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#800000;fill-opacity:1;stroke:none;stroke-width:0.47624996px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="-7.5290732"
+       y="49.346863"
+       id="text1311-1"><tspan
+         sodipodi:role="line"
+         id="tspan1309-0"
+         x="-7.5290732"
+         y="49.346863"
+         style="fill:#800000;stroke-width:0.47624996px">Backend, CitationGroups</tspan></text>
+    <rect
+       style="display:inline;opacity:0.95099996;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#808080;stroke-width:0.18000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3976"
+       width="194.19331"
+       height="146.09041"
+       x="-42.104073"
+       y="-31.414536"
+       ry="2.7845526" />
+    <g
+       id="g24116"
+       transform="matrix(1.8,0,0,1.8,-43.994071,-35.209536)">
+      <rect
+         ry="0.8448149"
+         y="36.683681"
+         x="12.384912"
+         height="10.137131"
+         width="76.172737"
+         id="rect815-0-9"
+         style="display:inline;opacity:0.95099996;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#050c13;stroke-width:0.0519435;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         transform="translate(-8.0590546,-32.148314)" />
+      <text
+         id="text1311-5-3"
+         y="8.3449545"
+         x="5.0887189"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.82222223px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         xml:space="preserve"><tspan
+           style="fill:#000000;stroke-width:0.26458332px"
+           y="8.3449545"
+           x="5.0887189"
+           id="tspan1309-1-4"
+           sodipodi:role="line">GUI:</tspan></text>
+      <text
+         id="text1311-5-3-0"
+         y="8.3449545"
+         x="12.73384"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.82222223px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#800000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         xml:space="preserve"><tspan
+           style="fill:#800000;stroke-width:0.26458332px"
+           y="8.3449545"
+           x="12.73384"
+           id="tspan1309-1-4-3"
+           sodipodi:role="line">BibEntry, BibDatabase, OOBibStyle</tspan></text>
+      <text
+         id="text23892"
+         y="12.762286"
+         x="13.195879"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.82222223px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#666666;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         xml:space="preserve"><tspan
+           style="fill:#666666;stroke-width:0.26458332px"
+           y="12.762286"
+           x="13.195879"
+           id="tspan23890"
+           sodipodi:role="line">provides input in terms of these types </tspan></text>
+    </g>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.07999992px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#666666;fill-opacity:1;stroke:none;stroke-width:0.47624996px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="41.337749"
+       y="1.8470242"
+       id="text23892-9"><tspan
+         sodipodi:role="line"
+         id="tspan23890-6"
+         x="41.337749"
+         y="1.8470242"
+         style="fill:#666666;stroke-width:0.47624996px">provides connection to doc</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.03525543px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000080;fill-opacity:1;stroke:none;stroke-width:0.3783052px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="-10.485328"
+       y="25.316629"
+       id="text24120"><tspan
+         sodipodi:role="line"
+         id="tspan24118"
+         x="-10.485328"
+         y="25.316629"
+         style="fill:#000080;stroke-width:0.3783052px">Cite, Update, Merge, Separate, Manage, Export</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.03525543px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000080;fill-opacity:1;stroke:none;stroke-width:0.3783052px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="5.7747917"
+       y="8.5604258"
+       id="text24120-9"><tspan
+         sodipodi:role="line"
+         id="tspan24118-8"
+         x="5.7747917"
+         y="8.5604258"
+         style="fill:#000080;stroke-width:0.3783052px">Connect</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.03525543px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000080;fill-opacity:1;stroke:none;stroke-width:0.3783052px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="105.53105"
+       y="82.529007"
+       id="text24120-9-7"><tspan
+         sodipodi:role="line"
+         id="tspan24118-8-2"
+         x="105.53105"
+         y="82.529007"
+         style="fill:#000080;stroke-width:0.3783052px">Load Style</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.27971148px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#666666;fill-opacity:1;stroke:none;stroke-width:0.40996245px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="101.04594"
+       y="-0.62424481"
+       id="text23892-9-3"><tspan
+         sodipodi:role="line"
+         id="tspan1163"
+         x="101.04594"
+         y="-0.62424481"
+         style="stroke-width:0.40996245px">Create OOFrontend instance</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.27971148px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#666666;fill-opacity:1;stroke:none;stroke-width:0.40996245px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="101.04594"
+       y="10.582888"
+       id="text23892-9-3-8"><tspan
+         sodipodi:role="line"
+         id="tspan1169"
+         x="101.04594"
+         y="10.582888"
+         style="stroke-width:0.40996245px">Catch exceptions, Undo</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.27971148px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#666666;fill-opacity:1;stroke:none;stroke-width:0.40996245px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="101.1116"
+       y="6.8471761"
+       id="text23892-9-3-6"><tspan
+         sodipodi:role="line"
+         id="tspan1167"
+         x="101.1116"
+         y="6.8471761"
+         style="stroke-width:0.40996245px">Forward requests to actions</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.27971148px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#666666;fill-opacity:1;stroke:none;stroke-width:0.40996245px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="101.04594"
+       y="3.1114674"
+       id="text23892-9-3-09"><tspan
+         sodipodi:role="line"
+         id="tspan1165"
+         x="101.04594"
+         y="3.1114674"
+         style="stroke-width:0.40996245px">Check preconditions</tspan></text>
+    <g
+       id="g1267"
+       transform="matrix(2.3623607,0,0,2.3623607,-52.083935,-66.373795)">
+      <text
+         id="text23892-9-3-0-0-7"
+         y="57.031704"
+         x="17.883856"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:1.06682765px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#666666;fill-opacity:1;stroke:none;stroke-width:0.13335297px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         xml:space="preserve"><tspan
+           style="stroke-width:0.13335297px"
+           y="57.031704"
+           x="17.883856"
+           id="tspan1217"
+           sodipodi:role="line">locations</tspan></text>
+      <text
+         id="text23892-9-3-0-0-7-4"
+         y="57.961243"
+         x="17.879168"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:1.06683528px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#666666;fill-opacity:1;stroke:none;stroke-width:0.13335297px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         xml:space="preserve"><tspan
+           y="57.961243"
+           x="17.879168"
+           id="tspan1257"
+           sodipodi:role="line">citation keys</tspan></text>
+      <text
+         id="text23892-9-3-0-0-7-2"
+         y="59.820324"
+         x="17.919277"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:1.06682765px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#666666;fill-opacity:1;stroke:none;stroke-width:0.13335297px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         xml:space="preserve"><tspan
+           style="stroke-width:0.13335297px"
+           y="59.820324"
+           x="17.919277"
+           id="tspan1221"
+           sodipodi:role="line">pageInfo</tspan></text>
+      <text
+         id="text23892-9-3-0-0-7-4-1"
+         y="58.890785"
+         x="17.879168"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:1.06683528px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#666666;fill-opacity:1;stroke:none;stroke-width:0.13335297px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         xml:space="preserve"><tspan
+           y="58.890785"
+           x="17.879168"
+           id="tspan1255"
+           sodipodi:role="line">citation type</tspan></text>
+    </g>
+    <g
+       id="g1649"
+       transform="matrix(1.1450969,0,0,1.1450969,-21.072094,-10.046352)">
+      <text
+         id="text23892-9-3-0"
+         y="68.140526"
+         x="122.66064"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:1.76829851px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#666666;fill-opacity:1;stroke:none;stroke-width:0.22103475px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         xml:space="preserve"><tspan
+           y="68.140526"
+           x="122.66064"
+           id="tspan1624"
+           sodipodi:role="line">lookup, localOrder, number,</tspan></text>
+      <text
+         id="text23892-9-3-0-8"
+         y="69.955353"
+         x="122.71158"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:1.76829851px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#666666;fill-opacity:1;stroke:none;stroke-width:0.22103477px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         xml:space="preserve"><tspan
+           y="69.955353"
+           x="122.71158"
+           id="tspan1626"
+           sodipodi:role="line">uniqueLetter, sort bibliography,</tspan></text>
+      <text
+         id="text23892-9-3-0-2"
+         y="71.77018"
+         x="122.6451"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:1.76829851px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#666666;fill-opacity:1;stroke:none;stroke-width:0.22103477px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         xml:space="preserve"><tspan
+           y="71.77018"
+           x="122.6451"
+           id="tspan1628"
+           sodipodi:role="line">format citationMarkers,</tspan><tspan
+           y="73.980553"
+           x="122.6451"
+           id="tspan1630"
+           sodipodi:role="line"></tspan><tspan
+           y="76.190926"
+           x="122.6451"
+           id="tspan1632"
+           sodipodi:role="line"></tspan></text>
+      <text
+         id="text23892-9-3-0-08"
+         y="73.585007"
+         x="122.6451"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:1.76829851px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#666666;fill-opacity:1;stroke:none;stroke-width:0.22103477px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         xml:space="preserve"><tspan
+           y="73.585007"
+           x="122.6451"
+           id="tspan1634"
+           sodipodi:role="line">format bibliography</tspan><tspan
+           y="75.79538"
+           x="122.6451"
+           id="tspan1636"
+           sodipodi:role="line"></tspan></text>
+    </g>
+    <g
+       id="g1680"
+       transform="translate(0.08711402,5.2268409)">
+      <text
+         id="text23892-9-3-0-0"
+         y="74.441177"
+         x="40.053444"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.22595716px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#666666;fill-opacity:1;stroke:none;stroke-width:0.27824375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         xml:space="preserve"><tspan
+           y="74.441177"
+           x="40.053444"
+           id="tspan1674"
+           sodipodi:role="line">or visually</tspan></text>
+      <text
+         id="text23892-9-3-0-0-5"
+         y="72.313141"
+         x="40.114311"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.22595716px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#666666;fill-opacity:1;stroke:none;stroke-width:0.27824375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         xml:space="preserve"><tspan
+           y="72.313141"
+           x="40.114311"
+           id="tspan1672"
+           sodipodi:role="line">within XText</tspan></text>
+    </g>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.22595716px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#666666;fill-opacity:1;stroke:none;stroke-width:0.27824375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="47.68161"
+       y="54.36618"
+       id="text23892-9-3-0-0-8"><tspan
+         y="54.36618"
+         x="47.68161"
+         id="tspan1713"
+         sodipodi:role="line">checkRangeOverlaps, checkRangeOverlapsWithCursor</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.07999992px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#666666;fill-opacity:1;stroke:none;stroke-width:0.27824375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="47.292217"
+       y="49.346863"
+       id="text23892-9-3-0-0-5-7"><tspan
+         sodipodi:role="line"
+         id="tspan1741"
+         x="47.292217"
+         y="49.346863">connects the parts below</tspan></text>
+    <text
+       id="text23892-9-3-0-0-8-0"
+       y="56.857639"
+       x="47.691391"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.22595716px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#666666;fill-opacity:1;stroke:none;stroke-width:0.27824375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       xml:space="preserve"><tspan
+         sodipodi:role="line"
+         id="tspan1739"
+         x="47.691391"
+         y="56.857639">getVisuallySortedCitationGroups, imposeGlobalOrder</tspan></text>
+    <text
+       id="text23892-9-3-0-0-8-0-8"
+       y="59.349098"
+       x="47.745735"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.22595716px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#666666;fill-opacity:1;stroke:none;stroke-width:0.27824375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       xml:space="preserve"><tspan
+         sodipodi:role="line"
+         id="tspan1761"
+         x="47.745735"
+         y="59.349098">UpdateCitationMarkers, UpdateBibliography</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.27971172px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#666666;fill-opacity:1;stroke:none;stroke-width:0.40996245px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="69.50473"
+       y="30.303537"
+       id="text23892-9-3-8-3"><tspan
+         sodipodi:role="line"
+         id="tspan1169-1"
+         x="69.50473"
+         y="30.303537"
+         style="stroke-width:0.40996245px">lock screen refresh</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.02166653px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#666666;fill-opacity:1;stroke:none;stroke-width:0.47624996px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="69.422882"
+       y="25.316629"
+       id="text23892-9-1"><tspan
+         sodipodi:role="line"
+         id="tspan23890-6-0"
+         x="69.422882"
+         y="25.316629"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.02166653px;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#666666;stroke-width:0.47624996px">GUI-independent part of actions  </tspan></text>
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="arrows"
+     style="display:none"
+     transform="translate(43.194071,32.504535)">
+    <path
+       transform="translate(-8.0590546,-32.148314)"
+       style="opacity:0.281;fill:none;fill-rule:evenodd;stroke:#0000ff;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Mend-5)"
+       d="m 36.221557,52.941103 4.901789,26.370295"
+       id="path1351-6"
+       inkscape:connector-type="polyline"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cscc" />
+    <path
+       style="opacity:0.831;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#008080;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#marker22849)"
+       d="m 38.683752,47.078685 c 0,0 -8.222514,20.338553 -0.82387,21.328016 7.530373,1.00708 3.825198,-21.328016 3.825198,-21.328016"
+       id="path22797"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="csc" />
+    <path
+       style="opacity:0.92400004;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#eab200;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 42.288901,47.331044 c 0,0 5.685408,2.324298 11.149094,2.831158 5.982552,0.554995 13.150037,1.290116 19.143428,1.675056 6.202436,0.398367 17.791829,4.412147 17.791829,4.412147"
+       id="path22929"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cssc" />
+    <path
+       style="opacity:0.92400004;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#eab200;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 68.530268,10.229075 c 0.680366,20.154564 1.911289,39.872118 21.509503,45.853587"
+       id="path22931"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="opacity:0.92400004;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#eab200;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#marker22945)"
+       d="m 90.22196,56.244317 c 0,0 13.65994,5.692759 2.850421,-1.858969 C 82.262861,46.83362 45.234912,47.321266 45.234912,47.321266"
+       id="path22935"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="czc" />
+    <path
+       style="opacity:0.59200003;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#800000;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#marker23233)"
+       d="m 50.192161,45.462298 c 0,0 9.653711,6.442461 12.496099,12.348956 1.612217,3.350196 2.87138,11.074053 2.87138,11.074053"
+       id="path23223"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="csc" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.11666656px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;opacity:0.44100001;fill:#0000ff;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="28.086821"
+       y="23.816538"
+       id="text23549"><tspan
+         sodipodi:role="line"
+         id="tspan23547"
+         x="28.086821"
+         y="23.816538"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.11666656px;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#0000ff;stroke:none;stroke-width:0.26458332px">1. collect data from doc</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.11666656px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;opacity:0.76099997;fill:#008080;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="37.152584"
+       y="54.202911"
+       id="text23549-8"><tspan
+         sodipodi:role="line"
+         id="tspan23575"
+         x="37.152584"
+         y="54.202911">2. globalOrder</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.11666656px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;opacity:0.76099997;fill:#c88c00;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="43.655754"
+       y="51.507404"
+       id="text23549-8-3"><tspan
+         sodipodi:role="line"
+         id="tspan23595"
+         x="43.655754"
+         y="51.507404">3. markup</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.11666656px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;opacity:0.76099997;fill:#800000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="51.346542"
+       y="45.947517"
+       id="text23549-8-3-1"><tspan
+         sodipodi:role="line"
+         id="tspan23615"
+         x="51.346542"
+         y="45.947517">4. write</tspan></text>
+    <text
+       transform="translate(-8.0590546,-32.148314)"
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.82222223px;line-height:125%;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#800000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="60.034172"
+       y="40.913937"
+       id="text1311-5"><tspan
+         sodipodi:role="line"
+         id="tspan1309-1"
+         x="60.034172"
+         y="40.913937"
+         style="fill:#800000;stroke-width:0.26458332px">BibDatabase, OOBibStyle</tspan></text>
+  </g>
+</svg>
diff --git a/docs/index.md b/docs/index.md
new file mode 100644
index 00000000000..67f401f0509
--- /dev/null
+++ b/docs/index.md
@@ -0,0 +1,56 @@
+---
+nav_order: 1
+---
+# Overview on Developing JabRef
+
+This page presents all development information around JabRef.
+In case you are a end user, please head to the [user documentation](https://docs.jabref.org) or to the [general homepage](https://www.jabref.org) of JabRef.
+
+## Starting point for new developers
+
+On the page [Setting up a local workspace](https://devdocs.jabref.org/getting-into-the-code/guidelines-for-setting-up-a-local-workspace), we wrote about the initial steps to get your IDE running.
+We strongly recommend to continue reading there.
+After you successfully cloned and build JabRef, you are invited to continue reading here.
+
+## How tos
+
+* External: [Sync your fork with the JabRef repository](https://help.github.com/articles/syncing-a-fork/)
+* External (🇩🇪): Branches and pull requests: [https://github.com/unibas-marcelluethi/software-engineering/blob/master/docs/week2/exercises/practical-exercises.md](https://github.com/unibas-marcelluethi/software-engineering/blob/master/docs/week2/exercises/practical-exercises.md)
+
+## Teaching Exercises
+
+We are very happy that JabRef is part of [Software Engineering](https://en.wikipedia.org/wiki/Software\_engineering) trainings. Please head to [Teaching](teaching.md) for more information on using JabRef as a teaching object and on previous courses where JabRef was used.
+
+## Miscellaneous Hints
+
+### Command Line
+
+The package `org.jabref.cli` is responsible for handling the command line options.
+
+During development, one can configure IntelliJ to pass command line parameters:
+
+![IntelliJ-run-configuration](<images/intellij-run-configuration-command-line.png>)
+
+Passing command line arguments using gradle is currently not possible as all arguments (such as `-Dfile.encoding=windows-1252`) are passed to the application.
+
+Without jlink, it is not possible to generate a fat jar any more. During development, the capabilities of the IDE has to be used.
+
+### Groups
+
+Diagram showing aspects of groups: [Groups.uml](https://github.com/JabRef/jabref/tree/3b3716b1e05a0d3273c886e102a8efe5e96472e0/docs/Groups.uml).
+
+## Architectural Decision Records
+
+[Architectural decisions for JabRef](adr.md) are recorded.
+
+For new ADRs, please use [template.md](https://github.com/JabRef/jabref/tree/3b3716b1e05a0d3273c886e102a8efe5e96472e0/docs/adr/template.md) as basis. More information on MADR is available at [https://adr.github.io/madr/](https://adr.github.io/madr/). General information about architectural decision records is available at [https://adr.github.io/](https://adr.github.io). Add them to the [list of architectural decision records](adr.md).
+
+## FAQ
+
+*   Q: I get `java: package org.jabref.logic.journals does not exist`.
+
+    A: You have to ignore `buildSrc/src/main` as source directory in IntelliJ as indicated in our [setup guide](https://devdocs.jabref.org/getting-into-the-code/guidelines-for-setting-up-a-local-workspace).
+
+    Also filed as IntelliJ issue [IDEA-240250](https://youtrack.jetbrains.com/issue/IDEA-240250).
+*   Q: I get `Execution failed for task ':buildSrc:jar'. Entry org/jabref/build/JournalAbbreviationConverter$_convert_closure1$_closure2.class is a duplicate but no duplicate handling strategy has been set. Please refer to https://docs.gradle.org/7.4.2/dsl/org.gradle.api.tasks.Copy.html#org.gradle.api.tasks.Copy:duplicatesStrategy for details.` What can I do?\
+    A: You have to delete directory `buildSrc/build`.
diff --git a/docs/readings-on-coding/README.md b/docs/readings-on-coding/README.md
deleted file mode 100644
index 6108184a6d3..00000000000
--- a/docs/readings-on-coding/README.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# Readings on Coding
-
diff --git a/docs/teaching.md b/docs/teaching.md
index a346e23ef56..097110ce58e 100644
--- a/docs/teaching.md
+++ b/docs/teaching.md
@@ -1,58 +1,65 @@
+---
+nav_order: 3
+---
 # JabRef and Software Engineering Training
 
 By using JabRef as training object in exercises and labs, students can level-up their coding and project management skills. When taking part in JabRef development, one will learn modern Java coding practices, how code reviews work and how to properly address reviewing feedback.
 
 ## Why university instructors should cooperate with us?
 
-* No need to think about software engineering excesses anymore: JabRef has them.
-* No need to provision infra structure
 * High-quality student education due to real-world tooling and real-world code base
 * Sustainability of student works: No more thrown-away solved exercises: They now are incorporated in a real-world product
+* No need to provision infra structure
 * Visibility of your research groups
+* No need to think about basic software engineering exercises anymore: JabRef cooperation partners have them.
 
 ## How to integrate JabRef in your class
 
-1. Get in touch with the JabRef team to discuss details. We offer email, skype, [gitter.im](https://gitter.im/JabRef/jabref), discord. Get in touch with [@koppor](https://github.com/koppor/) to find the right channel and to start forming the success of your course.
-2. Choose tasks from one of the following boards. Write a comment on each issue so that it can be reserved for your course.
-   * Candidates for university projects: [https://github.com/JabRef/jabref/projects/9](https://github.com/JabRef/jabref/projects/9)
-     * This board categorizes in small, medium, and large features
-   * Feature Board: [https://github.com/JabRef/jabref/projects/7](https://github.com/JabRef/jabref/projects/7)
-     * This is a general feature board. Recommended, if the board above is empty or you did not find something suitable
-   * Bug Board: [https://github.com/JabRef/jabref/projects/5](https://github.com/JabRef/jabref/projects/5)
-     * This is an excellent board to find issues training the maintenance knowledge which is essential for industry work
-   * General "good first issues". The JabRef team tags issues as [good first issues](https://github.com/jabref/jabref/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22) to indicate open tasks offering a good start into the JabRef code. These issues are more a list of random bugs and features. For a more structured comparison of the opened tasks, we recommend the project boards listed above.
-   * Be aware that the difficulty of bugs and feature vary. A task should be chosen with care. The JabRef team can help here: The majority of the team has experiences in teaching
+1. Choose task from the board [Candidates for university projects](https://github.com/orgs/JabRef/projects/3/views/3).
+   There, new functionality is categorized in small, medium, and large effort.
+   Morevoer, categorization on the main focus (UI, logic, or both),
+   implementation effort, testing effort, and "issue understanding effort".
+   The latter category is important, because some issues are "quick wins" and others need thorough thinking.   
+   In general, all issues of JabRef are free to take.
+   Be aware that the difficulty of bugs and feature vary.
+   For the brave, the [Bug Board](https://github.com/JabRef/jabref/projects/5) or the [Feature Board](https://github.com/JabRef/jabref/projects/7) provide other issue sources.
+   Especially for Master students, these are excellent boards to find issues that train maintenance knowledge (which is essential for industry work).
+2. Get in touch with the JabRef team to reserve issues for your student group and possibly to discuss details. We offer email, skype, [gitter.im](https://gitter.im/JabRef/jabref), discord. Get in touch with [@koppor](https://github.com/koppor/) to find the right channel and to start forming the success of your course.
 3. Schedule tasks with students
-4. Code reviews by JabRef maintainers
-5. Students address feedback and learn more about good coding practices by incoporating feedback
-6. Students update their pull request
-7. Pull request is merged
+4. Students implement code
+5. Students review other student's code (recommended: students of a previous year's project review current year's project code)
+6. Students address review feedback
+7. Students submit pull request
+8. Code reviews by JabRef maintainers
+9. Students address feedback and learn more about good coding practices by incoporating feedback
+10. Students update their pull request
+11. Pull request is merged
 
-For a near-to-perfect preparation and effect of the course, we ask you to get in touch with us **four weeks** in advance. Then, the JabRef team can a) learn about the starting skill level of the students, b) the aimed skill level at the end of the course, c) the amount of time the students are given to learn about and contribute to JabRef, d) check the [feature board](https://github.com/JabRef/jabref/projects/7) for appropriate tasks (and fill it as needed), e) recommend appropriate features.
+For a near-to-perfect preparation and effect of the course, we ask you to get in touch with us **four weeks** in advance. Then, the JabRef team can a) learn about the starting skill level of the students, b) the aimed skill level at the end of the course, c) the amount of time the students are given to learn about and contribute to JabRef, d) check the [Candidates for university projects](https://github.com/orgs/JabRef/projects/3/views/3) for appropriate tasks (and fill it as needed), e) recommend appropriate features.
 
-It is also possible to just direct students to our [Contribution Guide](https://github.com/JabRef/jabref/blob/master/CONTRIBUTING.md#contributing-guide). The learning effect may be lower as the time of the students has to be spent to a) learn about JabRef and b) select an appropriate issue.
+It is also possible to just direct students to our [Contribution Guide](https://devdocs.jabref.org/contributing.html#contribute-code). The learning effect may be lower as the time of the students has to be spent to a) learn about JabRef and b) select an appropriate issue.
 
-Since a huge fraction of software costs is spent on [software maintenance](https://en.wikipedia.org/wiki/Software_maintenance), adding new features also educates in that aspect: perfective maintenance[1](teaching.md#LientzSwanson) is trained. When fixing bugs, corrective maintenance[2](teaching.md#LientzSwanson) is trained.
+Since a huge fraction of software costs is spent on [software maintenance](https://en.wikipedia.org/wiki/Software\_maintenance), adding new features also educates in that aspect: perfective maintenance[1](teaching.md#LientzSwanson) is trained. When fixing bugs, corrective maintenance [2](teaching.md#LientzSwanson) is trained.
 
 ## Process for contributions
 
 There is no special process for student contributions. We want to discuss it nevertheless to increase awareness of the time required from starting the contribution until the inclusion in a release of JabRef.
 
-The process for accepting contributions is as below. The syntax is [BPMN](https://en.wikipedia.org/wiki/Business_Process_Model_and_Notation) modeled using [bpmn.io](https://bpmn.io).
+The process for accepting contributions is as below. The syntax is [BPMN](https://en.wikipedia.org/wiki/Business\_Process\_Model\_and\_Notation) modeled using [bpmn.io](https://bpmn.io).
 
-[![process](<.gitbook/assets/contribution-process-reviews (2) (2) (2) (2) (2) (3).svg>)](https://github.com/JabRef/jabref/tree/ed275b62fe7dac57a086e43802e36deb93c63e31/docs/images/contribution-process-reviews.svg)
+[![process](<images/contribution-process-reviews.svg>)](https://github.com/JabRef/jabref/tree/ed275b62fe7dac57a086e43802e36deb93c63e31/docs/images/contribution-process-reviews.svg)
 
 In short, the contribution is **reviewed by two JabRef developers**. Typically, they have constructive feedback on their contribution. This means, that the contributors get comments on their contribution enabling them to level-up their coding skill. Incorporating improvements takes time, too. The benefit is two-fold: a) contributors improve their coding skills and b) JabRef's code quality improves. All in all, we ask to respect the aims of the JabRef team and to reserve time to incorporate the reviewer's comments.
 
 GitHub describes that in their page [Understanding the GitHub flow](https://guides.github.com/introduction/flow/):
 
-[![GitHub flow](images/github-flow.png)](https://github.com/JabRef/jabref/tree/ed275b62fe7dac57a086e43802e36deb93c63e31/docs/images/github-flow.png)
+[![GitHub flow](<images/github-flow.png>)](https://github.com/JabRef/jabref/tree/ed275b62fe7dac57a086e43802e36deb93c63e31/docs/images/github-flow.png)
 
 ## Process for Java newcomers
 
 Newcomers contributing in the context of a university teaching experience are invited to follow the process described above. In case the capacity of the instructing university allows, we propose a three-step approach. First, the contributors prepare their contribution as usual. Then, they submit the pull request _to a separate repository_. There, the instructor reviews the pull request and provides feedback. This happens in a loop until the instructor shows the green light. Then, the pull request can be submitted to the main JabRef repository. This will help to reduce the load on the JabRef team and improve the quality of the initial pull request.
 
-[![process with instructor](<.gitbook/assets/contribution-process-reviews-with-instructor (1) (2) (2) (2) (2) (2) (3).svg>)](https://github.com/JabRef/jabref/tree/ed275b62fe7dac57a086e43802e36deb93c63e31/docs/images/contribution-process-reviews-with-instructor.svg)
+[![process with instructor](<images/contribution-process-reviews-with-instructor.svg>)](https://github.com/JabRef/jabref/tree/ed275b62fe7dac57a086e43802e36deb93c63e31/docs/images/contribution-process-reviews-with-instructor.svg)
 
 ## Past courses
 
diff --git a/eclipse.gradle b/eclipse.gradle
index b82fd8bca2b..dab4df54bb6 100644
--- a/eclipse.gradle
+++ b/eclipse.gradle
@@ -25,11 +25,15 @@ eclipse {
                 }
 
                 def javafxcontrols = entries.find { isJavafxControls(it) };
-                javafxcontrols.entryAttributes['add-exports'] = 'javafx.controls/com.sun.javafx.scene.control=org.jabref:javafx.controls/com.sun.javafx.scene.control.behavior=org.jabref:javafx.controls/javafx.scene.control=org.jabref';
+                javafxcontrols.entryAttributes['add-exports'] = 'javafx.controls/com.sun.javafx.scene.control=org.jabref:javafx.controls/com.sun.javafx.scene.control.behavior=org.jabref:javafx.controls/javafx.scene.control=org.jabref:javafx.controls/com.sun.javafx.scene.control.behavior=com.jfoenix';
                 javafxcontrols.entryAttributes['add-opens'] = 'javafx.controls/com.sun.javafx.scene.control=org.jabref:javafx.controls/com.sun.javafx.scene.control.behavior=org.jabref:javafx.controls/javafx.scene.control=org.jabref:javafx.controls/javafx.scene.control.skin=org.controlsfx.controls';
 
                 def javafxgraphics = entries.find { isJavafxGraphics(it) };
                 javafxgraphics.entryAttributes['add-opens'] = 'javafx.graphics/javafx.scene=org.controlsfx.controls';
+                javafxgraphics.entryAttributes['add-exports'] = 'javafx.graphics/com.sun.javafx.stage=com.jfoenix';
+
+                def javafxbase = entries.find { isJavafxBase(it) };
+                javafxbase.entryAttributes['add-exports'] = 'javafx.base/com.sun.javafx.event=org.controlsfx.controls:';
 
                 def javafxfxml = entries.find { isJavafxFXML(it) };
                 javafxfxml.entryAttributes['add-opens'] = 'javafx.fxml/javafx.fxml=org.jabref';
@@ -61,6 +65,8 @@ boolean isJavafxControls(entry) { return entry.properties.path.contains('javafx-
 
 boolean isJavafxGraphics(entry) { return entry.properties.path.contains('javafx-graphics'); }
 
+boolean isJavafxBase(entry) { return entry.properties.path.contains('javafx-base'); }
+
 boolean isJavafxFXML(entry) { return entry.properties.path.contains('javafx-fxml'); }
 
 // add formatter and cleanup settings to Eclipse settings
diff --git a/external-libraries.md b/external-libraries.md
index ff4824e86c9..1eb2b8eeb71 100644
--- a/external-libraries.md
+++ b/external-libraries.md
@@ -134,13 +134,6 @@ URL:     https://github.com/eclipse-ee4j/jaxb-istack-commons
 License: BSD-3-Clause (with copyright as described in Eclipse Distribution License - v 1.0 - see https://wiki.spdx.org/view/Legal_Team/License_List/Licenses_Under_Consideration for details)
 ```
 
-```yaml
-Id:      com.sun.xml.fastinfoset:FastInfoset
-Project: Fast Infoset
-URL:     https://github.com/eclipse-ee4j/jaxb-fi
-License: Apache-2.0
-```
-
 ```yaml
 Id:      com.tobiasdiez:easybind
 Project: EasyBind
@@ -226,15 +219,15 @@ License: Apache-2.0
 ```
 
 ```yaml
-Id:      jakarta.activation:jakarata.activation-api
-Project: Jakarta Activation
-URL:     https://eclipse-ee4j.github.io/jaf/
-License: BSD-3-Clause
+Id:      jakarta.annotation:jakarata.annotation-api
+Project: Jakarta Annotations
+URL:     https://projects.eclipse.org/projects/ee4j.ca
+License: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
 ```
 
 ```yaml
-Id:      jakarta.annotation:jakarata.annotation-api
-Project: Jakarta Annotations
+Id:      jakarta.activation:jakarata.activation-api
+Project: Jakarta Activation
 URL:     https://projects.eclipse.org/projects/ee4j.ca
 License: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
 ```
@@ -281,13 +274,6 @@ URL:     https://github.com/jhalterman/typetools
 License: Apache-2.0
 ```
 
-```yaml
-Id:      org.antlr:antlr-runtime
-Project: ANTLR 3
-URL:     http://www.antlr3.org/
-License: BSD-3-Clause
-```
-
 ```yaml
 Id:      org.antlr:antlr4-runtime
 Project: ANTLR 4
@@ -296,42 +282,14 @@ License: BSD-3-Clause
 ```
 
 ```yaml
-Id:      org.apache.commons:commons-csv
+Id:      org.apache.commons:*
 Project: Apache Commons CSV
-URL:     https://commons.apache.org/proper/commons-csv/
-License: Apache-2.0
-```
-
-```yaml
-Id:      org.apache.commons:commons-lang3
-Project: Apache Commons Lang
-URL:     https://commons.apache.org/proper/commons-lang/
+URL:     https://commons.apache.org/
 License: Apache-2.0
 ```
 
 ```yaml
-Id:      org.apache.commons:commons-text
-Project: Apache Commons Text
-URL:     https://commons.apache.org/proper/commons-text/
-License: Apache-2.0
-```
-
-```yaml
-Id:      org.apache.lucene:lucene-core
-Project: Apache Lucene
-URL:     https://lucene.apache.org/
-License: Apache-2.0
-```
-
-```yaml
-Id:      org.apache.lucene:lucene-queries
-Project: Apache Lucene
-URL:     https://lucene.apache.org/
-License: Apache-2.0
-```
-
-```yaml
-Id:      org.apache.lucene:lucene-queryparser
+Id:      org.apache.lucene:*
 Project: Apache Lucene
 URL:     https://lucene.apache.org/
 License: Apache-2.0
@@ -414,6 +372,23 @@ URL:     https://github.com/TomasMikula/RichTextFX
 License: BSD-2-Clause
 ```
 
+```yaml
+Id:      org.glassfish.*
+Project: Eclipse GlassFish
+URL:     https://glassfish.org/
+License: BSD-3-Clause (with copyright as described in Eclipse Distribution License - v 1.0 - see https://wiki.spdx.org/view/Legal_Team/License_List/Licenses_Under_Consideration for details)
+```
+
+```yaml
+Id:      com.ibm.icu:*
+Project: International Components for Unicode
+URL:     https://icu.unicode.org/
+License: Unicode License (https://www.unicode.org/copyright.html)
+Note:    Our own fork https://github.com/JabRef/icu. Upstream PR: https://github.com/unicode-org/icu/pull/2127
+Path:    lib/icu4j.jar
+SourcePath: lib/ic4j-src.jar
+```
+
 ```yaml
 Id:      org.jsoup:jsoup
 Project: jsoup
@@ -533,23 +508,24 @@ License: Apache-2.0
 3. (on WSL) `sed 's/[^a-z]*//' < build/dependencies.txt | sed "s/\(.*\) .*/\1/" | grep -v "\->" | sort | uniq > build/dependencies-for-external-libraries.txt`
 
 ```text
-com.fasterxml.jackson.core:jackson-annotations:2.13.0
-com.fasterxml.jackson.core:jackson-core:2.13.0
-com.fasterxml.jackson.core:jackson-databind:2.13.0
-com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.0
-com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.0
-com.fasterxml.jackson:jackson-bom:2.13.0
-com.github.tomtung:latex2unicode_2.12:0.2.6
-com.google.code.gson:gson:2.8.8
-com.google.errorprone:error_prone_annotations:2.7.1
+com.fasterxml.jackson.core:jackson-annotations:2.13.3
+com.fasterxml.jackson.core:jackson-core:2.13.3
+com.fasterxml.jackson.core:jackson-databind:2.13.3
+com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.3
+com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.3
+com.fasterxml.jackson:jackson-bom:2.13.3
+com.github.sialcasa.mvvmFX:mvvmfx-validation:f195849ca9
+com.github.tomtung:latex2unicode_2.13:0.3.2
+com.google.code.gson:gson:2.9.0
+com.google.errorprone:error_prone_annotations:2.11.0
 com.google.guava:failureaccess:1.0.1
-com.google.guava:guava:31.0.1-jre
+com.google.guava:guava:31.1-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.j2objc:j2objc-annotations:1.3
-com.googlecode.javaewah:JavaEWAH:1.1.12
-com.h2database:h2-mvstore:2.0.202
+com.googlecode.javaewah:JavaEWAH:1.1.13
+com.h2database:h2-mvstore:2.1.214
 com.jfoenix:jfoenix:9.0.10
-com.konghq:unirest-java:3.13.4
+com.konghq:unirest-java:3.13.10
 com.microsoft.azure:applicationinsights-core:2.4.1
 com.microsoft.azure:applicationinsights-logging-log4j2:2.4.1
 com.oracle.ojdbc:ojdbc10:19.3.0.0
@@ -558,91 +534,95 @@ com.oracle.ojdbc:osdt_cert:19.3.0.0
 com.oracle.ojdbc:osdt_core:19.3.0.0
 com.oracle.ojdbc:simplefan:19.3.0.0
 com.oracle.ojdbc:ucp:19.3.0.0
-com.sun.istack:istack-commons-runtime:3.0.8
-com.sun.xml.fastinfoset:FastInfoset:1.2.16
+com.sun.activation:jakarta.activation:2.0.1
+com.sun.istack:istack-commons-runtime:4.0.1
 com.tobiasdiez:easybind:2.2
-com.vladsch.flexmark:flexmark-ext-gfm-strikethrough:0.62.2
-com.vladsch.flexmark:flexmark-ext-gfm-tasklist:0.62.2
-com.vladsch.flexmark:flexmark-util-ast:0.62.2
-com.vladsch.flexmark:flexmark-util-builder:0.62.2
-com.vladsch.flexmark:flexmark-util-collection:0.62.2
-com.vladsch.flexmark:flexmark-util-data:0.62.2
-com.vladsch.flexmark:flexmark-util-dependency:0.62.2
-com.vladsch.flexmark:flexmark-util-format:0.62.2
-com.vladsch.flexmark:flexmark-util-html:0.62.2
-com.vladsch.flexmark:flexmark-util-misc:0.62.2
-com.vladsch.flexmark:flexmark-util-options:0.62.2
-com.vladsch.flexmark:flexmark-util-sequence:0.62.2
-com.vladsch.flexmark:flexmark-util-visitor:0.62.2
-com.vladsch.flexmark:flexmark-util:0.62.2
-com.vladsch.flexmark:flexmark:0.62.2
+com.vladsch.flexmark:flexmark-ext-gfm-strikethrough:0.64.0
+com.vladsch.flexmark:flexmark-ext-gfm-tasklist:0.64.0
+com.vladsch.flexmark:flexmark-util-ast:0.64.0
+com.vladsch.flexmark:flexmark-util-builder:0.64.0
+com.vladsch.flexmark:flexmark-util-collection:0.64.0
+com.vladsch.flexmark:flexmark-util-data:0.64.0
+com.vladsch.flexmark:flexmark-util-dependency:0.64.0
+com.vladsch.flexmark:flexmark-util-format:0.64.0
+com.vladsch.flexmark:flexmark-util-html:0.64.0
+com.vladsch.flexmark:flexmark-util-misc:0.64.0
+com.vladsch.flexmark:flexmark-util-options:0.64.0
+com.vladsch.flexmark:flexmark-util-sequence:0.64.0
+com.vladsch.flexmark:flexmark-util-visitor:0.64.0
+com.vladsch.flexmark:flexmark-util:0.64.0
+com.vladsch.flexmark:flexmark:0.64.0
 commons-cli:commons-cli:1.5.0
-commons-codec:commons-codec:1.11
+commons-codec:commons-codec:1.15
 commons-io:commons-io:2.11.0
 commons-logging:commons-logging:1.2
-de.saxsys:mvvmfx-validation:1.9.0-SNAPSHOT
 de.saxsys:mvvmfx:1.8.0
-de.undercouch:citeproc-java:3.0.0-alpha.3
+de.undercouch:citeproc-java:3.0.0-alpha.6
 eu.lestard:doc-annotations:0.2
 info.debatty:java-string-similarity:2.0.0
-io.github.java-diff-utils:java-diff-utils:4.11
-jakarta.activation:jakarta.activation-api:1.2.1
+io.github.java-diff-utils:java-diff-utils:4.12
 jakarta.annotation:jakarta.annotation-api:1.3.5
-jakarta.xml.bind:jakarta.xml.bind-api:2.3.2
+jakarta.xml.bind:jakarta.xml.bind-api:3.0.1
 net.harawata:appdirs:1.2.1
 net.java.dev.jna:jna-platform:5.6.0
 net.java.dev.jna:jna:5.6.0
 net.jcip:jcip-annotations:1.0
 net.jodah:typetools:0.6.1
-org.antlr:antlr-runtime:3.5.2
 org.antlr:antlr4-runtime:4.9.3
 org.apache.commons:commons-csv:1.9.0
-org.apache.commons:commons-lang3:3.9
-org.apache.commons:commons-text:1.8
-org.apache.httpcomponents:httpasyncclient:4.1.4
+org.apache.commons:commons-lang3:3.12.0
+org.apache.commons:commons-text:1.9
+org.apache.httpcomponents:httpasyncclient:4.1.5
 org.apache.httpcomponents:httpclient:4.5.13
 org.apache.httpcomponents:httpcore-nio:4.4.13
 org.apache.httpcomponents:httpcore:4.4.13
 org.apache.httpcomponents:httpmime:4.5.13
-org.apache.pdfbox:fontbox:2.0.25
-org.apache.pdfbox:pdfbox:2.0.25
-org.apache.pdfbox:xmpbox:2.0.24
-org.apache.tika:tika-core:2.2.0
-org.bouncycastle:bcprov-jdk15on:1.70
+org.apache.lucene:lucene-analysis-common:9.3.0
+org.apache.lucene:lucene-core:9.3.0
+org.apache.lucene:lucene-highlighter:9.3.0
+org.apache.lucene:lucene-memory:9.3.0
+org.apache.lucene:lucene-queries:9.3.0
+org.apache.lucene:lucene-queryparser:9.3.0
+org.apache.lucene:lucene-sandbox:9.3.0
+org.apache.pdfbox:fontbox:3.0.0-RC1
+org.apache.pdfbox:pdfbox:3.0.0-RC1
+org.apache.pdfbox:xmpbox:3.0.0-RC1
+org.apache.tika:tika-core:2.4.1
+org.bouncycastle:bcprov-jdk18on:1.71
 org.checkerframework:checker-qual:3.12.0
 org.codehaus.mojo:animal-sniffer-annotations:1.18
 org.controlsfx:controlsfx:11.1.1
-org.eclipse.jgit:org.eclipse.jgit:5.13.0.202109080827-r
-org.fxmisc.flowless:flowless:0.6.7
-org.fxmisc.richtext:richtextfx:0.10.7
+org.eclipse.jgit:org.eclipse.jgit:6.2.0.202206071550-r
+org.fxmisc.flowless:flowless:0.6.10
+org.fxmisc.richtext:richtextfx:0.10.9
 org.fxmisc.undo:undofx:2.1.1
 org.fxmisc.wellbehaved:wellbehavedfx:0.3.3
 org.glassfish.hk2.external:jakarta.inject:2.6.1
-org.glassfish.jaxb:jaxb-runtime:2.3.2
-org.glassfish.jaxb:txw2:2.3.2
-org.jbibtex:jbibtex:1.0.17
+org.glassfish.jaxb:jaxb-core:3.0.2
+org.glassfish.jaxb:jaxb-runtime:3.0.2
+org.glassfish.jaxb:txw2:3.0.2
+org.jbibtex:jbibtex:1.0.19
 org.jetbrains:annotations:15.0
-org.jsoup:jsoup:1.14.3
-org.jvnet.staxex:stax-ex:1.8.1
-org.kordamp.ikonli:ikonli-core:12.2.0
-org.kordamp.ikonli:ikonli-javafx:12.2.0
-org.kordamp.ikonli:ikonli-materialdesign2-pack:12.2.0
-org.libreoffice:libreoffice:7.2.3
-org.libreoffice:unoloader:7.2.2
-org.mariadb.jdbc:mariadb-java-client:2.7.4
-org.openjfx:javafx-base:17.0.1
-org.openjfx:javafx-controls:17.0.1
-org.openjfx:javafx-fxml:17.0.1
-org.openjfx:javafx-graphics:17.0.1
-org.openjfx:javafx-media:17.0.1
-org.openjfx:javafx-swing:17.0.1
-org.openjfx:javafx-web:17.0.1
-org.postgresql:postgresql:42.3.1
+org.jsoup:jsoup:1.15.1
+org.kordamp.ikonli:ikonli-core:12.3.1
+org.kordamp.ikonli:ikonli-javafx:12.3.1
+org.kordamp.ikonli:ikonli-materialdesign2-pack:12.3.1
+org.libreoffice:libreoffice:7.3.5
+org.libreoffice:unoloader:7.3.5
+org.mariadb.jdbc:mariadb-java-client:2.7.6
+org.openjfx:javafx-base:18.0.1
+org.openjfx:javafx-controls:18.0.1
+org.openjfx:javafx-fxml:18.0.1
+org.openjfx:javafx-graphics:18.0.1
+org.openjfx:javafx-media:18.0.1
+org.openjfx:javafx-swing:18.0.1
+org.openjfx:javafx-web:18.0.1
+org.postgresql:postgresql:42.4.0
 org.reactfx:reactfx:2.0-M5
-org.scala-lang:scala-library:2.12.8
-org.slf4j:slf4j-api:2.0.0-alpha5
+org.scala-lang:scala-library:2.13.8
+org.slf4j:slf4j-api:2.0.0-alpha7
 org.tinylog:slf4j-tinylog:2.4.1
 org.tinylog:tinylog-api:2.4.1
 org.tinylog:tinylog-impl:2.4.1
-org.yaml:snakeyaml:1.28
+org.yaml:snakeyaml:1.30
 ```
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 41d9927a4d4..249e5832f09 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 1debed0d8fd..b916c04dbb2 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=8cc27038d5dbd815759851ba53e70cf62e481b87494cc97cfd97982ada5ba634
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionSha256Sum=f6b8596b10cce501591e92f229816aa4046424f3b24d771751b06779d58c8ec4
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 1b6c787337f..a69d9cb6c20 100755
--- a/gradlew
+++ b/gradlew
@@ -205,6 +205,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.
diff --git a/gradlew.bat b/gradlew.bat
index 107acd32c4e..f127cfd49d4 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,7 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal
diff --git a/lib/fastparse-1.0.0.jar b/lib/fastparse-1.0.0.jar
deleted file mode 100644
index 7c38dac21c6..00000000000
Binary files a/lib/fastparse-1.0.0.jar and /dev/null differ
diff --git a/lib/fastparse-2.3.3.jar b/lib/fastparse-2.3.3.jar
new file mode 100644
index 00000000000..2bcb25233f8
Binary files /dev/null and b/lib/fastparse-2.3.3.jar differ
diff --git a/lib/fastparse-utils-1.0.0.jar b/lib/fastparse-utils-1.0.0.jar
deleted file mode 100644
index 58d520f52fb..00000000000
Binary files a/lib/fastparse-utils-1.0.0.jar and /dev/null differ
diff --git a/lib/geny-0.6.10.jar b/lib/geny-0.6.10.jar
new file mode 100644
index 00000000000..02846e358ae
Binary files /dev/null and b/lib/geny-0.6.10.jar differ
diff --git a/lib/icu4j-src.jar b/lib/icu4j-src.jar
new file mode 100644
index 00000000000..032936efdbd
Binary files /dev/null and b/lib/icu4j-src.jar differ
diff --git a/lib/icu4j.jar b/lib/icu4j.jar
new file mode 100644
index 00000000000..207c4a6afc7
Binary files /dev/null and b/lib/icu4j.jar differ
diff --git a/lib/lucene.jar b/lib/lucene.jar
deleted file mode 100644
index 758012cdc90..00000000000
Binary files a/lib/lucene.jar and /dev/null differ
diff --git a/lib/sourcecode-0.1.4.jar b/lib/sourcecode-0.1.4.jar
deleted file mode 100644
index 2aa74d89a0d..00000000000
Binary files a/lib/sourcecode-0.1.4.jar and /dev/null differ
diff --git a/lib/sourcecode-0.2.3.jar b/lib/sourcecode-0.2.3.jar
new file mode 100644
index 00000000000..a0a649fca58
Binary files /dev/null and b/lib/sourcecode-0.2.3.jar differ
diff --git a/lucene-jar/lib/build.gradle b/lucene-jar/lib/build.gradle
deleted file mode 100644
index b267c5c7e45..00000000000
--- a/lucene-jar/lib/build.gradle
+++ /dev/null
@@ -1,23 +0,0 @@
-plugins {
-    id 'java-library'
-    id 'com.github.johnrengelman.shadow' version '7.0.0'
-}
-
-repositories {
-    mavenCentral()
-}
-
-shadowJar {
-    mergeServiceFiles()
-}
-
-dependencies {
-    implementation 'org.apache.lucene:lucene-core:8.9.0'
-    implementation ('org.apache.lucene:lucene-queryparser:8.9.0') {
-        exclude module: "lucene-sandbox"
-    }
-    implementation 'org.apache.lucene:lucene-queries:8.9.0'
-    implementation 'org.apache.lucene:lucene-analyzers-common:8.9.0'
-    implementation 'org.apache.lucene:lucene-backward-codecs:8.9.0'
-    implementation 'org.apache.lucene:lucene-highlighter:8.9.0'
-}
diff --git a/lucene-jar/settings.gradle b/lucene-jar/settings.gradle
deleted file mode 100644
index d810394f855..00000000000
--- a/lucene-jar/settings.gradle
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * This file was generated by the Gradle 'init' task.
- *
- * The settings file is used to specify which projects to include in your build.
- *
- * Detailed information about configuring a multi-project build in Gradle can be found
- * in the user manual at https://docs.gradle.org/7.0.2/userguide/multi_project_builds.html
- */
-
-rootProject.name = 'lucene-jar'
-include('lib')
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 700933d2631..2d32b9f9627 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -6,7 +6,7 @@ summary: Bibliography manager
 description: |
   JabRef is an open source bibliography reference manager.
   The native file format used by JabRef is BibTeX, the standard LaTeX bibliography format.
-  To access files in external media (i.e. usb drives) you must run:
+  To access files in external media (i.e., USB drives) you must run:
   `snap connect jabref:removable-media`
 grade: stable
 confinement: strict
@@ -57,7 +57,7 @@ environment:
 parts:
   jabref:
     plugin: dump
-    source: https://builds.jabref.org/main/JabRef-5.6-portable_linux.tar.gz
+    source: https://builds.jabref.org/main/JabRef-5.8-portable_linux.tar.gz
     stage-packages:
       - x11-utils
     override-build: |
diff --git a/src/main/antlr3/org/jabref/bst/Bst.g b/src/main/antlr3/org/jabref/bst/Bst.g
deleted file mode 100644
index 498621ad1a1..00000000000
--- a/src/main/antlr3/org/jabref/bst/Bst.g
+++ /dev/null
@@ -1,96 +0,0 @@
-grammar Bst;
-
-options {
-    output=AST;
-}
-
-tokens {
-	IDLIST;
-	STACK;
-	ENTRY;
-	COMMANDS;
-}
-
-// applies only to the parser:
-@header {// Generated by ANTLR
-package org.jabref.logic.bst;}
-
-// applies only to the lexer:
-@lexer::header {// Generated by ANTLR
-package org.jabref.logic.bst;}
-
-program : commands+ -> ^(COMMANDS commands+);
-
-commands
-	: STRINGS^ idList
-	| INTEGERS^ idList
-	| FUNCTION^ id stack
-	| MACRO^ id '{'! STRING '}'!
-	| READ^
-	| EXECUTE^ '{'! function '}'!
-	| ITERATE^ '{'! function '}'!
-	| REVERSE^ '{'! function '}'!
-	| ENTRY^ idList0 idList0 idList0
-	| SORT^;
-
-identifier
-	: IDENTIFIER;
-
-id
-	: '{'! identifier '}'!;
-
-idList
-	: '{' identifier+ '}' -> ^(IDLIST identifier+);
-
-idList0
-	: '{' identifier* '}' -> ^(IDLIST identifier*);
-
-function
-	: '<' | '>' | '=' | '+' | '-' | ':=' | '*' | identifier;
-
-stack
-	: '{' stackitem+ '}' -> ^(STACK stackitem+);
-
-stackitem
-	: function
-	| STRING
-	| INTEGER
-	| QUOTED
-	| stack;
-
-STRINGS : 'STRINGS';
-INTEGERS : 'INTEGERS';
-FUNCTION : 'FUNCTION';
-EXECUTE : 'EXECUTE';
-SORT : 'SORT';
-ITERATE : 'ITERATE';
-REVERSE : 'REVERSE';
-ENTRY : 'ENTRY';
-READ : 'READ';
-MACRO : 'MACRO';
-
-QUOTED
-	: '\'' IDENTIFIER;
-
-IDENTIFIER
-	: LETTER (LETTER|NUMERAL|'_')* ;
-
-fragment LETTER
-	: ('a'..'z'|'A'..'Z'|'.'|'$');
-
-STRING
-	: '"' (~('"'))* '"';
-
-INTEGER
-	: '#' ('+'|'-')? NUMERAL+ ;
-
-fragment NUMERAL
-	: ('0'..'9');
-
-WS
-	: (' '|'\t'|'\n'|'\r')+ {_channel=99;} ;
-
-LINE_COMMENT
-    : '%' ~('\n'|'\r')* '\r'? '\n' {_channel=99;}
-    ;
-
diff --git a/src/main/antlr4/org/jabref/bst/Bst.g4 b/src/main/antlr4/org/jabref/bst/Bst.g4
new file mode 100644
index 00000000000..92b96ce18df
--- /dev/null
+++ b/src/main/antlr4/org/jabref/bst/Bst.g4
@@ -0,0 +1,85 @@
+grammar Bst;
+
+// Lexer
+
+STRINGS : 'STRINGS';
+INTEGERS : 'INTEGERS';
+FUNCTION : 'FUNCTION';
+EXECUTE : 'EXECUTE';
+SORT : 'SORT';
+ITERATE : 'ITERATE';
+REVERSE : 'REVERSE';
+ENTRY : 'ENTRY';
+READ : 'READ';
+MACRO : 'MACRO';
+
+GT : '>';
+LT : '<';
+EQUAL : '=';
+ASSIGN : ':=';
+ADD : '+';
+SUB : '-';
+CONCAT : '*';
+LBRACE : '{';
+RBRACE : '}';
+
+fragment LETTER : ('a'..'z'|'A'..'Z'|'.'|'$');
+fragment NUMERAL : ('0'..'9');
+
+IDENTIFIER : LETTER (LETTER|NUMERAL|'_')*;
+INTEGER : '#' ('+'|'-')? NUMERAL+;
+QUOTED : '\'' IDENTIFIER;
+STRING : '"' (~('"'))* '"';
+
+WS: [ \r\n\t]+ -> skip;
+LINE_COMMENT : '%' ~('\n'|'\r')* '\r'? '\n' -> skip;
+
+// Parser
+
+bstFile
+    : commands+ EOF
+    ;
+
+commands
+    : STRINGS ids=idListObl                                           #stringsCommand
+    | INTEGERS ids=idListObl                                          #integersCommand
+    | FUNCTION LBRACE id=identifier RBRACE function=stack             #functionCommand
+    | MACRO LBRACE id=identifier RBRACE LBRACE repl=STRING RBRACE     #macroCommand
+    | READ                                                            #readCommand
+    | EXECUTE LBRACE bstFunction RBRACE                               #executeCommand
+    | ITERATE LBRACE bstFunction RBRACE                               #iterateCommand
+    | REVERSE LBRACE bstFunction RBRACE                               #reverseCommand
+    | ENTRY idListOpt idListOpt idListOpt                             #entryCommand
+    | SORT                                                            #sortCommand
+    ;
+
+identifier
+    : IDENTIFIER
+    ;
+
+// Obligatory identifier list
+idListObl
+    : LBRACE identifier+ RBRACE
+    ;
+
+// Optional identifier list
+idListOpt
+    : LBRACE identifier* RBRACE
+    ;
+
+bstFunction
+    : LT | GT | EQUAL | ADD | SUB | ASSIGN | CONCAT
+    | identifier
+    ;
+
+stack
+    : LBRACE stackitem+ RBRACE
+    ;
+
+stackitem
+    : bstFunction
+    | STRING
+    | INTEGER
+    | QUOTED
+    | stack
+    ;
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
index 79b2fc3c81a..c05e10bda2b 100644
--- a/src/main/java/module-info.java
+++ b/src/main/java/module-info.java
@@ -46,11 +46,11 @@
     with org.jabref.gui.logging.GuiWriter,
          org.jabref.gui.logging.ApplicationInsightsWriter;
 
-    requires applicationinsights.logging.log4j2;
-
     // Preferences and XML
     requires java.prefs;
-    requires java.xml.bind;
+    requires jakarta.xml.bind;
+    // needs to be loaded here as it's otherwise not found at runtime
+    requires org.glassfish.jaxb.runtime;
     requires jdk.xml.dom;
 
     // Annotations (@PostConstruct)
@@ -58,23 +58,20 @@
 
     // Microsoft application insights
     requires applicationinsights.core;
+    requires applicationinsights.logging.log4j2;
 
     // Libre Office
     requires org.libreoffice.uno;
 
     // Other modules
-    requires commons.logging;
     requires com.google.common;
     requires jakarta.inject;
-    requires org.apache.pdfbox;
     requires reactfx;
     requires commons.cli;
     requires com.github.tomtung.latex2unicode;
     requires fastparse;
     requires jbibtex;
     requires citeproc.java;
-    requires antlr.runtime;
-    requires org.apache.xmpbox;
     requires de.saxsys.mvvmfx.validation;
     requires com.google.gson;
     requires unirest.java;
@@ -91,6 +88,10 @@
     requires org.antlr.antlr4.runtime;
     requires org.fxmisc.flowless;
     requires org.apache.tika.core;
+    uses org.apache.tika.detect.AutoDetectReader;
+    requires pdfbox;
+    requires xmpbox;
+    requires com.ibm.icu;
 
     requires flexmark;
     requires flexmark.ext.gfm.strikethrough;
@@ -98,10 +99,23 @@
     requires flexmark.util.ast;
     requires flexmark.util.data;
     requires com.h2database.mvstore;
-    requires lucene;
-    requires org.eclipse.jgit;
+
+    // fulltext search
+    requires org.apache.lucene.core;
+    // In case the version is updated, please also adapt SearchFieldConstants#VERSION to the newly used version
+    uses org.apache.lucene.codecs.lucene92.Lucene92Codec;
+
+    requires org.apache.lucene.queryparser;
+    uses org.apache.lucene.queryparser.classic.MultiFieldQueryParser;
+    requires org.apache.lucene.analysis.common;
+    requires org.apache.lucene.highlighter;
+
     requires com.fasterxml.jackson.databind;
     requires com.fasterxml.jackson.dataformat.yaml;
     requires com.fasterxml.jackson.datatype.jsr310;
     requires net.harawata.appdirs;
+
+    requires org.eclipse.jgit;
+    uses org.eclipse.jgit.transport.SshSessionFactory;
+    uses org.eclipse.jgit.lib.GpgSigner;
 }
diff --git a/src/main/java/org/jabref/architecture/AllowedToUseStandardStreams.java b/src/main/java/org/jabref/architecture/AllowedToUseStandardStreams.java
new file mode 100644
index 00000000000..1fe80af54d7
--- /dev/null
+++ b/src/main/java/org/jabref/architecture/AllowedToUseStandardStreams.java
@@ -0,0 +1,10 @@
+package org.jabref.architecture;
+
+/**
+ * Annotation to indicate that this class can use System.Out.* instead of using the logging framework
+ */
+public @interface AllowedToUseStandardStreams {
+
+    // The rationale
+    String value();
+}
diff --git a/src/main/java/org/jabref/cli/ArgumentProcessor.java b/src/main/java/org/jabref/cli/ArgumentProcessor.java
index adbf9be7f42..fad33ed0d0d 100644
--- a/src/main/java/org/jabref/cli/ArgumentProcessor.java
+++ b/src/main/java/org/jabref/cli/ArgumentProcessor.java
@@ -1,7 +1,7 @@
 package org.jabref.cli;
 
 import java.io.IOException;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
@@ -15,7 +15,6 @@
 
 import org.jabref.gui.Globals;
 import org.jabref.gui.externalfiles.AutoSetFileLinksUtil;
-import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.undo.NamedCompound;
 import org.jabref.logic.JabRefException;
 import org.jabref.logic.bibtex.FieldWriterPreferences;
@@ -157,7 +156,8 @@ private static Optional<ParserResult> importFile(Path file, String importFormat)
                 // * means "guess the format":
                 System.out.println(Localization.lang("Importing in unknown format") + ": " + file);
 
-                ImportFormatReader.UnknownFormatImport importResult = Globals.IMPORT_FORMAT_READER.importUnknownFormat(file, new DummyFileUpdateMonitor());
+                ImportFormatReader.UnknownFormatImport importResult =
+                        Globals.IMPORT_FORMAT_READER.importUnknownFormat(file, new DummyFileUpdateMonitor());
 
                 System.out.println(Localization.lang("Format used") + ": " + importResult.format);
                 return Optional.of(importResult.parserResult);
@@ -178,7 +178,6 @@ public boolean hasParserResults() {
     }
 
     private List<ParserResult> processArguments() {
-
         if (!cli.isBlank() && cli.isDebugLogging()) {
             System.err.println("use java property -Dtinylog.level=debug");
         }
@@ -236,7 +235,6 @@ private List<ParserResult> processArguments() {
             if (!loaded.isEmpty()) {
                 writeMetadatatoPdf(loaded,
                         cli.getWriteMetadatatoPdf(),
-                        preferencesService.getGeneralPreferences().getDefaultEncoding(),
                         preferencesService.getXmpPreferences(),
                         preferencesService.getFilePreferences(),
                         preferencesService.getGeneralPreferences().getDefaultBibDatabaseMode(),
@@ -271,7 +269,7 @@ private List<ParserResult> processArguments() {
         return loaded;
     }
 
-    private void writeMetadatatoPdf(List<ParserResult> loaded, String filesAndCitekeys, Charset encoding, XmpPreferences xmpPreferences, FilePreferences filePreferences, BibDatabaseMode databaseMode, BibEntryTypesManager entryTypesManager, FieldWriterPreferences fieldWriterPreferences, boolean writeXMP, boolean embeddBibfile) {
+    private void writeMetadatatoPdf(List<ParserResult> loaded, String filesAndCitekeys, XmpPreferences xmpPreferences, FilePreferences filePreferences, BibDatabaseMode databaseMode, BibEntryTypesManager entryTypesManager, FieldWriterPreferences fieldWriterPreferences, boolean writeXMP, boolean embeddBibfile) {
         if (loaded.isEmpty()) {
             LOGGER.error("The write xmp option depends on a valid import option.");
             return;
@@ -285,7 +283,7 @@ private void writeMetadatatoPdf(List<ParserResult> loaded, String filesAndCiteke
 
         if ("all".equals(filesAndCitekeys)) {
             for (BibEntry entry : dataBase.getEntries()) {
-                writeMetadatatoPDFsOfEntry(databaseContext, entry.getCitationKey().orElse("<no cite key defined>"), entry, encoding, filePreferences, xmpPdfExporter, embeddedBibFilePdfExporter, writeXMP, embeddBibfile);
+                writeMetadatatoPDFsOfEntry(databaseContext, entry.getCitationKey().orElse("<no cite key defined>"), entry, filePreferences, xmpPdfExporter, embeddedBibFilePdfExporter, writeXMP, embeddBibfile);
             }
             return;
         }
@@ -300,22 +298,21 @@ private void writeMetadatatoPdf(List<ParserResult> loaded, String filesAndCiteke
             }
         }
 
-        writeMetadatatoPdfByCitekey(databaseContext, dataBase, citeKeys, encoding, filePreferences, xmpPdfExporter, embeddedBibFilePdfExporter, writeXMP, embeddBibfile);
-        writeMetadatatoPdfByFileNames(databaseContext, dataBase, pdfs, encoding, filePreferences, xmpPdfExporter, embeddedBibFilePdfExporter, writeXMP, embeddBibfile);
-
+        writeMetadatatoPdfByCitekey(databaseContext, dataBase, citeKeys, filePreferences, xmpPdfExporter, embeddedBibFilePdfExporter, writeXMP, embeddBibfile);
+        writeMetadatatoPdfByFileNames(databaseContext, dataBase, pdfs, filePreferences, xmpPdfExporter, embeddedBibFilePdfExporter, writeXMP, embeddBibfile);
     }
 
-    private void writeMetadatatoPDFsOfEntry(BibDatabaseContext databaseContext, String citeKey, BibEntry entry, Charset encoding, FilePreferences filePreferences, XmpPdfExporter xmpPdfExporter, EmbeddedBibFilePdfExporter embeddedBibFilePdfExporter, boolean writeXMP, boolean embeddBibfile) {
+    private void writeMetadatatoPDFsOfEntry(BibDatabaseContext databaseContext, String citeKey, BibEntry entry, FilePreferences filePreferences, XmpPdfExporter xmpPdfExporter, EmbeddedBibFilePdfExporter embeddedBibFilePdfExporter, boolean writeXMP, boolean embeddBibfile) {
         try {
             if (writeXMP) {
-                if (xmpPdfExporter.exportToAllFilesOfEntry(databaseContext, encoding, filePreferences, entry, List.of(entry))) {
+                if (xmpPdfExporter.exportToAllFilesOfEntry(databaseContext, filePreferences, entry, List.of(entry))) {
                     System.out.printf("Successfully written XMP metadata on at least one linked file of %s%n", citeKey);
                 } else {
                     System.err.printf("Cannot write XMP metadata on any linked files of %s. Make sure there is at least one linked file and the path is correct.%n", citeKey);
                 }
             }
             if (embeddBibfile) {
-                if (embeddedBibFilePdfExporter.exportToAllFilesOfEntry(databaseContext, encoding, filePreferences, entry, List.of(entry))) {
+                if (embeddedBibFilePdfExporter.exportToAllFilesOfEntry(databaseContext, filePreferences, entry, List.of(entry))) {
                     System.out.printf("Successfully embedded metadata on at least one linked file of %s%n", citeKey);
                 } else {
                     System.out.printf("Cannot embedd metadata on any linked files of %s. Make sure there is at least one linked file and the path is correct.%n", citeKey);
@@ -326,7 +323,7 @@ private void writeMetadatatoPDFsOfEntry(BibDatabaseContext databaseContext, Stri
         }
     }
 
-    private void writeMetadatatoPdfByCitekey(BibDatabaseContext databaseContext, BibDatabase dataBase, Vector<String> citeKeys, Charset encoding, FilePreferences filePreferences, XmpPdfExporter xmpPdfExporter, EmbeddedBibFilePdfExporter embeddedBibFilePdfExporter, boolean writeXMP, boolean embeddBibfile) {
+    private void writeMetadatatoPdfByCitekey(BibDatabaseContext databaseContext, BibDatabase dataBase, Vector<String> citeKeys, FilePreferences filePreferences, XmpPdfExporter xmpPdfExporter, EmbeddedBibFilePdfExporter embeddedBibFilePdfExporter, boolean writeXMP, boolean embeddBibfile) {
         for (String citeKey : citeKeys) {
             List<BibEntry> bibEntryList = dataBase.getEntriesByCitationKey(citeKey);
             if (bibEntryList.isEmpty()) {
@@ -334,12 +331,12 @@ private void writeMetadatatoPdfByCitekey(BibDatabaseContext databaseContext, Bib
                 continue;
             }
             for (BibEntry entry : bibEntryList) {
-                writeMetadatatoPDFsOfEntry(databaseContext, citeKey, entry, encoding, filePreferences, xmpPdfExporter, embeddedBibFilePdfExporter, writeXMP, embeddBibfile);
+                writeMetadatatoPDFsOfEntry(databaseContext, citeKey, entry, filePreferences, xmpPdfExporter, embeddedBibFilePdfExporter, writeXMP, embeddBibfile);
             }
         }
     }
 
-    private void writeMetadatatoPdfByFileNames(BibDatabaseContext databaseContext, BibDatabase dataBase, Vector<String> fileNames, Charset encoding, FilePreferences filePreferences, XmpPdfExporter xmpPdfExporter, EmbeddedBibFilePdfExporter embeddedBibFilePdfExporter, boolean writeXMP, boolean embeddBibfile) {
+    private void writeMetadatatoPdfByFileNames(BibDatabaseContext databaseContext, BibDatabase dataBase, Vector<String> fileNames, FilePreferences filePreferences, XmpPdfExporter xmpPdfExporter, EmbeddedBibFilePdfExporter embeddedBibFilePdfExporter, boolean writeXMP, boolean embeddBibfile) {
         for (String fileName : fileNames) {
             Path filePath = Path.of(fileName);
             if (!filePath.isAbsolute()) {
@@ -348,14 +345,14 @@ private void writeMetadatatoPdfByFileNames(BibDatabaseContext databaseContext, B
             if (Files.exists(filePath)) {
                 try {
                     if (writeXMP) {
-                        if (xmpPdfExporter.exportToFileByPath(databaseContext, dataBase, encoding, filePreferences, filePath)) {
+                        if (xmpPdfExporter.exportToFileByPath(databaseContext, dataBase, filePreferences, filePath)) {
                             System.out.printf("Successfully written XMP metadata of at least one entry to %s%n", fileName);
                         } else {
                             System.out.printf("File %s is not linked to any entry in database.%n", fileName);
                         }
                     }
                     if (embeddBibfile) {
-                        if (embeddedBibFilePdfExporter.exportToFileByPath(databaseContext, dataBase, encoding, filePreferences, filePath)) {
+                        if (embeddedBibFilePdfExporter.exportToFileByPath(databaseContext, dataBase, filePreferences, filePath)) {
                             System.out.printf("Successfully embedded XMP metadata of at least one entry to %s%n", fileName);
                         } else {
                             System.out.printf("File %s is not linked to any entry in database.%n", fileName);
@@ -410,9 +407,7 @@ private boolean exportMatches(List<ParserResult> loaded) {
                 // We have an TemplateExporter instance:
                 try {
                     System.out.println(Localization.lang("Exporting") + ": " + data[1]);
-                    exporter.get().export(databaseContext, Path.of(data[1]),
-                            databaseContext.getMetaData().getEncoding().orElse(preferencesService.getGeneralPreferences().getDefaultEncoding()),
-                            matches);
+                    exporter.get().export(databaseContext, Path.of(data[1]), matches);
                 } catch (Exception ex) {
                     System.err.println(Localization.lang("Could not export file") + " '" + data[1] + "': "
                             + Throwables.getStackTraceAsString(ex));
@@ -455,7 +450,6 @@ private List<ParserResult> importAndOpenFiles() {
                     try {
                         pr = OpenDatabase.loadDatabase(
                                 Path.of(aLeftOver),
-                                preferencesService.getGeneralPreferences(),
                                 preferencesService.getImportFormatPreferences(),
                                 Globals.getFileUpdateMonitor());
                     } catch (IOException ex) {
@@ -530,18 +524,21 @@ private void saveDatabase(BibDatabase newBase, String subName) {
             System.out.println(Localization.lang("Saving") + ": " + subName);
             GeneralPreferences generalPreferences = preferencesService.getGeneralPreferences();
             SavePreferences savePreferences = preferencesService.getSavePreferences();
-            AtomicFileWriter fileWriter = new AtomicFileWriter(Path.of(subName), generalPreferences.getDefaultEncoding());
-            BibWriter bibWriter = new BibWriter(fileWriter, OS.NEWLINE);
-            BibDatabaseWriter databaseWriter = new BibtexDatabaseWriter(bibWriter, generalPreferences, savePreferences, Globals.entryTypesManager);
-            databaseWriter.saveDatabase(new BibDatabaseContext(newBase));
-
-            // Show just a warning message if encoding did not work for all characters:
-            if (fileWriter.hasEncodingProblems()) {
-                System.err.println(Localization.lang("Warning") + ": "
-                        + Localization.lang(
-                        "The chosen encoding '%0' could not encode the following characters:",
-                        generalPreferences.getDefaultEncoding().displayName())
-                        + " " + fileWriter.getEncodingProblems());
+            try (AtomicFileWriter fileWriter = new AtomicFileWriter(Path.of(subName), StandardCharsets.UTF_8)) {
+                BibWriter bibWriter = new BibWriter(fileWriter, OS.NEWLINE);
+
+                BibDatabaseWriter databaseWriter = new BibtexDatabaseWriter(
+                                                                            bibWriter,
+                                                                            generalPreferences,
+                                                                            savePreferences,
+                                                                            Globals.entryTypesManager);
+                databaseWriter.saveDatabase(new BibDatabaseContext(newBase));
+
+                // Show just a warning message if encoding did not work for all characters:
+                if (fileWriter.hasEncodingProblems()) {
+                    System.err.println(Localization.lang("Warning") + ": "
+                                       + Localization.lang("UTF-8 could not be used to encode the following characters: %0", fileWriter.getEncodingProblems()));
+                }
             }
         } catch (IOException ex) {
             System.err.println(Localization.lang("Could not save file.") + "\n" + ex.getLocalizedMessage());
@@ -581,8 +578,6 @@ private void exportFile(List<ParserResult> loaded, String[] data) {
                 // We have an exporter:
                 try {
                     exporter.get().export(pr.getDatabaseContext(), Path.of(data[0]),
-                            pr.getDatabaseContext().getMetaData().getEncoding()
-                              .orElse(preferencesService.getGeneralPreferences().getDefaultEncoding()),
                             pr.getDatabaseContext().getDatabase().getEntries());
                 } catch (Exception ex) {
                     System.err.println(Localization.lang("Could not export file") + " '" + data[0] + "': "
@@ -597,13 +592,20 @@ private void importPreferences() {
             preferencesService.importPreferences(Path.of(cli.getPreferencesImport()));
             Globals.entryTypesManager.addCustomOrModifiedTypes(preferencesService.getBibEntryTypes(BibDatabaseMode.BIBTEX),
                     preferencesService.getBibEntryTypes(BibDatabaseMode.BIBLATEX));
-            List<TemplateExporter> customExporters = preferencesService.getCustomExportFormats(Globals.journalAbbreviationRepository);
+            List<TemplateExporter> customExporters =
+                    preferencesService.getCustomExportFormats(Globals.journalAbbreviationRepository);
             LayoutFormatterPreferences layoutPreferences =
                     preferencesService.getLayoutFormatterPreferences(Globals.journalAbbreviationRepository);
             SavePreferences savePreferences = preferencesService.getSavePreferencesForExport();
             XmpPreferences xmpPreferences = preferencesService.getXmpPreferences();
             BibDatabaseMode bibDatabaseMode = preferencesService.getGeneralPreferences().getDefaultBibDatabaseMode();
-            Globals.exportFactory = ExporterFactory.create(customExporters, layoutPreferences, savePreferences, xmpPreferences, bibDatabaseMode, Globals.entryTypesManager);
+            Globals.exportFactory = ExporterFactory.create(
+                    customExporters,
+                    layoutPreferences,
+                    savePreferences,
+                    xmpPreferences,
+                    bibDatabaseMode,
+                    Globals.entryTypesManager);
         } catch (JabRefException ex) {
             LOGGER.error("Cannot import preferences", ex);
         }
@@ -639,8 +641,7 @@ private void automaticallySetFileLinks(List<ParserResult> loaded) {
             AutoSetFileLinksUtil util = new AutoSetFileLinksUtil(
                     parserResult.getDatabaseContext(),
                     preferencesService.getFilePreferences(),
-                    preferencesService.getAutoLinkPreferences(),
-                    ExternalFileTypes.getInstance());
+                    preferencesService.getAutoLinkPreferences());
             util.linkAssociatedFiles(database.getEntries(), new NamedCompound(""));
         }
     }
@@ -677,7 +678,9 @@ private Optional<ParserResult> fetch(String fetchCommand) {
         String engine = split[0];
         String query = split[1];
 
-        Set<SearchBasedFetcher> fetchers = WebFetchers.getSearchBasedFetchers(preferencesService.getImportFormatPreferences());
+        Set<SearchBasedFetcher> fetchers = WebFetchers.getSearchBasedFetchers(
+                preferencesService.getImportFormatPreferences(),
+                preferencesService.getImporterPreferences());
         Optional<SearchBasedFetcher> selectedFetcher = fetchers.stream()
                                                                .filter(fetcher -> fetcher.getName().equalsIgnoreCase(engine))
                                                                .findFirst();
diff --git a/src/main/java/org/jabref/cli/CrossrefFetcherEvaluator.java b/src/main/java/org/jabref/cli/CrossrefFetcherEvaluator.java
index 207f523753c..f4fda96c23e 100644
--- a/src/main/java/org/jabref/cli/CrossrefFetcherEvaluator.java
+++ b/src/main/java/org/jabref/cli/CrossrefFetcherEvaluator.java
@@ -50,7 +50,6 @@ public static void main(String[] args) throws IOException, InterruptedException
 
             for (BibEntry entry : entries) {
                 executorService.execute(new Runnable() {
-
                     @Override
                     public void run() {
                         Optional<DOI> origDOI = entry.getField(StandardField.DOI).flatMap(DOI::parse);
diff --git a/src/main/java/org/jabref/gui/Base.css b/src/main/java/org/jabref/gui/Base.css
index b1b6894a6da..9ecf96eea3a 100644
--- a/src/main/java/org/jabref/gui/Base.css
+++ b/src/main/java/org/jabref/gui/Base.css
@@ -1,4 +1,13 @@
+
+
 .root {
+    -jr-row-odd-background: -fx-control-inner-background-alt;
+    -jr-row-even-background: -fx-control-inner-background;
+    /*
+    On light theme, the text is hard to see when it's on top of the accent color. This is an alternative lighter accent color
+    for better text visibility.
+    */
+    -jr-accent-alt: derive(-jr-accent, 15%);
 
     /*
     The theme color and some derived colors from it are used for icons, tab-headers, marking of selected inputs and
@@ -9,6 +18,7 @@
     /* This theme is the original JabRef dark blue color */
     -jr-theme: #50618F;
     -jr-accent: #a3b7e6;
+    -jr-transparent-accent: rgba(163, 183, 230, 0.16);
     -jr-selected: -jr-accent;
     -jr-checked: -jr-theme;
     -jr-hover: #0002;
@@ -98,6 +108,9 @@
     -jr-drag-target: -jr-purple;
     -jr-drag-target-hover: derive(-jr-purple, 80%);
 
+    -js-summary-text-color: #000000;
+    -js-summary-text-color-selected: #000000;
+
     /*
      Here are redefinitions of the default properties of modena. They should in principle all be derived from the
      above colors. Goal should be to make as few as possible direct color-changes to elements and only do this for
@@ -242,6 +255,23 @@
     -jr-header-height: 3em;
 }
 
+.unchanged {
+    -rtfx-background-color:#0000;
+}
+
+.updated {
+    -rtfx-background-color: rgba(41, 166, 236, 0.66);
+}
+
+.addition {
+    -rtfx-background-color: rgba(29, 209, 161, 0.5);
+}
+
+.deletion {
+    -rtfx-background-color: rgba(255, 107, 107, 0.55);
+}
+
+
 #frame {
     -fx-background-color: -jr-background-alt;
 }
@@ -413,7 +443,7 @@ TextFlow > .tooltip-text-monospaced {
 }
 
 .progress-indicatorToolbar .percentage {
-    -fx-fill:null;
+    -fx-fill: null;
 }
 
 .check-box {
@@ -604,6 +634,27 @@ TextFlow > .tooltip-text-monospaced {
     -fx-background-insets: 0;
 }
 
+.merge-field-value .action-icon {
+    -fx-blend-mode: multiply;
+    -fx-opacity: 69%;
+    -fx-icon-size: 14;
+    -fx-icon-color: -fx-text-background-color;
+}
+
+.merge-field-value:disabled .action-icon {
+    -fx-opacity: 0%;
+}
+
+.merge-header-cell {
+    -fx-border-width: 0 0 1 0;
+    -fx-border-color: -jr-gray-1;
+    -fx-background-color: -jr-row-even-background;
+}
+
+.merge-header {
+    -fx-background-color: -jr-row-even-background;
+}
+
 .table-view .groupColumnBackground {
     -fx-stroke: -jr-gray-2;
 }
@@ -650,11 +701,11 @@ TextFlow > .tooltip-text-monospaced {
     -fx-background-color: -jr-warn;
 }
 
-.file-row-text{
+.file-row-text {
     -fx-fill: -jr-search-text;
 }
 
-.file-row-text:opacity{
+.file-row-text:opacity {
     -fx-fill: derive(-jr-search-text, 70%);
 }
 
@@ -706,9 +757,9 @@ TextFlow > .tooltip-text-monospaced {
     -fx-padding: 0;
 }
 
-.accordion .titled-pane  {
-   -fx-skin: "org.jabref.gui.util.CustomTitledPaneSkin";
-   -fx-arrow-side: right;
+.accordion .titled-pane {
+    -fx-skin: "org.jabref.gui.util.CustomTitledPaneSkin";
+    -fx-arrow-side: right;
 }
 
 .accordion .titled-pane .title {
@@ -1100,15 +1151,40 @@ We want to have a look that matches our icons in the tool-bar */
     -fx-background-color: -jr-sidepane-background;
 }
 
-.jfx-snackbar-content {
+.notification-bar > .pane {
     -fx-background-color: -jr-gray-3;
     -fx-background-radius: 4px;
-    -fx-padding: 0ex 0ex 0ex 0ex;
 }
 
-.jfx-snackbar-toast {
-    -fx-text-fill: -fx-light-text-color;
-    -fx-padding: -1ex -0.5ex -1ex -0.5ex;
+.notification-bar > .pane > .title,
+.notification-bar > .pane > .label,
+.notification-bar > .pane > .button-bar > .container > .action {
+    -fx-text-fill: -jr-base;
+    -fx-padding: 1ex 1ex 1ex 1ex;
+}
+
+.notification-bar > .pane {
+    -fx-effect: dropshadow(three-pass-box, rgba(0, 0, 0, 0.3), 9, 0, 0, 2);
+    -fx-padding: 6px 7px 6px 32px;
+    -fx-background-radius: 0px;
+    -fx-border-radius: 0px;
+}
+
+.notification-bar > .pane > .button-bar > .container {
+    -fx-padding: 0px 24px 0px 0px;
+}
+
+.notification-bar > .pane > .label {
+    -fx-graphic-text-gap: 8px;
+}
+
+.notification-pane .notification-bar > .pane .close-button > .graphic {
+    -fx-background-color: -jr-base;
+}
+
+.notification-bar > .pane > .label > .ikonli-font-icon {
+    -fx-icon-size: 16px;
+    -fx-icon-color: -jr-base;
 }
 
 .progress-bar > .bar {
@@ -1270,10 +1346,23 @@ TextFlow * {
     -fx-fill: -fx-mid-text-color;
 }
 
-.fontsizeSpinner{
+.fontsizeSpinner {
     -fx-pref-width: 5em;
 }
 
 .text-field:invalid {
     -fx-background-color: rgba(240, 128, 128, 0.5);
 }
+
+.rating {
+    -fx-skin: "org.jabref.gui.util.CustomRatingSkin";
+    -fx-padding: 0.5em 0px 0px 0px;
+}
+
+.rating > .container > .button {
+    -fx-icon-color: derive(-fx-text-base-color, 85%);
+}
+
+.rating > .container > .button.strong {
+    -fx-icon-color: -fx-text-base-color;
+}
diff --git a/src/main/java/org/jabref/gui/ClipBoardManager.java b/src/main/java/org/jabref/gui/ClipBoardManager.java
index 290cb774c72..a75dd1798d9 100644
--- a/src/main/java/org/jabref/gui/ClipBoardManager.java
+++ b/src/main/java/org/jabref/gui/ClipBoardManager.java
@@ -5,10 +5,7 @@
 import java.awt.datatransfer.StringSelection;
 import java.awt.datatransfer.Transferable;
 import java.awt.datatransfer.UnsupportedFlavorException;
-import java.io.ByteArrayInputStream;
 import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 
@@ -22,19 +19,8 @@
 import org.jabref.architecture.AllowedToUseAwt;
 import org.jabref.logic.bibtex.BibEntryWriter;
 import org.jabref.logic.bibtex.FieldWriter;
-import org.jabref.logic.importer.FetcherException;
-import org.jabref.logic.importer.ImportException;
-import org.jabref.logic.importer.ImportFormatReader;
-import org.jabref.logic.importer.ImportFormatReader.UnknownFormatImport;
-import org.jabref.logic.importer.ParseException;
-import org.jabref.logic.importer.fetcher.ArXiv;
-import org.jabref.logic.importer.fetcher.DoiFetcher;
-import org.jabref.logic.importer.fileformat.BibtexParser;
 import org.jabref.model.database.BibDatabaseMode;
 import org.jabref.model.entry.BibEntry;
-import org.jabref.model.entry.identifier.ArXivIdentifier;
-import org.jabref.model.entry.identifier.DOI;
-import org.jabref.model.util.OptionalUtil;
 import org.jabref.preferences.PreferencesService;
 
 import org.slf4j.Logger;
@@ -49,18 +35,16 @@ public class ClipBoardManager {
 
     private static Clipboard clipboard;
     private static java.awt.datatransfer.Clipboard primary;
-    private static ImportFormatReader importFormatReader;
+
     private final PreferencesService preferencesService;
 
     public ClipBoardManager(PreferencesService preferencesService) {
-        this(Clipboard.getSystemClipboard(), Toolkit.getDefaultToolkit().getSystemSelection(), Globals.IMPORT_FORMAT_READER, preferencesService);
+        this(Clipboard.getSystemClipboard(), Toolkit.getDefaultToolkit().getSystemSelection(), preferencesService);
     }
 
-    public ClipBoardManager(Clipboard clipboard, java.awt.datatransfer.Clipboard primary, ImportFormatReader importFormatReader, PreferencesService preferencesService) {
+    public ClipBoardManager(Clipboard clipboard, java.awt.datatransfer.Clipboard primary, PreferencesService preferencesService) {
         ClipBoardManager.clipboard = clipboard;
         ClipBoardManager.primary = primary;
-        ClipBoardManager.importFormatReader = importFormatReader;
-
         this.preferencesService = preferencesService;
     }
 
@@ -103,6 +87,10 @@ public static String getContents() {
         return result;
     }
 
+    public Optional<String> getBibTeXEntriesFromClipbaord() {
+        return Optional.ofNullable(clipboard.getContent(DragAndDropDataFormats.ENTRIES)).map(String.class::cast);
+    }
+
     /**
      * Get the String residing on the primary clipboard (if it exists).
      *
@@ -167,71 +155,4 @@ public void setContent(List<BibEntry> entries) throws IOException {
         clipboard.setContent(content);
         setPrimaryClipboardContent(content);
     }
-
-    public List<BibEntry> extractData() {
-        Object entries = clipboard.getContent(DragAndDropDataFormats.ENTRIES);
-
-        if (entries == null) {
-            return handleStringData(clipboard.getString());
-        }
-        return handleBibTeXData((String) entries);
-    }
-
-    private List<BibEntry> handleBibTeXData(String entries) {
-        BibtexParser parser = new BibtexParser(preferencesService.getImportFormatPreferences(), Globals.getFileUpdateMonitor());
-        try {
-            return parser.parseEntries(new ByteArrayInputStream(entries.getBytes(StandardCharsets.UTF_8)));
-        } catch (ParseException ex) {
-            LOGGER.error("Could not paste", ex);
-            return Collections.emptyList();
-        }
-    }
-
-    private List<BibEntry> handleStringData(String data) {
-        if ((data == null) || data.isEmpty()) {
-            return Collections.emptyList();
-        }
-
-        Optional<DOI> doi = DOI.parse(data);
-        if (doi.isPresent()) {
-            return fetchByDOI(doi.get());
-        }
-        Optional<ArXivIdentifier> arXiv = ArXivIdentifier.parse(data);
-        if (arXiv.isPresent()) {
-            return fetchByArXiv(arXiv.get());
-        }
-
-        return tryImportFormats(data);
-    }
-
-    private List<BibEntry> tryImportFormats(String data) {
-        try {
-            UnknownFormatImport unknownFormatImport = importFormatReader.importUnknownFormat(data);
-            return unknownFormatImport.parserResult.getDatabase().getEntries();
-        } catch (ImportException ignored) {
-            return Collections.emptyList();
-        }
-    }
-
-    private List<BibEntry> fetchByDOI(DOI doi) {
-        LOGGER.info("Found DOI in clipboard");
-        try {
-            Optional<BibEntry> entry = new DoiFetcher(preferencesService.getImportFormatPreferences()).performSearchById(doi.getDOI());
-            return OptionalUtil.toList(entry);
-        } catch (FetcherException ex) {
-            LOGGER.error("Error while fetching", ex);
-            return Collections.emptyList();
-        }
-    }
-
-    private List<BibEntry> fetchByArXiv(ArXivIdentifier arXivIdentifier) {
-        LOGGER.info("Found arxiv identifier in clipboard");
-        try {
-            Optional<BibEntry> entry = new ArXiv(preferencesService.getImportFormatPreferences()).performSearchById(arXivIdentifier.getNormalizedWithoutVersion());
-            return OptionalUtil.toList(entry);
-        } catch (FetcherException ex) {
-            LOGGER.error("Error while fetching", ex);
-            return Collections.emptyList();
-        }
-    }
 }
diff --git a/src/main/java/org/jabref/gui/Dark.css b/src/main/java/org/jabref/gui/Dark.css
index ecc993453dc..4a9f76d6c1b 100644
--- a/src/main/java/org/jabref/gui/Dark.css
+++ b/src/main/java/org/jabref/gui/Dark.css
@@ -4,6 +4,9 @@
     -jr-selected: -jr-accent;
     -jr-hover: #fff1;
 
+    -jr-row-odd-background: #272b38;
+    -jr-row-even-background: #212330;
+    -jr-accent-alt: -jr-accent;
 
     -jr-red: #b71c1f;
     -jr-light-red: #db1d2b;
@@ -55,6 +58,21 @@
 
     -jr-drag-target: -jr-accent;
     -jr-drag-target-hover: -jr-accent;
+
+    -js-summary-text-color: derive(-fx-light-text-color, 70%);
+    -js-summary-text-color-selected: derive( -fx-dark-text-color, 70%);
+}
+
+.unchanged {
+
+}
+
+.addition {
+    -rtfx-background-color: -jr-green;
+}
+
+.deletion {
+    -rtfx-background-color: -jr-red;
 }
 
 #previewBody {
@@ -79,6 +97,21 @@
     -fx-background-color: -jr-hover;
 }
 
+.merge-field-value .action-icon {
+    -fx-blend-mode: none;
+    -fx-opacity: 90%;
+}
+
+.merge-header-cell {
+    -fx-border-width: 0 0 1 0;
+    -fx-border-color: -fx-outer-border;
+    -fx-background-color: -jr-row-odd-background;
+}
+
+.merge-header {
+    -fx-background-color: -jr-row-odd-background;
+}
+
 .table-view .groupColumnBackground {
     -fx-stroke: -jr-gray-3;
 }
@@ -125,3 +158,15 @@
     -fx-text-fill: derive(-fx-light-text-color, 80%);
     -fx-icon-color: derive(-fx-light-text-color, 80%);
 }
+
+.notification-bar > .pane {
+    -fx-background-color: -fx-light-text-color;
+}
+
+.rating > .container > .button {
+    -fx-icon-color: derive(-fx-light-text-color, -50%);
+}
+
+.rating > .container > .button.strong {
+    -fx-icon-color: -fx-light-text-color;
+}
diff --git a/src/main/java/org/jabref/gui/DefaultInjector.java b/src/main/java/org/jabref/gui/DefaultInjector.java
index d198dbe1136..5318c3b95dc 100644
--- a/src/main/java/org/jabref/gui/DefaultInjector.java
+++ b/src/main/java/org/jabref/gui/DefaultInjector.java
@@ -7,6 +7,7 @@
 import org.jabref.gui.keyboard.KeyBindingRepository;
 import org.jabref.gui.theme.ThemeManager;
 import org.jabref.gui.util.TaskExecutor;
+import org.jabref.logic.importer.ImportFormatReader;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.protectedterms.ProtectedTermsLoader;
 import org.jabref.model.entry.BibEntryTypesManager;
@@ -52,6 +53,8 @@ private static Object createDependency(Class<?> clazz) {
             return Globals.undoManager;
         } else if (clazz == BibEntryTypesManager.class) {
             return Globals.entryTypesManager;
+        } else if (clazz == ImportFormatReader.class) {
+            return Globals.IMPORT_FORMAT_READER;
         } else {
             try {
                 return clazz.newInstance();
diff --git a/src/main/java/org/jabref/gui/EntryTypeView.java b/src/main/java/org/jabref/gui/EntryTypeView.java
index 10a95f3a5d0..7db73467529 100644
--- a/src/main/java/org/jabref/gui/EntryTypeView.java
+++ b/src/main/java/org/jabref/gui/EntryTypeView.java
@@ -24,10 +24,12 @@
 import org.jabref.gui.util.IconValidationDecorator;
 import org.jabref.gui.util.ViewModelListCellFactory;
 import org.jabref.logic.importer.IdBasedFetcher;
+import org.jabref.logic.importer.ImportFormatReader;
 import org.jabref.logic.importer.WebFetcher;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseMode;
 import org.jabref.model.entry.BibEntryType;
+import org.jabref.model.entry.types.BiblatexAPAEntryTypeDefinitions;
 import org.jabref.model.entry.types.BiblatexEntryTypeDefinitions;
 import org.jabref.model.entry.types.BiblatexSoftwareEntryTypeDefinitions;
 import org.jabref.model.entry.types.BibtexEntryTypeDefinitions;
@@ -47,6 +49,7 @@
 public class EntryTypeView extends BaseDialog<EntryType> {
 
     @Inject StateManager stateManager;
+    @Inject ImportFormatReader importFormatReader;
 
     @FXML private ButtonType generateButton;
     @FXML private TextField idTextField;
@@ -118,7 +121,7 @@ private void addEntriesToPane(FlowPane pane, Collection<? extends BibEntryType>
     @FXML
     public void initialize() {
         visualizer.setDecoration(new IconValidationDecorator());
-        viewModel = new EntryTypeViewModel(preferencesService, libraryTab, dialogService, stateManager);
+        viewModel = new EntryTypeViewModel(preferencesService, libraryTab, dialogService, stateManager, importFormatReader);
 
         idBasedFetchers.itemsProperty().bind(viewModel.fetcherItemsProperty());
         idTextField.textProperty().bindBidirectional(viewModel.idTextProperty());
@@ -157,6 +160,7 @@ public void initialize() {
                 .filter(e -> !recommendedEntries.contains(e))
                 .collect(Collectors.toList());
             otherEntries.addAll(BiblatexSoftwareEntryTypeDefinitions.ALL);
+            otherEntries.addAll(BiblatexAPAEntryTypeDefinitions.ALL);
         } else {
             recommendedEntries = BibtexEntryTypeDefinitions.RECOMMENDED;
             otherEntries = BibtexEntryTypeDefinitions.ALL
diff --git a/src/main/java/org/jabref/gui/EntryTypeViewModel.java b/src/main/java/org/jabref/gui/EntryTypeViewModel.java
index d8255ee0fa7..7e08b6857e2 100644
--- a/src/main/java/org/jabref/gui/EntryTypeViewModel.java
+++ b/src/main/java/org/jabref/gui/EntryTypeViewModel.java
@@ -14,13 +14,13 @@
 import javafx.concurrent.Task;
 import javafx.concurrent.Worker;
 
-import org.jabref.gui.duplicationFinder.DuplicateResolverDialog;
+import org.jabref.gui.externalfiles.ImportHandler;
 import org.jabref.gui.importer.NewEntryAction;
-import org.jabref.logic.citationkeypattern.CitationKeyGenerator;
-import org.jabref.logic.database.DuplicateCheck;
+import org.jabref.logic.importer.FetcherClientException;
 import org.jabref.logic.importer.FetcherException;
+import org.jabref.logic.importer.FetcherServerException;
 import org.jabref.logic.importer.IdBasedFetcher;
-import org.jabref.logic.importer.ImportCleanup;
+import org.jabref.logic.importer.ImportFormatReader;
 import org.jabref.logic.importer.WebFetchers;
 import org.jabref.logic.importer.fetcher.DoiFetcher;
 import org.jabref.logic.l10n.Localization;
@@ -52,18 +52,27 @@ public class EntryTypeViewModel {
     private final DialogService dialogService;
     private final Validator idFieldValidator;
     private final StateManager stateManager;
+    private final ImportFormatReader importFormatReader;
 
     public EntryTypeViewModel(PreferencesService preferences,
                               LibraryTab libraryTab,
                               DialogService dialogService,
-                              StateManager stateManager) {
+                              StateManager stateManager,
+                              ImportFormatReader importFormatReader) {
         this.libraryTab = libraryTab;
         this.preferencesService = preferences;
         this.dialogService = dialogService;
         this.stateManager = stateManager;
-        fetchers.addAll(WebFetchers.getIdBasedFetchers(preferences.getImportFormatPreferences()));
+        this.importFormatReader = importFormatReader;
+
+        fetchers.addAll(WebFetchers.getIdBasedFetchers(
+                preferences.getImportFormatPreferences(),
+                preferences.getImporterPreferences()));
         selectedItemProperty.setValue(getLastSelectedFetcher());
-        idFieldValidator = new FunctionBasedValidator<>(idText, StringUtil::isNotBlank, ValidationMessage.error(Localization.lang("Required field \"%0\" is empty.", Localization.lang("ID"))));
+        idFieldValidator = new FunctionBasedValidator<>(
+                idText,
+                StringUtil::isNotBlank,
+                ValidationMessage.error(Localization.lang("Required field \"%0\" is empty.", Localization.lang("ID"))));
     }
 
     public BooleanProperty searchSuccesfulProperty() {
@@ -137,15 +146,18 @@ public void runFetcherWorker() {
             String fetcherExceptionMessage = exception.getMessage();
             String fetcher = selectedItemProperty().getValue().getName();
             String searchId = idText.getValue();
-            if (exception instanceof FetcherException) {
-                dialogService.showErrorDialogAndWait(Localization.lang("Error"), Localization.lang("Error while fetching from %0", fetcher + "." + "\n" + fetcherExceptionMessage));
+
+            if (exception instanceof FetcherClientException) {
+                dialogService.showInformationDialogAndWait(Localization.lang("Failed to import by ID"), Localization.lang("Bibliographic data not found. Cause is likely the client side. Please check connection and identifier for correctness.") + "\n" + fetcherExceptionMessage);
+            } else if (exception instanceof FetcherServerException) {
+                dialogService.showInformationDialogAndWait(Localization.lang("Failed to import by ID"), Localization.lang("Bibliographic data not found. Cause is likely the server side. Please try agan later.") + "\n" + fetcherExceptionMessage);
             } else {
-                dialogService.showErrorDialogAndWait(Localization.lang("No files found.", Localization.lang("Fetcher '%0' did not find an entry for id '%1'.", fetcher, searchId) + "\n" + fetcherExceptionMessage));
+                dialogService.showInformationDialogAndWait(Localization.lang("Failed to import by ID"), Localization.lang("Error message %0", fetcherExceptionMessage));
             }
+
             LOGGER.error(String.format("Exception during fetching when using fetcher '%s' with entry id '%s'.", searchId, fetcher), exception);
 
             searchingProperty.set(false);
-
             fetcherWorker = new FetcherWorker();
         });
 
@@ -153,28 +165,17 @@ public void runFetcherWorker() {
             Optional<BibEntry> result = fetcherWorker.getValue();
             if (result.isPresent()) {
                 final BibEntry entry = result.get();
-                ImportCleanup cleanup = new ImportCleanup(libraryTab.getBibDatabaseContext().getMode());
-                cleanup.doPostCleanup(entry);
-                Optional<BibEntry> duplicate = new DuplicateCheck(Globals.entryTypesManager).containsDuplicate(libraryTab.getDatabase(), entry, libraryTab.getBibDatabaseContext().getMode());
-                if (duplicate.isPresent()) {
-                    DuplicateResolverDialog dialog = new DuplicateResolverDialog(entry, duplicate.get(), DuplicateResolverDialog.DuplicateResolverType.IMPORT_CHECK, libraryTab.getBibDatabaseContext(), stateManager);
-                    switch (dialogService.showCustomDialogAndWait(dialog)
-                                         .orElse(DuplicateResolverDialog.DuplicateResolverResult.BREAK)) {
-                        case KEEP_LEFT -> {
-                            libraryTab.getDatabase().removeEntry(duplicate.get());
-                            libraryTab.getDatabase().insertEntry(entry);
-                        }
-                        case KEEP_BOTH -> libraryTab.getDatabase().insertEntry(entry);
-                        case KEEP_MERGE -> {
-                            libraryTab.getDatabase().removeEntry(duplicate.get());
-                            libraryTab.getDatabase().insertEntry(dialog.getMergedEntry());
-                        }
-                    }
-                } else {
-                    // Regenerate CiteKey of imported BibEntry
-                    new CitationKeyGenerator(libraryTab.getBibDatabaseContext(), preferencesService.getCitationKeyPatternPreferences()).generateAndSetKey(entry);
-                    libraryTab.insertEntry(entry);
-                }
+
+                ImportHandler handler = new ImportHandler(
+                        libraryTab.getBibDatabaseContext(),
+                        preferencesService,
+                        Globals.getFileUpdateMonitor(),
+                        libraryTab.getUndoManager(),
+                        stateManager,
+                        dialogService,
+                        importFormatReader);
+                handler.importEntryWithDuplicateCheck(libraryTab.getBibDatabaseContext(), entry);
+
                 searchSuccesfulProperty.set(true);
             } else if (StringUtil.isBlank(idText.getValue())) {
                 dialogService.showWarningDialogAndWait(Localization.lang("Empty search ID"), Localization.lang("The given search ID was empty."));
@@ -185,12 +186,17 @@ public void runFetcherWorker() {
                 String searchId = idText.getValue();
 
                 // When DOI ID is not found, allow the user to either return to the dialog or add entry manually
-                boolean addEntryFlag = dialogService.showConfirmationDialogAndWait(Localization.lang("DOI not found"),
+                boolean addEntryFlag = dialogService.showConfirmationDialogAndWait(Localization.lang("Identifier not found"),
                         Localization.lang("Fetcher '%0' did not find an entry for id '%1'.", fetcher, searchId),
                         Localization.lang("Add entry manually"),
                         Localization.lang("Return to dialog"));
                 if (addEntryFlag) {
-                    new NewEntryAction(libraryTab.frame(), StandardEntryType.Article, dialogService, preferencesService, stateManager).execute();
+                    new NewEntryAction(
+                            libraryTab.frame(),
+                            StandardEntryType.Article,
+                            dialogService,
+                            preferencesService,
+                            stateManager).execute();
                     searchSuccesfulProperty.set(true);
                 }
             }
diff --git a/src/main/java/org/jabref/gui/Globals.java b/src/main/java/org/jabref/gui/Globals.java
index 44a510066d8..1696a1dfba9 100644
--- a/src/main/java/org/jabref/gui/Globals.java
+++ b/src/main/java/org/jabref/gui/Globals.java
@@ -1,6 +1,5 @@
 package org.jabref.gui;
 
-import java.awt.GraphicsEnvironment;
 import java.util.Optional;
 import java.util.UUID;
 
@@ -115,10 +114,10 @@ public static synchronized ThemeManager getThemeManager() {
     public static void startBackgroundTasks() {
         Globals.fileUpdateMonitor = new DefaultFileUpdateMonitor();
         JabRefExecutorService.INSTANCE.executeInterruptableTask(Globals.fileUpdateMonitor, "FileUpdateMonitor");
-
-        if (Globals.prefs.getTelemetryPreferences().shouldCollectTelemetry() && !GraphicsEnvironment.isHeadless()) {
+        // TODO Currently deactivated due to incompatibilities in XML
+      /*  if (Globals.prefs.getTelemetryPreferences().shouldCollectTelemetry() && !GraphicsEnvironment.isHeadless()) {
             startTelemetryClient();
-        }
+        } */
     }
 
     private static void stopTelemetryClient() {
diff --git a/src/main/java/org/jabref/gui/JabRefDialogService.java b/src/main/java/org/jabref/gui/JabRefDialogService.java
index 1fdb109ff8f..d21e0b3b9d9 100644
--- a/src/main/java/org/jabref/gui/JabRefDialogService.java
+++ b/src/main/java/org/jabref/gui/JabRefDialogService.java
@@ -13,6 +13,7 @@
 import java.util.stream.Collectors;
 
 import javafx.concurrent.Task;
+import javafx.geometry.Pos;
 import javafx.print.PrinterJob;
 import javafx.scene.Group;
 import javafx.scene.Node;
@@ -34,19 +35,19 @@
 import javafx.stage.Window;
 import javafx.util.Duration;
 
+import org.jabref.gui.help.ErrorConsoleAction;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.theme.ThemeManager;
 import org.jabref.gui.util.BackgroundTask;
 import org.jabref.gui.util.BaseDialog;
+import org.jabref.gui.util.DefaultTaskExecutor;
 import org.jabref.gui.util.DirectoryDialogConfiguration;
 import org.jabref.gui.util.FileDialogConfiguration;
 import org.jabref.gui.util.ZipFileChooser;
 import org.jabref.logic.l10n.Localization;
 
-import com.jfoenix.controls.JFXSnackbar;
-import com.jfoenix.controls.JFXSnackbar.SnackbarEvent;
-import com.jfoenix.controls.JFXSnackbarLayout;
 import com.tobiasdiez.easybind.EasyBind;
+import org.controlsfx.control.Notifications;
 import org.controlsfx.control.TaskProgressView;
 import org.controlsfx.dialog.ExceptionDialog;
 import org.controlsfx.dialog.ProgressDialog;
@@ -70,18 +71,15 @@ public class JabRefDialogService implements DialogService {
     private static final Logger LOGGER = LoggerFactory.getLogger(JabRefDialogService.class);
 
     private final Window mainWindow;
-    private final JFXSnackbar statusLine;
     private final ThemeManager themeManager;
 
     public JabRefDialogService(Window mainWindow, Pane mainPane, ThemeManager themeManager) {
         this.mainWindow = mainWindow;
         this.themeManager = themeManager;
-        this.statusLine = new JFXSnackbar(mainPane);
     }
 
     private FXDialog createDialog(AlertType type, String title, String content) {
         FXDialog alert = new FXDialog(type, title, true);
-        themeManager.installCss(alert.getDialogPane().getScene());
         alert.setHeaderText(null);
         alert.setContentText(content);
         alert.getDialogPane().setMinHeight(Region.USE_PREF_SIZE);
@@ -99,7 +97,6 @@ private FXDialog createDialogWithOptOut(AlertType type, String title, String con
         // Create a new dialog pane that has a checkbox instead of the hide/show details button
         // Use the supplied callback for the action of the checkbox
         alert.setDialogPane(new DialogPane() {
-
             @Override
             protected Node createDetailsButton() {
                 CheckBox optOut = new CheckBox();
@@ -115,7 +112,6 @@ protected Node createDetailsButton() {
 
         // Reset the dialog graphic using the default style
         alert.getDialogPane().setGraphic(graphic);
-        themeManager.installCss(alert.getDialogPane().getScene());
         alert.setHeaderText(null);
         alert.setContentText(content);
         alert.getDialogPane().setMinHeight(Region.USE_PREF_SIZE);
@@ -140,7 +136,6 @@ public <T> Optional<T> showChoiceDialogAndWait(String title, String content, Str
         choiceDialog.setTitle(title);
         choiceDialog.setContentText(content);
         choiceDialog.initOwner(mainWindow);
-        themeManager.installCss(choiceDialog.getDialogPane().getScene());
         return choiceDialog.showAndWait();
     }
 
@@ -150,7 +145,6 @@ public Optional<String> showInputDialogAndWait(String title, String content) {
         inputDialog.setHeaderText(title);
         inputDialog.setContentText(content);
         inputDialog.initOwner(mainWindow);
-        themeManager.installCss(inputDialog.getDialogPane().getScene());
         return inputDialog.showAndWait();
     }
 
@@ -160,7 +154,6 @@ public Optional<String> showInputDialogWithDefaultAndWait(String title, String c
         inputDialog.setHeaderText(title);
         inputDialog.setContentText(content);
         inputDialog.initOwner(mainWindow);
-        themeManager.installCss(inputDialog.getDialogPane().getScene());
         return inputDialog.showAndWait();
     }
 
@@ -188,7 +181,6 @@ public void showErrorDialogAndWait(String message, Throwable exception) {
         exceptionDialog.getDialogPane().setMaxWidth(mainWindow.getWidth() / 2);
         exceptionDialog.setHeaderText(message);
         exceptionDialog.initOwner(mainWindow);
-        themeManager.installCss(exceptionDialog.getDialogPane().getScene());
         exceptionDialog.showAndWait();
     }
 
@@ -198,7 +190,6 @@ public void showErrorDialogAndWait(String title, String content, Throwable excep
         exceptionDialog.setHeaderText(title);
         exceptionDialog.setContentText(content);
         exceptionDialog.initOwner(mainWindow);
-        themeManager.installCss(exceptionDialog.getDialogPane().getScene());
         exceptionDialog.showAndWait();
     }
 
@@ -268,7 +259,6 @@ public Optional<ButtonType> showCustomDialogAndWait(String title, DialogPane con
         alert.getDialogPane().setMinHeight(Region.USE_PREF_SIZE);
         alert.setResizable(true);
         alert.initOwner(mainWindow);
-        themeManager.installCss(alert.getDialogPane().getScene());
         return alert.showAndWait();
     }
 
@@ -296,7 +286,6 @@ public <V> void showProgressDialog(String title, String content, Task<V> task) {
             task.cancel();
             progressDialog.close();
         });
-        themeManager.installCss(progressDialog.getDialogPane().getScene());
         progressDialog.initOwner(mainWindow);
         progressDialog.show();
     }
@@ -321,9 +310,8 @@ public <V> Optional<ButtonType> showBackgroundProgressDialogAndWait(String title
         alert.getDialogPane().setMinHeight(Region.USE_PREF_SIZE);
         alert.setResizable(true);
         alert.initOwner(mainWindow);
-        themeManager.installCss(alert.getDialogPane().getScene());
 
-        stateManager.getAnyTaskRunning().addListener((observable, oldValue, newValue) -> {
+        stateManager.getAnyTasksThatWillNotBeRecoveredRunning().addListener((observable, oldValue, newValue) -> {
             if (!newValue) {
                 alert.setResult(ButtonType.YES);
                 alert.close();
@@ -336,7 +324,27 @@ public <V> Optional<ButtonType> showBackgroundProgressDialogAndWait(String title
     @Override
     public void notify(String message) {
         LOGGER.info(message);
-        statusLine.fireEvent(new SnackbarEvent(new JFXSnackbarLayout(message), TOAST_MESSAGE_DISPLAY_TIME, null));
+
+        DefaultTaskExecutor.runInJavaFXThread(() -> {
+            Notifications.create()
+                         .text(message)
+                         .position(Pos.BOTTOM_CENTER)
+                         .hideAfter(TOAST_MESSAGE_DISPLAY_TIME)
+                         .owner(mainWindow)
+                         .threshold(5,
+                                 Notifications.create()
+                                              .title(Localization.lang("Last notification"))
+                                              // TODO: Change to a notification overview instead of event log when that is available. The event log is not that user friendly (different purpose).
+                                              .text(
+                                                    "(" + Localization.lang("Check the event log to see all notifications") + ")"
+                                                     + "\n\n" + message)
+                                              .onAction((e)-> {
+                                                     ErrorConsoleAction ec = new ErrorConsoleAction();
+                                                     ec.execute();
+                                                 }))
+                         .hideCloseButton()
+                         .show();
+        });
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java
index 4d6d09ab0f7..718516f669e 100644
--- a/src/main/java/org/jabref/gui/JabRefFrame.java
+++ b/src/main/java/org/jabref/gui/JabRefFrame.java
@@ -61,15 +61,14 @@
 import org.jabref.gui.copyfiles.CopyFilesAction;
 import org.jabref.gui.customentrytypes.CustomizeEntryAction;
 import org.jabref.gui.desktop.JabRefDesktop;
-import org.jabref.gui.dialogs.AutosaveUiManager;
 import org.jabref.gui.documentviewer.ShowDocumentViewerAction;
 import org.jabref.gui.duplicationFinder.DuplicateSearch;
 import org.jabref.gui.edit.CopyMoreAction;
 import org.jabref.gui.edit.EditAction;
 import org.jabref.gui.edit.ManageKeywordsAction;
-import org.jabref.gui.edit.MassSetFieldsAction;
 import org.jabref.gui.edit.OpenBrowserAction;
 import org.jabref.gui.edit.ReplaceStringAction;
+import org.jabref.gui.edit.automaticfiededitor.AutomaticFieldEditorAction;
 import org.jabref.gui.entryeditor.OpenEntryEditorAction;
 import org.jabref.gui.entryeditor.PreviewSwitchAction;
 import org.jabref.gui.exporter.ExportCommand;
@@ -81,7 +80,6 @@
 import org.jabref.gui.externalfiles.AutoLinkFilesAction;
 import org.jabref.gui.externalfiles.DownloadFullTextAction;
 import org.jabref.gui.externalfiles.FindUnlinkedFilesAction;
-import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.help.AboutAction;
 import org.jabref.gui.help.ErrorConsoleAction;
 import org.jabref.gui.help.HelpAction;
@@ -124,8 +122,10 @@
 import org.jabref.logic.autosaveandbackup.AutosaveManager;
 import org.jabref.logic.autosaveandbackup.BackupManager;
 import org.jabref.logic.citationstyle.CitationStyleOutputFormat;
+import org.jabref.logic.help.HelpFile;
 import org.jabref.logic.importer.IdFetcher;
 import org.jabref.logic.importer.ImportCleanup;
+import org.jabref.logic.importer.ImportFormatReader;
 import org.jabref.logic.importer.ParserResult;
 import org.jabref.logic.importer.WebFetchers;
 import org.jabref.logic.l10n.Localization;
@@ -182,6 +182,7 @@ public class JabRefFrame extends BorderPane {
     private Subscription dividerSubscription;
 
     private final TaskExecutor taskExecutor;
+    private final ImportFormatReader importFormatReader;
 
     public JabRefFrame(Stage mainStage) {
         this.mainStage = mainStage;
@@ -193,6 +194,7 @@ public JabRefFrame(Stage mainStage) {
         this.globalSearchBar = new GlobalSearchBar(this, stateManager, prefs, undoManager);
         this.fileHistory = new FileHistoryMenu(prefs, dialogService, getOpenDatabaseAction());
         this.taskExecutor = Globals.TASK_EXECUTOR;
+        this.importFormatReader = Globals.IMPORT_FORMAT_READER;
         this.setOnKeyTyped(key -> {
             if (this.fileHistory.isShowing()) {
                 if (this.fileHistory.openFileByKey(key)) {
@@ -221,6 +223,54 @@ private void initDragAndDrop() {
                 } else {
                     tabbedPane.getTabs().remove(dndIndicator);
                 }
+                // Accept drag entries from MainTable
+                if (event.getDragboard().hasContent(DragAndDropDataFormats.ENTRIES)) {
+                    event.acceptTransferModes(TransferMode.COPY);
+                    event.consume();
+                }
+            });
+
+            this.getScene().setOnDragEntered(event -> {
+                // It is necessary to setOnDragOver for newly opened tabs
+                // drag'n'drop on tabs covered dnd on tabbedPane, so dnd on tabs should contain all dnds on tabbedPane
+                tabbedPane.lookupAll(".tab").forEach(tab -> {
+                    tab.setOnDragOver(tabDragEvent -> {
+                        if (DragAndDropHelper.hasBibFiles(tabDragEvent.getDragboard())) {
+                            tabDragEvent.acceptTransferModes(TransferMode.ANY);
+                            if (!tabbedPane.getTabs().contains(dndIndicator)) {
+                                tabbedPane.getTabs().add(dndIndicator);
+                            }
+                            event.consume();
+                        } else {
+                            tabbedPane.getTabs().remove(dndIndicator);
+                        }
+
+                        if (tabDragEvent.getDragboard().hasContent(DragAndDropDataFormats.ENTRIES)) {
+                            tabDragEvent.acceptTransferModes(TransferMode.COPY);
+                            tabDragEvent.consume();
+                        }
+                    });
+                    tab.setOnDragExited(event1 -> tabbedPane.getTabs().remove(dndIndicator));
+                    tab.setOnDragDropped(tabDragEvent -> {
+                        if (DragAndDropHelper.hasBibFiles(tabDragEvent.getDragboard())) {
+                            tabbedPane.getTabs().remove(dndIndicator);
+                            List<Path> bibFiles = DragAndDropHelper.getBibFiles(tabDragEvent.getDragboard());
+                            OpenDatabaseAction openDatabaseAction = this.getOpenDatabaseAction();
+                            openDatabaseAction.openFiles(bibFiles);
+                            tabDragEvent.setDropCompleted(true);
+                            tabDragEvent.consume();
+                        } else {
+                            for (Tab libraryTab : tabbedPane.getTabs()) {
+                                if (libraryTab.getId().equals(tab.getId()) &&
+                                        !tabbedPane.getSelectionModel().getSelectedItem().equals(libraryTab)) {
+                                    ((LibraryTab) libraryTab).dropEntry(stateManager.getLocalDragboard().getBibEntries());
+                                }
+                            }
+                            tabDragEvent.consume();
+                        }
+                    });
+                });
+                event.consume();
             });
 
             this.getScene().setOnDragExited(event -> tabbedPane.getTabs().remove(dndIndicator));
@@ -229,7 +279,7 @@ private void initDragAndDrop() {
                 tabbedPane.getTabs().remove(dndIndicator);
                 List<Path> bibFiles = DragAndDropHelper.getBibFiles(event.getDragboard());
                 OpenDatabaseAction openDatabaseAction = this.getOpenDatabaseAction();
-                openDatabaseAction.openFiles(bibFiles, true);
+                openDatabaseAction.openFiles(bibFiles);
                 event.setDropCompleted(true);
                 event.consume();
             });
@@ -300,7 +350,6 @@ private void initKeyBindings() {
     private void initShowTrackingNotification() {
         if (prefs.getTelemetryPreferences().shouldAskToCollectTelemetry()) {
             JabRefExecutorService.INSTANCE.submit(new TimerTask() {
-
                 @Override
                 public void run() {
                     DefaultTaskExecutor.runInJavaFXThread(JabRefFrame.this::showTrackingNotification);
@@ -330,15 +379,14 @@ private void showTrackingNotification() {
      */
     public void openAction(String filePath) {
         Path file = Path.of(filePath);
-        // all the logic is done in openIt. Even raising an existing panel
-        getOpenDatabaseAction().openFile(file, true);
+        getOpenDatabaseAction().openFile(file);
     }
 
     /**
      * The MacAdapter calls this method when "About" is selected from the application menu.
      */
     public void about() {
-        HelpAction.getMainHelpPageCommand().execute();
+        new HelpAction(HelpFile.CONTENTS, dialogService).execute();
     }
 
     /**
@@ -384,7 +432,7 @@ public boolean quit() {
         It is important to wait for unfinished background tasks before checking if a save-operation is needed, because
         the background tasks may make changes themselves that need saving.
          */
-        if (stateManager.getAnyTaskRunning().getValue()) {
+        if (stateManager.getAnyTasksThatWillNotBeRecoveredRunning().getValue()) {
             Optional<ButtonType> shouldClose = dialogService.showBackgroundProgressDialogAndWait(
                     Localization.lang("Please wait..."),
                     Localization.lang("Waiting for background tasks to finish. Quit anyway?"),
@@ -445,12 +493,13 @@ private void initLayout() {
 
         // We need to wait with setting the divider since it gets reset a few times during the initial set-up
         mainStage.showingProperty().addListener(new InvalidationListener() {
-
             @Override
             public void invalidated(Observable observable) {
                 if (mainStage.isShowing()) {
-                    setDividerPosition();
-                    observable.removeListener(this);
+                    Platform.runLater(() -> {
+                        setDividerPosition();
+                        observable.removeListener(this);
+                    });
                 }
             }
         });
@@ -473,10 +522,9 @@ private void updateSidePane() {
     }
 
     private void setDividerPosition() {
-        splitPane.setDividerPositions(prefs.getGuiPreferences().getSidePaneWidth());
         if (mainStage.isShowing() && !sidePane.getChildren().isEmpty()) {
-            dividerSubscription = EasyBind.subscribe(splitPane.getDividers().get(0).positionProperty(),
-                    position -> prefs.getGuiPreferences().setSidePaneWidth(position.doubleValue()));
+            splitPane.setDividerPositions(prefs.getGuiPreferences().getSidePaneWidth() / splitPane.getWidth());
+            dividerSubscription = EasyBind.subscribe(sidePane.widthProperty(), width -> prefs.getGuiPreferences().setSidePaneWidth(width.doubleValue()));
         }
     }
 
@@ -531,14 +579,12 @@ private Node createToolbar() {
                 new Separator(Orientation.VERTICAL),
 
                 new HBox(
-                        factory.createIconButton(StandardActions.OPEN_GITHUB, new OpenBrowserAction("https://github.com/JabRef/jabref")),
-                        factory.createIconButton(StandardActions.OPEN_FACEBOOK, new OpenBrowserAction("https://www.facebook.com/JabRef/")),
-                        factory.createIconButton(StandardActions.OPEN_TWITTER, new OpenBrowserAction("https://twitter.com/jabref_org"))),
+                        createTaskIndicator()),
 
                 new Separator(Orientation.VERTICAL),
 
                 new HBox(
-                        createTaskIndicator()));
+                        factory.createIconButton(StandardActions.OPEN_GITHUB, new OpenBrowserAction("https://github.com/JabRef/jabref", dialogService))));
 
         leftSpacer.setPrefWidth(50);
         leftSpacer.setMinWidth(Region.USE_PREF_SIZE);
@@ -565,7 +611,7 @@ public LibraryTab getLibraryTabAt(int i) {
      */
     public List<LibraryTab> getLibraryTabs() {
         return tabbedPane.getTabs().stream()
-            .filter(LibraryTab.class::isInstance)
+                         .filter(LibraryTab.class::isInstance)
                          .map(LibraryTab.class::cast)
                          .collect(Collectors.toList());
     }
@@ -710,8 +756,8 @@ private MenuBar createMenu() {
                         factory.createMenuItem(StandardActions.IMPORT_INTO_NEW_LIBRARY, new ImportCommand(this, true, prefs, stateManager))),
 
                 factory.createSubMenu(StandardActions.EXPORT,
-                        factory.createMenuItem(StandardActions.EXPORT_ALL, new ExportCommand(false, stateManager, dialogService, prefs)),
-                        factory.createMenuItem(StandardActions.EXPORT_SELECTED, new ExportCommand(true, stateManager, dialogService, prefs)),
+                        factory.createMenuItem(StandardActions.EXPORT_ALL, new ExportCommand(ExportCommand.ExportMethod.EXPORT_ALL, this, stateManager, dialogService, prefs)),
+                        factory.createMenuItem(StandardActions.EXPORT_SELECTED, new ExportCommand(ExportCommand.ExportMethod.EXPORT_SELECTED, this, stateManager, dialogService, prefs)),
                         factory.createMenuItem(StandardActions.SAVE_SELECTED_AS_PLAIN_BIBTEX, new SaveAction(SaveAction.SaveMethod.SAVE_SELECTED, this, prefs, stateManager))),
 
                 new SeparatorMenuItem(),
@@ -753,8 +799,7 @@ private MenuBar createMenu() {
                 new SeparatorMenuItem(),
 
                 factory.createMenuItem(StandardActions.MANAGE_KEYWORDS, new ManageKeywordsAction(stateManager)),
-                factory.createMenuItem(StandardActions.MASS_SET_FIELDS, new MassSetFieldsAction(stateManager, dialogService, undoManager)));
-
+                factory.createMenuItem(StandardActions.AUTOMATIC_FIELD_EDITOR, new AutomaticFieldEditorAction(stateManager, dialogService)));
         SeparatorMenuItem specialFieldsSeparator = new SeparatorMenuItem();
         specialFieldsSeparator.visibleProperty().bind(prefs.getSpecialFieldsPreferences().specialFieldsEnabledProperty());
 
@@ -782,7 +827,7 @@ private MenuBar createMenu() {
 
         quality.getItems().addAll(
                 factory.createMenuItem(StandardActions.FIND_DUPLICATES, new DuplicateSearch(this, dialogService, stateManager)),
-                factory.createMenuItem(StandardActions.MERGE_ENTRIES, new MergeEntriesAction(this, dialogService, stateManager)),
+                factory.createMenuItem(StandardActions.MERGE_ENTRIES, new MergeEntriesAction(dialogService, stateManager)),
                 factory.createMenuItem(StandardActions.CHECK_INTEGRITY, new IntegrityCheckAction(this, stateManager, Globals.TASK_EXECUTOR)),
                 factory.createMenuItem(StandardActions.CLEANUP_ENTRIES, new CleanupAction(this, this.prefs, dialogService, stateManager)),
 
@@ -826,7 +871,7 @@ private MenuBar createMenu() {
 
                 new SeparatorMenuItem(),
 
-                factory.createMenuItem(StandardActions.WRITE_METADATA_TO_PDF, new WriteMetadataToPdfAction(stateManager, prefs.getGeneralPreferences().getDefaultBibDatabaseMode(), Globals.entryTypesManager, prefs.getFieldWriterPreferences(), dialogService, taskExecutor, prefs.getFilePreferences(), prefs.getXmpPreferences(), prefs.getGeneralPreferences().getDefaultEncoding())),
+                factory.createMenuItem(StandardActions.WRITE_METADATA_TO_PDF, new WriteMetadataToPdfAction(stateManager, Globals.entryTypesManager, prefs.getFieldWriterPreferences(), dialogService, taskExecutor, prefs.getFilePreferences(), prefs.getXmpPreferences())),
                 factory.createMenuItem(StandardActions.COPY_LINKED_FILES, new CopyFilesAction(dialogService, prefs, stateManager)),
 
                 new SeparatorMenuItem(),
@@ -858,7 +903,7 @@ private MenuBar createMenu() {
 
                 factory.createMenuItem(StandardActions.SHOW_PDF_VIEWER, new ShowDocumentViewerAction(stateManager, prefs)),
                 factory.createMenuItem(StandardActions.EDIT_ENTRY, new OpenEntryEditorAction(this, stateManager)),
-                factory.createMenuItem(StandardActions.OPEN_CONSOLE, new OpenConsoleAction(stateManager, prefs))
+                factory.createMenuItem(StandardActions.OPEN_CONSOLE, new OpenConsoleAction(stateManager, prefs, dialogService))
         );
 
         options.getItems().addAll(
@@ -871,8 +916,8 @@ private MenuBar createMenu() {
         );
 
         help.getItems().addAll(
-                factory.createMenuItem(StandardActions.HELP, HelpAction.getMainHelpPageCommand()),
-                factory.createMenuItem(StandardActions.OPEN_FORUM, new OpenBrowserAction("http://discourse.jabref.org/")),
+                factory.createMenuItem(StandardActions.HELP, new HelpAction(HelpFile.CONTENTS, dialogService)),
+                factory.createMenuItem(StandardActions.OPEN_FORUM, new OpenBrowserAction("http://discourse.jabref.org/", dialogService)),
 
                 new SeparatorMenuItem(),
 
@@ -880,19 +925,19 @@ private MenuBar createMenu() {
 
                 new SeparatorMenuItem(),
 
-                factory.createMenuItem(StandardActions.DONATE, new OpenBrowserAction("https://donations.jabref.org")),
+                factory.createMenuItem(StandardActions.DONATE, new OpenBrowserAction("https://donations.jabref.org", dialogService)),
                 factory.createMenuItem(StandardActions.SEARCH_FOR_UPDATES, new SearchForUpdateAction(Globals.BUILD_INFO, prefs.getInternalPreferences(), dialogService, Globals.TASK_EXECUTOR)),
                 factory.createSubMenu(StandardActions.WEB_MENU,
-                        factory.createMenuItem(StandardActions.OPEN_WEBPAGE, new OpenBrowserAction("https://jabref.org/")),
-                        factory.createMenuItem(StandardActions.OPEN_BLOG, new OpenBrowserAction("https://blog.jabref.org/")),
-                        factory.createMenuItem(StandardActions.OPEN_FACEBOOK, new OpenBrowserAction("https://www.facebook.com/JabRef/")),
-                        factory.createMenuItem(StandardActions.OPEN_TWITTER, new OpenBrowserAction("https://twitter.com/jabref_org")),
-                        factory.createMenuItem(StandardActions.OPEN_GITHUB, new OpenBrowserAction("https://github.com/JabRef/jabref")),
+                        factory.createMenuItem(StandardActions.OPEN_WEBPAGE, new OpenBrowserAction("https://jabref.org/", dialogService)),
+                        factory.createMenuItem(StandardActions.OPEN_BLOG, new OpenBrowserAction("https://blog.jabref.org/", dialogService)),
+                        factory.createMenuItem(StandardActions.OPEN_FACEBOOK, new OpenBrowserAction("https://www.facebook.com/JabRef/", dialogService)),
+                        factory.createMenuItem(StandardActions.OPEN_TWITTER, new OpenBrowserAction("https://twitter.com/jabref_org", dialogService)),
+                        factory.createMenuItem(StandardActions.OPEN_GITHUB, new OpenBrowserAction("https://github.com/JabRef/jabref", dialogService)),
 
                         new SeparatorMenuItem(),
 
-                        factory.createMenuItem(StandardActions.OPEN_DEV_VERSION_LINK, new OpenBrowserAction("https://builds.jabref.org/master/")),
-                        factory.createMenuItem(StandardActions.OPEN_CHANGELOG, new OpenBrowserAction("https://github.com/JabRef/jabref/blob/master/CHANGELOG.md"))
+                        factory.createMenuItem(StandardActions.OPEN_DEV_VERSION_LINK, new OpenBrowserAction("https://builds.jabref.org/master/", dialogService)),
+                        factory.createMenuItem(StandardActions.OPEN_CHANGELOG, new OpenBrowserAction("https://github.com/JabRef/jabref/blob/main/CHANGELOG.md", dialogService))
                 ),
                 factory.createMenuItem(StandardActions.ABOUT, new AboutAction())
         );
@@ -1001,6 +1046,11 @@ hide it and clip it to a square of (width x width) each time width is updated.
         return new Group(indicator);
     }
 
+    /**
+     * Might be called when a user asks JabRef at the command line
+     * i) to import a file or
+     * ii) to open a .bib file
+     */
     public void addParserResult(ParserResult parserResult, boolean focusPanel) {
         if (parserResult.toOpenTab()) {
             // Add the entries to the open tab.
@@ -1012,7 +1062,7 @@ public void addParserResult(ParserResult parserResult, boolean focusPanel) {
                 addImportedEntries(libraryTab, parserResult);
             }
         } else {
-            // only add tab if DB is not already open
+            // only add tab if library is not already open
             Optional<LibraryTab> libraryTab = getLibraryTabs().stream()
                                                               .filter(p -> p.getBibDatabaseContext()
                                                                             .getDatabasePath()
@@ -1047,7 +1097,7 @@ private ContextMenu createTabContextMenuFor(LibraryTab tab, KeyBindingRepository
         contextMenu.getItems().addAll(
                 factory.createMenuItem(StandardActions.LIBRARY_PROPERTIES, new LibraryPropertiesAction(tab::getBibDatabaseContext, stateManager)),
                 factory.createMenuItem(StandardActions.OPEN_DATABASE_FOLDER, new OpenDatabaseFolder(tab::getBibDatabaseContext)),
-                factory.createMenuItem(StandardActions.OPEN_CONSOLE, new OpenConsoleAction(tab::getBibDatabaseContext, stateManager, prefs)),
+                factory.createMenuItem(StandardActions.OPEN_CONSOLE, new OpenConsoleAction(tab::getBibDatabaseContext, stateManager, prefs, dialogService)),
                 new SeparatorMenuItem(),
                 factory.createMenuItem(StandardActions.CLOSE_LIBRARY, new CloseDatabaseAction(tab)),
                 factory.createMenuItem(StandardActions.CLOSE_OTHER_LIBRARIES, new CloseOthersDatabaseAction(tab)),
@@ -1072,17 +1122,6 @@ public void addTab(LibraryTab libraryTab, boolean raisePanel) {
         }
 
         libraryTab.getUndoManager().registerListener(new UndoRedoEventManager());
-
-        BibDatabaseContext context = libraryTab.getBibDatabaseContext();
-
-        if (readyForAutosave(context)) {
-            AutosaveManager autosaver = AutosaveManager.start(context);
-            autosaver.registerListener(new AutosaveUiManager(libraryTab));
-        }
-
-        BackupManager.start(context, Globals.entryTypesManager, prefs);
-
-        trackOpenNewDatabase(libraryTab);
     }
 
     private void trackOpenNewDatabase(LibraryTab libraryTab) {
@@ -1095,18 +1134,11 @@ private void trackOpenNewDatabase(LibraryTab libraryTab) {
     public LibraryTab addTab(BibDatabaseContext databaseContext, boolean raisePanel) {
         Objects.requireNonNull(databaseContext);
 
-        LibraryTab libraryTab = new LibraryTab(this, prefs, stateManager, themeManager, databaseContext, ExternalFileTypes.getInstance());
+        LibraryTab libraryTab = new LibraryTab(this, prefs, stateManager, themeManager, databaseContext, importFormatReader);
         addTab(libraryTab, raisePanel);
         return libraryTab;
     }
 
-    private boolean readyForAutosave(BibDatabaseContext context) {
-        return ((context.getLocation() == DatabaseLocation.SHARED)
-                || ((context.getLocation() == DatabaseLocation.LOCAL)
-                && prefs.getImportExportPreferences().shouldAutoSave()))
-                && context.getDatabasePath().isPresent();
-    }
-
     /**
      * Opens the import inspection dialog to let the user decide which of the given entries to import.
      *
@@ -1140,7 +1172,7 @@ private boolean confirmClose(LibraryTab libraryTab) {
 
         ButtonType saveChanges = new ButtonType(Localization.lang("Save changes"), ButtonBar.ButtonData.YES);
         ButtonType discardChanges = new ButtonType(Localization.lang("Discard changes"), ButtonBar.ButtonData.NO);
-        ButtonType cancel = new ButtonType(Localization.lang("Return to JabRef"), ButtonBar.ButtonData.CANCEL_CLOSE);
+        ButtonType cancel = new ButtonType(Localization.lang("Return to library"), ButtonBar.ButtonData.CANCEL_CLOSE);
 
         Optional<ButtonType> response = dialogService.showCustomButtonDialogAndWait(Alert.AlertType.CONFIRMATION,
                 Localization.lang("Save before closing"),
@@ -1178,7 +1210,7 @@ private Boolean confirmEmptyEntry(LibraryTab libraryTab, BibDatabaseContext cont
 
         ButtonType deleteEmptyEntries = new ButtonType(Localization.lang("Delete empty entries"), ButtonBar.ButtonData.YES);
         ButtonType keepEmptyEntries = new ButtonType(Localization.lang("Keep empty entries"), ButtonBar.ButtonData.NO);
-        ButtonType cancel = new ButtonType(Localization.lang("Return to JabRef"), ButtonBar.ButtonData.CANCEL_CLOSE);
+        ButtonType cancel = new ButtonType(Localization.lang("Return to library"), ButtonBar.ButtonData.CANCEL_CLOSE);
 
         Optional<ButtonType> response = dialogService.showCustomButtonDialogAndWait(Alert.AlertType.CONFIRMATION,
                 Localization.lang("Empty entries"),
@@ -1345,7 +1377,7 @@ public OpenDatabaseFolder(Supplier<BibDatabaseContext> databaseContext) {
         public void execute() {
             Optional.of(databaseContext.get()).flatMap(BibDatabaseContext::getDatabasePath).ifPresent(path -> {
                 try {
-                    JabRefDesktop.openFolderAndSelectFile(path, prefs);
+                    JabRefDesktop.openFolderAndSelectFile(path, prefs, dialogService);
                 } catch (IOException e) {
                     LOGGER.info("Could not open folder", e);
                 }
diff --git a/src/main/java/org/jabref/gui/JabRefGUI.java b/src/main/java/org/jabref/gui/JabRefGUI.java
index c4d82316ae0..2acb97939c1 100644
--- a/src/main/java/org/jabref/gui/JabRefGUI.java
+++ b/src/main/java/org/jabref/gui/JabRefGUI.java
@@ -1,7 +1,5 @@
 package org.jabref.gui;
 
-import java.io.IOException;
-import java.nio.file.Files;
 import java.nio.file.Path;
 import java.sql.SQLException;
 import java.util.ArrayList;
@@ -14,20 +12,18 @@
 import javafx.stage.Screen;
 import javafx.stage.Stage;
 
-import org.jabref.gui.dialogs.BackupUIManager;
 import org.jabref.gui.help.VersionWorker;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.importer.ParserResultWarningDialog;
 import org.jabref.gui.importer.actions.OpenDatabaseAction;
 import org.jabref.gui.keyboard.TextInputKeyBindings;
 import org.jabref.gui.shared.SharedDatabaseUIManager;
-import org.jabref.logic.autosaveandbackup.BackupManager;
-import org.jabref.logic.importer.OpenDatabase;
 import org.jabref.logic.importer.ParserResult;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.shared.DatabaseNotSupportedException;
 import org.jabref.logic.shared.exception.InvalidDBMSConnectionPropertiesException;
 import org.jabref.logic.shared.exception.NotASharedDatabaseException;
+import org.jabref.logic.util.WebViewStore;
 import org.jabref.preferences.GuiPreferences;
 import org.jabref.preferences.PreferencesService;
 
@@ -54,6 +50,8 @@ public JabRefGUI(Stage mainStage, List<ParserResult> databases, boolean isBlank,
         this.preferencesService = preferencesService;
         this.correctedWindowPos = false;
 
+        WebViewStore.init();
+
         mainFrame = new JabRefFrame(mainStage);
 
         openWindow(mainStage);
@@ -74,8 +72,8 @@ private void openWindow(Stage mainStage) {
         if (guiPreferences.isWindowMaximised()) {
             mainStage.setMaximized(true);
         } else if ((Screen.getScreens().size() == 1) && isWindowPositionOutOfBounds()) {
-            // corrects the Window, if its outside of the mainscreen
-            LOGGER.debug("The Jabref Window is outside the Main Monitor\n");
+            // corrects the Window, if it is outside the mainscreen
+            LOGGER.debug("The Jabref window is outside the main screen\n");
             mainStage.setX(0);
             mainStage.setY(0);
             mainStage.setWidth(1024);
@@ -132,6 +130,8 @@ private void openDatabases() {
             openLastEditedDatabases();
         }
 
+        // From here on, the libraries provided by command line arguments are treated
+
         // Remove invalid databases
         List<ParserResult> invalidDatabases = bibDatabases.stream()
                                                           .filter(ParserResult::isInvalid)
@@ -263,35 +263,8 @@ private void openLastEditedDatabases() {
             return;
         }
 
-        for (String fileName : lastFiles) {
-            Path dbFile = Path.of(fileName);
-
-            // Already parsed via command line parameter, e.g., "jabref.jar somefile.bib"
-            if (isLoaded(dbFile) || !Files.exists(dbFile)) {
-                continue;
-            }
-
-            if (BackupManager.backupFileDiffers(dbFile)) {
-                BackupUIManager.showRestoreBackupDialog(mainFrame.getDialogService(), dbFile);
-            }
-
-            ParserResult parsedDatabase;
-            try {
-                parsedDatabase = OpenDatabase.loadDatabase(
-                        dbFile,
-                        preferencesService.getGeneralPreferences(),
-                        preferencesService.getImportFormatPreferences(),
-                        Globals.getFileUpdateMonitor());
-            } catch (IOException ex) {
-                LOGGER.error("Error opening file '{}'", dbFile, ex);
-                parsedDatabase = ParserResult.fromError(ex);
-            }
-            bibDatabases.add(parsedDatabase);
-        }
-    }
-
-    private boolean isLoaded(Path fileToOpen) {
-        return bibDatabases.stream().anyMatch(pr -> pr.getPath().isPresent() && pr.getPath().get().equals(fileToOpen));
+        List<Path> filesToOpen = lastFiles.stream().map(file -> Path.of(file)).collect(Collectors.toList());
+        getMainFrame().getOpenDatabaseAction().openFiles(filesToOpen);
     }
 
     public static JabRefFrame getMainFrame() {
diff --git a/src/main/java/org/jabref/gui/JabRefMain.java b/src/main/java/org/jabref/gui/JabRefMain.java
index 084356f5fe3..a9812e591ec 100644
--- a/src/main/java/org/jabref/gui/JabRefMain.java
+++ b/src/main/java/org/jabref/gui/JabRefMain.java
@@ -7,6 +7,7 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Comparator;
+import java.util.Map;
 
 import javafx.application.Application;
 import javafx.application.Platform;
@@ -14,6 +15,7 @@
 
 import org.jabref.cli.ArgumentProcessor;
 import org.jabref.cli.JabRefCLI;
+import org.jabref.gui.openoffice.OOBibBaseConnect;
 import org.jabref.gui.remote.JabRefMessageHandler;
 import org.jabref.logic.exporter.ExporterFactory;
 import org.jabref.logic.journals.JournalAbbreviationLoader;
@@ -21,37 +23,71 @@
 import org.jabref.logic.net.ProxyAuthenticator;
 import org.jabref.logic.net.ProxyPreferences;
 import org.jabref.logic.net.ProxyRegisterer;
-import org.jabref.logic.net.URLDownload;
+import org.jabref.logic.net.ssl.SSLPreferences;
+import org.jabref.logic.net.ssl.TrustStoreManager;
 import org.jabref.logic.protectedterms.ProtectedTermsLoader;
 import org.jabref.logic.remote.RemotePreferences;
 import org.jabref.logic.remote.client.RemoteClient;
+import org.jabref.logic.util.BuildInfo;
 import org.jabref.migrations.PreferencesMigrations;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.database.BibDatabaseMode;
 import org.jabref.preferences.JabRefPreferences;
 import org.jabref.preferences.PreferencesService;
 
+import net.harawata.appdirs.AppDirsFactory;
 import org.apache.commons.cli.ParseException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.tinylog.configuration.Configuration;
 
 /**
  * JabRef's main class to process command line options and to start the UI
  */
 public class JabRefMain extends Application {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(JabRefMain.class);
+    private static Logger LOGGER;
 
     private static String[] arguments;
 
     public static void main(String[] args) {
+        addLogToDisk();
         arguments = args;
         launch(arguments);
     }
 
+    private static void initializeLogger() {
+         LOGGER = LoggerFactory.getLogger(JabRefMain.class);
+    }
+
+    /**
+     * This needs to be called as early as possible. After the first log write, it is not possible to alter
+     * the log configuration programmatically anymore.
+     */
+    private static void addLogToDisk() {
+        Path directory = Path.of(AppDirsFactory.getInstance().getUserLogDir(
+                                     "jabref",
+                                     new BuildInfo().version.toString(),
+                                     "org.jabref"));
+        try {
+            Files.createDirectories(directory);
+        } catch (IOException e) {
+            initializeLogger();
+            LOGGER.error("Could not create log directory {}", directory, e);
+            return;
+        }
+        // The "Shared File Writer" is explained at https://tinylog.org/v2/configuration/#shared-file-writer
+        Map<String, String> configuration = Map.of(
+                "writerFile", "shared file",
+                "writerFile.level", "info",
+                "writerFile.file", directory.resolve("log.txt").toString(),
+                "writerFile.charset", "UTF-8");
+
+        configuration.entrySet().forEach(config -> Configuration.set(config.getKey(), config.getValue()));
+        initializeLogger();
+    }
+
     @Override
     public void start(Stage mainStage) {
-        URLDownload.bypassSSLVerification();
         try {
             FallbackExceptionHandler.installExceptionHandler();
 
@@ -63,6 +99,8 @@ public void start(Stage mainStage) {
 
             configureProxy(preferences.getProxyPreferences());
 
+            configureSSL(preferences.getSSLPreferences());
+
             Globals.startBackgroundTasks();
 
             applyPreferences(preferences);
@@ -94,6 +132,7 @@ public void start(Stage mainStage) {
 
     @Override
     public void stop() {
+        OOBibBaseConnect.closeOfficeConnection();
         Globals.stopBackgroundTasks();
         Globals.shutdownThreadPools();
     }
@@ -125,10 +164,12 @@ private static void applyPreferences(PreferencesService preferences) {
         Globals.journalAbbreviationRepository = JournalAbbreviationLoader.loadRepository(preferences.getJournalAbbreviationPreferences());
 
         // Build list of Import and Export formats
-        Globals.IMPORT_FORMAT_READER.resetImportFormats(preferences.getImporterPreferences(),
-                preferences.getGeneralPreferences(), preferences.getImportFormatPreferences(),
-                preferences.getXmpPreferences(), Globals.getFileUpdateMonitor());
-        Globals.entryTypesManager.addCustomOrModifiedTypes(preferences.getBibEntryTypes(BibDatabaseMode.BIBTEX),
+        Globals.IMPORT_FORMAT_READER.resetImportFormats(
+                preferences.getImporterPreferences(),
+                preferences.getImportFormatPreferences(),
+                Globals.getFileUpdateMonitor());
+        Globals.entryTypesManager.addCustomOrModifiedTypes(
+                preferences.getBibEntryTypes(BibDatabaseMode.BIBTEX),
                 preferences.getBibEntryTypes(BibDatabaseMode.BIBLATEX));
         Globals.exportFactory = ExporterFactory.create(
                 preferences.getCustomExportFormats(Globals.journalAbbreviationRepository),
@@ -149,19 +190,30 @@ private static void configureProxy(ProxyPreferences proxyPreferences) {
         }
     }
 
+    private static void configureSSL(SSLPreferences sslPreferences) {
+        TrustStoreManager.createTruststoreFileIfNotExist(Path.of(sslPreferences.getTruststorePath()));
+        System.setProperty("javax.net.ssl.trustStore", sslPreferences.getTruststorePath());
+        System.setProperty("javax.net.ssl.trustStorePassword", "changeit");
+    }
+
     private static void clearOldSearchIndices() {
         Path currentIndexPath = BibDatabaseContext.getFulltextIndexBasePath();
         Path appData = currentIndexPath.getParent();
 
+        try {
+            Files.createDirectories(currentIndexPath);
+        } catch (IOException e) {
+            LOGGER.error("Could not create index directory {}", appData, e);
+        }
+
         try (DirectoryStream<Path> stream = Files.newDirectoryStream(appData)) {
             for (Path path : stream) {
-                if (Files.isDirectory(path) && !path.equals(currentIndexPath)) {
+                if (Files.isDirectory(path) && !path.toString().endsWith("ssl") && path.toString().contains("lucene") && !path.equals(currentIndexPath)) {
                     LOGGER.info("Deleting out-of-date fulltext search index at {}.", path);
                     Files.walk(path)
                          .sorted(Comparator.reverseOrder())
                          .map(Path::toFile)
                          .forEach(File::delete);
-
                 }
             }
         } catch (IOException e) {
diff --git a/src/main/java/org/jabref/gui/LibraryTab.java b/src/main/java/org/jabref/gui/LibraryTab.java
index 2a50b1fa373..246b9d554ab 100644
--- a/src/main/java/org/jabref/gui/LibraryTab.java
+++ b/src/main/java/org/jabref/gui/LibraryTab.java
@@ -7,7 +7,9 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.Random;
 
+import javafx.animation.PauseTransition;
 import javafx.application.Platform;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
@@ -19,15 +21,14 @@
 import javafx.scene.control.Tab;
 import javafx.scene.control.Tooltip;
 import javafx.scene.layout.BorderPane;
+import javafx.util.Duration;
 
 import org.jabref.gui.autocompleter.AutoCompletePreferences;
 import org.jabref.gui.autocompleter.PersonNameSuggestionProvider;
 import org.jabref.gui.autocompleter.SuggestionProviders;
 import org.jabref.gui.collab.DatabaseChangeMonitor;
-import org.jabref.gui.collab.DatabaseChangePane;
 import org.jabref.gui.dialogs.AutosaveUiManager;
 import org.jabref.gui.entryeditor.EntryEditor;
-import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.importer.actions.OpenDatabaseAction;
 import org.jabref.gui.maintable.MainTable;
 import org.jabref.gui.maintable.MainTableDataModel;
@@ -42,6 +43,7 @@
 import org.jabref.logic.autosaveandbackup.AutosaveManager;
 import org.jabref.logic.autosaveandbackup.BackupManager;
 import org.jabref.logic.citationstyle.CitationStyleCache;
+import org.jabref.logic.importer.ImportFormatReader;
 import org.jabref.logic.importer.ParserResult;
 import org.jabref.logic.importer.util.FileFieldParser;
 import org.jabref.logic.l10n.Localization;
@@ -71,6 +73,8 @@
 import com.google.common.eventbus.Subscribe;
 import com.tobiasdiez.easybind.EasyBind;
 import com.tobiasdiez.easybind.Subscription;
+import org.controlsfx.control.NotificationPane;
+import org.controlsfx.control.action.Action;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -79,7 +83,6 @@ public class LibraryTab extends Tab {
     private static final Logger LOGGER = LoggerFactory.getLogger(LibraryTab.class);
     private final JabRefFrame frame;
     private final CountingUndoManager undoManager;
-    private final ExternalFileTypes externalFileTypes;
     private final DialogService dialogService;
     private final PreferencesService preferencesService;
     private final StateManager stateManager;
@@ -94,7 +97,8 @@ public class LibraryTab extends Tab {
     private MainTable mainTable;
     private BasePanelMode mode = BasePanelMode.SHOWING_NOTHING;
     private SplitPane splitPane;
-    private DatabaseChangePane changePane;
+    private DatabaseNotification databaseNotificationPane;
+
     private boolean saving;
     private PersonNameSuggestionProvider searchAutoCompleter;
     // Used to track whether the base has changed since last save.
@@ -109,21 +113,22 @@ public class LibraryTab extends Tab {
     private BackgroundTask<ParserResult> dataLoadingTask = BackgroundTask.wrap(() -> null);
 
     private final IndexingTaskManager indexingTaskManager = new IndexingTaskManager(Globals.TASK_EXECUTOR);
+    private final ImportFormatReader importFormatReader;
 
     public LibraryTab(JabRefFrame frame,
                       PreferencesService preferencesService,
                       StateManager stateManager,
                       ThemeManager themeManager,
                       BibDatabaseContext bibDatabaseContext,
-                      ExternalFileTypes externalFileTypes) {
+                      ImportFormatReader importFormatReader) {
         this.frame = Objects.requireNonNull(frame);
         this.bibDatabaseContext = Objects.requireNonNull(bibDatabaseContext);
-        this.externalFileTypes = Objects.requireNonNull(externalFileTypes);
         this.undoManager = frame.getUndoManager();
         this.dialogService = frame.getDialogService();
         this.preferencesService = Objects.requireNonNull(preferencesService);
         this.stateManager = Objects.requireNonNull(stateManager);
         this.themeManager = Objects.requireNonNull(themeManager);
+        this.importFormatReader = importFormatReader;
 
         bibDatabaseContext.getDatabase().registerListener(this);
         bibDatabaseContext.getMetaData().registerListener(this);
@@ -147,7 +152,11 @@ public LibraryTab(JabRefFrame frame,
 
         this.getDatabase().registerListener(new UpdateTimestampListener(preferencesService));
 
-        this.entryEditor = new EntryEditor(this, externalFileTypes);
+        this.entryEditor = new EntryEditor(this);
+
+        // set LibraryTab ID for drag'n'drop
+        // ID content doesn't matter, we only need different tabs to have different ID
+        this.setId(Long.valueOf(new Random().nextLong()).toString());
 
         Platform.runLater(() -> {
             EasyBind.subscribe(changedProperty, this::updateTabTitle);
@@ -203,6 +212,7 @@ public void onDatabaseLoadingSucceed(ParserResult result) {
         OpenDatabaseAction.performPostOpenActions(this, result);
 
         feedData(context);
+
         // a temporary workaround to update groups pane
         stateManager.activeDatabaseProperty().bind(
                 EasyBind.map(frame.getTabbedPane().getSelectionModel().selectedItemProperty(),
@@ -244,7 +254,7 @@ public void feedData(BibDatabaseContext bibDatabaseContext) {
 
         this.getDatabase().registerListener(new UpdateTimestampListener(preferencesService));
 
-        this.entryEditor = new EntryEditor(this, externalFileTypes);
+        this.entryEditor = new EntryEditor(this);
 
         Platform.runLater(() -> {
             EasyBind.subscribe(changedProperty, this::updateTabTitle);
@@ -252,12 +262,17 @@ public void feedData(BibDatabaseContext bibDatabaseContext) {
                     updateTabTitle(changedProperty.getValue()));
         });
 
+        installAutosaveManagerAndBackupManager();
+    }
+
+    public void installAutosaveManagerAndBackupManager() {
         if (isDatabaseReadyForAutoSave(bibDatabaseContext)) {
-            AutosaveManager autoSaver = AutosaveManager.start(bibDatabaseContext);
-            autoSaver.registerListener(new AutosaveUiManager(this));
+            AutosaveManager autosaveManager = AutosaveManager.start(bibDatabaseContext);
+            autosaveManager.registerListener(new AutosaveUiManager(this));
+        }
+        if (isDatabaseReadyForBackup(bibDatabaseContext)) {
+            BackupManager.start(bibDatabaseContext, Globals.entryTypesManager, preferencesService);
         }
-
-        BackupManager.start(this.bibDatabaseContext, Globals.entryTypesManager, preferencesService);
     }
 
     private boolean isDatabaseReadyForAutoSave(BibDatabaseContext context) {
@@ -267,6 +282,10 @@ private boolean isDatabaseReadyForAutoSave(BibDatabaseContext context) {
                 && context.getDatabasePath().isPresent();
     }
 
+    private boolean isDatabaseReadyForBackup(BibDatabaseContext context) {
+        return (context.getLocation() == DatabaseLocation.LOCAL) && context.getDatabasePath().isPresent();
+    }
+
     /**
      * Sets the title of the tab modification-asterisk filename – path-fragment
      * <p>
@@ -313,7 +332,6 @@ public void updateTabTitle(boolean isChanged) {
             // Unique path fragment
             Optional<String> uniquePathPart = FileUtil.getUniquePathFragment(collectAllDatabasePaths(), databasePath);
             uniquePathPart.ifPresent(part -> tabTitle.append(" \u2013 ").append(part));
-
         } else {
             if (databaseLocation == DatabaseLocation.LOCAL) {
                 tabTitle.append(Localization.lang("untitled"));
@@ -476,8 +494,9 @@ private void createMainTable() {
                 preferencesService,
                 dialogService,
                 stateManager,
-                externalFileTypes,
-                Globals.getKeyPrefs());
+                Globals.getKeyPrefs(),
+                Globals.getClipboardManager(),
+                Globals.IMPORT_FORMAT_READER);
 
         // Add the listener that binds selection to state manager (TODO: should be replaced by proper JavaFX binding as soon as table is implemented in JavaFX)
         mainTable.addSelectionListener(listEvent -> stateManager.setSelectedEntries(mainTable.getSelectedEntries()));
@@ -496,6 +515,8 @@ public void setupMainPanel() {
         createMainTable();
 
         splitPane.getItems().add(mainTable);
+        databaseNotificationPane = new DatabaseNotification(splitPane);
+        setContent(databaseNotificationPane);
 
         // Saves the divider position as soon as it changes
         // We need to keep a reference to the subscription, otherwise the binding gets garbage collected
@@ -506,8 +527,7 @@ public void setupMainPanel() {
         // Add changePane in case a file is present - otherwise just add the splitPane to the panel
         Optional<Path> file = bibDatabaseContext.getDatabasePath();
         if (file.isPresent()) {
-            // create changeMonitor and changePane so we get notifications about outside changes to the file.
-            resetChangeMonitorAndChangePane();
+            resetChangeMonitor();
         } else {
             if (bibDatabaseContext.getDatabase().hasEntries()) {
                 // if the database is not empty and no file is assigned,
@@ -515,8 +535,6 @@ public void setupMainPanel() {
                 // -> mark as changed
                 this.changedProperty.setValue(true);
             }
-            changePane = null;
-            this.setContent(splitPane);
         }
     }
 
@@ -608,7 +626,6 @@ public void entryEditorClosing() {
      * Closes the entry editor if it is showing any of the given entries.
      */
     private void ensureNotShowingBottomPanel(List<BibEntry> entriesToCheck) {
-
         // This method is not able to close the bottom pane currently
 
         if ((mode == BasePanelMode.SHOWING_EDITOR) && (entriesToCheck.contains(entryEditor.getEntry()))) {
@@ -737,7 +754,7 @@ public FileAnnotationCache getAnnotationCache() {
         return annotationCache;
     }
 
-    public void resetChangeMonitorAndChangePane() {
+    public void resetChangeMonitor() {
         changeMonitor.ifPresent(DatabaseChangeMonitor::unregister);
         changeMonitor = Optional.of(new DatabaseChangeMonitor(bibDatabaseContext,
                 Globals.getFileUpdateMonitor(),
@@ -745,11 +762,8 @@ public void resetChangeMonitorAndChangePane() {
                 dialogService,
                 preferencesService,
                 stateManager,
-                themeManager));
-
-        changePane = new DatabaseChangePane(splitPane, bibDatabaseContext, changeMonitor.get());
-
-        this.setContent(changePane);
+                themeManager,
+                databaseNotificationPane));
     }
 
     public void copy() {
@@ -757,7 +771,11 @@ public void copy() {
     }
 
     public void paste() {
-        mainTable.paste(this.bibDatabaseContext.getMode());
+        mainTable.paste();
+    }
+
+    public void dropEntry(List<BibEntry> entriesToAdd) {
+        mainTable.dropEntry(entriesToAdd);
     }
 
     public void cut() {
@@ -791,11 +809,11 @@ public void resetChangedProperties() {
     }
 
     public static class Factory {
-        public LibraryTab createLibraryTab(JabRefFrame frame, PreferencesService preferencesService, StateManager stateManager, ThemeManager themeManager, Path file, BackgroundTask<ParserResult> dataLoadingTask) {
+        public LibraryTab createLibraryTab(JabRefFrame frame, PreferencesService preferencesService, StateManager stateManager, ThemeManager themeManager, Path file, BackgroundTask<ParserResult> dataLoadingTask, ImportFormatReader importFormatReader) {
             BibDatabaseContext context = new BibDatabaseContext();
             context.setDatabasePath(file);
 
-            LibraryTab newTab = new LibraryTab(frame, preferencesService, stateManager, themeManager, context, ExternalFileTypes.getInstance());
+            LibraryTab newTab = new LibraryTab(frame, preferencesService, stateManager, themeManager, context, importFormatReader);
             newTab.setDataLoadingTask(dataLoadingTask);
 
             dataLoadingTask.onRunning(newTab::onDatabaseLoadingStarted)
@@ -859,7 +877,7 @@ private class IndexUpdateListener {
         public IndexUpdateListener() {
             if (preferencesService.getFilePreferences().shouldFulltextIndexLinkedFiles()) {
                 try {
-                    indexingTaskManager.addToIndex(PdfIndexer.of(bibDatabaseContext, preferencesService.getFilePreferences()), bibDatabaseContext);
+                    indexingTaskManager.updateIndex(PdfIndexer.of(bibDatabaseContext, preferencesService.getFilePreferences()), bibDatabaseContext);
                 } catch (IOException e) {
                     LOGGER.error("Cannot access lucene index", e);
                 }
@@ -920,4 +938,26 @@ public void listen(FieldChangedEvent fieldChangedEvent) {
     public IndexingTaskManager getIndexingTaskManager() {
         return indexingTaskManager;
     }
+
+    public static class DatabaseNotification extends NotificationPane {
+        public DatabaseNotification(Node content) {
+            super(content);
+        }
+
+        public void notify(Node graphic, String text, List<Action> actions, Duration duration) {
+            this.setGraphic(graphic);
+            this.setText(text);
+            this.getActions().setAll(actions);
+            this.show();
+            if ((duration != null) && !duration.equals(Duration.ZERO)) {
+                PauseTransition delay = new PauseTransition(duration);
+                delay.setOnFinished(e -> this.hide());
+                delay.play();
+            }
+        }
+    }
+
+    public DatabaseNotification getNotificationPane() {
+        return databaseNotificationPane;
+    }
 }
diff --git a/src/main/java/org/jabref/gui/OpenConsoleAction.java b/src/main/java/org/jabref/gui/OpenConsoleAction.java
index 52ddf7fb4a0..b470e1e3ef0 100644
--- a/src/main/java/org/jabref/gui/OpenConsoleAction.java
+++ b/src/main/java/org/jabref/gui/OpenConsoleAction.java
@@ -19,6 +19,7 @@ public class OpenConsoleAction extends SimpleCommand {
     private final Supplier<BibDatabaseContext> databaseContext;
     private final StateManager stateManager;
     private final PreferencesService preferencesService;
+    private final DialogService dialogService;
 
     /**
      * Creates a command that opens the console at the path of the supplied database,
@@ -26,10 +27,11 @@ public class OpenConsoleAction extends SimpleCommand {
      * {@link #OpenConsoleAction(StateManager, PreferencesService)} if not supplying
      * another database.
      */
-    public OpenConsoleAction(Supplier<BibDatabaseContext> databaseContext, StateManager stateManager, PreferencesService preferencesService) {
+    public OpenConsoleAction(Supplier<BibDatabaseContext> databaseContext, StateManager stateManager, PreferencesService preferencesService, DialogService dialogService) {
         this.databaseContext = databaseContext;
         this.stateManager = stateManager;
         this.preferencesService = preferencesService;
+        this.dialogService = dialogService;
 
         this.executable.bind(ActionHelper.needsDatabase(stateManager));
     }
@@ -37,15 +39,15 @@ public OpenConsoleAction(Supplier<BibDatabaseContext> databaseContext, StateMana
     /**
      * Using this constructor will result in executing the command on the active database.
      */
-    public OpenConsoleAction(StateManager stateManager, PreferencesService preferencesService) {
-        this(() -> null, stateManager, preferencesService);
+    public OpenConsoleAction(StateManager stateManager, PreferencesService preferencesService, DialogService dialogService) {
+        this(() -> null, stateManager, preferencesService, dialogService);
     }
 
     @Override
     public void execute() {
         Optional.ofNullable(databaseContext.get()).or(stateManager::getActiveDatabase).flatMap(BibDatabaseContext::getDatabasePath).ifPresent(path -> {
             try {
-                JabRefDesktop.openConsole(path.toFile(), preferencesService);
+                JabRefDesktop.openConsole(path.toFile(), preferencesService, dialogService);
             } catch (IOException e) {
                 LOGGER.info("Could not open console", e);
             }
diff --git a/src/main/java/org/jabref/gui/SendAsEMailAction.java b/src/main/java/org/jabref/gui/SendAsEMailAction.java
index 6ef1150cbe6..016b4a039ba 100644
--- a/src/main/java/org/jabref/gui/SendAsEMailAction.java
+++ b/src/main/java/org/jabref/gui/SendAsEMailAction.java
@@ -100,7 +100,7 @@ private String sendEmail() throws Exception {
             attachments.add(path.toAbsolutePath().toString());
             if (openFolders) {
                 try {
-                    JabRefDesktop.openFolderAndSelectFile(path.toAbsolutePath(), preferencesService);
+                    JabRefDesktop.openFolderAndSelectFile(path.toAbsolutePath(), preferencesService, dialogService);
                 } catch (IOException e) {
                     LOGGER.debug("Cannot open file", e);
                 }
diff --git a/src/main/java/org/jabref/gui/StateManager.java b/src/main/java/org/jabref/gui/StateManager.java
index 386e08779e9..cc6ab8ae8bd 100644
--- a/src/main/java/org/jabref/gui/StateManager.java
+++ b/src/main/java/org/jabref/gui/StateManager.java
@@ -8,16 +8,21 @@
 import javafx.beans.Observable;
 import javafx.beans.binding.Bindings;
 import javafx.beans.property.IntegerProperty;
+import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.ReadOnlyListProperty;
 import javafx.beans.property.ReadOnlyListWrapper;
 import javafx.beans.property.SimpleIntegerProperty;
+import javafx.beans.property.SimpleObjectProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.collections.ObservableMap;
 import javafx.concurrent.Task;
 import javafx.scene.Node;
+import javafx.util.Pair;
 
+import org.jabref.gui.edit.automaticfiededitor.LastAutomaticFieldEditorEdit;
 import org.jabref.gui.sidepane.SidePaneType;
+import org.jabref.gui.util.BackgroundTask;
 import org.jabref.gui.util.CustomLocalDragboard;
 import org.jabref.gui.util.DialogWindowState;
 import org.jabref.gui.util.OptionalObjectProperty;
@@ -53,12 +58,15 @@ public class StateManager {
     private final OptionalObjectProperty<SearchQuery> activeSearchQuery = OptionalObjectProperty.empty();
     private final ObservableMap<BibDatabaseContext, IntegerProperty> searchResultMap = FXCollections.observableHashMap();
     private final OptionalObjectProperty<Node> focusOwner = OptionalObjectProperty.empty();
-    private final ObservableList<Task<?>> backgroundTasks = FXCollections.observableArrayList(task -> new Observable[] {task.progressProperty(), task.runningProperty()});
-    private final EasyBinding<Boolean> anyTaskRunning = EasyBind.reduce(backgroundTasks, tasks -> tasks.anyMatch(Task::isRunning));
-    private final EasyBinding<Double> tasksProgress = EasyBind.reduce(backgroundTasks, tasks -> tasks.filter(Task::isRunning).mapToDouble(Task::getProgress).average().orElse(1));
+    private final ObservableList<Pair<BackgroundTask, Task<?>>> backgroundTasks = FXCollections.observableArrayList(task -> new Observable[] {task.getValue().progressProperty(), task.getValue().runningProperty()});
+    private final EasyBinding<Boolean> anyTaskRunning = EasyBind.reduce(backgroundTasks, tasks -> tasks.map(Pair::getValue).anyMatch(Task::isRunning));
+    private final EasyBinding<Boolean> anyTasksThatWillNotBeRecoveredRunning = EasyBind.reduce(backgroundTasks, tasks -> tasks.anyMatch(task -> !task.getKey().willBeRecoveredAutomatically() && task.getValue().isRunning()));
+    private final EasyBinding<Double> tasksProgress = EasyBind.reduce(backgroundTasks, tasks -> tasks.map(Pair::getValue).filter(Task::isRunning).mapToDouble(Task::getProgress).average().orElse(1));
     private final ObservableMap<String, DialogWindowState> dialogWindowStates = FXCollections.observableHashMap();
     private final ObservableList<SidePaneType> visibleSidePanes = FXCollections.observableArrayList();
 
+    private final ObjectProperty<LastAutomaticFieldEditorEdit> lastAutomaticFieldEditorEdit = new SimpleObjectProperty<>();
+
     public StateManager() {
         activeGroups.bind(Bindings.valueAt(selectedGroups, activeDatabase.orElse(null)));
     }
@@ -143,17 +151,21 @@ public Optional<Node> getFocusOwner() {
     }
 
     public ObservableList<Task<?>> getBackgroundTasks() {
-        return backgroundTasks;
+        return EasyBind.map(backgroundTasks, Pair::getValue);
     }
 
-    public void addBackgroundTask(Task<?> backgroundTask) {
-        this.backgroundTasks.add(0, backgroundTask);
+    public void addBackgroundTask(BackgroundTask backgroundTask, Task<?> task) {
+        this.backgroundTasks.add(0, new Pair<>(backgroundTask, task));
     }
 
     public EasyBinding<Boolean> getAnyTaskRunning() {
         return anyTaskRunning;
     }
 
+    public EasyBinding<Boolean> getAnyTasksThatWillNotBeRecoveredRunning() {
+        return anyTasksThatWillNotBeRecoveredRunning;
+    }
+
     public EasyBinding<Double> getTasksProgress() {
         return tasksProgress;
     }
@@ -165,4 +177,16 @@ public DialogWindowState getDialogWindowState(String className) {
     public void setDialogWindowState(String className, DialogWindowState state) {
         dialogWindowStates.put(className, state);
     }
+
+    public ObjectProperty<LastAutomaticFieldEditorEdit> lastAutomaticFieldEditorEditProperty() {
+        return lastAutomaticFieldEditorEdit;
+    }
+
+    public LastAutomaticFieldEditorEdit getLastAutomaticFieldEditorEdit() {
+        return lastAutomaticFieldEditorEditProperty().get();
+    }
+
+    public void setLastAutomaticFieldEditorEdit(LastAutomaticFieldEditorEdit automaticFieldEditorEdit) {
+        lastAutomaticFieldEditorEditProperty().set(automaticFieldEditorEdit);
+    }
 }
diff --git a/src/main/java/org/jabref/gui/actions/Action.java b/src/main/java/org/jabref/gui/actions/Action.java
index e6ccfe487b2..28859e00225 100644
--- a/src/main/java/org/jabref/gui/actions/Action.java
+++ b/src/main/java/org/jabref/gui/actions/Action.java
@@ -1,5 +1,6 @@
 package org.jabref.gui.actions;
 
+import java.util.Objects;
 import java.util.Optional;
 
 import org.jabref.gui.icon.JabRefIcon;
@@ -19,4 +20,71 @@ default Optional<KeyBinding> getKeyBinding() {
     default String getDescription() {
         return "";
     }
+
+    class Builder {
+        private final ActionImpl actionImpl;
+
+        public Builder(String text) {
+            this.actionImpl = new ActionImpl();
+            setText(text);
+        }
+
+        public Builder() {
+            this("");
+        }
+
+        public Action setIcon(JabRefIcon icon) {
+            Objects.requireNonNull(icon);
+            actionImpl.icon = icon;
+            return actionImpl;
+        }
+
+        public Action setText(String text) {
+            Objects.requireNonNull(text);
+            actionImpl.text = text;
+            return actionImpl;
+        }
+
+        public Action setKeyBinding(KeyBinding keyBinding) {
+            Objects.requireNonNull(keyBinding);
+            actionImpl.keyBinding = keyBinding;
+            return actionImpl;
+        }
+
+        public Action setDescription(String description) {
+            Objects.requireNonNull(description);
+            actionImpl.description = description;
+            return actionImpl;
+        }
+    }
+
+    class ActionImpl implements Action {
+        private JabRefIcon icon;
+        private KeyBinding keyBinding;
+        private String text;
+        private String description;
+
+        private ActionImpl() {
+        }
+
+        @Override
+        public Optional<JabRefIcon> getIcon() {
+            return Optional.ofNullable(icon);
+        }
+
+        @Override
+        public Optional<KeyBinding> getKeyBinding() {
+            return Optional.ofNullable(keyBinding);
+        }
+
+        @Override
+        public String getText() {
+            return text != null ? text : "";
+        }
+
+        @Override
+        public String getDescription() {
+            return description != null ? description : "";
+        }
+    }
 }
diff --git a/src/main/java/org/jabref/gui/actions/ActionHelper.java b/src/main/java/org/jabref/gui/actions/ActionHelper.java
index 0c34735f12d..3b91e686489 100644
--- a/src/main/java/org/jabref/gui/actions/ActionHelper.java
+++ b/src/main/java/org/jabref/gui/actions/ActionHelper.java
@@ -57,7 +57,6 @@ public static BooleanExpression isAnyFieldSetForSelectedEntry(List<Field> fields
     }
 
     public static BooleanExpression isFilePresentForSelectedEntry(StateManager stateManager, PreferencesService preferencesService) {
-
         ObservableList<BibEntry> selectedEntries = stateManager.getSelectedEntries();
         Binding<Boolean> fileIsPresent = EasyBind.valueAt(selectedEntries, 0).map(entry -> {
             List<LinkedFile> files = entry.getFiles();
@@ -75,7 +74,6 @@ public static BooleanExpression isFilePresentForSelectedEntry(StateManager state
             } else {
                 return false;
             }
-
         }).orElse(false);
 
         return BooleanExpression.booleanExpression(fileIsPresent);
@@ -85,6 +83,7 @@ public static BooleanExpression isFilePresentForSelectedEntry(StateManager state
      * Check if at least one of the selected entries has linked files
      * <br>
      * Used in {@link org.jabref.gui.maintable.OpenExternalFileAction} when multiple entries selected
+     *
      * @param stateManager manager for the state of the GUI
      * @return a boolean binding
      */
diff --git a/src/main/java/org/jabref/gui/actions/StandardActions.java b/src/main/java/org/jabref/gui/actions/StandardActions.java
index aec2323eb26..b673a4e516b 100644
--- a/src/main/java/org/jabref/gui/actions/StandardActions.java
+++ b/src/main/java/org/jabref/gui/actions/StandardActions.java
@@ -78,6 +78,8 @@ public enum StandardActions implements Action {
     REPLACE_ALL(Localization.lang("Find and replace"), KeyBinding.REPLACE_STRING),
     MANAGE_KEYWORDS(Localization.lang("Manage keywords")),
     MASS_SET_FIELDS(Localization.lang("Manage field names & content")),
+
+    AUTOMATIC_FIELD_EDITOR(Localization.lang("Automatic field editor")),
     TOGGLE_GROUPS(Localization.lang("Groups"), IconTheme.JabRefIcons.TOGGLE_GROUPS, KeyBinding.TOGGLE_GROUPS_INTERFACE),
     TOOGLE_OO(Localization.lang("OpenOffice/LibreOffice"), IconTheme.JabRefIcons.FILE_OPENOFFICE, KeyBinding.OPEN_OPEN_OFFICE_LIBRE_OFFICE_CONNECTION),
     TOGGLE_WEB_SEARCH(Localization.lang("Web search"), Localization.lang("Toggle web search interface"), IconTheme.JabRefIcons.WWW, KeyBinding.WEB_SEARCH),
diff --git a/src/main/java/org/jabref/gui/autocompleter/AutoCompletionTextInputBinding.java b/src/main/java/org/jabref/gui/autocompleter/AutoCompletionTextInputBinding.java
index 7f0f10b160e..a294c91df91 100644
--- a/src/main/java/org/jabref/gui/autocompleter/AutoCompletionTextInputBinding.java
+++ b/src/main/java/org/jabref/gui/autocompleter/AutoCompletionTextInputBinding.java
@@ -41,8 +41,6 @@
  * Represents a binding between a text input control and a auto-completion popup
  * This class is a slightly modified version of {@link impl.org.controlsfx.autocompletion.AutoCompletionTextFieldBinding}
  * that works with general text input controls instead of just text fields.
- * @param <T>
- *
  */
 public class AutoCompletionTextInputBinding<T> extends AutoCompletionBinding<T> {
 
diff --git a/src/main/java/org/jabref/gui/autocompleter/PersonNameStringConverter.java b/src/main/java/org/jabref/gui/autocompleter/PersonNameStringConverter.java
index 04d085fcb1b..c78312638af 100644
--- a/src/main/java/org/jabref/gui/autocompleter/PersonNameStringConverter.java
+++ b/src/main/java/org/jabref/gui/autocompleter/PersonNameStringConverter.java
@@ -39,7 +39,6 @@ public PersonNameStringConverter(AutoCompletePreferences preferences) {
 
     @Override
     public String toString(Author author) {
-
         if (autoCompLF) {
             switch (autoCompleteFirstNameMode) {
                 case ONLY_ABBREVIATED:
diff --git a/src/main/java/org/jabref/gui/bibtexextractor/BibtexExtractorViewModel.java b/src/main/java/org/jabref/gui/bibtexextractor/BibtexExtractorViewModel.java
index aee3adde536..a8e007dda62 100644
--- a/src/main/java/org/jabref/gui/bibtexextractor/BibtexExtractorViewModel.java
+++ b/src/main/java/org/jabref/gui/bibtexextractor/BibtexExtractorViewModel.java
@@ -13,10 +13,10 @@
 import org.jabref.gui.Globals;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.externalfiles.ImportHandler;
-import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.util.BackgroundTask;
 import org.jabref.gui.util.TaskExecutor;
 import org.jabref.logic.importer.FetcherException;
+import org.jabref.logic.importer.ImportFormatReader;
 import org.jabref.logic.importer.fetcher.GrobidCitationFetcher;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseContext;
@@ -43,18 +43,20 @@ public BibtexExtractorViewModel(BibDatabaseContext bibdatabaseContext,
                                     FileUpdateMonitor fileUpdateMonitor,
                                     TaskExecutor taskExecutor,
                                     UndoManager undoManager,
-                                    StateManager stateManager) {
+                                    StateManager stateManager,
+                                    ImportFormatReader importFormatReader) {
 
         this.dialogService = dialogService;
         this.preferencesService = preferencesService;
         this.taskExecutor = taskExecutor;
         this.importHandler = new ImportHandler(
                 bibdatabaseContext,
-                ExternalFileTypes.getInstance(),
                 preferencesService,
                 fileUpdateMonitor,
                 undoManager,
-                stateManager);
+                stateManager,
+                dialogService,
+                importFormatReader);
     }
 
     public StringProperty inputTextProperty() {
@@ -62,7 +64,7 @@ public StringProperty inputTextProperty() {
     }
 
     public void startParsing() {
-        if (preferencesService.getImporterPreferences().isGrobidEnabled()) {
+        if (preferencesService.getGrobidPreferences().isGrobidEnabled()) {
             parseUsingGrobid();
         } else {
             parseUsingBibtexExtractor();
@@ -76,7 +78,7 @@ private void parseUsingBibtexExtractor() {
     }
 
     private void parseUsingGrobid() {
-        GrobidCitationFetcher grobidCitationFetcher = new GrobidCitationFetcher(preferencesService.getImporterPreferences(), preferencesService.getImportFormatPreferences());
+        GrobidCitationFetcher grobidCitationFetcher = new GrobidCitationFetcher(preferencesService.getGrobidPreferences(), preferencesService.getImportFormatPreferences());
         BackgroundTask.wrap(() -> grobidCitationFetcher.performSearch(inputTextProperty.getValue()))
                       .onRunning(() -> dialogService.notify(Localization.lang("Your text is being parsed...")))
                       .onFailure((e) -> {
diff --git a/src/main/java/org/jabref/gui/bibtexextractor/ExtractBibtexAction.java b/src/main/java/org/jabref/gui/bibtexextractor/ExtractBibtexAction.java
index ce198561af4..70c693a5fe9 100644
--- a/src/main/java/org/jabref/gui/bibtexextractor/ExtractBibtexAction.java
+++ b/src/main/java/org/jabref/gui/bibtexextractor/ExtractBibtexAction.java
@@ -24,7 +24,7 @@ public ExtractBibtexAction(DialogService dialogService, PreferencesService prefe
     @Override
     public void execute() {
         DialogService dialogService = Injector.instantiateModelOrService(DialogService.class);
-        GrobidOptInDialogHelper.showAndWaitIfUserIsUndecided(dialogService, preferencesService.getImporterPreferences());
+        GrobidOptInDialogHelper.showAndWaitIfUserIsUndecided(dialogService, preferencesService.getGrobidPreferences());
         dialogService.showCustomDialogAndWait(new ExtractBibtexDialog());
     }
 }
diff --git a/src/main/java/org/jabref/gui/bibtexextractor/ExtractBibtexDialog.java b/src/main/java/org/jabref/gui/bibtexextractor/ExtractBibtexDialog.java
index 04affccbf1a..3a5d0ec7a3f 100644
--- a/src/main/java/org/jabref/gui/bibtexextractor/ExtractBibtexDialog.java
+++ b/src/main/java/org/jabref/gui/bibtexextractor/ExtractBibtexDialog.java
@@ -13,6 +13,7 @@
 import org.jabref.gui.StateManager;
 import org.jabref.gui.util.BaseDialog;
 import org.jabref.gui.util.TaskExecutor;
+import org.jabref.logic.importer.ImportFormatReader;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.util.FileUpdateMonitor;
@@ -35,6 +36,7 @@ public class ExtractBibtexDialog extends BaseDialog<Void> {
     @Inject private TaskExecutor taskExecutor;
     @Inject private UndoManager undoManager;
     @Inject private PreferencesService preferencesService;
+    @Inject private ImportFormatReader importFormatReader;
 
     public ExtractBibtexDialog() {
         ViewLoader.view(this)
@@ -53,7 +55,7 @@ public ExtractBibtexDialog() {
     @FXML
     private void initialize() {
         BibDatabaseContext database = stateManager.getActiveDatabase().orElseThrow(() -> new NullPointerException("Database null"));
-        this.viewModel = new BibtexExtractorViewModel(database, dialogService, preferencesService, fileUpdateMonitor, taskExecutor, undoManager, stateManager);
+        this.viewModel = new BibtexExtractorViewModel(database, dialogService, preferencesService, fileUpdateMonitor, taskExecutor, undoManager, stateManager, importFormatReader);
         input.textProperty().bindBidirectional(viewModel.inputTextProperty());
     }
 }
diff --git a/src/main/java/org/jabref/gui/citationkeypattern/GenerateCitationKeyAction.java b/src/main/java/org/jabref/gui/citationkeypattern/GenerateCitationKeyAction.java
index b70d511dd64..82d9553d865 100644
--- a/src/main/java/org/jabref/gui/citationkeypattern/GenerateCitationKeyAction.java
+++ b/src/main/java/org/jabref/gui/citationkeypattern/GenerateCitationKeyAction.java
@@ -96,7 +96,6 @@ private void checkOverwriteKeysChosen() {
 
     private BackgroundTask generateKeysInBackground() {
         return new BackgroundTask<Void>() {
-
             private NamedCompound compound;
 
             @Override
@@ -141,7 +140,6 @@ public BackgroundTask<Void> onSuccess(Consumer<Void> onSuccess) {
                 return super.onSuccess(onSuccess);
             }
         };
-
     }
 
     private String formatOutputMessage(String start, int count) {
diff --git a/src/main/java/org/jabref/gui/collab/ChangeDisplayDialog.java b/src/main/java/org/jabref/gui/collab/ChangeDisplayDialog.java
deleted file mode 100644
index e9f0751cc07..00000000000
--- a/src/main/java/org/jabref/gui/collab/ChangeDisplayDialog.java
+++ /dev/null
@@ -1,114 +0,0 @@
-package org.jabref.gui.collab;
-
-import java.util.List;
-
-import javafx.collections.FXCollections;
-import javafx.scene.control.Button;
-import javafx.scene.control.ButtonBar;
-import javafx.scene.control.ButtonBar.ButtonData;
-import javafx.scene.control.ButtonType;
-import javafx.scene.control.CheckBox;
-import javafx.scene.control.Label;
-import javafx.scene.control.ListView;
-import javafx.scene.control.ScrollPane;
-import javafx.scene.control.SplitPane;
-import javafx.scene.layout.BorderPane;
-import javafx.scene.layout.Region;
-import javafx.scene.layout.VBox;
-
-import org.jabref.gui.undo.NamedCompound;
-import org.jabref.gui.util.BaseDialog;
-import org.jabref.logic.l10n.Localization;
-import org.jabref.model.database.BibDatabaseContext;
-
-import com.tobiasdiez.easybind.EasyBind;
-
-class ChangeDisplayDialog extends BaseDialog<Boolean> {
-
-    private final ListView<DatabaseChangeViewModel> changesList;
-    private final BorderPane infoPanel = new BorderPane();
-    private final CheckBox cb = new CheckBox(Localization.lang("Accept change"));
-
-    public ChangeDisplayDialog(BibDatabaseContext database, List<DatabaseChangeViewModel> changes) {
-        this.setTitle(Localization.lang("External changes"));
-        this.getDialogPane().setPrefSize(800, 600);
-
-        changesList = new ListView<>(FXCollections.observableArrayList(changes));
-        changesList.setPrefWidth(200);
-        EasyBind.subscribe(changesList.getSelectionModel().selectedItemProperty(), this::selectedChangeChanged);
-
-        SplitPane pane = new SplitPane();
-        pane.setDividerPositions(0.2);
-
-        Button selectAllChangesFromDisk = new Button(Localization.lang("Mark all changes as accepted"));
-        selectAllChangesFromDisk.setMinWidth(Region.USE_PREF_SIZE);
-        selectAllChangesFromDisk.setOnAction(evt -> {
-            for (DatabaseChangeViewModel change : changes) {
-                change.setAccepted(true);
-            }
-        });
-        Button unselectAllAcceptChanges = new Button(Localization.lang("Unmark all changes"));
-        unselectAllAcceptChanges.setOnAction(evt -> {
-            for (DatabaseChangeViewModel change : changes) {
-                change.setAccepted(false);
-            }
-        });
-
-        VBox leftContent = new VBox(changesList,
-                selectAllChangesFromDisk,
-                unselectAllAcceptChanges);
-
-        ScrollPane leftScroll = new ScrollPane(leftContent);
-        leftScroll.setFitToHeight(true);
-        leftScroll.setFitToWidth(true);
-
-        pane.getItems().addAll(leftScroll, infoPanel);
-        SplitPane.setResizableWithParent(leftScroll, false);
-
-        getDialogPane().setContent(pane);
-
-        Label rootInfo = new Label(Localization.lang("Select the tree nodes to view and accept or reject changes") + '.');
-        infoPanel.setCenter(rootInfo);
-        changesList.getSelectionModel().selectFirst();
-
-        ButtonType dismissChanges = new ButtonType(Localization.lang("Dismiss"), ButtonData.CANCEL_CLOSE);
-
-        getDialogPane().getButtonTypes().setAll(new ButtonType(Localization.lang("Accept changes"), ButtonBar.ButtonData.APPLY),
-                dismissChanges);
-
-        setResultConverter(button -> {
-            if (button == dismissChanges) {
-                return false;
-            } else {
-                // Perform all accepted changes
-                NamedCompound ce = new NamedCompound(Localization.lang("Merged external changes"));
-                for (DatabaseChangeViewModel change : changes) {
-                    if (change instanceof EntryChangeViewModel) {
-                        // We don't have a checkbox for accept and always get the correct merged entry, the accept property in this special case only controls the radio buttons selection
-                        change.makeChange(database, ce);
-                    } else if (change.isAccepted()) {
-                        change.makeChange(database, ce);
-                    }
-                }
-                ce.end();
-                // TODO: panel.getUndoManager().addEdit(ce);
-
-                return true;
-            }
-        });
-    }
-
-    private void selectedChangeChanged(DatabaseChangeViewModel currentChange) {
-        if (currentChange != null) {
-            infoPanel.setCenter(currentChange.description());
-
-            if (!(currentChange instanceof EntryChangeViewModel)) {
-                cb.setManaged(true);
-                infoPanel.setBottom(cb);
-                cb.selectedProperty().bindBidirectional(currentChange.acceptedProperty());
-            } else {
-                cb.setManaged(false);
-            }
-        }
-    }
-}
diff --git a/src/main/java/org/jabref/gui/collab/ChangeScanner.java b/src/main/java/org/jabref/gui/collab/ChangeScanner.java
index cf76d3b7c41..74e9bf2b88b 100644
--- a/src/main/java/org/jabref/gui/collab/ChangeScanner.java
+++ b/src/main/java/org/jabref/gui/collab/ChangeScanner.java
@@ -7,6 +7,16 @@
 
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
+import org.jabref.gui.collab.entryadd.EntryAdd;
+import org.jabref.gui.collab.entrychange.EntryChange;
+import org.jabref.gui.collab.entrydelete.EntryDelete;
+import org.jabref.gui.collab.groupchange.GroupChange;
+import org.jabref.gui.collab.metedatachange.MetadataChange;
+import org.jabref.gui.collab.preamblechange.PreambleChange;
+import org.jabref.gui.collab.stringadd.BibTexStringAdd;
+import org.jabref.gui.collab.stringchange.BibTexStringChange;
+import org.jabref.gui.collab.stringdelete.BibTexStringDelete;
+import org.jabref.gui.collab.stringrename.BibTexStringRename;
 import org.jabref.gui.theme.ThemeManager;
 import org.jabref.logic.bibtex.comparator.BibDatabaseDiff;
 import org.jabref.logic.bibtex.comparator.BibEntryDiff;
@@ -31,6 +41,8 @@ public class ChangeScanner {
     private final StateManager stateManager;
     private final ThemeManager themeManager;
 
+    private final ExternalChangeResolverFactory externalChangeResolverFactory;
+
     public ChangeScanner(BibDatabaseContext database,
                          DialogService dialogService,
                          PreferencesService preferencesService,
@@ -41,30 +53,33 @@ public ChangeScanner(BibDatabaseContext database,
         this.preferencesService = preferencesService;
         this.stateManager = stateManager;
         this.themeManager = themeManager;
+        this.externalChangeResolverFactory = new ExternalChangeResolverFactory(dialogService, database);
     }
 
-    public List<DatabaseChangeViewModel> scanForChanges() {
+    public List<ExternalChange> scanForChanges() {
         if (database.getDatabasePath().isEmpty()) {
             return Collections.emptyList();
         }
 
         try {
-            List<DatabaseChangeViewModel> changes = new ArrayList<>();
+            List<ExternalChange> changes = new ArrayList<>();
 
             // Parse the modified file
             // Important: apply all post-load actions
             ImportFormatPreferences importFormatPreferences = preferencesService.getImportFormatPreferences();
             GeneralPreferences generalPreferences = preferencesService.getGeneralPreferences();
-            ParserResult result = OpenDatabase.loadDatabase(database.getDatabasePath().get(), generalPreferences, importFormatPreferences, new DummyFileUpdateMonitor());
+            ParserResult result = OpenDatabase.loadDatabase(database.getDatabasePath().get(), importFormatPreferences, new DummyFileUpdateMonitor());
             BibDatabaseContext databaseOnDisk = result.getDatabaseContext();
 
             // Start looking at changes.
             BibDatabaseDiff differences = BibDatabaseDiff.compare(database, databaseOnDisk);
             differences.getMetaDataDifferences().ifPresent(diff -> {
-                changes.add(new MetaDataChangeViewModel(diff, preferencesService));
-                diff.getGroupDifferences().ifPresent(groupDiff -> changes.add(new GroupChangeViewModel(groupDiff)));
+                changes.add(new MetadataChange(diff, database, externalChangeResolverFactory));
+                diff.getGroupDifferences().ifPresent(groupDiff -> changes.add(new GroupChange(
+                        groupDiff, database, externalChangeResolverFactory
+                )));
             });
-            differences.getPreambleDifferences().ifPresent(diff -> changes.add(new PreambleChangeViewModel(diff)));
+            differences.getPreambleDifferences().ifPresent(diff -> changes.add(new PreambleChange(diff, database, externalChangeResolverFactory)));
             differences.getBibStringDifferences().forEach(diff -> changes.add(createBibStringDiff(diff)));
             differences.getEntryDifferences().forEach(diff -> changes.add(createBibEntryDiff(diff)));
             return changes;
@@ -74,31 +89,31 @@ public List<DatabaseChangeViewModel> scanForChanges() {
         }
     }
 
-    private DatabaseChangeViewModel createBibStringDiff(BibStringDiff diff) {
-        if (diff.getOriginalString() == null) {
-            return new StringAddChangeViewModel(diff.getNewString());
+    private ExternalChange createBibStringDiff(BibStringDiff diff) {
+         if (diff.getOriginalString() == null) {
+            return new BibTexStringAdd(diff.getNewString(), database, externalChangeResolverFactory);
         }
 
         if (diff.getNewString() == null) {
-            return new StringRemoveChangeViewModel(diff.getOriginalString());
+            return new BibTexStringDelete(diff.getOriginalString(), database, externalChangeResolverFactory);
         }
 
         if (diff.getOriginalString().getName().equals(diff.getNewString().getName())) {
-            return new StringChangeViewModel(diff.getOriginalString(), diff.getNewString());
+            return new BibTexStringChange(diff.getOriginalString(), diff.getNewString(), database, externalChangeResolverFactory);
         }
 
-        return new StringNameChangeViewModel(diff.getOriginalString(), diff.getNewString());
+        return new BibTexStringRename(diff.getOriginalString(), diff.getNewString(), database, externalChangeResolverFactory);
     }
 
-    private DatabaseChangeViewModel createBibEntryDiff(BibEntryDiff diff) {
+    private ExternalChange createBibEntryDiff(BibEntryDiff diff) {
         if (diff.getOriginalEntry() == null) {
-            return new EntryAddChangeViewModel(diff.getNewEntry(), preferencesService, dialogService, stateManager, themeManager);
+            return new EntryAdd(diff.getNewEntry(), database, externalChangeResolverFactory);
         }
 
         if (diff.getNewEntry() == null) {
-            return new EntryDeleteChangeViewModel(diff.getOriginalEntry());
+            return new EntryDelete(diff.getOriginalEntry(), database, externalChangeResolverFactory);
         }
 
-        return new EntryChangeViewModel(diff.getOriginalEntry(), diff.getNewEntry());
+        return new EntryChange(diff.getOriginalEntry(), diff.getNewEntry(), database, externalChangeResolverFactory);
     }
 }
diff --git a/src/main/java/org/jabref/gui/collab/DatabaseChangeListener.java b/src/main/java/org/jabref/gui/collab/DatabaseChangeListener.java
index cfb9ac2e1ff..b26a511ecf1 100644
--- a/src/main/java/org/jabref/gui/collab/DatabaseChangeListener.java
+++ b/src/main/java/org/jabref/gui/collab/DatabaseChangeListener.java
@@ -3,5 +3,5 @@
 import java.util.List;
 
 public interface DatabaseChangeListener {
-    void databaseChanged(List<DatabaseChangeViewModel> changes);
+    void databaseChanged(List<ExternalChange> changes);
 }
diff --git a/src/main/java/org/jabref/gui/collab/DatabaseChangeMonitor.java b/src/main/java/org/jabref/gui/collab/DatabaseChangeMonitor.java
index 7eacbc10bb8..3f1b3b4fb5e 100644
--- a/src/main/java/org/jabref/gui/collab/DatabaseChangeMonitor.java
+++ b/src/main/java/org/jabref/gui/collab/DatabaseChangeMonitor.java
@@ -4,16 +4,22 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import javafx.util.Duration;
+
 import org.jabref.gui.DialogService;
+import org.jabref.gui.LibraryTab;
 import org.jabref.gui.StateManager;
+import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.theme.ThemeManager;
 import org.jabref.gui.util.BackgroundTask;
 import org.jabref.gui.util.TaskExecutor;
+import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.util.FileUpdateListener;
 import org.jabref.model.util.FileUpdateMonitor;
 import org.jabref.preferences.PreferencesService;
 
+import org.controlsfx.control.action.Action;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -36,7 +42,8 @@ public DatabaseChangeMonitor(BibDatabaseContext database,
                                  DialogService dialogService,
                                  PreferencesService preferencesService,
                                  StateManager stateManager,
-                                 ThemeManager themeManager) {
+                                 ThemeManager themeManager,
+                                 LibraryTab.DatabaseNotification notificationPane) {
         this.database = database;
         this.fileMonitor = fileMonitor;
         this.taskExecutor = taskExecutor;
@@ -51,23 +58,35 @@ public DatabaseChangeMonitor(BibDatabaseContext database,
             try {
                 fileMonitor.addListenerForFile(path, this);
             } catch (IOException e) {
-                LOGGER.error("Error while trying to monitor " + path, e);
+                LOGGER.error("Error while trying to monitor {}", path, e);
             }
         });
+
+        addListener(changes -> notificationPane.notify(
+                IconTheme.JabRefIcons.SAVE.getGraphicNode(),
+                Localization.lang("The library has been modified by another program."),
+                List.of(new Action(Localization.lang("Dismiss changes"), event -> notificationPane.hide()),
+                        new Action(Localization.lang("Review changes"), event -> {
+                            dialogService.showCustomDialogAndWait(new ExternalChangesResolverDialog(changes, database, dialogService, stateManager, themeManager, preferencesService));
+                            notificationPane.hide();
+                        })),
+                Duration.ZERO));
     }
 
     @Override
     public void fileUpdated() {
-        // File on disk has changed, thus look for notable changes and notify listeners in case there are such changes
-        ChangeScanner scanner = new ChangeScanner(database, dialogService, preferencesService, stateManager, themeManager);
-        BackgroundTask.wrap(scanner::scanForChanges)
-                      .onSuccess(changes -> {
-                          if (!changes.isEmpty()) {
-                              listeners.forEach(listener -> listener.databaseChanged(changes));
-                          }
-                      })
-                      .onFailure(e -> LOGGER.error("Error while watching for changes", e))
-                      .executeWith(taskExecutor);
+        synchronized (database) {
+            // File on disk has changed, thus look for notable changes and notify listeners in case there are such changes
+            ChangeScanner scanner = new ChangeScanner(database, dialogService, preferencesService, stateManager, themeManager);
+            BackgroundTask.wrap(scanner::scanForChanges)
+                          .onSuccess(changes -> {
+                              if (!changes.isEmpty()) {
+                                  listeners.forEach(listener -> listener.databaseChanged(changes));
+                              }
+                          })
+                          .onFailure(e -> LOGGER.error("Error while watching for changes", e))
+                          .executeWith(taskExecutor);
+        }
     }
 
     public void addListener(DatabaseChangeListener listener) {
diff --git a/src/main/java/org/jabref/gui/collab/DatabaseChangePane.java b/src/main/java/org/jabref/gui/collab/DatabaseChangePane.java
deleted file mode 100644
index 569b07158d1..00000000000
--- a/src/main/java/org/jabref/gui/collab/DatabaseChangePane.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.jabref.gui.collab;
-
-import java.util.List;
-
-import javafx.scene.Node;
-
-import org.jabref.gui.DialogService;
-import org.jabref.gui.icon.IconTheme;
-import org.jabref.logic.l10n.Localization;
-import org.jabref.model.database.BibDatabaseContext;
-
-import com.airhacks.afterburner.injection.Injector;
-import org.controlsfx.control.NotificationPane;
-import org.controlsfx.control.action.Action;
-
-public class DatabaseChangePane extends NotificationPane {
-
-    private final DatabaseChangeMonitor monitor;
-    private final BibDatabaseContext database;
-
-    public DatabaseChangePane(Node parent, BibDatabaseContext database, DatabaseChangeMonitor monitor) {
-        super(parent);
-        this.database = database;
-        this.monitor = monitor;
-
-        this.setGraphic(IconTheme.JabRefIcons.SAVE.getGraphicNode());
-        this.setText(Localization.lang("The library has been modified by another program."));
-
-        monitor.addListener(this::onDatabaseChanged);
-    }
-
-    private void onDatabaseChanged(List<DatabaseChangeViewModel> changes) {
-        this.getActions().setAll(
-                new Action(Localization.lang("Dismiss changes"), event -> {
-                    this.hide();
-                }),
-                new Action(Localization.lang("Review changes"), event -> {
-                    DialogService dialogService = Injector.instantiateModelOrService(DialogService.class);
-                    dialogService.showCustomDialogAndWait(new ChangeDisplayDialog(database, changes));
-                    this.hide();
-                }));
-        this.show();
-    }
-}
diff --git a/src/main/java/org/jabref/gui/collab/DatabaseChangeViewModel.java b/src/main/java/org/jabref/gui/collab/DatabaseChangeViewModel.java
deleted file mode 100644
index bdc7dead217..00000000000
--- a/src/main/java/org/jabref/gui/collab/DatabaseChangeViewModel.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package org.jabref.gui.collab;
-
-import javafx.beans.property.BooleanProperty;
-import javafx.beans.property.SimpleBooleanProperty;
-import javafx.scene.Node;
-
-import org.jabref.gui.undo.NamedCompound;
-import org.jabref.model.database.BibDatabaseContext;
-
-abstract class DatabaseChangeViewModel {
-
-    protected String name;
-    private BooleanProperty acceptedProperty = new SimpleBooleanProperty(true);
-
-    DatabaseChangeViewModel() {
-        name = "";
-    }
-
-    DatabaseChangeViewModel(String name) {
-        this.name = name;
-    }
-
-    @Override
-    public String toString() {
-        return name;
-    }
-
-    public boolean isAccepted() {
-        return acceptedProperty.getValue();
-    }
-
-    public BooleanProperty acceptedProperty() {
-        return this.acceptedProperty;
-    }
-
-    public void setAccepted(boolean accepted) {
-        this.acceptedProperty.setValue(accepted);
-    }
-
-    /**
-     * This method returns a {@link Node} detailing the nature and look of the change, e.g. how it is displayed
-     *
-     * @return Node the Node with the layout of the change
-     */
-    public abstract Node description();
-
-    /**
-     * Performs the change. This method is responsible for adding a proper undo edit to the NamedCompound, so the change can be undone.
-     *
-     * @param database the database that should be modified accordingly.
-     * @param undoEdit NamedCompound The compound to hold the undo edits.
-     */
-    public abstract void makeChange(BibDatabaseContext database, NamedCompound undoEdit);
-}
diff --git a/src/main/java/org/jabref/gui/collab/EntryAddChangeViewModel.java b/src/main/java/org/jabref/gui/collab/EntryAddChangeViewModel.java
deleted file mode 100644
index 56d763be3c6..00000000000
--- a/src/main/java/org/jabref/gui/collab/EntryAddChangeViewModel.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package org.jabref.gui.collab;
-
-import javafx.scene.Node;
-
-import org.jabref.gui.DialogService;
-import org.jabref.gui.StateManager;
-import org.jabref.gui.preview.PreviewViewer;
-import org.jabref.gui.theme.ThemeManager;
-import org.jabref.gui.undo.NamedCompound;
-import org.jabref.gui.undo.UndoableInsertEntries;
-import org.jabref.logic.l10n.Localization;
-import org.jabref.model.database.BibDatabaseContext;
-import org.jabref.model.entry.BibEntry;
-import org.jabref.preferences.PreferencesService;
-
-class EntryAddChangeViewModel extends DatabaseChangeViewModel {
-
-    private final BibEntry entry;
-    private final PreferencesService preferencesService;
-    private final DialogService dialogService;
-    private final StateManager stateManager;
-    private final ThemeManager themeManager;
-
-    public EntryAddChangeViewModel(BibEntry entry,
-                                   PreferencesService preferencesService,
-                                   DialogService dialogService,
-                                   StateManager stateManager,
-                                   ThemeManager themeManager) {
-        super();
-        this.dialogService = dialogService;
-        this.preferencesService = preferencesService;
-        this.themeManager = themeManager;
-        this.stateManager = stateManager;
-        this.name = entry.getCitationKey()
-                         .map(key -> Localization.lang("Added entry") + ": '" + key + '\'')
-                         .orElse(Localization.lang("Added entry"));
-        this.entry = entry;
-    }
-
-    @Override
-    public void makeChange(BibDatabaseContext database, NamedCompound undoEdit) {
-        database.getDatabase().insertEntry(entry);
-        undoEdit.addEdit(new UndoableInsertEntries(database.getDatabase(), entry));
-    }
-
-    @Override
-    public Node description() {
-        PreviewViewer previewViewer = new PreviewViewer(new BibDatabaseContext(), dialogService, stateManager, themeManager);
-        previewViewer.setLayout(preferencesService.getPreviewPreferences().getSelectedPreviewLayout());
-        previewViewer.setEntry(entry);
-        return previewViewer;
-    }
-}
diff --git a/src/main/java/org/jabref/gui/collab/EntryChangeViewModel.java b/src/main/java/org/jabref/gui/collab/EntryChangeViewModel.java
deleted file mode 100644
index 8a42001472a..00000000000
--- a/src/main/java/org/jabref/gui/collab/EntryChangeViewModel.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package org.jabref.gui.collab;
-
-import javafx.geometry.Insets;
-import javafx.scene.Node;
-import javafx.scene.control.Label;
-import javafx.scene.layout.VBox;
-
-import org.jabref.gui.mergeentries.MergeEntries;
-import org.jabref.gui.mergeentries.MergeEntries.DefaultRadioButtonSelectionMode;
-import org.jabref.gui.undo.NamedCompound;
-import org.jabref.gui.undo.UndoableInsertEntries;
-import org.jabref.logic.l10n.Localization;
-import org.jabref.model.database.BibDatabaseContext;
-import org.jabref.model.entry.BibEntry;
-
-class EntryChangeViewModel extends DatabaseChangeViewModel {
-
-    private final BibEntry oldEntry;
-    private final BibEntry newEntry;
-    private MergeEntries mergePanel;
-
-    public EntryChangeViewModel(BibEntry entry, BibEntry newEntry) {
-        super();
-
-        this.oldEntry = entry;
-        this.newEntry = newEntry;
-
-        name = entry.getCitationKey()
-                    .map(key -> Localization.lang("Modified entry") + ": '" + key + '\'')
-                    .orElse(Localization.lang("Modified entry"));
-    }
-
-    /**
-     * We override this here to select the radio buttons accordingly
-     */
-    @Override
-    public void setAccepted(boolean accepted) {
-        super.setAccepted(accepted);
-        if (accepted) {
-            mergePanel.selectAllRightRadioButtons();
-        } else {
-            mergePanel.selectAllLeftRadioButtons();
-        }
-    }
-
-    @Override
-    public void makeChange(BibDatabaseContext database, NamedCompound undoEdit) {
-        this.description(); // Init dialog to prevent NPE
-        database.getDatabase().removeEntry(oldEntry);
-        BibEntry mergedEntry = mergePanel.getMergeEntry();
-        mergedEntry.setId(oldEntry.getId()); // Keep ID
-        database.getDatabase().insertEntry(mergedEntry);
-        undoEdit.addEdit(new UndoableInsertEntries(database.getDatabase(), oldEntry));
-        undoEdit.addEdit(new UndoableInsertEntries(database.getDatabase(), mergedEntry));
-    }
-
-    @Override
-    public Node description() {
-        mergePanel = new MergeEntries(oldEntry, newEntry, Localization.lang("In JabRef"), Localization.lang("On disk"), DefaultRadioButtonSelectionMode.LEFT);
-        VBox container = new VBox(10);
-        Label header = new Label(name);
-        header.getStyleClass().add("sectionHeader");
-        container.getChildren().add(header);
-        container.getChildren().add(mergePanel);
-        VBox.setMargin(mergePanel, new Insets(5, 5, 5, 5));
-        return container;
-    }
-}
diff --git a/src/main/java/org/jabref/gui/collab/EntryDeleteChangeViewModel.java b/src/main/java/org/jabref/gui/collab/EntryDeleteChangeViewModel.java
deleted file mode 100644
index f30b6bda14a..00000000000
--- a/src/main/java/org/jabref/gui/collab/EntryDeleteChangeViewModel.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package org.jabref.gui.collab;
-
-import javafx.scene.Node;
-
-import org.jabref.gui.Globals;
-import org.jabref.gui.JabRefGUI;
-import org.jabref.gui.preview.PreviewViewer;
-import org.jabref.gui.undo.NamedCompound;
-import org.jabref.gui.undo.UndoableRemoveEntries;
-import org.jabref.logic.l10n.Localization;
-import org.jabref.model.database.BibDatabaseContext;
-import org.jabref.model.entry.BibEntry;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-class EntryDeleteChangeViewModel extends DatabaseChangeViewModel {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(EntryDeleteChangeViewModel.class);
-    private final BibEntry entry;
-
-    public EntryDeleteChangeViewModel(BibEntry entry) {
-        super(Localization.lang("Deleted entry"));
-
-        this.name = entry.getCitationKey()
-                         .map(key -> Localization.lang("Deleted entry") + ": '" + key + '\'')
-                         .orElse(Localization.lang("Deleted entry"));
-        this.entry = entry;
-    }
-
-    @Override
-    public void makeChange(BibDatabaseContext database, NamedCompound undoEdit) {
-        database.getDatabase().removeEntry(entry);
-        undoEdit.addEdit(new UndoableRemoveEntries(database.getDatabase(), entry));
-    }
-
-    @Override
-    public Node description() {
-        PreviewViewer previewViewer = new PreviewViewer(new BibDatabaseContext(), JabRefGUI.getMainFrame().getDialogService(), Globals.stateManager, Globals.getThemeManager());
-        previewViewer.setEntry(entry);
-        return previewViewer;
-    }
-}
diff --git a/src/main/java/org/jabref/gui/collab/ExternalChange.java b/src/main/java/org/jabref/gui/collab/ExternalChange.java
new file mode 100644
index 00000000000..00d13c92d29
--- /dev/null
+++ b/src/main/java/org/jabref/gui/collab/ExternalChange.java
@@ -0,0 +1,71 @@
+package org.jabref.gui.collab;
+
+import java.util.Optional;
+
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+
+import org.jabref.gui.collab.entryadd.EntryAdd;
+import org.jabref.gui.collab.entrychange.EntryChange;
+import org.jabref.gui.collab.entrydelete.EntryDelete;
+import org.jabref.gui.collab.groupchange.GroupChange;
+import org.jabref.gui.collab.metedatachange.MetadataChange;
+import org.jabref.gui.collab.preamblechange.PreambleChange;
+import org.jabref.gui.collab.stringadd.BibTexStringAdd;
+import org.jabref.gui.collab.stringchange.BibTexStringChange;
+import org.jabref.gui.collab.stringdelete.BibTexStringDelete;
+import org.jabref.gui.collab.stringrename.BibTexStringRename;
+import org.jabref.gui.undo.NamedCompound;
+import org.jabref.gui.util.OptionalObjectProperty;
+import org.jabref.model.database.BibDatabaseContext;
+
+public sealed abstract class ExternalChange permits EntryAdd, EntryChange, EntryDelete, GroupChange, MetadataChange, PreambleChange, BibTexStringAdd, BibTexStringChange, BibTexStringDelete, BibTexStringRename {
+    protected final BibDatabaseContext databaseContext;
+    protected final OptionalObjectProperty<ExternalChangeResolver> externalChangeResolver = OptionalObjectProperty.empty();
+    private final BooleanProperty accepted = new SimpleBooleanProperty();
+    private final StringProperty name = new SimpleStringProperty();
+
+    protected ExternalChange(BibDatabaseContext databaseContext, ExternalChangeResolverFactory externalChangeResolverFactory) {
+        this.databaseContext = databaseContext;
+        setChangeName("Unnamed Change!");
+
+        if (externalChangeResolverFactory != null) {
+            externalChangeResolver.set(externalChangeResolverFactory.create(this));
+        }
+    }
+
+    public boolean isAccepted() {
+        return accepted.get();
+    }
+
+    public BooleanProperty acceptedProperty() {
+        return accepted;
+    }
+
+    public void setAccepted(boolean accepted) {
+        this.accepted.set(accepted);
+    }
+
+    /**
+     * Convinience method for accepting changes
+     * */
+    public void accept() {
+        setAccepted(true);
+    }
+
+    public String getName() {
+        return name.get();
+    }
+
+    protected void setChangeName(String changeName) {
+        name.set(changeName);
+    }
+
+    public Optional<ExternalChangeResolver> getExternalChangeResolver() {
+        return externalChangeResolver.get();
+    }
+
+    public abstract void applyChange(NamedCompound undoEdit);
+}
diff --git a/src/main/java/org/jabref/gui/collab/ExternalChangeDetailsView.java b/src/main/java/org/jabref/gui/collab/ExternalChangeDetailsView.java
new file mode 100644
index 00000000000..d83940060da
--- /dev/null
+++ b/src/main/java/org/jabref/gui/collab/ExternalChangeDetailsView.java
@@ -0,0 +1,17 @@
+package org.jabref.gui.collab;
+
+import javafx.scene.layout.AnchorPane;
+
+import org.jabref.gui.collab.entryadd.EntryAddDetailsView;
+import org.jabref.gui.collab.entrychange.EntryChangeDetailsView;
+import org.jabref.gui.collab.entrydelete.EntryDeleteDetailsView;
+import org.jabref.gui.collab.groupchange.GroupChangeDetailsView;
+import org.jabref.gui.collab.metedatachange.MetadataChangeDetailsView;
+import org.jabref.gui.collab.preamblechange.PreambleChangeDetailsView;
+import org.jabref.gui.collab.stringadd.BibTexStringAddDetailsView;
+import org.jabref.gui.collab.stringchange.BibTexStringChangeDetailsView;
+import org.jabref.gui.collab.stringdelete.BibTexStringDeleteDetailsView;
+import org.jabref.gui.collab.stringrename.BibTexStringRenameDetailsView;
+
+public sealed abstract class ExternalChangeDetailsView extends AnchorPane permits EntryAddDetailsView, EntryChangeDetailsView, EntryDeleteDetailsView, GroupChangeDetailsView, MetadataChangeDetailsView, PreambleChangeDetailsView, BibTexStringAddDetailsView, BibTexStringChangeDetailsView, BibTexStringDeleteDetailsView, BibTexStringRenameDetailsView {
+}
diff --git a/src/main/java/org/jabref/gui/collab/ExternalChangeDetailsViewFactory.java b/src/main/java/org/jabref/gui/collab/ExternalChangeDetailsViewFactory.java
new file mode 100644
index 00000000000..1935d72a898
--- /dev/null
+++ b/src/main/java/org/jabref/gui/collab/ExternalChangeDetailsViewFactory.java
@@ -0,0 +1,69 @@
+package org.jabref.gui.collab;
+
+import org.jabref.gui.DialogService;
+import org.jabref.gui.StateManager;
+import org.jabref.gui.collab.entryadd.EntryAdd;
+import org.jabref.gui.collab.entryadd.EntryAddDetailsView;
+import org.jabref.gui.collab.entrychange.EntryChange;
+import org.jabref.gui.collab.entrychange.EntryChangeDetailsView;
+import org.jabref.gui.collab.entrydelete.EntryDelete;
+import org.jabref.gui.collab.entrydelete.EntryDeleteDetailsView;
+import org.jabref.gui.collab.groupchange.GroupChange;
+import org.jabref.gui.collab.groupchange.GroupChangeDetailsView;
+import org.jabref.gui.collab.metedatachange.MetadataChange;
+import org.jabref.gui.collab.metedatachange.MetadataChangeDetailsView;
+import org.jabref.gui.collab.preamblechange.PreambleChange;
+import org.jabref.gui.collab.preamblechange.PreambleChangeDetailsView;
+import org.jabref.gui.collab.stringadd.BibTexStringAdd;
+import org.jabref.gui.collab.stringadd.BibTexStringAddDetailsView;
+import org.jabref.gui.collab.stringchange.BibTexStringChange;
+import org.jabref.gui.collab.stringchange.BibTexStringChangeDetailsView;
+import org.jabref.gui.collab.stringdelete.BibTexStringDelete;
+import org.jabref.gui.collab.stringdelete.BibTexStringDeleteDetailsView;
+import org.jabref.gui.collab.stringrename.BibTexStringRename;
+import org.jabref.gui.collab.stringrename.BibTexStringRenameDetailsView;
+import org.jabref.gui.theme.ThemeManager;
+import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.preferences.PreferencesService;
+
+public class ExternalChangeDetailsViewFactory {
+    private final BibDatabaseContext databaseContext;
+    private final DialogService dialogService;
+    private final StateManager stateManager;
+    private final ThemeManager themeManager;
+    private final PreferencesService preferencesService;
+
+    public ExternalChangeDetailsViewFactory(BibDatabaseContext databaseContext, DialogService dialogService, StateManager stateManager, ThemeManager themeManager, PreferencesService preferencesService) {
+        this.databaseContext = databaseContext;
+        this.dialogService = dialogService;
+        this.stateManager = stateManager;
+        this.themeManager = themeManager;
+        this.preferencesService = preferencesService;
+    }
+
+    public ExternalChangeDetailsView create(ExternalChange externalChange) {
+        // TODO: Use Pattern Matching for switch once it's out of preview
+        if (externalChange instanceof EntryChange entryChange) {
+            return new EntryChangeDetailsView(entryChange, databaseContext, dialogService, stateManager, themeManager, preferencesService);
+        } else if (externalChange instanceof EntryAdd entryAdd) {
+            return new EntryAddDetailsView(entryAdd, databaseContext, dialogService, stateManager, themeManager, preferencesService);
+        } else if (externalChange instanceof EntryDelete entryDelete) {
+            return new EntryDeleteDetailsView(entryDelete, databaseContext, dialogService, stateManager, themeManager, preferencesService);
+        } else if (externalChange instanceof BibTexStringAdd stringAdd) {
+            return new BibTexStringAddDetailsView(stringAdd);
+        } else if (externalChange instanceof BibTexStringDelete stringDelete) {
+            return new BibTexStringDeleteDetailsView(stringDelete);
+        } else if (externalChange instanceof BibTexStringChange stringChange) {
+            return new BibTexStringChangeDetailsView(stringChange);
+        } else if (externalChange instanceof BibTexStringRename stringRename) {
+            return new BibTexStringRenameDetailsView(stringRename);
+        } else if (externalChange instanceof MetadataChange metadataChange) {
+            return new MetadataChangeDetailsView(metadataChange, preferencesService);
+        } else if (externalChange instanceof GroupChange groupChange) {
+            return new GroupChangeDetailsView(groupChange);
+        } else if (externalChange instanceof PreambleChange preambleChange) {
+            return new PreambleChangeDetailsView(preambleChange);
+        }
+        throw new UnsupportedOperationException("Cannot preview the given change: " + externalChange.getName());
+    }
+}
diff --git a/src/main/java/org/jabref/gui/collab/ExternalChangeResolver.java b/src/main/java/org/jabref/gui/collab/ExternalChangeResolver.java
new file mode 100644
index 00000000000..17b53e704d3
--- /dev/null
+++ b/src/main/java/org/jabref/gui/collab/ExternalChangeResolver.java
@@ -0,0 +1,16 @@
+package org.jabref.gui.collab;
+
+import java.util.Optional;
+
+import org.jabref.gui.DialogService;
+import org.jabref.gui.collab.entrychange.EntryChangeResolver;
+
+public sealed abstract class ExternalChangeResolver permits EntryChangeResolver {
+    protected final DialogService dialogService;
+
+    protected ExternalChangeResolver(DialogService dialogService) {
+        this.dialogService = dialogService;
+    }
+
+    public abstract Optional<ExternalChange> askUserToResolveChange();
+}
diff --git a/src/main/java/org/jabref/gui/collab/ExternalChangeResolverFactory.java b/src/main/java/org/jabref/gui/collab/ExternalChangeResolverFactory.java
new file mode 100644
index 00000000000..937fd486e9d
--- /dev/null
+++ b/src/main/java/org/jabref/gui/collab/ExternalChangeResolverFactory.java
@@ -0,0 +1,26 @@
+package org.jabref.gui.collab;
+
+import java.util.Optional;
+
+import org.jabref.gui.DialogService;
+import org.jabref.gui.collab.entrychange.EntryChange;
+import org.jabref.gui.collab.entrychange.EntryChangeResolver;
+import org.jabref.model.database.BibDatabaseContext;
+
+public class ExternalChangeResolverFactory {
+    private final DialogService dialogService;
+    private final BibDatabaseContext databaseContext;
+
+    public ExternalChangeResolverFactory(DialogService dialogService, BibDatabaseContext databaseContext) {
+        this.dialogService = dialogService;
+        this.databaseContext = databaseContext;
+    }
+
+    public Optional<ExternalChangeResolver> create(ExternalChange change) {
+        if (change instanceof EntryChange entryChange) {
+            return Optional.of(new EntryChangeResolver(entryChange, dialogService, databaseContext));
+        }
+
+        return Optional.empty();
+    }
+}
diff --git a/src/main/java/org/jabref/gui/collab/ExternalChangesResolverDialog.fxml b/src/main/java/org/jabref/gui/collab/ExternalChangesResolverDialog.fxml
new file mode 100644
index 00000000000..27197eb571a
--- /dev/null
+++ b/src/main/java/org/jabref/gui/collab/ExternalChangesResolverDialog.fxml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.ButtonType?>
+<?import javafx.scene.control.DialogPane?>
+<?import javafx.scene.control.TableColumn?>
+<?import javafx.scene.control.TableView?>
+<?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.BorderPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
+<?import org.controlsfx.control.MasterDetailPane?>
+<DialogPane prefHeight="460.0" prefWidth="820.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.collab.ExternalChangesResolverDialog">
+    <content>
+        <AnchorPane>
+            <MasterDetailPane fx:id="materDetailPane" detailSide="BOTTOM" dividerPosition="0.5" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+                <masterNode>
+                    <HBox>
+                        <TableView fx:id="changesTableView" layoutX="34.0" layoutY="46.0" maxWidth="Infinity" prefHeight="236.0" HBox.hgrow="ALWAYS">
+                            <columns>
+                                <TableColumn fx:id="changeName" prefWidth="400.0" text="Change" />
+                            </columns>
+                        </TableView>
+                        <VBox maxHeight="1.7976931348623157E308" maxWidth="Infinity" minHeight="-Infinity" minWidth="-Infinity" spacing="8.0" HBox.hgrow="NEVER">
+                            <Button onAction="#acceptChanges" text="Accept" maxWidth="Infinity"/>
+                            <Button onAction="#denyChanges" text="Deny" maxWidth="Infinity"/>
+                            <Button fx:id="askUserToResolveChangeButton"
+                                    maxWidth="Infinity" onAction="#askUserToResolveChange" text="Merge.." />
+                            <HBox.margin>
+                                <Insets left="8.0" right="8.0" top="8.0" />
+                            </HBox.margin>
+                        </VBox>
+                    </HBox>
+                </masterNode>
+                <detailNode>
+                    <BorderPane fx:id = "changeInfoPane" prefHeight="100">
+                    </BorderPane>
+                </detailNode>
+            </MasterDetailPane>
+
+        </AnchorPane>
+
+    </content>
+    <ButtonType fx:id="close" text="%Close" buttonData="CANCEL_CLOSE"/>
+</DialogPane>
diff --git a/src/main/java/org/jabref/gui/collab/ExternalChangesResolverDialog.java b/src/main/java/org/jabref/gui/collab/ExternalChangesResolverDialog.java
new file mode 100644
index 00000000000..744bf914f1f
--- /dev/null
+++ b/src/main/java/org/jabref/gui/collab/ExternalChangesResolverDialog.java
@@ -0,0 +1,122 @@
+package org.jabref.gui.collab;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.inject.Inject;
+import javax.swing.undo.UndoManager;
+
+import javafx.application.Platform;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+import javafx.scene.control.SelectionMode;
+import javafx.scene.control.TableColumn;
+import javafx.scene.control.TableView;
+import javafx.scene.layout.BorderPane;
+
+import org.jabref.gui.DialogService;
+import org.jabref.gui.StateManager;
+import org.jabref.gui.theme.ThemeManager;
+import org.jabref.gui.util.BaseDialog;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.preferences.PreferencesService;
+
+import com.airhacks.afterburner.views.ViewLoader;
+import com.tobiasdiez.easybind.EasyBind;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class ExternalChangesResolverDialog extends BaseDialog<Boolean> {
+    private final static Logger LOGGER = LoggerFactory.getLogger(ExternalChangesResolverDialog.class);
+    /**
+     * Reconstructing the details view to preview an {@link ExternalChange} every time it's selected is a heavy operation.
+     * It is also useless because changes are static and if the change data is static then the view doesn't have to change
+     * either. This cache is used to ensure that we only create the detail view instance once for each {@link ExternalChange}.
+     */
+    private final Map<ExternalChange, ExternalChangeDetailsView> DETAILS_VIEW_CACHE = new HashMap<>();
+
+    @FXML
+    private TableView<ExternalChange> changesTableView;
+    @FXML
+    private TableColumn<ExternalChange, String> changeName;
+    @FXML
+    private Button askUserToResolveChangeButton;
+    @FXML
+    private BorderPane changeInfoPane;
+
+    private final List<ExternalChange> changes;
+
+    private ExternalChangesResolverViewModel viewModel;
+
+    private final ExternalChangeDetailsViewFactory externalChangeDetailsViewFactory;
+
+    @Inject private UndoManager undoManager;
+
+    public ExternalChangesResolverDialog(List<ExternalChange> changes, BibDatabaseContext database, DialogService dialogService, StateManager stateManager, ThemeManager themeManager, PreferencesService preferencesService) {
+        this.changes = changes;
+        this.externalChangeDetailsViewFactory = new ExternalChangeDetailsViewFactory(database, dialogService, stateManager, themeManager, preferencesService);
+
+        this.setTitle(Localization.lang("External Changes Resolver"));
+        ViewLoader.view(this)
+                .load()
+                .setAsDialogPane(this);
+
+        this.setResultConverter(button -> {
+            if (viewModel.areAllChangesResolved()) {
+                LOGGER.info("External changes are resolved successfully");
+                return true;
+            } else {
+                LOGGER.info("External changes aren't resolved");
+                return false;
+            }
+        });
+    }
+
+    @FXML
+    private void initialize() {
+        viewModel = new ExternalChangesResolverViewModel(changes, undoManager);
+
+        changeName.setCellValueFactory(data -> new SimpleStringProperty(data.getValue().getName()));
+        askUserToResolveChangeButton.disableProperty().bind(viewModel.canAskUserToResolveChangeProperty().not());
+
+        changesTableView.setItems(viewModel.getVisibleChanges());
+        // Think twice before setting this to MULTIPLE...
+        changesTableView.getSelectionModel().setSelectionMode(SelectionMode.SINGLE);
+        changesTableView.getSelectionModel().selectFirst();
+
+        viewModel.selectedChangeProperty().bind(changesTableView.getSelectionModel().selectedItemProperty());
+        EasyBind.subscribe(viewModel.selectedChangeProperty(), selectedChange -> {
+            if (selectedChange != null) {
+                ExternalChangeDetailsView detailsView = DETAILS_VIEW_CACHE.computeIfAbsent(selectedChange, externalChangeDetailsViewFactory::create);
+                changeInfoPane.setCenter(detailsView);
+            }
+        });
+
+        EasyBind.subscribe(viewModel.areAllChangesResolvedProperty(), isResolved -> {
+            if (isResolved) {
+                Platform.runLater(viewModel::applyChanges);
+                close();
+                LOGGER.debug("Closing ExternalChangesResolverDialog");
+            }
+        });
+    }
+
+    @FXML
+    public void denyChanges() {
+        viewModel.denyChange();
+    }
+
+    @FXML
+    public void acceptChanges() {
+        viewModel.acceptChange();
+    }
+
+    @FXML
+    public void askUserToResolveChange() {
+        viewModel.getSelectedChange().flatMap(ExternalChange::getExternalChangeResolver)
+                 .flatMap(ExternalChangeResolver::askUserToResolveChange).ifPresent(viewModel::acceptMergedChange);
+    }
+}
diff --git a/src/main/java/org/jabref/gui/collab/ExternalChangesResolverViewModel.java b/src/main/java/org/jabref/gui/collab/ExternalChangesResolverViewModel.java
new file mode 100644
index 00000000000..efa06a6dd06
--- /dev/null
+++ b/src/main/java/org/jabref/gui/collab/ExternalChangesResolverViewModel.java
@@ -0,0 +1,107 @@
+package org.jabref.gui.collab;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+
+import javax.swing.undo.UndoManager;
+
+import javafx.beans.binding.Bindings;
+import javafx.beans.binding.BooleanBinding;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+
+import org.jabref.gui.AbstractViewModel;
+import org.jabref.gui.undo.NamedCompound;
+import org.jabref.logic.l10n.Localization;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class ExternalChangesResolverViewModel extends AbstractViewModel {
+
+    private final static Logger LOGGER = LoggerFactory.getLogger(ExternalChangesResolverViewModel.class);
+
+    private final NamedCompound ce = new NamedCompound(Localization.lang("Merged external changes"));
+    private final ObservableList<ExternalChange> visibleChanges = FXCollections.observableArrayList();
+
+    /**
+     * Because visible changes list will be bound to the UI, certain changes can be removed. This list is used to keep
+     * track of changes even when they're removed from the UI.
+     */
+    private final ObservableList<ExternalChange> changes = FXCollections.observableArrayList();
+
+    private final ObjectProperty<ExternalChange> selectedChange = new SimpleObjectProperty<>();
+
+    private final BooleanBinding areAllChangesResolved;
+
+    private final BooleanBinding canAskUserToResolveChange;
+
+    private final UndoManager undoManager;
+
+    public ExternalChangesResolverViewModel(List<ExternalChange> externalChanges, UndoManager undoManager) {
+        Objects.requireNonNull(externalChanges);
+        assert !externalChanges.isEmpty();
+
+        this.visibleChanges.addAll(externalChanges);
+        this.changes.addAll(externalChanges);
+        this.undoManager = undoManager;
+
+        areAllChangesResolved = Bindings.createBooleanBinding(visibleChanges::isEmpty, visibleChanges);
+        canAskUserToResolveChange = Bindings.createBooleanBinding(() -> selectedChange.isNotNull().get() && selectedChange.get().getExternalChangeResolver().isPresent(), selectedChange);
+    }
+
+    public ObservableList<ExternalChange> getVisibleChanges() {
+        return visibleChanges;
+    }
+
+    public ObjectProperty<ExternalChange> selectedChangeProperty() {
+        return selectedChange;
+    }
+
+    public Optional<ExternalChange> getSelectedChange() {
+        return Optional.ofNullable(selectedChangeProperty().get());
+    }
+
+    public BooleanBinding areAllChangesResolvedProperty() {
+        return areAllChangesResolved;
+    }
+
+    public boolean areAllChangesResolved() {
+        return areAllChangesResolvedProperty().get();
+    }
+
+    public BooleanBinding canAskUserToResolveChangeProperty() {
+        return canAskUserToResolveChange;
+    }
+
+    public void acceptChange() {
+        getSelectedChange().ifPresent(selectedChange -> {
+            selectedChange.accept();
+            getVisibleChanges().remove(selectedChange);
+        });
+    }
+
+    public void denyChange() {
+        getSelectedChange().ifPresent(getVisibleChanges()::remove);
+    }
+
+    public void acceptMergedChange(ExternalChange externalChange) {
+        Objects.requireNonNull(externalChange);
+
+        getSelectedChange().ifPresent(oldChange -> {
+            changes.remove(oldChange);
+            changes.add(externalChange);
+            getVisibleChanges().remove(oldChange);
+            externalChange.accept();
+        });
+    }
+
+    public void applyChanges() {
+        changes.stream().filter(ExternalChange::isAccepted).forEach(change -> change.applyChange(ce));
+        ce.end();
+        undoManager.addEdit(ce);
+    }
+}
diff --git a/src/main/java/org/jabref/gui/collab/GroupChangeViewModel.java b/src/main/java/org/jabref/gui/collab/GroupChangeViewModel.java
deleted file mode 100644
index 92a08c39884..00000000000
--- a/src/main/java/org/jabref/gui/collab/GroupChangeViewModel.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package org.jabref.gui.collab;
-
-import javafx.scene.Node;
-import javafx.scene.control.Label;
-
-import org.jabref.gui.groups.GroupTreeNodeViewModel;
-import org.jabref.gui.groups.UndoableModifySubtree;
-import org.jabref.gui.undo.NamedCompound;
-import org.jabref.logic.bibtex.comparator.GroupDiff;
-import org.jabref.logic.groups.DefaultGroupsFactory;
-import org.jabref.logic.l10n.Localization;
-import org.jabref.model.database.BibDatabaseContext;
-import org.jabref.model.groups.GroupTreeNode;
-
-class GroupChangeViewModel extends DatabaseChangeViewModel {
-
-    private final GroupTreeNode changedGroups;
-
-    public GroupChangeViewModel(GroupDiff diff) {
-        super(diff.getOriginalGroupRoot() == null ? Localization.lang("Removed all groups") : Localization
-                .lang("Modified groups tree"));
-        this.changedGroups = diff.getNewGroupRoot();
-    }
-
-    @Override
-    public void makeChange(BibDatabaseContext database, NamedCompound undoEdit) {
-        GroupTreeNode root = database.getMetaData().getGroups().orElseGet(() -> {
-            GroupTreeNode groupTreeNode = new GroupTreeNode(DefaultGroupsFactory.getAllEntriesGroup());
-            database.getMetaData().setGroups(groupTreeNode);
-            return groupTreeNode;
-        });
-
-        final UndoableModifySubtree undo = new UndoableModifySubtree(
-                new GroupTreeNodeViewModel(database.getMetaData().getGroups().orElse(null)),
-                new GroupTreeNodeViewModel(root), Localization.lang("Modified groups"));
-        root.removeAllChildren();
-        if (changedGroups == null) {
-            // I think setting root to null is not possible
-            root.setGroup(DefaultGroupsFactory.getAllEntriesGroup(), false, false, null);
-        } else {
-            // change root group, even though it'll be AllEntries anyway
-            root.setGroup(changedGroups.getGroup(), false, false, null);
-            for (GroupTreeNode child : changedGroups.getChildren()) {
-                child.copySubtree().moveTo(root);
-            }
-        }
-
-        undoEdit.addEdit(undo);
-    }
-
-    @Override
-    public Node description() {
-        return new Label(toString() + '.'
-                + (changedGroups == null ? "" : ' ' + Localization
-                .lang("Accepting the change replaces the complete groups tree with the externally modified groups tree.")));
-    }
-}
diff --git a/src/main/java/org/jabref/gui/collab/MetaDataChangeViewModel.java b/src/main/java/org/jabref/gui/collab/MetaDataChangeViewModel.java
deleted file mode 100644
index 83b6351fd78..00000000000
--- a/src/main/java/org/jabref/gui/collab/MetaDataChangeViewModel.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package org.jabref.gui.collab;
-
-import javafx.scene.Node;
-import javafx.scene.control.Label;
-import javafx.scene.layout.VBox;
-
-import org.jabref.gui.undo.NamedCompound;
-import org.jabref.logic.bibtex.comparator.MetaDataDiff;
-import org.jabref.logic.l10n.Localization;
-import org.jabref.model.database.BibDatabaseContext;
-import org.jabref.preferences.PreferencesService;
-
-class MetaDataChangeViewModel extends DatabaseChangeViewModel {
-
-    private final MetaDataDiff metaDataDiff;
-    private final PreferencesService preferences;
-
-    public MetaDataChangeViewModel(MetaDataDiff metaDataDiff, PreferencesService preferences) {
-        super(Localization.lang("Metadata change"));
-        this.metaDataDiff = metaDataDiff;
-        this.preferences = preferences;
-    }
-
-    @Override
-    public Node description() {
-        VBox container = new VBox(15);
-
-        Label header = new Label(Localization.lang("The following metadata changed:"));
-        header.getStyleClass().add("sectionHeader");
-        container.getChildren().add(header);
-
-        for (String change : metaDataDiff.getDifferences(preferences)) {
-            container.getChildren().add(new Label(change));
-        }
-
-        return container;
-    }
-
-    @Override
-    public void makeChange(BibDatabaseContext database, NamedCompound undoEdit) {
-        database.setMetaData(metaDataDiff.getNewMetaData());
-    }
-}
diff --git a/src/main/java/org/jabref/gui/collab/PreambleChangeViewModel.java b/src/main/java/org/jabref/gui/collab/PreambleChangeViewModel.java
deleted file mode 100644
index b8a17ccb840..00000000000
--- a/src/main/java/org/jabref/gui/collab/PreambleChangeViewModel.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.jabref.gui.collab;
-
-import javafx.scene.Node;
-import javafx.scene.control.Label;
-import javafx.scene.layout.VBox;
-
-import org.jabref.gui.undo.NamedCompound;
-import org.jabref.gui.undo.UndoablePreambleChange;
-import org.jabref.logic.bibtex.comparator.PreambleDiff;
-import org.jabref.logic.l10n.Localization;
-import org.jabref.model.database.BibDatabaseContext;
-import org.jabref.model.strings.StringUtil;
-
-class PreambleChangeViewModel extends DatabaseChangeViewModel {
-
-    private final PreambleDiff change;
-
-    public PreambleChangeViewModel(PreambleDiff change) {
-        super(Localization.lang("Changed preamble"));
-        this.change = change;
-    }
-
-    @Override
-    public void makeChange(BibDatabaseContext database, NamedCompound undoEdit) {
-        database.getDatabase().setPreamble(change.getNewPreamble());
-        undoEdit.addEdit(new UndoablePreambleChange(database.getDatabase(), change.getOriginalPreamble(), change.getNewPreamble()));
-    }
-
-    @Override
-    public Node description() {
-        VBox container = new VBox();
-        Label header = new Label(Localization.lang("Changed preamble"));
-        header.getStyleClass().add("sectionHeader");
-        container.getChildren().add(header);
-
-        if (StringUtil.isNotBlank(change.getOriginalPreamble())) {
-            container.getChildren().add(new Label(Localization.lang("Current value") + ": " + change.getOriginalPreamble()));
-        }
-
-        if (StringUtil.isNotBlank(change.getNewPreamble())) {
-            container.getChildren().add(new Label(Localization.lang("Value set externally") + ": " + change.getNewPreamble()));
-        } else {
-            container.getChildren().add(new Label(Localization.lang("Value cleared externally")));
-        }
-
-        return container;
-    }
-}
diff --git a/src/main/java/org/jabref/gui/collab/StringAddChangeViewModel.java b/src/main/java/org/jabref/gui/collab/StringAddChangeViewModel.java
deleted file mode 100644
index 8ad0c7f4e2b..00000000000
--- a/src/main/java/org/jabref/gui/collab/StringAddChangeViewModel.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package org.jabref.gui.collab;
-
-import javafx.scene.Node;
-import javafx.scene.control.Label;
-import javafx.scene.layout.VBox;
-
-import org.jabref.gui.undo.NamedCompound;
-import org.jabref.gui.undo.UndoableInsertString;
-import org.jabref.logic.l10n.Localization;
-import org.jabref.model.database.BibDatabaseContext;
-import org.jabref.model.database.KeyCollisionException;
-import org.jabref.model.entry.BibtexString;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-class StringAddChangeViewModel extends DatabaseChangeViewModel {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(StringAddChangeViewModel.class);
-    private final BibtexString string;
-
-    public StringAddChangeViewModel(BibtexString string) {
-        super(Localization.lang("Added string") + ": '" + string.getName() + '\'');
-        this.string = string;
-    }
-
-    @Override
-    public void makeChange(BibDatabaseContext database, NamedCompound undoEdit) {
-        try {
-            database.getDatabase().addString(string);
-            undoEdit.addEdit(new UndoableInsertString(database.getDatabase(), string));
-        } catch (KeyCollisionException ex) {
-            LOGGER.warn("Error: could not add string '" + string.getName() + "': " + ex.getMessage(), ex);
-        }
-    }
-
-    @Override
-    public Node description() {
-        VBox container = new VBox();
-        Label header = new Label(Localization.lang("Added string"));
-        header.getStyleClass().add("sectionHeader");
-        container.getChildren().addAll(
-                header,
-                new Label(Localization.lang("Label") + ": " + string.getName()),
-                new Label(Localization.lang("Content") + ": " + string.getContent())
-        );
-        return container;
-    }
-}
diff --git a/src/main/java/org/jabref/gui/collab/StringChangeViewModel.java b/src/main/java/org/jabref/gui/collab/StringChangeViewModel.java
deleted file mode 100644
index 5747a815a47..00000000000
--- a/src/main/java/org/jabref/gui/collab/StringChangeViewModel.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package org.jabref.gui.collab;
-
-import java.util.Objects;
-
-import javafx.scene.Node;
-import javafx.scene.control.Label;
-import javafx.scene.layout.VBox;
-
-import org.jabref.gui.undo.NamedCompound;
-import org.jabref.gui.undo.UndoableStringChange;
-import org.jabref.logic.l10n.Localization;
-import org.jabref.model.database.BibDatabaseContext;
-import org.jabref.model.entry.BibtexString;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-class StringChangeViewModel extends DatabaseChangeViewModel {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(StringChangeViewModel.class);
-    private final BibtexString string;
-    private final BibtexString newString;
-
-    public StringChangeViewModel(BibtexString string, BibtexString newString) {
-        super(Localization.lang("Modified string") + ": '" + string.getName() + '\'');
-        this.string = Objects.requireNonNull(string);
-        this.newString = Objects.requireNonNull(newString);
-    }
-
-    @Override
-    public void makeChange(BibDatabaseContext database, NamedCompound undoEdit) {
-        String currentValue = string.getContent();
-        String newValue = newString.getContent();
-        string.setContent(newValue);
-        undoEdit.addEdit(new UndoableStringChange(string, false, currentValue, newValue));
-    }
-
-    @Override
-    public Node description() {
-        VBox container = new VBox();
-        Label header = new Label(Localization.lang("Modified string"));
-        header.getStyleClass().add("sectionHeader");
-        container.getChildren().addAll(
-                header,
-                new Label(Localization.lang("Label") + ": " + newString.getName()),
-                new Label(Localization.lang("Content") + ": " + newString.getContent())
-        );
-
-        container.getChildren().add(new Label(Localization.lang("Current content") + ": " + string.getContent()));
-
-        return container;
-    }
-}
diff --git a/src/main/java/org/jabref/gui/collab/StringNameChangeViewModel.java b/src/main/java/org/jabref/gui/collab/StringNameChangeViewModel.java
deleted file mode 100644
index 48a1c473322..00000000000
--- a/src/main/java/org/jabref/gui/collab/StringNameChangeViewModel.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package org.jabref.gui.collab;
-
-import java.util.Objects;
-
-import javafx.scene.Node;
-import javafx.scene.control.Label;
-
-import org.jabref.gui.undo.NamedCompound;
-import org.jabref.gui.undo.UndoableStringChange;
-import org.jabref.logic.l10n.Localization;
-import org.jabref.model.database.BibDatabaseContext;
-import org.jabref.model.entry.BibtexString;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-class StringNameChangeViewModel extends DatabaseChangeViewModel {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(StringNameChangeViewModel.class);
-    private final BibtexString string;
-    private final BibtexString newString;
-
-    public StringNameChangeViewModel(BibtexString string, BibtexString newString) {
-        super(Localization.lang("Renamed string") + ": '" + string.getName() + '\'');
-        this.string = Objects.requireNonNull(string);
-        this.newString = Objects.requireNonNull(newString);
-    }
-
-    @Override
-    public void makeChange(BibDatabaseContext database, NamedCompound undoEdit) {
-        if (database.getDatabase().hasStringByName(newString.getName())) {
-            // The name to change to is already in the database, so we can't comply.
-            LOGGER.info("Cannot rename string '" + string.getName() + "' to '" + newString.getName() + "' because the name "
-                    + "is already in use.");
-        }
-
-        String currentName = string.getName();
-        String newName = newString.getName();
-        string.setName(newName);
-        undoEdit.addEdit(new UndoableStringChange(string, true, currentName, newName));
-    }
-
-    @Override
-    public Node description() {
-        return new Label(newString.getName() + " : " + string.getContent());
-    }
-}
diff --git a/src/main/java/org/jabref/gui/collab/StringRemoveChangeViewModel.java b/src/main/java/org/jabref/gui/collab/StringRemoveChangeViewModel.java
deleted file mode 100644
index 7352de26182..00000000000
--- a/src/main/java/org/jabref/gui/collab/StringRemoveChangeViewModel.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package org.jabref.gui.collab;
-
-import javafx.scene.Node;
-import javafx.scene.control.Label;
-import javafx.scene.layout.VBox;
-
-import org.jabref.gui.undo.NamedCompound;
-import org.jabref.gui.undo.UndoableRemoveString;
-import org.jabref.logic.l10n.Localization;
-import org.jabref.model.database.BibDatabaseContext;
-import org.jabref.model.entry.BibtexString;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-class StringRemoveChangeViewModel extends DatabaseChangeViewModel {
-    private static final Logger LOGGER = LoggerFactory.getLogger(StringRemoveChangeViewModel.class);
-    private final BibtexString string;
-
-    public StringRemoveChangeViewModel(BibtexString string) {
-        super(Localization.lang("Removed string") + ": '" + string.getName() + '\'');
-        this.string = string;
-    }
-
-    @Override
-    public void makeChange(BibDatabaseContext database, NamedCompound undoEdit) {
-        try {
-            database.getDatabase().removeString(string.getId());
-            undoEdit.addEdit(new UndoableRemoveString(database.getDatabase(), string));
-        } catch (Exception ex) {
-            LOGGER.warn("Error: could not remove string '" + string.getName() + "': " + ex.getMessage(), ex);
-        }
-    }
-
-    @Override
-    public Node description() {
-        VBox container = new VBox();
-        Label header = new Label(Localization.lang("Removed string"));
-        header.getStyleClass().add("sectionHeader");
-        container.getChildren().addAll(
-                header,
-                new Label(Localization.lang("Label") + ": " + string.getName()),
-                new Label(Localization.lang("Content") + ": " + string.getContent())
-        );
-        return container;
-    }
-}
diff --git a/src/main/java/org/jabref/gui/collab/entryadd/EntryAdd.java b/src/main/java/org/jabref/gui/collab/entryadd/EntryAdd.java
new file mode 100644
index 00000000000..c9be0167535
--- /dev/null
+++ b/src/main/java/org/jabref/gui/collab/entryadd/EntryAdd.java
@@ -0,0 +1,31 @@
+package org.jabref.gui.collab.entryadd;
+
+import org.jabref.gui.collab.ExternalChange;
+import org.jabref.gui.collab.ExternalChangeResolverFactory;
+import org.jabref.gui.undo.NamedCompound;
+import org.jabref.gui.undo.UndoableInsertEntries;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.model.entry.BibEntry;
+
+public final class EntryAdd extends ExternalChange {
+    private final BibEntry addedEntry;
+
+    public EntryAdd(BibEntry addedEntry, BibDatabaseContext databaseContext, ExternalChangeResolverFactory externalChangeResolverFactory) {
+        super(databaseContext, externalChangeResolverFactory);
+        this.addedEntry = addedEntry;
+        setChangeName(addedEntry.getCitationKey()
+                           .map(key -> Localization.lang("Added entry '%0'", key))
+                           .orElse(Localization.lang("Added entry")));
+    }
+
+    @Override
+    public void applyChange(NamedCompound undoEdit) {
+        databaseContext.getDatabase().insertEntry(addedEntry);
+        undoEdit.addEdit(new UndoableInsertEntries(databaseContext.getDatabase(), addedEntry));
+    }
+
+    public BibEntry getAddedEntry() {
+        return addedEntry;
+    }
+}
diff --git a/src/main/java/org/jabref/gui/collab/entryadd/EntryAddDetailsView.java b/src/main/java/org/jabref/gui/collab/entryadd/EntryAddDetailsView.java
new file mode 100644
index 00000000000..a967d2a1381
--- /dev/null
+++ b/src/main/java/org/jabref/gui/collab/entryadd/EntryAddDetailsView.java
@@ -0,0 +1,25 @@
+package org.jabref.gui.collab.entryadd;
+
+import org.jabref.gui.DialogService;
+import org.jabref.gui.StateManager;
+import org.jabref.gui.collab.ExternalChangeDetailsView;
+import org.jabref.gui.preview.PreviewViewer;
+import org.jabref.gui.theme.ThemeManager;
+import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.preferences.PreferencesService;
+
+public final class EntryAddDetailsView extends ExternalChangeDetailsView {
+
+    public EntryAddDetailsView(EntryAdd entryAdd, BibDatabaseContext bibDatabaseContext, DialogService dialogService, StateManager stateManager, ThemeManager themeManager, PreferencesService preferencesService) {
+        PreviewViewer previewViewer = new PreviewViewer(bibDatabaseContext, dialogService, stateManager, themeManager);
+        previewViewer.setLayout(preferencesService.getPreviewPreferences().getSelectedPreviewLayout());
+        previewViewer.setEntry(entryAdd.getAddedEntry());
+
+        setLeftAnchor(previewViewer, 8d);
+        setTopAnchor(previewViewer, 8d);
+        setRightAnchor(previewViewer, 8d);
+        setBottomAnchor(previewViewer, 8d);
+
+        getChildren().setAll(previewViewer);
+    }
+}
diff --git a/src/main/java/org/jabref/gui/collab/entrychange/EntryChange.java b/src/main/java/org/jabref/gui/collab/entrychange/EntryChange.java
new file mode 100644
index 00000000000..34a70872c50
--- /dev/null
+++ b/src/main/java/org/jabref/gui/collab/entrychange/EntryChange.java
@@ -0,0 +1,49 @@
+package org.jabref.gui.collab.entrychange;
+
+import javax.swing.undo.CompoundEdit;
+
+import org.jabref.gui.collab.ExternalChange;
+import org.jabref.gui.collab.ExternalChangeResolverFactory;
+import org.jabref.gui.undo.NamedCompound;
+import org.jabref.gui.undo.UndoableInsertEntries;
+import org.jabref.gui.undo.UndoableRemoveEntries;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.model.entry.BibEntry;
+
+public final class EntryChange extends ExternalChange {
+    private final BibEntry oldEntry;
+    private final BibEntry newEntry;
+
+    public EntryChange(BibEntry oldEntry, BibEntry newEntry, BibDatabaseContext databaseContext, ExternalChangeResolverFactory externalChangeResolverFactory) {
+        super(databaseContext, externalChangeResolverFactory);
+        this.oldEntry = oldEntry;
+        this.newEntry = newEntry;
+        setChangeName(oldEntry.getCitationKey().map(key -> Localization.lang("Modified entry '%0'", key))
+                           .orElse(Localization.lang("Modified entry")));
+    }
+
+    public EntryChange(BibEntry oldEntry, BibEntry newEntry, BibDatabaseContext databaseContext) {
+        this(oldEntry, newEntry, databaseContext, null);
+    }
+
+    public BibEntry getOldEntry() {
+        return oldEntry;
+    }
+
+    public BibEntry getNewEntry() {
+        return newEntry;
+    }
+
+    @Override
+    public void applyChange(NamedCompound undoEdit) {
+        databaseContext.getDatabase().removeEntry(oldEntry);
+        databaseContext.getDatabase().insertEntry(newEntry);
+        CompoundEdit changeEntryEdit = new CompoundEdit();
+        changeEntryEdit.addEdit(new UndoableRemoveEntries(databaseContext.getDatabase(), oldEntry));
+        changeEntryEdit.addEdit(new UndoableInsertEntries(databaseContext.getDatabase(), newEntry));
+        changeEntryEdit.end();
+
+        undoEdit.addEdit(changeEntryEdit);
+    }
+}
diff --git a/src/main/java/org/jabref/gui/collab/entrychange/EntryChangeDetailsView.java b/src/main/java/org/jabref/gui/collab/entrychange/EntryChangeDetailsView.java
new file mode 100644
index 00000000000..18286e5fc99
--- /dev/null
+++ b/src/main/java/org/jabref/gui/collab/entrychange/EntryChangeDetailsView.java
@@ -0,0 +1,24 @@
+package org.jabref.gui.collab.entrychange;
+
+import org.jabref.gui.DialogService;
+import org.jabref.gui.StateManager;
+import org.jabref.gui.collab.ExternalChangeDetailsView;
+import org.jabref.gui.preview.PreviewViewer;
+import org.jabref.gui.theme.ThemeManager;
+import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.preferences.PreferencesService;
+
+public final class EntryChangeDetailsView extends ExternalChangeDetailsView {
+    public EntryChangeDetailsView(EntryChange entryChange, BibDatabaseContext bibDatabaseContext, DialogService dialogService, StateManager stateManager, ThemeManager themeManager, PreferencesService preferencesService) {
+        PreviewViewer previewViewer = new PreviewViewer(bibDatabaseContext, dialogService, stateManager, themeManager);
+        previewViewer.setLayout(preferencesService.getPreviewPreferences().getSelectedPreviewLayout());
+        previewViewer.setEntry(entryChange.getNewEntry());
+
+        setLeftAnchor(previewViewer, 8d);
+        setTopAnchor(previewViewer, 8d);
+        setRightAnchor(previewViewer, 8d);
+        setBottomAnchor(previewViewer, 8d);
+
+        getChildren().setAll(previewViewer);
+    }
+}
diff --git a/src/main/java/org/jabref/gui/collab/entrychange/EntryChangeResolver.java b/src/main/java/org/jabref/gui/collab/entrychange/EntryChangeResolver.java
new file mode 100644
index 00000000000..dfb3a1a1470
--- /dev/null
+++ b/src/main/java/org/jabref/gui/collab/entrychange/EntryChangeResolver.java
@@ -0,0 +1,44 @@
+package org.jabref.gui.collab.entrychange;
+
+import java.util.Optional;
+
+import org.jabref.gui.DialogService;
+import org.jabref.gui.collab.ExternalChange;
+import org.jabref.gui.collab.ExternalChangeResolver;
+import org.jabref.gui.mergeentries.EntriesMergeResult;
+import org.jabref.gui.mergeentries.MergeEntriesDialog;
+import org.jabref.gui.mergeentries.newmergedialog.ShowDiffConfig;
+import org.jabref.gui.mergeentries.newmergedialog.diffhighlighter.DiffHighlighter;
+import org.jabref.gui.mergeentries.newmergedialog.toolbar.ThreeWayMergeToolbar;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.model.database.BibDatabaseContext;
+
+public final class EntryChangeResolver extends ExternalChangeResolver {
+    private final EntryChange entryChange;
+    private final BibDatabaseContext databaseContext;
+
+    public EntryChangeResolver(EntryChange entryChange, DialogService dialogService, BibDatabaseContext databaseContext) {
+        super(dialogService);
+        this.entryChange = entryChange;
+        this.databaseContext = databaseContext;
+    }
+
+    @Override
+    public Optional<ExternalChange> askUserToResolveChange() {
+        MergeEntriesDialog mergeEntriesDialog = new MergeEntriesDialog(entryChange.getOldEntry(), entryChange.getNewEntry());
+        mergeEntriesDialog.setLeftHeaderText(Localization.lang("On JabRef"));
+        mergeEntriesDialog.setRightHeaderText(Localization.lang("On disk"));
+        mergeEntriesDialog.configureDiff(new ShowDiffConfig(ThreeWayMergeToolbar.DiffView.SPLIT, DiffHighlighter.DiffMethod.WORDS));
+
+        return dialogService.showCustomDialogAndWait(mergeEntriesDialog)
+                            .map(this::mapMergeResultToExternalChange);
+    }
+
+    private EntryChange mapMergeResultToExternalChange(EntriesMergeResult entriesMergeResult) {
+        return new EntryChange(
+                entryChange.getOldEntry(),
+                entriesMergeResult.mergedEntry(),
+                databaseContext
+        );
+    }
+}
diff --git a/src/main/java/org/jabref/gui/collab/entrydelete/EntryDelete.java b/src/main/java/org/jabref/gui/collab/entrydelete/EntryDelete.java
new file mode 100644
index 00000000000..13913a7974d
--- /dev/null
+++ b/src/main/java/org/jabref/gui/collab/entrydelete/EntryDelete.java
@@ -0,0 +1,31 @@
+package org.jabref.gui.collab.entrydelete;
+
+import org.jabref.gui.collab.ExternalChange;
+import org.jabref.gui.collab.ExternalChangeResolverFactory;
+import org.jabref.gui.undo.NamedCompound;
+import org.jabref.gui.undo.UndoableRemoveEntries;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.model.entry.BibEntry;
+
+public final class EntryDelete extends ExternalChange {
+    private final BibEntry deletedEntry;
+
+    public EntryDelete(BibEntry deletedEntry, BibDatabaseContext databaseContext, ExternalChangeResolverFactory externalChangeResolverFactory) {
+        super(databaseContext, externalChangeResolverFactory);
+        this.deletedEntry = deletedEntry;
+        setChangeName(deletedEntry.getCitationKey()
+                           .map(key -> Localization.lang("Deleted entry '%0'", key))
+                           .orElse(Localization.lang("Deleted entry")));
+    }
+
+    @Override
+    public void applyChange(NamedCompound undoEdit) {
+        databaseContext.getDatabase().removeEntry(deletedEntry);
+        undoEdit.addEdit(new UndoableRemoveEntries(databaseContext.getDatabase(), deletedEntry));
+    }
+
+    public BibEntry getDeletedEntry() {
+        return deletedEntry;
+    }
+}
diff --git a/src/main/java/org/jabref/gui/collab/entrydelete/EntryDeleteDetailsView.java b/src/main/java/org/jabref/gui/collab/entrydelete/EntryDeleteDetailsView.java
new file mode 100644
index 00000000000..e60051af592
--- /dev/null
+++ b/src/main/java/org/jabref/gui/collab/entrydelete/EntryDeleteDetailsView.java
@@ -0,0 +1,25 @@
+package org.jabref.gui.collab.entrydelete;
+
+import org.jabref.gui.DialogService;
+import org.jabref.gui.StateManager;
+import org.jabref.gui.collab.ExternalChangeDetailsView;
+import org.jabref.gui.preview.PreviewViewer;
+import org.jabref.gui.theme.ThemeManager;
+import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.preferences.PreferencesService;
+
+public final class EntryDeleteDetailsView extends ExternalChangeDetailsView {
+
+    public EntryDeleteDetailsView(EntryDelete entryDelete, BibDatabaseContext bibDatabaseContext, DialogService dialogService, StateManager stateManager, ThemeManager themeManager, PreferencesService preferencesService) {
+        PreviewViewer previewViewer = new PreviewViewer(bibDatabaseContext, dialogService, stateManager, themeManager);
+        previewViewer.setLayout(preferencesService.getPreviewPreferences().getSelectedPreviewLayout());
+        previewViewer.setEntry(entryDelete.getDeletedEntry());
+
+        setLeftAnchor(previewViewer, 8d);
+        setTopAnchor(previewViewer, 8d);
+        setRightAnchor(previewViewer, 8d);
+        setBottomAnchor(previewViewer, 8d);
+
+        getChildren().setAll(previewViewer);
+    }
+}
diff --git a/src/main/java/org/jabref/gui/collab/groupchange/GroupChange.java b/src/main/java/org/jabref/gui/collab/groupchange/GroupChange.java
new file mode 100644
index 00000000000..e6259766614
--- /dev/null
+++ b/src/main/java/org/jabref/gui/collab/groupchange/GroupChange.java
@@ -0,0 +1,56 @@
+package org.jabref.gui.collab.groupchange;
+
+import org.jabref.gui.collab.ExternalChange;
+import org.jabref.gui.collab.ExternalChangeResolverFactory;
+import org.jabref.gui.groups.GroupTreeNodeViewModel;
+import org.jabref.gui.groups.UndoableModifySubtree;
+import org.jabref.gui.undo.NamedCompound;
+import org.jabref.logic.bibtex.comparator.GroupDiff;
+import org.jabref.logic.groups.DefaultGroupsFactory;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.model.groups.GroupTreeNode;
+
+public final class GroupChange extends ExternalChange {
+    private final GroupDiff groupDiff;
+
+    public GroupChange(GroupDiff groupDiff, BibDatabaseContext databaseContext, ExternalChangeResolverFactory externalChangeResolverFactory) {
+        super(databaseContext, externalChangeResolverFactory);
+        this.groupDiff = groupDiff;
+        setChangeName(groupDiff.getOriginalGroupRoot() == null ? Localization.lang("Removed all groups") : Localization
+                .lang("Modified groups tree"));
+    }
+
+    @Override
+    public void applyChange(NamedCompound undoEdit) {
+        GroupTreeNode oldRoot = groupDiff.getOriginalGroupRoot();
+        GroupTreeNode newRoot = groupDiff.getNewGroupRoot();
+
+        GroupTreeNode root = databaseContext.getMetaData().getGroups().orElseGet(() -> {
+            GroupTreeNode groupTreeNode = new GroupTreeNode(DefaultGroupsFactory.getAllEntriesGroup());
+            databaseContext.getMetaData().setGroups(groupTreeNode);
+            return groupTreeNode;
+        });
+
+        final UndoableModifySubtree undo = new UndoableModifySubtree(
+                new GroupTreeNodeViewModel(databaseContext.getMetaData().getGroups().orElse(null)),
+                new GroupTreeNodeViewModel(root), Localization.lang("Modified groups"));
+        root.removeAllChildren();
+        if (newRoot == null) {
+            // I think setting root to null is not possible
+            root.setGroup(DefaultGroupsFactory.getAllEntriesGroup(), false, false, null);
+        } else {
+            // change root group, even though it'll be AllEntries anyway
+            root.setGroup(newRoot.getGroup(), false, false, null);
+            for (GroupTreeNode child : newRoot.getChildren()) {
+                child.copySubtree().moveTo(root);
+            }
+        }
+
+        undoEdit.addEdit(undo);
+    }
+
+    public GroupDiff getGroupDiff() {
+        return groupDiff;
+    }
+}
diff --git a/src/main/java/org/jabref/gui/collab/groupchange/GroupChangeDetailsView.java b/src/main/java/org/jabref/gui/collab/groupchange/GroupChangeDetailsView.java
new file mode 100644
index 00000000000..0c3f6eda15a
--- /dev/null
+++ b/src/main/java/org/jabref/gui/collab/groupchange/GroupChangeDetailsView.java
@@ -0,0 +1,25 @@
+package org.jabref.gui.collab.groupchange;
+
+import javafx.scene.control.Label;
+
+import org.jabref.gui.collab.ExternalChangeDetailsView;
+import org.jabref.logic.l10n.Localization;
+
+public final class GroupChangeDetailsView extends ExternalChangeDetailsView {
+
+    public GroupChangeDetailsView(GroupChange groupChange) {
+        String labelValue = "";
+        if (groupChange.getGroupDiff().getNewGroupRoot() == null) {
+            labelValue = groupChange.getName() + '.';
+        } else {
+            labelValue = Localization.lang("%0. Accepting the change replaces the complete groups tree with the externally modified groups tree.", groupChange.getName());
+        }
+        Label label = new Label(labelValue);
+        setLeftAnchor(label, 8d);
+        setTopAnchor(label, 8d);
+        setRightAnchor(label, 8d);
+        setBottomAnchor(label, 8d);
+
+        getChildren().setAll(label);
+    }
+}
diff --git a/src/main/java/org/jabref/gui/collab/metedatachange/MetadataChange.java b/src/main/java/org/jabref/gui/collab/metedatachange/MetadataChange.java
new file mode 100644
index 00000000000..ae1340df6c6
--- /dev/null
+++ b/src/main/java/org/jabref/gui/collab/metedatachange/MetadataChange.java
@@ -0,0 +1,32 @@
+package org.jabref.gui.collab.metedatachange;
+
+import org.jabref.gui.collab.ExternalChange;
+import org.jabref.gui.collab.ExternalChangeResolverFactory;
+import org.jabref.gui.undo.NamedCompound;
+import org.jabref.logic.bibtex.comparator.MetaDataDiff;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.model.database.BibDatabaseContext;
+
+public final class MetadataChange extends ExternalChange {
+    private final MetaDataDiff metaDataDiff;
+
+    public MetadataChange(MetaDataDiff metaDataDiff, BibDatabaseContext databaseContext, ExternalChangeResolverFactory externalChangeResolverFactory) {
+        super(databaseContext, externalChangeResolverFactory);
+        this.metaDataDiff = metaDataDiff;
+        setChangeName(Localization.lang("Metadata change"));
+    }
+
+    @Override
+    public void applyChange(NamedCompound undoEdit) {
+        // TODO: Metadata edit should be undoable
+        databaseContext.setMetaData(metaDataDiff.getNewMetaData());
+        // group change is handled by GroupChange, so we set the groups root to the original value
+        // to prevent any inconsistency
+        metaDataDiff.getGroupDifferences()
+                    .ifPresent(groupDiff -> databaseContext.getMetaData().setGroups(groupDiff.getOriginalGroupRoot()));
+    }
+
+    public MetaDataDiff getMetaDataDiff() {
+        return metaDataDiff;
+    }
+}
diff --git a/src/main/java/org/jabref/gui/collab/metedatachange/MetadataChangeDetailsView.java b/src/main/java/org/jabref/gui/collab/metedatachange/MetadataChangeDetailsView.java
new file mode 100644
index 00000000000..43023cab438
--- /dev/null
+++ b/src/main/java/org/jabref/gui/collab/metedatachange/MetadataChangeDetailsView.java
@@ -0,0 +1,30 @@
+package org.jabref.gui.collab.metedatachange;
+
+import javafx.scene.control.Label;
+import javafx.scene.layout.VBox;
+
+import org.jabref.gui.collab.ExternalChangeDetailsView;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.preferences.PreferencesService;
+
+public final class MetadataChangeDetailsView extends ExternalChangeDetailsView {
+
+    public MetadataChangeDetailsView(MetadataChange metadataChange, PreferencesService preferencesService) {
+        VBox container = new VBox(15);
+
+        Label header = new Label(Localization.lang("The following metadata changed:"));
+        header.getStyleClass().add("sectionHeader");
+        container.getChildren().add(header);
+
+        for (String change : metadataChange.getMetaDataDiff().getDifferences(preferencesService)) {
+            container.getChildren().add(new Label(change));
+        }
+
+        setLeftAnchor(container, 8d);
+        setTopAnchor(container, 8d);
+        setRightAnchor(container, 8d);
+        setBottomAnchor(container, 8d);
+
+        getChildren().setAll(container);
+    }
+}
diff --git a/src/main/java/org/jabref/gui/collab/preamblechange/PreambleChange.java b/src/main/java/org/jabref/gui/collab/preamblechange/PreambleChange.java
new file mode 100644
index 00000000000..50922e67d35
--- /dev/null
+++ b/src/main/java/org/jabref/gui/collab/preamblechange/PreambleChange.java
@@ -0,0 +1,35 @@
+package org.jabref.gui.collab.preamblechange;
+
+import org.jabref.gui.collab.ExternalChange;
+import org.jabref.gui.collab.ExternalChangeResolverFactory;
+import org.jabref.gui.undo.NamedCompound;
+import org.jabref.gui.undo.UndoablePreambleChange;
+import org.jabref.logic.bibtex.comparator.PreambleDiff;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.model.database.BibDatabaseContext;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public final class PreambleChange extends ExternalChange {
+    private static final Logger LOGGER = LoggerFactory.getLogger(PreambleChange.class);
+
+    private final PreambleDiff preambleDiff;
+
+    public PreambleChange(PreambleDiff preambleDiff, BibDatabaseContext databaseContext, ExternalChangeResolverFactory externalChangeResolverFactory) {
+        super(databaseContext, externalChangeResolverFactory);
+        this.preambleDiff = preambleDiff;
+
+        setChangeName(Localization.lang("Changed preamble"));
+    }
+
+    @Override
+    public void applyChange(NamedCompound undoEdit) {
+        databaseContext.getDatabase().setPreamble(preambleDiff.getNewPreamble());
+        undoEdit.addEdit(new UndoablePreambleChange(databaseContext.getDatabase(), preambleDiff.getOriginalPreamble(), preambleDiff.getNewPreamble()));
+    }
+
+    public PreambleDiff getPreambleDiff() {
+        return preambleDiff;
+    }
+}
diff --git a/src/main/java/org/jabref/gui/collab/preamblechange/PreambleChangeDetailsView.java b/src/main/java/org/jabref/gui/collab/preamblechange/PreambleChangeDetailsView.java
new file mode 100644
index 00000000000..5d621403478
--- /dev/null
+++ b/src/main/java/org/jabref/gui/collab/preamblechange/PreambleChangeDetailsView.java
@@ -0,0 +1,37 @@
+package org.jabref.gui.collab.preamblechange;
+
+import javafx.scene.control.Label;
+import javafx.scene.layout.VBox;
+
+import org.jabref.gui.collab.ExternalChangeDetailsView;
+import org.jabref.logic.bibtex.comparator.PreambleDiff;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.model.strings.StringUtil;
+
+public final class PreambleChangeDetailsView extends ExternalChangeDetailsView {
+
+    public PreambleChangeDetailsView(PreambleChange preambleChange) {
+        PreambleDiff preambleDiff = preambleChange.getPreambleDiff();
+
+        VBox container = new VBox();
+        Label header = new Label(Localization.lang("Changed preamble"));
+        header.getStyleClass().add("sectionHeader");
+        container.getChildren().add(header);
+
+        if (StringUtil.isNotBlank(preambleDiff.getOriginalPreamble())) {
+            container.getChildren().add(new Label(Localization.lang("Current value: %0", preambleDiff.getOriginalPreamble())));
+        }
+
+        if (StringUtil.isNotBlank(preambleDiff.getNewPreamble())) {
+            container.getChildren().add(new Label(Localization.lang("Value set externally: %0", preambleDiff.getNewPreamble())));
+        } else {
+            container.getChildren().add(new Label(Localization.lang("Value cleared externally")));
+        }
+        setLeftAnchor(container, 8d);
+        setTopAnchor(container, 8d);
+        setRightAnchor(container, 8d);
+        setBottomAnchor(container, 8d);
+
+        getChildren().setAll(container);
+    }
+}
diff --git a/src/main/java/org/jabref/gui/collab/stringadd/BibTexStringAdd.java b/src/main/java/org/jabref/gui/collab/stringadd/BibTexStringAdd.java
new file mode 100644
index 00000000000..38a2a8a0168
--- /dev/null
+++ b/src/main/java/org/jabref/gui/collab/stringadd/BibTexStringAdd.java
@@ -0,0 +1,39 @@
+package org.jabref.gui.collab.stringadd;
+
+import org.jabref.gui.collab.ExternalChange;
+import org.jabref.gui.collab.ExternalChangeResolverFactory;
+import org.jabref.gui.undo.NamedCompound;
+import org.jabref.gui.undo.UndoableInsertString;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.model.database.KeyCollisionException;
+import org.jabref.model.entry.BibtexString;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public final class BibTexStringAdd extends ExternalChange {
+    private static final Logger LOGGER = LoggerFactory.getLogger(BibTexStringAdd.class);
+
+    private final BibtexString addedString;
+
+    public BibTexStringAdd(BibtexString addedString, BibDatabaseContext databaseContext, ExternalChangeResolverFactory externalChangeResolverFactory) {
+        super(databaseContext, externalChangeResolverFactory);
+        this.addedString = addedString;
+        setChangeName(Localization.lang("Added string: '%0'", addedString.getName()));
+    }
+
+    @Override
+    public void applyChange(NamedCompound undoEdit) {
+        try {
+            databaseContext.getDatabase().addString(addedString);
+            undoEdit.addEdit(new UndoableInsertString(databaseContext.getDatabase(), addedString));
+        } catch (KeyCollisionException ex) {
+            LOGGER.warn("Error: could not add string '{}': {}", addedString.getName(), ex.getMessage(), ex);
+        }
+    }
+
+    public BibtexString getAddedString() {
+        return addedString;
+    }
+}
diff --git a/src/main/java/org/jabref/gui/collab/stringadd/BibTexStringAddDetailsView.java b/src/main/java/org/jabref/gui/collab/stringadd/BibTexStringAddDetailsView.java
new file mode 100644
index 00000000000..4097f03c343
--- /dev/null
+++ b/src/main/java/org/jabref/gui/collab/stringadd/BibTexStringAddDetailsView.java
@@ -0,0 +1,27 @@
+package org.jabref.gui.collab.stringadd;
+
+import javafx.scene.control.Label;
+import javafx.scene.layout.VBox;
+
+import org.jabref.gui.collab.ExternalChangeDetailsView;
+import org.jabref.logic.l10n.Localization;
+
+public final class BibTexStringAddDetailsView extends ExternalChangeDetailsView {
+
+    public BibTexStringAddDetailsView(BibTexStringAdd stringAdd) {
+        VBox container = new VBox();
+        Label header = new Label(Localization.lang("Added string"));
+        header.getStyleClass().add("sectionHeader");
+        container.getChildren().addAll(
+                header,
+                new Label(Localization.lang("Label: %0", stringAdd.getAddedString().getName())),
+                new Label(Localization.lang("Content: %0", stringAdd.getAddedString().getContent()))
+        );
+        setLeftAnchor(container, 8d);
+        setTopAnchor(container, 8d);
+        setRightAnchor(container, 8d);
+        setBottomAnchor(container, 8d);
+
+        getChildren().setAll(container);
+    }
+}
diff --git a/src/main/java/org/jabref/gui/collab/stringchange/BibTexStringChange.java b/src/main/java/org/jabref/gui/collab/stringchange/BibTexStringChange.java
new file mode 100644
index 00000000000..928a15bf73c
--- /dev/null
+++ b/src/main/java/org/jabref/gui/collab/stringchange/BibTexStringChange.java
@@ -0,0 +1,43 @@
+package org.jabref.gui.collab.stringchange;
+
+import org.jabref.gui.collab.ExternalChange;
+import org.jabref.gui.collab.ExternalChangeResolverFactory;
+import org.jabref.gui.undo.NamedCompound;
+import org.jabref.gui.undo.UndoableStringChange;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.model.entry.BibtexString;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public final class BibTexStringChange extends ExternalChange {
+    private static final Logger LOGGER = LoggerFactory.getLogger(BibTexStringChange.class);
+
+    private final BibtexString oldString;
+    private final BibtexString newString;
+
+    public BibTexStringChange(BibtexString oldString, BibtexString newString, BibDatabaseContext databaseContext, ExternalChangeResolverFactory externalChangeResolverFactory) {
+        super(databaseContext, externalChangeResolverFactory);
+        this.oldString = oldString;
+        this.newString = newString;
+
+        setChangeName(Localization.lang("Modified string: '%0'", oldString.getName()));
+    }
+
+    @Override
+    public void applyChange(NamedCompound undoEdit) {
+        String oldContent = oldString.getContent();
+        String newContent = newString.getContent();
+        oldString.setContent(newContent);
+        undoEdit.addEdit(new UndoableStringChange(oldString, false, oldContent, newContent));
+    }
+
+    public BibtexString getOldString() {
+        return oldString;
+    }
+
+    public BibtexString getNewString() {
+        return newString;
+    }
+}
diff --git a/src/main/java/org/jabref/gui/collab/stringchange/BibTexStringChangeDetailsView.java b/src/main/java/org/jabref/gui/collab/stringchange/BibTexStringChangeDetailsView.java
new file mode 100644
index 00000000000..f0775409f61
--- /dev/null
+++ b/src/main/java/org/jabref/gui/collab/stringchange/BibTexStringChangeDetailsView.java
@@ -0,0 +1,29 @@
+package org.jabref.gui.collab.stringchange;
+
+import javafx.scene.control.Label;
+import javafx.scene.layout.VBox;
+
+import org.jabref.gui.collab.ExternalChangeDetailsView;
+import org.jabref.logic.l10n.Localization;
+
+public final class BibTexStringChangeDetailsView extends ExternalChangeDetailsView {
+
+    public BibTexStringChangeDetailsView(BibTexStringChange stringChange) {
+        VBox container = new VBox();
+        Label header = new Label(Localization.lang("Modified string"));
+        header.getStyleClass().add("sectionHeader");
+        container.getChildren().addAll(
+                header,
+                new Label(Localization.lang("Label: %0", stringChange.getOldString().getName())),
+                new Label(Localization.lang("Content: %0", stringChange.getNewString().getContent()))
+        );
+
+        container.getChildren().add(new Label(Localization.lang("Current content: %0", stringChange.getOldString().getContent())));
+        setLeftAnchor(container, 8d);
+        setTopAnchor(container, 8d);
+        setRightAnchor(container, 8d);
+        setBottomAnchor(container, 8d);
+
+        getChildren().setAll(container);
+    }
+}
diff --git a/src/main/java/org/jabref/gui/collab/stringdelete/BibTexStringDelete.java b/src/main/java/org/jabref/gui/collab/stringdelete/BibTexStringDelete.java
new file mode 100644
index 00000000000..1f7ca9e16ff
--- /dev/null
+++ b/src/main/java/org/jabref/gui/collab/stringdelete/BibTexStringDelete.java
@@ -0,0 +1,38 @@
+package org.jabref.gui.collab.stringdelete;
+
+import org.jabref.gui.collab.ExternalChange;
+import org.jabref.gui.collab.ExternalChangeResolverFactory;
+import org.jabref.gui.undo.NamedCompound;
+import org.jabref.gui.undo.UndoableRemoveString;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.model.entry.BibtexString;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public final class BibTexStringDelete extends ExternalChange {
+    private static final Logger LOGGER = LoggerFactory.getLogger(BibTexStringDelete.class);
+
+    private final BibtexString deletedString;
+
+    public BibTexStringDelete(BibtexString deletedString, BibDatabaseContext databaseContext, ExternalChangeResolverFactory externalChangeResolverFactory) {
+        super(databaseContext, externalChangeResolverFactory);
+        this.deletedString = deletedString;
+        setChangeName(Localization.lang("Deleted string: '%0'", deletedString.getName()));
+    }
+
+    @Override
+    public void applyChange(NamedCompound undoEdit) {
+        try {
+            databaseContext.getDatabase().removeString(deletedString.getId());
+            undoEdit.addEdit(new UndoableRemoveString(databaseContext.getDatabase(), deletedString));
+        } catch (Exception ex) {
+            LOGGER.warn("Error: could not remove string '{}': {}", deletedString.getName(), ex.getMessage(), ex);
+        }
+    }
+
+    public BibtexString getDeletedString() {
+        return deletedString;
+    }
+}
diff --git a/src/main/java/org/jabref/gui/collab/stringdelete/BibTexStringDeleteDetailsView.java b/src/main/java/org/jabref/gui/collab/stringdelete/BibTexStringDeleteDetailsView.java
new file mode 100644
index 00000000000..d57af155a2b
--- /dev/null
+++ b/src/main/java/org/jabref/gui/collab/stringdelete/BibTexStringDeleteDetailsView.java
@@ -0,0 +1,27 @@
+package org.jabref.gui.collab.stringdelete;
+
+import javafx.scene.control.Label;
+import javafx.scene.layout.VBox;
+
+import org.jabref.gui.collab.ExternalChangeDetailsView;
+import org.jabref.logic.l10n.Localization;
+
+public final class BibTexStringDeleteDetailsView extends ExternalChangeDetailsView {
+
+    public BibTexStringDeleteDetailsView(BibTexStringDelete stringDelete) {
+        VBox container = new VBox();
+        Label header = new Label(Localization.lang("Deleted string"));
+        header.getStyleClass().add("sectionHeader");
+        container.getChildren().addAll(
+                header,
+                new Label(Localization.lang("Label: %0", stringDelete.getDeletedString().getName())),
+                new Label(Localization.lang("Content: %0", stringDelete.getDeletedString().getContent()))
+        );
+        setLeftAnchor(container, 8d);
+        setTopAnchor(container, 8d);
+        setRightAnchor(container, 8d);
+        setBottomAnchor(container, 8d);
+
+        getChildren().setAll(container);
+    }
+}
diff --git a/src/main/java/org/jabref/gui/collab/stringrename/BibTexStringRename.java b/src/main/java/org/jabref/gui/collab/stringrename/BibTexStringRename.java
new file mode 100644
index 00000000000..5c58cf11362
--- /dev/null
+++ b/src/main/java/org/jabref/gui/collab/stringrename/BibTexStringRename.java
@@ -0,0 +1,48 @@
+package org.jabref.gui.collab.stringrename;
+
+import org.jabref.gui.collab.ExternalChange;
+import org.jabref.gui.collab.ExternalChangeResolverFactory;
+import org.jabref.gui.undo.NamedCompound;
+import org.jabref.gui.undo.UndoableStringChange;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.model.entry.BibtexString;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public final class BibTexStringRename extends ExternalChange {
+    private static final Logger LOGGER = LoggerFactory.getLogger(BibTexStringRename.class);
+
+    private final BibtexString oldString;
+    private final BibtexString newString;
+
+    public BibTexStringRename(BibtexString oldString, BibtexString newString, BibDatabaseContext databaseContext, ExternalChangeResolverFactory externalChangeResolverFactory) {
+        super(databaseContext, externalChangeResolverFactory);
+        this.oldString = oldString;
+        this.newString = newString;
+
+        setChangeName(Localization.lang("Renamed string: '%0'", oldString.getName()));
+    }
+
+    @Override
+    public void applyChange(NamedCompound undoEdit) {
+        if (databaseContext.getDatabase().hasStringByName(newString.getName())) {
+            // The name to change to is already in the database, so we can't comply.
+            LOGGER.info("Cannot rename string '{}' to '{}' because the name is already in use", oldString.getName(), newString.getName());
+        }
+
+        String currentName = oldString.getName();
+        String newName = newString.getName();
+        oldString.setName(newName);
+        undoEdit.addEdit(new UndoableStringChange(oldString, true, currentName, newName));
+    }
+
+    public BibtexString getOldString() {
+        return oldString;
+    }
+
+    public BibtexString getNewString() {
+        return newString;
+    }
+}
diff --git a/src/main/java/org/jabref/gui/collab/stringrename/BibTexStringRenameDetailsView.java b/src/main/java/org/jabref/gui/collab/stringrename/BibTexStringRenameDetailsView.java
new file mode 100644
index 00000000000..693feaf5def
--- /dev/null
+++ b/src/main/java/org/jabref/gui/collab/stringrename/BibTexStringRenameDetailsView.java
@@ -0,0 +1,18 @@
+package org.jabref.gui.collab.stringrename;
+
+import javafx.scene.control.Label;
+
+import org.jabref.gui.collab.ExternalChangeDetailsView;
+
+public final class BibTexStringRenameDetailsView extends ExternalChangeDetailsView {
+
+    public BibTexStringRenameDetailsView(BibTexStringRename stringRename) {
+        Label label = new Label(stringRename.getNewString().getName() + " : " + stringRename.getOldString().getContent());
+        setLeftAnchor(label, 8d);
+        setTopAnchor(label, 8d);
+        setRightAnchor(label, 8d);
+        setBottomAnchor(label, 8d);
+
+        getChildren().setAll(label);
+    }
+}
diff --git a/src/main/java/org/jabref/gui/copyfiles/CopyFilesTask.java b/src/main/java/org/jabref/gui/copyfiles/CopyFilesTask.java
index 36514b6858f..0c2cbc2e03d 100644
--- a/src/main/java/org/jabref/gui/copyfiles/CopyFilesTask.java
+++ b/src/main/java/org/jabref/gui/copyfiles/CopyFilesTask.java
@@ -63,9 +63,7 @@ protected List<CopyFilesResultItemViewModel> call() throws InterruptedException,
         String currentDate = currentTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd-HH-mm-ss"));
 
         try (BufferedWriter bw = Files.newBufferedWriter(exportPath.resolve(LOGFILE_PREFIX + currentDate + LOGFILE_EXT), StandardCharsets.UTF_8)) {
-
             for (int i = 0; i < entries.size(); i++) {
-
                 if (isCancelled()) {
                     break;
                 }
@@ -73,7 +71,6 @@ protected List<CopyFilesResultItemViewModel> call() throws InterruptedException,
                 List<LinkedFile> files = entries.get(i).getFiles();
 
                 for (int j = 0; j < files.size(); j++) {
-
                     if (isCancelled()) {
                         break;
                     }
@@ -87,7 +84,6 @@ protected List<CopyFilesResultItemViewModel> call() throws InterruptedException,
                     newPath = OptionalUtil.combine(Optional.of(exportPath), fileToExport, resolvePathFilename);
 
                     if (newPath.isPresent()) {
-
                         Path newFile = newPath.get();
                         boolean success = FileUtil.copyFile(fileToExport.get(), newFile, false);
                         updateProgress(totalFilesCounter++, totalFilesCount);
@@ -105,7 +101,6 @@ protected List<CopyFilesResultItemViewModel> call() throws InterruptedException,
                             writeLogMessage(newFile, bw, localizedSucessMessage);
                             addResultToList(newFile, success, localizedSucessMessage);
                         } else {
-
                             updateMessage(localizedErrorMessage);
                             writeLogMessage(newFile, bw, localizedErrorMessage);
                             addResultToList(newFile, success, localizedErrorMessage);
diff --git a/src/main/java/org/jabref/gui/customentrytypes/CustomEntryTypeDialogViewModel.java b/src/main/java/org/jabref/gui/customentrytypes/CustomEntryTypeDialogViewModel.java
index ab51c2f7390..d55729e4de2 100644
--- a/src/main/java/org/jabref/gui/customentrytypes/CustomEntryTypeDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/customentrytypes/CustomEntryTypeDialogViewModel.java
@@ -191,7 +191,6 @@ public void resetAllCustomEntryTypes() {
     }
 
     public void apply() {
-
         for (var typeWithField : entryTypesWithFields) {
             BibEntryType type = typeWithField.entryType().getValue();
             List<FieldViewModel> allFields = typeWithField.fields();
diff --git a/src/main/java/org/jabref/gui/customentrytypes/CustomizeEntryTypeDialogView.java b/src/main/java/org/jabref/gui/customentrytypes/CustomizeEntryTypeDialogView.java
index 7a4973cf8e2..c82a3084094 100644
--- a/src/main/java/org/jabref/gui/customentrytypes/CustomizeEntryTypeDialogView.java
+++ b/src/main/java/org/jabref/gui/customentrytypes/CustomizeEntryTypeDialogView.java
@@ -109,7 +109,6 @@ private void initialize() {
     }
 
     private void setupTable() {
-
         // Table View must be editable, otherwise the change of the Radiobuttons does not propagate the commit event
         fields.setEditable(true);
         entryTypColumn.setCellValueFactory(cellData -> new ReadOnlyStringWrapper(cellData.getValue().entryType().get().getType().getDisplayName()));
@@ -213,7 +212,6 @@ private void handleOnDragDetected(TableRow<FieldViewModel> row, FieldViewModel f
     }
 
     private void handleOnDragDropped(TableRow<FieldViewModel> row, FieldViewModel originalItem, DragEvent event) {
-
         if (localDragboard.hasType(FieldViewModel.class)) {
             FieldViewModel field = localDragboard.getValue(FieldViewModel.class);
             fields.getItems().remove(field);
@@ -256,6 +254,5 @@ private void resetEntryTypes() {
             viewModel.addAllTypes();
             this.entryTypes.refresh();
         }
-
     }
 }
diff --git a/src/main/java/org/jabref/gui/customentrytypes/EntryTypeViewModel.java b/src/main/java/org/jabref/gui/customentrytypes/EntryTypeViewModel.java
index 9b8e4fb7fd6..daa7e160a60 100644
--- a/src/main/java/org/jabref/gui/customentrytypes/EntryTypeViewModel.java
+++ b/src/main/java/org/jabref/gui/customentrytypes/EntryTypeViewModel.java
@@ -60,5 +60,4 @@ public void removeField(FieldViewModel focusedItem) {
     public String toString() {
         return "CustomEntryTypeViewModel [entryType=" + entryType + ", fields=" + fields + "]";
     }
-
 }
diff --git a/src/main/java/org/jabref/gui/desktop/JabRefDesktop.java b/src/main/java/org/jabref/gui/desktop/JabRefDesktop.java
index 75d22919cb8..517ffc1689d 100644
--- a/src/main/java/org/jabref/gui/desktop/JabRefDesktop.java
+++ b/src/main/java/org/jabref/gui/desktop/JabRefDesktop.java
@@ -12,7 +12,6 @@
 
 import org.jabref.gui.DialogService;
 import org.jabref.gui.Globals;
-import org.jabref.gui.JabRefGUI;
 import org.jabref.gui.desktop.os.DefaultDesktop;
 import org.jabref.gui.desktop.os.Linux;
 import org.jabref.gui.desktop.os.NativeDesktop;
@@ -184,7 +183,7 @@ private static void openExternalFilePlatformIndependent(Optional<ExternalFileTyp
      * @param fileLink the location of the file
      * @throws IOException if the default file browser cannot be opened
      */
-    public static void openFolderAndSelectFile(Path fileLink, PreferencesService preferencesService) throws IOException {
+    public static void openFolderAndSelectFile(Path fileLink, PreferencesService preferencesService, DialogService dialogService) throws IOException {
         if (fileLink == null) {
             return;
         }
@@ -208,7 +207,7 @@ public static void openFolderAndSelectFile(Path fileLink, PreferencesService pre
                     new ProcessBuilder(subcommands).start();
                 } catch (IOException exception) {
                     LOGGER.error("Open File Browser", exception);
-                    JabRefGUI.getMainFrame().getDialogService().notify(Localization.lang("Error occured while executing the command \"%0\".", command));
+                    dialogService.notify(Localization.lang("Error occured while executing the command \"%0\".", command));
                 }
             }
         }
@@ -220,7 +219,7 @@ public static void openFolderAndSelectFile(Path fileLink, PreferencesService pre
      * @param url the URL to open
      */
     public static void openBrowser(String url) throws IOException {
-        Optional<ExternalFileType> fileType = ExternalFileTypes.getInstance().getExternalFileTypeByExt("html");
+        Optional<ExternalFileType> fileType = ExternalFileTypes.getExternalFileTypeByExt("html", Globals.prefs.getFilePreferences());
         openExternalFilePlatformIndependent(fileType, url);
     }
 
@@ -233,7 +232,7 @@ public static void openBrowser(URI url) throws IOException {
      *
      * @param url the URL to open
      */
-    public static void openBrowserShowPopup(String url) {
+    public static void openBrowserShowPopup(String url, DialogService dialogService) {
         try {
             openBrowser(url);
         } catch (IOException exception) {
@@ -242,8 +241,8 @@ public static void openBrowserShowPopup(String url) {
             String couldNotOpenBrowser = Localization.lang("Could not open browser.");
             String openManually = Localization.lang("Please open %0 manually.", url);
             String copiedToClipboard = Localization.lang("The link has been copied to the clipboard.");
-            JabRefGUI.getMainFrame().getDialogService().notify(couldNotOpenBrowser);
-            JabRefGUI.getMainFrame().getDialogService().showErrorDialogAndWait(couldNotOpenBrowser, couldNotOpenBrowser + "\n" + openManually + "\n" + copiedToClipboard);
+            dialogService.notify(couldNotOpenBrowser);
+            dialogService.showErrorDialogAndWait(couldNotOpenBrowser, couldNotOpenBrowser + "\n" + openManually + "\n" + copiedToClipboard);
         }
     }
 
@@ -253,8 +252,9 @@ public static void openBrowserShowPopup(String url) {
      * If no command is specified in {@link Globals}, the default system console will be executed.
      *
      * @param file Location the console should be opened at.
+     * @param dialogService
      */
-    public static void openConsole(File file, PreferencesService preferencesService) throws IOException {
+    public static void openConsole(File file, PreferencesService preferencesService, DialogService dialogService) throws IOException {
         if (file == null) {
             return;
         }
@@ -263,7 +263,7 @@ public static void openConsole(File file, PreferencesService preferencesService)
 
         boolean useCustomTerminal = preferencesService.getExternalApplicationsPreferences().useCustomTerminal();
         if (!useCustomTerminal) {
-            NATIVE_DESKTOP.openConsole(absolutePath);
+            NATIVE_DESKTOP.openConsole(absolutePath, dialogService);
         } else {
             String command = preferencesService.getExternalApplicationsPreferences().getCustomTerminalCommand();
             command = command.trim();
@@ -275,14 +275,14 @@ public static void openConsole(File file, PreferencesService preferencesService)
                 String[] subcommands = command.split(" ");
 
                 LOGGER.info("Executing command \"" + command + "\"...");
-                JabRefGUI.getMainFrame().getDialogService().notify(Localization.lang("Executing command \"%0\"...", command));
+                dialogService.notify(Localization.lang("Executing command \"%0\"...", command));
 
                 try {
                     new ProcessBuilder(subcommands).start();
                 } catch (IOException exception) {
                     LOGGER.error("Open console", exception);
 
-                    JabRefGUI.getMainFrame().getDialogService().notify(Localization.lang("Error occured while executing the command \"%0\".", command));
+                   dialogService.notify(Localization.lang("Error occured while executing the command \"%0\".", command));
                 }
             }
         }
diff --git a/src/main/java/org/jabref/gui/desktop/os/DefaultDesktop.java b/src/main/java/org/jabref/gui/desktop/os/DefaultDesktop.java
index 5cb41e0d0f2..ec0805b641f 100644
--- a/src/main/java/org/jabref/gui/desktop/os/DefaultDesktop.java
+++ b/src/main/java/org/jabref/gui/desktop/os/DefaultDesktop.java
@@ -6,6 +6,7 @@
 import java.nio.file.Path;
 
 import org.jabref.architecture.AllowedToUseAwt;
+import org.jabref.gui.DialogService;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -31,7 +32,7 @@ public void openFolderAndSelectFile(Path filePath) throws IOException {
     }
 
     @Override
-    public void openConsole(String absolutePath) throws IOException {
+    public void openConsole(String absolutePath, DialogService dialogService) throws IOException {
         LOGGER.error("This feature is not supported by your Operating System.");
     }
 
diff --git a/src/main/java/org/jabref/gui/desktop/os/Linux.java b/src/main/java/org/jabref/gui/desktop/os/Linux.java
index e4a73faa177..289efb4f576 100644
--- a/src/main/java/org/jabref/gui/desktop/os/Linux.java
+++ b/src/main/java/org/jabref/gui/desktop/os/Linux.java
@@ -5,15 +5,19 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Locale;
 import java.util.Optional;
 
 import org.jabref.architecture.AllowedToUseAwt;
+import org.jabref.gui.DialogService;
+import org.jabref.gui.Globals;
 import org.jabref.gui.JabRefExecutorService;
 import org.jabref.gui.externalfiletype.ExternalFileType;
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.util.StreamGobbler;
+import org.jabref.logic.l10n.Localization;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -28,24 +32,24 @@ private void nativeOpenFile(String filePath) {
             try {
                 File file = new File(filePath);
                 Desktop.getDesktop().open(file);
-                System.out.println("Open file in default application with Desktop integration");
+                LOGGER.debug("Open file in default application with Desktop integration");
             } catch (IllegalArgumentException e) {
-                System.out.println("Fail back to xdg-open");
+                LOGGER.debug("Fail back to xdg-open");
                 try {
                     String[] cmd = {"xdg-open", filePath};
                     Runtime.getRuntime().exec(cmd);
                 } catch (Exception e2) {
-                    System.out.println("Open operation not successful: " + e2);
+                    LOGGER.warn("Open operation not successful: " + e2);
                 }
             } catch (IOException e) {
-                System.out.println("Native open operation not successful: " + e);
+                LOGGER.warn("Native open operation not successful: " + e);
             }
         });
     }
 
     @Override
     public void openFile(String filePath, String fileType) throws IOException {
-        Optional<ExternalFileType> type = ExternalFileTypes.getInstance().getExternalFileTypeByExt(fileType);
+        Optional<ExternalFileType> type = ExternalFileTypes.getExternalFileTypeByExt(fileType, Globals.prefs.getFilePreferences());
         String viewer;
 
         if (type.isPresent() && !type.get().getOpenWithApplication().isEmpty()) {
@@ -89,37 +93,67 @@ public void openFileWithApplication(String filePath, String application) throws
     public void openFolderAndSelectFile(Path filePath) throws IOException {
         String desktopSession = System.getenv("DESKTOP_SESSION");
 
-        String cmd = "xdg-open " + filePath.toAbsolutePath().getParent().toString(); // default command
+        String absoluteFilePath = filePath.toAbsolutePath().toString();
+        String[] cmd = {"xdg-open", absoluteFilePath}; // default command
 
         if (desktopSession != null) {
             desktopSession = desktopSession.toLowerCase(Locale.ROOT);
             if (desktopSession.contains("gnome")) {
-                cmd = "nautilus" + filePath.toString().replace(" ", "\\ ");
-            } else if (desktopSession.contains("kde")) {
-                cmd = "dolphin --select " + filePath.toString().replace(" ", "\\ ");
+                cmd = new String[] {"nautilus", "--select", absoluteFilePath};
+            } else if (desktopSession.contains("kde") || desktopSession.contains("plasma")) {
+                cmd = new String[] {"dolphin", "--select", absoluteFilePath};
+            } else if (desktopSession.contains("mate")) {
+                cmd = new String[] {"caja", "--select", absoluteFilePath};
+            } else if (desktopSession.contains("cinnamon")) {
+                cmd = new String[] {"nemo", absoluteFilePath}; // Although nemo is based on nautilus it does not support --select, it directly highlights the file
             }
         }
-        Runtime.getRuntime().exec(cmd);
+        ProcessBuilder processBuilder = new ProcessBuilder((cmd));
+        Process process = processBuilder.start();
+
+        StreamGobbler streamGobblerInput = new StreamGobbler(process.getInputStream(), LOGGER::debug);
+        StreamGobbler streamGobblerError = new StreamGobbler(process.getErrorStream(), LOGGER::debug);
+
+        JabRefExecutorService.INSTANCE.execute(streamGobblerInput);
+        JabRefExecutorService.INSTANCE.execute(streamGobblerError);
     }
 
     @Override
-    public void openConsole(String absolutePath) throws IOException {
-        Runtime runtime = Runtime.getRuntime();
-        Process p = runtime.exec("readlink /etc/alternatives/x-terminal-emulator");
-        BufferedReader reader = new BufferedReader(new InputStreamReader(p.getInputStream()));
-
-        String emulatorName = reader.readLine();
-        if (emulatorName != null) {
-            emulatorName = emulatorName.substring(emulatorName.lastIndexOf(File.separator) + 1);
-
-            if (emulatorName.contains("gnome")) {
-                runtime.exec("gnome-terminal --working-directory=" + absolutePath);
-            } else if (emulatorName.contains("xfce4")) {
-                runtime.exec("xfce4-terminal --working-directory=" + absolutePath);
-            } else if (emulatorName.contains("konsole")) {
-                runtime.exec("konsole --workdir=" + absolutePath);
-            } else {
-                runtime.exec(emulatorName, null, new File(absolutePath));
+    public void openConsole(String absolutePath, DialogService dialogService) throws IOException {
+
+        if (!Files.exists(Path.of("/etc/alternatives/x-terminal-emulator"))) {
+            dialogService.showErrorDialogAndWait(Localization.lang("Could not detect terminal automatically. Please define a custom terminal in the preferences."));
+            return;
+        }
+
+        ProcessBuilder processBuilder = new ProcessBuilder("readlink", "/etc/alternatives/x-terminal-emulator");
+        Process process = processBuilder.start();
+
+        try (BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()))) {
+            String emulatorName = reader.readLine();
+            if (emulatorName != null) {
+                emulatorName = emulatorName.substring(emulatorName.lastIndexOf(File.separator) + 1);
+
+                String[] cmd = {};
+                if (emulatorName.contains("gnome")) {
+                    cmd = new String[] {"gnome-terminal", "--working-directory=", absolutePath};
+                } else if (emulatorName.contains("xfce4")) {
+                    cmd = new String[] {"xfce4-terminal", "--working-directory=", absolutePath};
+                } else if (emulatorName.contains("konsole")) {
+                    cmd = new String[] {"konsole", "--workdir=", absolutePath};
+                } else {
+                    cmd = new String[] {emulatorName, absolutePath};
+                }
+
+                ProcessBuilder builder = new ProcessBuilder(cmd);
+                builder.directory(new File(absolutePath));
+                Process processTerminal = builder.start();
+
+                StreamGobbler streamGobblerInput = new StreamGobbler(processTerminal.getInputStream(), LOGGER::debug);
+                StreamGobbler streamGobblerError = new StreamGobbler(processTerminal.getErrorStream(), LOGGER::debug);
+
+                JabRefExecutorService.INSTANCE.execute(streamGobblerInput);
+                JabRefExecutorService.INSTANCE.execute(streamGobblerError);
             }
         }
     }
diff --git a/src/main/java/org/jabref/gui/desktop/os/NativeDesktop.java b/src/main/java/org/jabref/gui/desktop/os/NativeDesktop.java
index 23178a150a6..349368ef3a6 100644
--- a/src/main/java/org/jabref/gui/desktop/os/NativeDesktop.java
+++ b/src/main/java/org/jabref/gui/desktop/os/NativeDesktop.java
@@ -3,7 +3,10 @@
 import java.io.IOException;
 import java.nio.file.Path;
 
+import org.jabref.gui.DialogService;
+
 public interface NativeDesktop {
+
     void openFile(String filePath, String fileType) throws IOException;
 
     /**
@@ -17,7 +20,7 @@ public interface NativeDesktop {
 
     void openFolderAndSelectFile(Path file) throws IOException;
 
-    void openConsole(String absolutePath) throws IOException;
+    void openConsole(String absolutePath, DialogService dialogService) throws IOException;
 
     String detectProgramPath(String programName, String directoryName);
 
diff --git a/src/main/java/org/jabref/gui/desktop/os/OSX.java b/src/main/java/org/jabref/gui/desktop/os/OSX.java
index 9d5f9b91baa..d7a3c6cd710 100644
--- a/src/main/java/org/jabref/gui/desktop/os/OSX.java
+++ b/src/main/java/org/jabref/gui/desktop/os/OSX.java
@@ -1,11 +1,12 @@
 package org.jabref.gui.desktop.os;
 
-import java.io.File;
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.Optional;
 
 import org.jabref.architecture.AllowedToUseAwt;
+import org.jabref.gui.DialogService;
+import org.jabref.gui.Globals;
 import org.jabref.gui.externalfiletype.ExternalFileType;
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
 
@@ -14,7 +15,7 @@ public class OSX implements NativeDesktop {
 
     @Override
     public void openFile(String filePath, String fileType) throws IOException {
-        Optional<ExternalFileType> type = ExternalFileTypes.getInstance().getExternalFileTypeByExt(fileType);
+        Optional<ExternalFileType> type = ExternalFileTypes.getExternalFileTypeByExt(fileType, Globals.prefs.getFilePreferences());
         if (type.isPresent() && !type.get().getOpenWithApplication().isEmpty()) {
             openFileWithApplication(filePath, type.get().getOpenWithApplication());
         } else {
@@ -28,7 +29,7 @@ public void openFileWithApplication(String filePath, String application) throws
         // Use "-a <application>" if the app is specified, and just "open <filename>" otherwise:
         String[] cmd = (application != null) && !application.isEmpty() ? new String[] {"/usr/bin/open", "-a",
                 application, filePath} : new String[] {"/usr/bin/open", filePath};
-        Runtime.getRuntime().exec(cmd);
+        new ProcessBuilder(cmd).start();
     }
 
     @Override
@@ -38,8 +39,8 @@ public void openFolderAndSelectFile(Path file) throws IOException {
     }
 
     @Override
-    public void openConsole(String absolutePath) throws IOException {
-        Runtime.getRuntime().exec("open -a Terminal " + absolutePath, null, new File(absolutePath));
+    public void openConsole(String absolutePath, DialogService dialogService) throws IOException {
+         new ProcessBuilder("open", "-a", "Terminal", absolutePath).start();
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/desktop/os/Windows.java b/src/main/java/org/jabref/gui/desktop/os/Windows.java
index 560a404653c..d85722740d6 100644
--- a/src/main/java/org/jabref/gui/desktop/os/Windows.java
+++ b/src/main/java/org/jabref/gui/desktop/os/Windows.java
@@ -6,6 +6,8 @@
 import java.nio.file.Path;
 import java.util.Optional;
 
+import org.jabref.gui.DialogService;
+import org.jabref.gui.Globals;
 import org.jabref.gui.externalfiletype.ExternalFileType;
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
 
@@ -14,7 +16,7 @@ public class Windows implements NativeDesktop {
 
     @Override
     public void openFile(String filePath, String fileType) throws IOException {
-        Optional<ExternalFileType> type = ExternalFileTypes.getInstance().getExternalFileTypeByExt(fileType);
+        Optional<ExternalFileType> type = ExternalFileTypes.getExternalFileTypeByExt(fileType, Globals.prefs.getFilePreferences());
 
         if (type.isPresent() && !type.get().getOpenWithApplication().isEmpty()) {
             openFileWithApplication(filePath, type.get().getOpenWithApplication());
@@ -79,7 +81,7 @@ public void openFolderAndSelectFile(Path filePath) throws IOException {
     }
 
     @Override
-    public void openConsole(String absolutePath) throws IOException {
+    public void openConsole(String absolutePath, DialogService dialogService) throws IOException {
         ProcessBuilder process = new ProcessBuilder("cmd.exe", "/c", "start");
         process.directory(new File(absolutePath));
         process.start();
diff --git a/src/main/java/org/jabref/gui/dialogs/AutosaveUiManager.java b/src/main/java/org/jabref/gui/dialogs/AutosaveUiManager.java
index 7aee99be695..a7bc85890ee 100644
--- a/src/main/java/org/jabref/gui/dialogs/AutosaveUiManager.java
+++ b/src/main/java/org/jabref/gui/dialogs/AutosaveUiManager.java
@@ -16,16 +16,16 @@
 public class AutosaveUiManager {
     private static final Logger LOGGER = LoggerFactory.getLogger(AutosaveUiManager.class);
 
-    private final LibraryTab libraryTab;
+    private SaveDatabaseAction saveDatabaseAction;
 
     public AutosaveUiManager(LibraryTab libraryTab) {
-        this.libraryTab = libraryTab;
+        this.saveDatabaseAction = new SaveDatabaseAction(libraryTab, Globals.prefs, Globals.entryTypesManager);
     }
 
     @Subscribe
     public void listen(AutosaveEvent event) {
         try {
-            new SaveDatabaseAction(libraryTab, Globals.prefs, Globals.entryTypesManager).save(SaveDatabaseAction.SaveDatabaseMode.SILENT);
+            this.saveDatabaseAction.save(SaveDatabaseAction.SaveDatabaseMode.SILENT);
         } catch (Throwable e) {
             LOGGER.error("Problem occurred while saving.", e);
         }
diff --git a/src/main/java/org/jabref/gui/dialogs/BackupUIManager.java b/src/main/java/org/jabref/gui/dialogs/BackupUIManager.java
index 8a344ee8bfb..c6f7cab9c5d 100644
--- a/src/main/java/org/jabref/gui/dialogs/BackupUIManager.java
+++ b/src/main/java/org/jabref/gui/dialogs/BackupUIManager.java
@@ -6,6 +6,8 @@
 import org.jabref.gui.util.DefaultTaskExecutor;
 import org.jabref.logic.autosaveandbackup.BackupManager;
 import org.jabref.logic.l10n.Localization;
+import org.jabref.logic.util.BackupFileType;
+import org.jabref.logic.util.io.BackupFileUtil;
 
 /**
  * Stores all user dialogs related to {@link BackupManager}.
@@ -17,7 +19,10 @@ private BackupUIManager() {
 
     public static void showRestoreBackupDialog(DialogService dialogService, Path originalPath) {
         String content = new StringBuilder()
-                .append(Localization.lang("A backup file for '%0' was found.", originalPath.getFileName().toString()))
+                .append(Localization.lang("A backup file for '%0' was found at '%1'.",
+                        originalPath.getFileName().toString(),
+                        // We need to determine the path "manually" as the path does not get passed through when a diff is detected.
+                        BackupFileUtil.getPathOfLatestExisingBackupFile(originalPath, BackupFileType.BACKUP).map(Path::toString).orElse(Localization.lang("File not found"))))
                 .append("\n")
                 .append(Localization.lang("This could indicate that JabRef did not shut down cleanly last time the file was used."))
                 .append("\n\n")
diff --git a/src/main/java/org/jabref/gui/documentviewer/DocumentViewerViewModel.java b/src/main/java/org/jabref/gui/documentviewer/DocumentViewerViewModel.java
index d1f54cfca3c..0a6f670c60e 100644
--- a/src/main/java/org/jabref/gui/documentviewer/DocumentViewerViewModel.java
+++ b/src/main/java/org/jabref/gui/documentviewer/DocumentViewerViewModel.java
@@ -19,11 +19,13 @@
 
 import org.jabref.gui.AbstractViewModel;
 import org.jabref.gui.StateManager;
+import org.jabref.logic.util.io.FileUtil;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.preferences.PreferencesService;
 
 import com.tobiasdiez.easybind.EasyBind;
+import org.apache.pdfbox.Loader;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -105,9 +107,12 @@ private void setCurrentEntry(BibEntry entry) {
 
     private void setCurrentDocument(Path path) {
         try {
-            currentDocument.set(new PdfDocumentViewModel(PDDocument.load(path.toFile())));
+            if (FileUtil.isPDFFile(path)) {
+                PDDocument document = Loader.loadPDF(path.toFile());
+                currentDocument.set(new PdfDocumentViewModel(document));
+            }
         } catch (IOException e) {
-            LOGGER.error("Could not set Document Viewer", e);
+            LOGGER.error("Could not set Document Viewer for path {}", path, e);
         }
     }
 
diff --git a/src/main/java/org/jabref/gui/duplicationFinder/DuplicateResolverDialog.java b/src/main/java/org/jabref/gui/duplicationFinder/DuplicateResolverDialog.java
index ccc8c3e507c..6a89a239500 100644
--- a/src/main/java/org/jabref/gui/duplicationFinder/DuplicateResolverDialog.java
+++ b/src/main/java/org/jabref/gui/duplicationFinder/DuplicateResolverDialog.java
@@ -6,10 +6,11 @@
 import javafx.scene.control.ButtonType;
 import javafx.scene.layout.BorderPane;
 
+import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.duplicationFinder.DuplicateResolverDialog.DuplicateResolverResult;
 import org.jabref.gui.help.HelpAction;
-import org.jabref.gui.mergeentries.MergeEntries;
+import org.jabref.gui.mergeentries.newmergedialog.ThreeWayMergeView;
 import org.jabref.gui.util.BaseDialog;
 import org.jabref.gui.util.DialogWindowState;
 import org.jabref.logic.help.HelpFile;
@@ -38,18 +39,19 @@ public enum DuplicateResolverResult {
         BREAK
     }
 
-    private MergeEntries me;
+    private ThreeWayMergeView threeWayMerge;
+    private final DialogService dialogService;
 
-    public DuplicateResolverDialog(BibEntry one, BibEntry two, DuplicateResolverType type, BibDatabaseContext database, StateManager stateManager) {
+    public DuplicateResolverDialog(BibEntry one, BibEntry two, DuplicateResolverType type, BibDatabaseContext database, StateManager stateManager, DialogService dialogService) {
         this.setTitle(Localization.lang("Possible duplicate entries"));
         this.database = database;
         this.stateManager = stateManager;
+        this.dialogService = dialogService;
         init(one, two, type);
     }
 
     private void init(BibEntry one, BibEntry two, DuplicateResolverType type) {
-
-        HelpAction helpCommand = new HelpAction(HelpFile.FIND_DUPLICATES);
+        HelpAction helpCommand = new HelpAction(HelpFile.FIND_DUPLICATES, dialogService);
         ButtonType help = new ButtonType(Localization.lang("Help"), ButtonData.HELP);
 
         ButtonType cancel = ButtonType.CANCEL;
@@ -67,14 +69,14 @@ private void init(BibEntry one, BibEntry two, DuplicateResolverType type) {
                 first = new ButtonType(Localization.lang("Keep left"), ButtonData.APPLY);
                 second = new ButtonType(Localization.lang("Keep right"), ButtonData.APPLY);
                 both = new ButtonType(Localization.lang("Keep both"), ButtonData.APPLY);
-                me = new MergeEntries(one, two);
+                threeWayMerge = new ThreeWayMergeView(one, two);
                 break;
             case INSPECTION:
                 first = new ButtonType(Localization.lang("Remove old entry"), ButtonData.APPLY);
                 second = new ButtonType(Localization.lang("Remove entry from import"), ButtonData.APPLY);
                 both = new ButtonType(Localization.lang("Keep both"), ButtonData.APPLY);
-                me = new MergeEntries(one, two, Localization.lang("Old entry"),
-                        Localization.lang("From import"));
+                threeWayMerge = new ThreeWayMergeView(one, two, Localization.lang("Old entry"),
+                                                      Localization.lang("From import"));
                 break;
             case DUPLICATE_SEARCH_WITH_EXACT:
                 first = new ButtonType(Localization.lang("Keep left"), ButtonData.APPLY);
@@ -83,14 +85,14 @@ private void init(BibEntry one, BibEntry two, DuplicateResolverType type) {
 
                 removeExactVisible = true;
 
-                me = new MergeEntries(one, two);
+                threeWayMerge = new ThreeWayMergeView(one, two);
                 break;
             default:
                 first = new ButtonType(Localization.lang("Import and remove old entry"), ButtonData.APPLY);
                 second = new ButtonType(Localization.lang("Do not import entry"), ButtonData.APPLY);
                 both = new ButtonType(Localization.lang("Import and keep old entry"), ButtonData.APPLY);
-                me = new MergeEntries(one, two, Localization.lang("Old entry"),
-                        Localization.lang("From import"));
+                threeWayMerge = new ThreeWayMergeView(one, two, Localization.lang("Old entry"),
+                                                      Localization.lang("From import"));
                 break;
         }
         if (removeExactVisible) {
@@ -107,7 +109,7 @@ private void init(BibEntry one, BibEntry two, DuplicateResolverType type) {
             this.setY(state.getY());
         }
 
-        BorderPane borderPane = new BorderPane(me);
+        BorderPane borderPane = new BorderPane(threeWayMerge);
         borderPane.setBottom(options);
 
         this.setResultConverter(button -> {
@@ -134,6 +136,14 @@ private void init(BibEntry one, BibEntry two, DuplicateResolverType type) {
     }
 
     public BibEntry getMergedEntry() {
-        return me.getMergeEntry();
+        return threeWayMerge.getMergedEntry();
+    }
+
+    public BibEntry getNewLeftEntry() {
+        return threeWayMerge.getLeftEntry();
+    }
+
+    public BibEntry getNewRightEntry() {
+        return threeWayMerge.getRightEntry();
     }
 }
diff --git a/src/main/java/org/jabref/gui/duplicationFinder/DuplicateSearch.java b/src/main/java/org/jabref/gui/duplicationFinder/DuplicateSearch.java
index 64af1bc9143..46ddfaf6f3b 100644
--- a/src/main/java/org/jabref/gui/duplicationFinder/DuplicateSearch.java
+++ b/src/main/java/org/jabref/gui/duplicationFinder/DuplicateSearch.java
@@ -142,7 +142,7 @@ private DuplicateSearchResult verifyDuplicates() {
     }
 
     private void askResolveStrategy(DuplicateSearchResult result, BibEntry first, BibEntry second, DuplicateResolverType resolverType) {
-        DuplicateResolverDialog dialog = new DuplicateResolverDialog(first, second, resolverType, frame.getCurrentLibraryTab().getBibDatabaseContext(), stateManager);
+        DuplicateResolverDialog dialog = new DuplicateResolverDialog(first, second, resolverType, frame.getCurrentLibraryTab().getBibDatabaseContext(), stateManager, dialogService);
 
         dialog.titleProperty().bind(Bindings.concat(dialog.getTitle()).concat(" (").concat(duplicateProgress.getValue()).concat("/").concat(duplicateTotal).concat(")"));
 
@@ -152,16 +152,21 @@ private void askResolveStrategy(DuplicateSearchResult result, BibEntry first, Bi
         if ((resolverResult == DuplicateResolverResult.KEEP_LEFT)
                 || (resolverResult == DuplicateResolverResult.AUTOREMOVE_EXACT)) {
             result.remove(second);
+            result.replace(first, dialog.getNewLeftEntry());
             if (resolverResult == DuplicateResolverResult.AUTOREMOVE_EXACT) {
                 autoRemoveExactDuplicates.set(true); // Remember choice
             }
         } else if (resolverResult == DuplicateResolverResult.KEEP_RIGHT) {
             result.remove(first);
+            result.replace(second, dialog.getNewRightEntry());
         } else if (resolverResult == DuplicateResolverResult.BREAK) {
             libraryAnalyzed.set(true);
             duplicates.clear();
         } else if (resolverResult == DuplicateResolverResult.KEEP_MERGE) {
             result.replace(first, second, dialog.getMergedEntry());
+        } else if (resolverResult == DuplicateResolverResult.KEEP_BOTH) {
+            result.replace(first, dialog.getNewLeftEntry());
+            result.replace(second, dialog.getNewRightEntry());
         }
     }
 
@@ -225,6 +230,11 @@ public synchronized void replace(BibEntry first, BibEntry second, BibEntry repla
             duplicates++;
         }
 
+        public synchronized void replace(BibEntry entry, BibEntry replacement) {
+            remove(entry);
+            getToAdd().add(replacement);
+        }
+
         public synchronized boolean isToRemove(BibEntry entry) {
             return toRemove.containsKey(System.identityHashCode(entry));
         }
diff --git a/src/main/java/org/jabref/gui/edit/EditAction.java b/src/main/java/org/jabref/gui/edit/EditAction.java
index 5cdebd07b14..c02bc2dd619 100644
--- a/src/main/java/org/jabref/gui/edit/EditAction.java
+++ b/src/main/java/org/jabref/gui/edit/EditAction.java
@@ -1,6 +1,7 @@
 package org.jabref.gui.edit;
 
 import javafx.scene.control.TextInputControl;
+import javafx.scene.web.WebView;
 
 import org.jabref.gui.JabRefFrame;
 import org.jabref.gui.StateManager;
@@ -56,11 +57,11 @@ public void execute() {
                     case DELETE_ENTRY -> textInput.deleteNextChar();
                     default -> throw new IllegalStateException("Only cut/copy/paste supported in TextInputControl but got " + action);
                 }
-
-            } else if (!(focusOwner instanceof CodeArea)) {
-
+            } else if ((focusOwner instanceof CodeArea) || (focusOwner instanceof WebView)) {
+                return;
+            } else {
                 LOGGER.debug("Else: {}", focusOwner.getClass().getSimpleName());
-                // Not sure what is selected -> copy/paste/cut selected entries
+                // Not sure what is selected -> copy/paste/cut selected entries except for Preview and CodeArea
 
                 // ToDo: Should be handled by BibDatabaseContext instead of LibraryTab
                 switch (action) {
diff --git a/src/main/java/org/jabref/gui/edit/ManageKeywordsViewModel.java b/src/main/java/org/jabref/gui/edit/ManageKeywordsViewModel.java
index 867eeccea47..2d4c48091ad 100644
--- a/src/main/java/org/jabref/gui/edit/ManageKeywordsViewModel.java
+++ b/src/main/java/org/jabref/gui/edit/ManageKeywordsViewModel.java
@@ -53,7 +53,6 @@ private void fillKeywordsList(ManageKeywordsDisplayType type) {
                 sortedKeywordsOfAllEntriesBeforeUpdateByUser.addAll(separatedKeywords);
             }
         } else if (type == ManageKeywordsDisplayType.CONTAINED_IN_ANY_ENTRY) {
-
             // all keywords from first entry have to be added
             BibEntry firstEntry = entries.get(0);
             KeywordList separatedKeywords = firstEntry.getKeywords(preferences.getKeywordDelimiter());
diff --git a/src/main/java/org/jabref/gui/edit/MassSetFieldsAction.java b/src/main/java/org/jabref/gui/edit/MassSetFieldsAction.java
deleted file mode 100644
index 392f90536fc..00000000000
--- a/src/main/java/org/jabref/gui/edit/MassSetFieldsAction.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package org.jabref.gui.edit;
-
-import javax.swing.undo.UndoManager;
-
-import org.jabref.gui.DialogService;
-import org.jabref.gui.StateManager;
-import org.jabref.gui.actions.SimpleCommand;
-import org.jabref.model.database.BibDatabaseContext;
-
-import static org.jabref.gui.actions.ActionHelper.needsDatabase;
-import static org.jabref.gui.actions.ActionHelper.needsEntriesSelected;
-
-/**
- * An Action for launching mass field.
- * <p>
- * Functionality:
- * <ul>
- *     <li>Defaults to selected entries, or all entries if none are selected.</li>
- *     <li>Input field name</li>
- *     <li>Either set field, or clear field.</li>
- * </ul>
- */
-public class MassSetFieldsAction extends SimpleCommand {
-
-    private final StateManager stateManager;
-    private DialogService dialogService;
-    private UndoManager undoManager;
-
-    public MassSetFieldsAction(StateManager stateManager, DialogService dialogService, UndoManager undoManager) {
-        this.stateManager = stateManager;
-        this.dialogService = dialogService;
-        this.undoManager = undoManager;
-
-        this.executable.bind(needsDatabase(stateManager).and(needsEntriesSelected(stateManager)));
-    }
-
-    @Override
-    public void execute() {
-        BibDatabaseContext database = stateManager.getActiveDatabase().orElseThrow(() -> new NullPointerException("Database null"));
-        dialogService.showCustomDialogAndWait(new MassSetFieldsDialog(stateManager.getSelectedEntries(), database, dialogService, undoManager));
-    }
-}
diff --git a/src/main/java/org/jabref/gui/edit/MassSetFieldsDialog.java b/src/main/java/org/jabref/gui/edit/MassSetFieldsDialog.java
deleted file mode 100644
index 20d5aa1f538..00000000000
--- a/src/main/java/org/jabref/gui/edit/MassSetFieldsDialog.java
+++ /dev/null
@@ -1,245 +0,0 @@
-package org.jabref.gui.edit;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
-import javax.swing.undo.UndoManager;
-import javax.swing.undo.UndoableEdit;
-
-import javafx.application.Platform;
-import javafx.geometry.Insets;
-import javafx.scene.control.ButtonType;
-import javafx.scene.control.CheckBox;
-import javafx.scene.control.ComboBox;
-import javafx.scene.control.Label;
-import javafx.scene.control.RadioButton;
-import javafx.scene.control.TextField;
-import javafx.scene.control.ToggleGroup;
-import javafx.scene.control.Tooltip;
-import javafx.scene.layout.GridPane;
-
-import org.jabref.gui.DialogService;
-import org.jabref.gui.undo.NamedCompound;
-import org.jabref.gui.undo.UndoableFieldChange;
-import org.jabref.gui.util.BaseDialog;
-import org.jabref.gui.util.IconValidationDecorator;
-import org.jabref.logic.l10n.Localization;
-import org.jabref.model.database.BibDatabaseContext;
-import org.jabref.model.entry.BibEntry;
-import org.jabref.model.entry.field.Field;
-import org.jabref.model.entry.field.FieldFactory;
-import org.jabref.model.strings.StringUtil;
-
-import de.saxsys.mvvmfx.utils.validation.FunctionBasedValidator;
-import de.saxsys.mvvmfx.utils.validation.Severity;
-import de.saxsys.mvvmfx.utils.validation.ValidationMessage;
-import de.saxsys.mvvmfx.utils.validation.Validator;
-import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
-
-public class MassSetFieldsDialog extends BaseDialog<Void> {
-
-    private final List<BibEntry> entries;
-    private final BibDatabaseContext database;
-    private final DialogService dialogService;
-
-    private RadioButton clearRadioButton;
-    private RadioButton setRadioButton;
-    private RadioButton appendRadioButton;
-    private RadioButton renameRadioButton;
-    private ComboBox<String> fieldComboBox;
-    private TextField setTextField;
-    private TextField appendTextField;
-    private TextField renameTextField;
-    private CheckBox overwriteCheckBox;
-    private UndoManager undoManager;
-
-    MassSetFieldsDialog(List<BibEntry> entries, BibDatabaseContext database, DialogService dialogService, UndoManager undoManager) {
-        this.entries = entries;
-        this.database = database;
-        this.dialogService = dialogService;
-        this.undoManager = undoManager;
-
-        init();
-        this.setTitle(Localization.lang("Manage field names & content"));
-        this.getDialogPane().getButtonTypes().addAll(ButtonType.OK, ButtonType.CANCEL);
-        this.setResultConverter(button -> {
-            if (button == ButtonType.OK) {
-                performEdits();
-            }
-            return null;
-        });
-    }
-
-    /**
-     * Append a given value to a given field for all entries in a Collection. This method DOES NOT update any UndoManager,
-     * but returns a relevant CompoundEdit that should be registered by the caller.
-     *
-     * @param entries      The entries to process the operation for.
-     * @param field        The name of the field to append to.
-     * @param textToAppend The value to set. A null in this case will simply preserve the current field state.
-     * @return A CompoundEdit for the entire operation.
-     */
-    private static UndoableEdit massAppendField(Collection<BibEntry> entries, Field field, String textToAppend) {
-        String newValue = "";
-
-        if (textToAppend != null) {
-            newValue = textToAppend;
-        }
-
-        NamedCompound compoundEdit = new NamedCompound(Localization.lang("Append field"));
-        for (BibEntry entry : entries) {
-            Optional<String> oldValue = entry.getField(field);
-            entry.setField(field, oldValue.orElse("") + newValue);
-            compoundEdit.addEdit(new UndoableFieldChange(entry, field, oldValue.orElse(null), newValue));
-        }
-        compoundEdit.end();
-        return compoundEdit;
-    }
-
-    /**
-     * Move contents from one field to another for a Collection of entries.
-     *
-     * @param entries         The entries to do this operation for.
-     * @param field           The field to move contents from.
-     * @param newField        The field to move contents into.
-     * @param overwriteValues If true, overwrites any existing values in the new field. If false, makes no change for
-     *                        entries with existing value in the new field.
-     * @return A CompoundEdit for the entire operation.
-     */
-    private static UndoableEdit massRenameField(Collection<BibEntry> entries, Field field, Field newField,
-                                                boolean overwriteValues) {
-        NamedCompound compoundEdit = new NamedCompound(Localization.lang("Rename field"));
-        for (BibEntry entry : entries) {
-            Optional<String> valToMove = entry.getField(field);
-            // If there is no value, do nothing:
-            if ((!valToMove.isPresent()) || valToMove.get().isEmpty()) {
-                continue;
-            }
-            // If we are not allowed to overwrite values, check if there is a
-            // non-empty value already for this entry for the new field:
-            Optional<String> valInNewField = entry.getField(newField);
-            if (!overwriteValues && (valInNewField.isPresent()) && !valInNewField.get().isEmpty()) {
-                continue;
-            }
-
-            entry.setField(newField, valToMove.get());
-            compoundEdit.addEdit(new UndoableFieldChange(entry, newField, valInNewField.orElse(null), valToMove.get()));
-            entry.clearField(field);
-            compoundEdit.addEdit(new UndoableFieldChange(entry, field, valToMove.get(), null));
-        }
-        compoundEdit.end();
-        return compoundEdit;
-    }
-
-    /**
-     * Set a given field to a given value for all entries in a Collection. This method DOES NOT update any UndoManager,
-     * but returns a relevant CompoundEdit that should be registered by the caller.
-     *
-     * @param entries         The entries to set the field for.
-     * @param field           The name of the field to set.
-     * @param textToSet       The value to set. This value can be null, indicating that the field should be cleared.
-     * @param overwriteValues Indicate whether the value should be set even if an entry already has the field set.
-     * @return A CompoundEdit for the entire operation.
-     */
-    private static UndoableEdit massSetField(Collection<BibEntry> entries, Field field, String textToSet,
-                                             boolean overwriteValues) {
-        NamedCompound compoundEdit = new NamedCompound(Localization.lang("Set field"));
-        for (BibEntry entry : entries) {
-            Optional<String> oldValue = entry.getField(field);
-            // If we are not allowed to overwrite values, check if there is a
-            // nonempty
-            // value already for this entry:
-            if (!overwriteValues && (oldValue.isPresent()) && !oldValue.get().isEmpty()) {
-                continue;
-            }
-            if (textToSet == null) {
-                entry.clearField(field);
-            } else {
-                entry.setField(field, textToSet);
-            }
-            compoundEdit.addEdit(new UndoableFieldChange(entry, field, oldValue.orElse(null), textToSet));
-        }
-        compoundEdit.end();
-        return compoundEdit;
-    }
-
-    private void init() {
-        fieldComboBox = new ComboBox<>();
-        fieldComboBox.setEditable(true);
-        fieldComboBox.getItems().addAll(database.getDatabase().getAllVisibleFields().stream().map(Field::getName).collect(Collectors.toSet()));
-
-        ToggleGroup toggleGroup = new ToggleGroup();
-        clearRadioButton = new RadioButton(Localization.lang("Clear fields"));
-        clearRadioButton.setToggleGroup(toggleGroup);
-        renameRadioButton = new RadioButton(Localization.lang("Rename field to") + ":");
-        renameRadioButton.setTooltip(new Tooltip(Localization.lang("Move contents of a field into a field with a different name")));
-        renameRadioButton.setToggleGroup(toggleGroup);
-        setRadioButton = new RadioButton(Localization.lang("Set fields") + ":");
-        setRadioButton.setToggleGroup(toggleGroup);
-        appendRadioButton = new RadioButton(Localization.lang("Append to fields") + ":");
-        appendRadioButton.setToggleGroup(toggleGroup);
-
-        setTextField = new TextField();
-        setTextField.disableProperty().bind(setRadioButton.selectedProperty().not());
-        appendTextField = new TextField();
-        appendTextField.disableProperty().bind(appendRadioButton.selectedProperty().not());
-        renameTextField = new TextField();
-        renameTextField.disableProperty().bind(renameRadioButton.selectedProperty().not());
-
-        overwriteCheckBox = new CheckBox(Localization.lang("Overwrite existing field values"));
-
-        GridPane main = new GridPane();
-        main.add(new Label(Localization.lang("Field name")), 0, 0);
-        main.add(fieldComboBox, 1, 0);
-        main.add(setRadioButton, 0, 2);
-        main.add(setTextField, 1, 2);
-        main.add(appendRadioButton, 0, 3);
-        main.add(appendTextField, 1, 3);
-        main.add(renameRadioButton, 0, 4);
-        main.add(renameTextField, 1, 4);
-        main.add(clearRadioButton, 0, 5);
-        main.add(overwriteCheckBox, 0, 7);
-
-        main.setPadding(new Insets(15, 15, 0, 15));
-        main.setGridLinesVisible(false);
-        main.setVgap(4);
-        main.setHgap(10);
-        getDialogPane().setContent(main);
-
-        Validator fieldNameValidator = new FunctionBasedValidator<>(
-                fieldComboBox.valueProperty(),
-                StringUtil::isNotBlank,
-                new ValidationMessage(Severity.ERROR, Localization.lang("You must enter at least one field name"))
-        );
-        Platform.runLater(() -> {
-            // Need to run this async, otherwise the dialog does not work
-            ControlsFxVisualizer visualizer = new ControlsFxVisualizer();
-            visualizer.setDecoration(new IconValidationDecorator());
-            visualizer.initVisualization(fieldNameValidator.getValidationStatus(), fieldComboBox, true);
-        });
-    }
-
-    private void performEdits() {
-        String toSet = setTextField.getText();
-        if (toSet.isEmpty()) {
-            toSet = null;
-        }
-
-        Field field = FieldFactory.parseField(fieldComboBox.getValue());
-
-        NamedCompound compoundEdit = new NamedCompound(Localization.lang("Set field"));
-        if (renameRadioButton.isSelected()) {
-            compoundEdit.addEdit(massRenameField(entries, field, FieldFactory.parseField(renameTextField.getText()), overwriteCheckBox.isSelected()));
-        } else if (appendRadioButton.isSelected()) {
-            compoundEdit.addEdit(massAppendField(entries, field, appendTextField.getText()));
-        } else {
-            compoundEdit.addEdit(massSetField(entries, field,
-                    setRadioButton.isSelected() ? toSet : null,
-                    overwriteCheckBox.isSelected()));
-        }
-        compoundEdit.end();
-        undoManager.addEdit(compoundEdit);
-    }
-}
diff --git a/src/main/java/org/jabref/gui/edit/OpenBrowserAction.java b/src/main/java/org/jabref/gui/edit/OpenBrowserAction.java
index 503f0711b3c..c6eb7653ae8 100644
--- a/src/main/java/org/jabref/gui/edit/OpenBrowserAction.java
+++ b/src/main/java/org/jabref/gui/edit/OpenBrowserAction.java
@@ -1,18 +1,21 @@
 package org.jabref.gui.edit;
 
+import org.jabref.gui.DialogService;
 import org.jabref.gui.actions.SimpleCommand;
 import org.jabref.gui.desktop.JabRefDesktop;
 
 public class OpenBrowserAction extends SimpleCommand {
 
     private final String urlToOpen;
+    private final DialogService dialogService;
 
-    public OpenBrowserAction(String urlToOpen) {
+    public OpenBrowserAction(String urlToOpen, DialogService dialogService) {
         this.urlToOpen = urlToOpen;
+        this.dialogService = dialogService;
     }
 
     @Override
     public void execute() {
-        JabRefDesktop.openBrowserShowPopup(urlToOpen);
+        JabRefDesktop.openBrowserShowPopup(urlToOpen, dialogService);
     }
 }
diff --git a/src/main/java/org/jabref/gui/edit/automaticfiededitor/AbstractAutomaticFieldEditorTabView.java b/src/main/java/org/jabref/gui/edit/automaticfiededitor/AbstractAutomaticFieldEditorTabView.java
new file mode 100644
index 00000000000..2954b013f68
--- /dev/null
+++ b/src/main/java/org/jabref/gui/edit/automaticfiededitor/AbstractAutomaticFieldEditorTabView.java
@@ -0,0 +1,11 @@
+package org.jabref.gui.edit.automaticfiededitor;
+
+import javafx.scene.layout.AnchorPane;
+
+public abstract class AbstractAutomaticFieldEditorTabView extends AnchorPane implements AutomaticFieldEditorTab {
+
+    @Override
+    public AnchorPane getContent() {
+        return this;
+    }
+}
diff --git a/src/main/java/org/jabref/gui/edit/automaticfiededitor/AbstractAutomaticFieldEditorTabViewModel.java b/src/main/java/org/jabref/gui/edit/automaticfiededitor/AbstractAutomaticFieldEditorTabViewModel.java
new file mode 100644
index 00000000000..fe6e60fee01
--- /dev/null
+++ b/src/main/java/org/jabref/gui/edit/automaticfiededitor/AbstractAutomaticFieldEditorTabViewModel.java
@@ -0,0 +1,48 @@
+package org.jabref.gui.edit.automaticfiededitor;
+
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.EnumSet;
+import java.util.HashSet;
+import java.util.Objects;
+import java.util.Set;
+
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+
+import org.jabref.gui.AbstractViewModel;
+import org.jabref.gui.StateManager;
+import org.jabref.model.database.BibDatabase;
+import org.jabref.model.entry.field.Field;
+import org.jabref.model.entry.field.StandardField;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public abstract class AbstractAutomaticFieldEditorTabViewModel extends AbstractViewModel {
+    public static final Logger LOGGER = LoggerFactory.getLogger(AbstractAutomaticFieldEditorTabViewModel.class);
+
+    protected final StateManager stateManager;
+
+    private final ObservableList<Field> allFields = FXCollections.observableArrayList();
+
+    public AbstractAutomaticFieldEditorTabViewModel(BibDatabase bibDatabase, StateManager stateManager) {
+        Objects.requireNonNull(bibDatabase);
+        Objects.requireNonNull(stateManager);
+        this.stateManager = stateManager;
+
+        addFields(EnumSet.allOf(StandardField.class));
+        addFields(bibDatabase.getAllVisibleFields());
+        allFields.sort(Comparator.comparing(Field::getName));
+    }
+
+    public ObservableList<Field> getAllFields() {
+        return allFields;
+    }
+
+    private void addFields(Collection<? extends Field> fields) {
+        Set<Field> fieldsSet = new HashSet<>(allFields);
+        fieldsSet.addAll(fields);
+        allFields.setAll(fieldsSet);
+    }
+}
diff --git a/src/main/java/org/jabref/gui/edit/automaticfiededitor/AutomaticFieldEditorAction.java b/src/main/java/org/jabref/gui/edit/automaticfiededitor/AutomaticFieldEditorAction.java
new file mode 100644
index 00000000000..904762ca02a
--- /dev/null
+++ b/src/main/java/org/jabref/gui/edit/automaticfiededitor/AutomaticFieldEditorAction.java
@@ -0,0 +1,25 @@
+package org.jabref.gui.edit.automaticfiededitor;
+
+import org.jabref.gui.DialogService;
+import org.jabref.gui.StateManager;
+import org.jabref.gui.actions.SimpleCommand;
+
+import static org.jabref.gui.actions.ActionHelper.needsDatabase;
+import static org.jabref.gui.actions.ActionHelper.needsEntriesSelected;
+
+public class AutomaticFieldEditorAction extends SimpleCommand {
+    private final StateManager stateManager;
+    private final DialogService dialogService;
+
+    public AutomaticFieldEditorAction(StateManager stateManager, DialogService dialogService) {
+        this.stateManager = stateManager;
+        this.dialogService = dialogService;
+
+        this.executable.bind(needsDatabase(stateManager).and(needsEntriesSelected(stateManager)));
+    }
+
+    @Override
+    public void execute() {
+        dialogService.showCustomDialogAndWait(new AutomaticFieldEditorDialog(stateManager));
+    }
+}
diff --git a/src/main/java/org/jabref/gui/edit/automaticfiededitor/AutomaticFieldEditorDialog.fxml b/src/main/java/org/jabref/gui/edit/automaticfiededitor/AutomaticFieldEditorDialog.fxml
new file mode 100644
index 00000000000..a909b45d522
--- /dev/null
+++ b/src/main/java/org/jabref/gui/edit/automaticfiededitor/AutomaticFieldEditorDialog.fxml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.ButtonType?>
+<?import javafx.scene.control.DialogPane?>
+<?import javafx.scene.control.TabPane?>
+<DialogPane xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml"
+            fx:controller="org.jabref.gui.edit.automaticfiededitor.AutomaticFieldEditorDialog"
+            prefHeight="400.0" prefWidth="600.0">
+    <content>
+        <TabPane fx:id="tabPane" tabClosingPolicy="UNAVAILABLE"/>
+    </content>
+    <ButtonType fx:id="saveButton" text="%Keep Modifications" buttonData="OK_DONE"/>
+    <ButtonType fx:constant="CANCEL"/>
+</DialogPane>
diff --git a/src/main/java/org/jabref/gui/edit/automaticfiededitor/AutomaticFieldEditorDialog.java b/src/main/java/org/jabref/gui/edit/automaticfiededitor/AutomaticFieldEditorDialog.java
new file mode 100644
index 00000000000..9f6a4663d9d
--- /dev/null
+++ b/src/main/java/org/jabref/gui/edit/automaticfiededitor/AutomaticFieldEditorDialog.java
@@ -0,0 +1,100 @@
+package org.jabref.gui.edit.automaticfiededitor;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.swing.undo.CannotUndoException;
+import javax.swing.undo.UndoManager;
+
+import javafx.fxml.FXML;
+import javafx.scene.control.ButtonBar;
+import javafx.scene.control.Tab;
+import javafx.scene.control.TabPane;
+
+import org.jabref.gui.Globals;
+import org.jabref.gui.StateManager;
+import org.jabref.gui.util.BaseDialog;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.model.database.BibDatabase;
+import org.jabref.model.entry.BibEntry;
+
+import com.airhacks.afterburner.views.ViewLoader;
+import com.tobiasdiez.easybind.EasyBind;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class AutomaticFieldEditorDialog extends BaseDialog<String> {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(AutomaticFieldEditorDialog.class);
+
+    @FXML
+    private TabPane tabPane;
+
+    private final UndoManager undoManager;
+
+    private final BibDatabase database;
+    private final List<BibEntry> selectedEntries;
+
+    private final StateManager stateManager;
+
+    private AutomaticFieldEditorViewModel viewModel;
+
+    private List<NotificationPaneAdapter> notificationPanes = new ArrayList<>();
+
+    public AutomaticFieldEditorDialog(StateManager stateManager) {
+        this.selectedEntries = stateManager.getSelectedEntries();
+        this.database = stateManager.getActiveDatabase().orElseThrow().getDatabase();
+        this.stateManager = stateManager;
+        this.undoManager = Globals.undoManager;
+
+        this.setTitle(Localization.lang("Automatic field editor"));
+
+        ViewLoader.view(this)
+                  .load()
+                  .setAsDialogPane(this);
+
+        setResultConverter(buttonType -> {
+            if (buttonType != null && buttonType.getButtonData() == ButtonBar.ButtonData.OK_DONE) {
+                saveChanges();
+            } else {
+                cancelChanges();
+            }
+            return "";
+        });
+
+        // This will prevent all dialog buttons from having the same size
+        // Read more: https://stackoverflow.com/questions/45866249/javafx-8-alert-different-button-sizes
+        getDialogPane().getButtonTypes().stream()
+            .map(getDialogPane()::lookupButton)
+            .forEach(btn-> ButtonBar.setButtonUniformSize(btn, false));
+    }
+
+    @FXML
+    public void initialize() {
+        viewModel = new AutomaticFieldEditorViewModel(selectedEntries, database, undoManager, stateManager);
+
+        for (AutomaticFieldEditorTab tabModel : viewModel.getFieldEditorTabs()) {
+            NotificationPaneAdapter notificationPane = new NotificationPaneAdapter(tabModel.getContent());
+            notificationPanes.add(notificationPane);
+            tabPane.getTabs().add(new Tab(tabModel.getTabName(), notificationPane));
+        }
+
+        EasyBind.listen(stateManager.lastAutomaticFieldEditorEditProperty(), (obs, old, lastEdit) -> {
+            viewModel.getDialogEdits().addEdit(lastEdit.getEdit());
+            notificationPanes.get(lastEdit.getTabIndex())
+                             .notify(lastEdit.getAffectedEntries(), selectedEntries.size());
+        });
+    }
+
+    private void saveChanges() {
+        viewModel.saveChanges();
+    }
+
+    private void cancelChanges() {
+        try {
+            viewModel.cancelChanges();
+        } catch (CannotUndoException e) {
+            LOGGER.info("Could not undo", e);
+        }
+    }
+}
diff --git a/src/main/java/org/jabref/gui/edit/automaticfiededitor/AutomaticFieldEditorTab.java b/src/main/java/org/jabref/gui/edit/automaticfiededitor/AutomaticFieldEditorTab.java
new file mode 100644
index 00000000000..7863422deff
--- /dev/null
+++ b/src/main/java/org/jabref/gui/edit/automaticfiededitor/AutomaticFieldEditorTab.java
@@ -0,0 +1,9 @@
+package org.jabref.gui.edit.automaticfiededitor;
+
+import javafx.scene.layout.Pane;
+
+public interface AutomaticFieldEditorTab {
+    Pane getContent();
+
+    String getTabName();
+}
diff --git a/src/main/java/org/jabref/gui/edit/automaticfiededitor/AutomaticFieldEditorViewModel.java b/src/main/java/org/jabref/gui/edit/automaticfiededitor/AutomaticFieldEditorViewModel.java
new file mode 100644
index 00000000000..3f517a1dabd
--- /dev/null
+++ b/src/main/java/org/jabref/gui/edit/automaticfiededitor/AutomaticFieldEditorViewModel.java
@@ -0,0 +1,52 @@
+package org.jabref.gui.edit.automaticfiededitor;
+
+import java.util.List;
+
+import javax.swing.undo.UndoManager;
+
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+
+import org.jabref.gui.AbstractViewModel;
+import org.jabref.gui.StateManager;
+import org.jabref.gui.edit.automaticfiededitor.copyormovecontent.CopyOrMoveFieldContentTabView;
+import org.jabref.gui.edit.automaticfiededitor.editfieldcontent.EditFieldContentTabView;
+import org.jabref.gui.edit.automaticfiededitor.renamefield.RenameFieldTabView;
+import org.jabref.gui.undo.NamedCompound;
+import org.jabref.model.database.BibDatabase;
+import org.jabref.model.entry.BibEntry;
+
+public class AutomaticFieldEditorViewModel extends AbstractViewModel {
+    public static final String NAMED_COMPOUND_EDITS = "EDIT_FIELDS";
+    private final ObservableList<AutomaticFieldEditorTab> fieldEditorTabs = FXCollections.observableArrayList();
+    private final NamedCompound dialogEdits = new NamedCompound(NAMED_COMPOUND_EDITS);
+
+    private final UndoManager undoManager;
+
+    public AutomaticFieldEditorViewModel(List<BibEntry> selectedEntries, BibDatabase database, UndoManager undoManager, StateManager stateManager) {
+        this.undoManager = undoManager;
+        fieldEditorTabs.addAll(
+                new EditFieldContentTabView(database, stateManager),
+                new CopyOrMoveFieldContentTabView(database, stateManager),
+                new RenameFieldTabView(database, stateManager)
+        );
+    }
+
+    public NamedCompound getDialogEdits() {
+        return dialogEdits;
+    }
+
+    public ObservableList<AutomaticFieldEditorTab> getFieldEditorTabs() {
+        return fieldEditorTabs;
+    }
+
+    public void saveChanges() {
+        dialogEdits.end();
+        undoManager.addEdit(dialogEdits);
+    }
+
+    public void cancelChanges() {
+        dialogEdits.end();
+        dialogEdits.undo();
+    }
+}
diff --git a/src/main/java/org/jabref/gui/edit/automaticfiededitor/LastAutomaticFieldEditorEdit.java b/src/main/java/org/jabref/gui/edit/automaticfiededitor/LastAutomaticFieldEditorEdit.java
new file mode 100644
index 00000000000..a1263576608
--- /dev/null
+++ b/src/main/java/org/jabref/gui/edit/automaticfiededitor/LastAutomaticFieldEditorEdit.java
@@ -0,0 +1,44 @@
+package org.jabref.gui.edit.automaticfiededitor;
+
+import javax.swing.undo.AbstractUndoableEdit;
+import javax.swing.undo.CannotRedoException;
+import javax.swing.undo.CannotUndoException;
+
+import org.jabref.gui.undo.NamedCompound;
+
+public class LastAutomaticFieldEditorEdit extends AbstractUndoableEdit {
+    private final Integer affectedEntries;
+    private final NamedCompound edit;
+
+    private final Integer tabIndex;
+
+    public LastAutomaticFieldEditorEdit(Integer affectedEntries, Integer tabIndex, NamedCompound edit) {
+        this.affectedEntries = affectedEntries;
+        this.edit = edit;
+        this.tabIndex = tabIndex;
+    }
+
+    public Integer getAffectedEntries() {
+        return affectedEntries;
+    }
+
+    public NamedCompound getEdit() {
+        return edit;
+    }
+
+    public Integer getTabIndex() {
+        return tabIndex;
+    }
+
+    @Override
+    public void undo() throws CannotUndoException {
+        super.undo();
+        edit.undo();
+    }
+
+    @Override
+    public void redo() throws CannotRedoException {
+        super.redo();
+        edit.redo();
+    }
+}
diff --git a/src/main/java/org/jabref/gui/edit/automaticfiededitor/MoveFieldValueAction.java b/src/main/java/org/jabref/gui/edit/automaticfiededitor/MoveFieldValueAction.java
new file mode 100644
index 00000000000..660c2f8454b
--- /dev/null
+++ b/src/main/java/org/jabref/gui/edit/automaticfiededitor/MoveFieldValueAction.java
@@ -0,0 +1,63 @@
+package org.jabref.gui.edit.automaticfiededitor;
+
+import java.util.List;
+
+import org.jabref.gui.actions.SimpleCommand;
+import org.jabref.gui.undo.NamedCompound;
+import org.jabref.gui.undo.UndoableFieldChange;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.field.Field;
+import org.jabref.model.strings.StringUtil;
+
+public class MoveFieldValueAction extends SimpleCommand {
+    private final Field fromField;
+    private final Field toField;
+    private final List<BibEntry> entries;
+
+    private final NamedCompound edits;
+
+    private int affectedEntriesCount;
+
+    private final boolean overwriteToFieldContent;
+
+    public MoveFieldValueAction(Field fromField, Field toField, List<BibEntry> entries, NamedCompound edits, boolean overwriteToFieldContent) {
+        this.fromField = fromField;
+        this.toField = toField;
+        this.entries = entries;
+        this.edits = edits;
+        this.overwriteToFieldContent = overwriteToFieldContent;
+    }
+
+    public MoveFieldValueAction(Field fromField, Field toField, List<BibEntry> entries, NamedCompound edits) {
+        this(fromField, toField, entries, edits, true);
+    }
+
+    @Override
+    public void execute() {
+        affectedEntriesCount = 0;
+        for (BibEntry entry : entries) {
+            String fromFieldValue = entry.getField(fromField).orElse("");
+            String toFieldValue = entry.getField(toField).orElse("");
+            if (StringUtil.isNotBlank(fromFieldValue)) {
+                if (overwriteToFieldContent || toFieldValue.isEmpty()) {
+                    entry.setField(toField, fromFieldValue);
+                    entry.setField(fromField, "");
+
+                    edits.addEdit(new UndoableFieldChange(entry, fromField, fromFieldValue, null));
+                    edits.addEdit(new UndoableFieldChange(entry, toField, toFieldValue, fromFieldValue));
+                    affectedEntriesCount++;
+                }
+            }
+        }
+
+        edits.end();
+    }
+
+    /**
+     * @return the number of affected entries
+     * */
+    public int executeAndGetAffectedEntriesCount() {
+        execute();
+        return affectedEntriesCount;
+    }
+}
diff --git a/src/main/java/org/jabref/gui/edit/automaticfiededitor/NotificationPaneAdapter.java b/src/main/java/org/jabref/gui/edit/automaticfiededitor/NotificationPaneAdapter.java
new file mode 100644
index 00000000000..4fc8b9d8b63
--- /dev/null
+++ b/src/main/java/org/jabref/gui/edit/automaticfiededitor/NotificationPaneAdapter.java
@@ -0,0 +1,23 @@
+package org.jabref.gui.edit.automaticfiededitor;
+
+import java.util.Collections;
+
+import javafx.scene.Node;
+import javafx.util.Duration;
+
+import org.jabref.gui.LibraryTab;
+import org.jabref.gui.icon.IconTheme;
+
+public class NotificationPaneAdapter extends LibraryTab.DatabaseNotification {
+
+    public NotificationPaneAdapter(Node content) {
+        super(content);
+    }
+
+    public void notify(int affectedEntries, int totalEntries) {
+        String notificationMessage = String.format("%d/%d affected entries", affectedEntries, totalEntries);
+        Node notificationGraphic = IconTheme.JabRefIcons.INTEGRITY_INFO.getGraphicNode();
+
+        notify(notificationGraphic, notificationMessage, Collections.emptyList(), Duration.seconds(2));
+    }
+}
diff --git a/src/main/java/org/jabref/gui/edit/automaticfiededitor/copyormovecontent/CopyOrMoveFieldContentTab.fxml b/src/main/java/org/jabref/gui/edit/automaticfiededitor/copyormovecontent/CopyOrMoveFieldContentTab.fxml
new file mode 100644
index 00000000000..1302a550b17
--- /dev/null
+++ b/src/main/java/org/jabref/gui/edit/automaticfiededitor/copyormovecontent/CopyOrMoveFieldContentTab.fxml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.CheckBox?>
+<?import javafx.scene.control.ComboBox?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.ColumnConstraints?>
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.RowConstraints?>
+
+<fx:root prefHeight="400.0" prefWidth="600.0" type="AnchorPane" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.edit.automaticfiededitor.copyormovecontent.CopyOrMoveFieldContentTabView">
+    <children>
+          <GridPane hgap="8.0" layoutX="16.0" layoutY="246.0" minHeight="160.0" prefHeight="230.0" prefWidth="568.0" vgap="8.0" AnchorPane.leftAnchor="16.0" AnchorPane.rightAnchor="16.0" AnchorPane.topAnchor="8.0">
+              <columnConstraints>
+                  <ColumnConstraints hgrow="SOMETIMES" maxWidth="379.20001220703125" minWidth="40.0" prefWidth="65.00001220703125" />
+                  <ColumnConstraints hgrow="SOMETIMES" maxWidth="726.3999938964844" minWidth="10.0" prefWidth="324.1999877929687" />
+            <ColumnConstraints hgrow="SOMETIMES" maxWidth="726.3999938964844" minWidth="10.0" prefWidth="206.5999877929687" />
+              </columnConstraints>
+              <rowConstraints>
+            <RowConstraints maxHeight="35.200015258789065" minHeight="10.0" prefHeight="20.800006103515624" vgrow="SOMETIMES" />
+            <RowConstraints maxHeight="33.000008010864256" minHeight="8.999984741210938" prefHeight="23.39999389648438" vgrow="SOMETIMES" />
+                  <RowConstraints maxHeight="33.000008010864256" minHeight="10.0" prefHeight="26.60001220703125" vgrow="SOMETIMES" />
+                  <RowConstraints maxHeight="35.99998168945312" minHeight="10.0" prefHeight="35.99998168945312" vgrow="SOMETIMES" />
+                  <RowConstraints maxHeight="25.600012207031256" minHeight="10.0" prefHeight="23.20001831054688" vgrow="SOMETIMES" />
+                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+              </rowConstraints>
+              <children>
+                  <Label prefHeight="19.0" prefWidth="48.0" text="%From" GridPane.rowIndex="2" />
+                  <Label text="%To" GridPane.rowIndex="3" />
+                  <ComboBox fx:id="fromFieldComboBox" editable="true" minWidth="-Infinity" prefHeight="32.0" prefWidth="150.0" GridPane.columnIndex="1" GridPane.hgrow="NEVER" GridPane.rowIndex="2" GridPane.vgrow="NEVER" />
+                  <ComboBox fx:id="toFieldComboBox" editable="true" minWidth="-Infinity" prefHeight="32.0" prefWidth="150.0" GridPane.columnIndex="1" GridPane.rowIndex="3" />
+                  <CheckBox fx:id="overwriteFieldContentCheckBox"
+                            mnemonicParsing="false" prefHeight="19.0" prefWidth="210.0" text="%Overwrite field content" GridPane.columnSpan="2147483647" GridPane.rowIndex="4" />
+                  <HBox maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" spacing="8.0" GridPane.columnSpan="2147483647" GridPane.rowIndex="5">
+                      <children>
+                          <Button fx:id="copyContentButton"
+                                  mnemonicParsing="false" onAction="#copyContent" text="%Copy content" />
+                          <Button fx:id="moveContentButton"
+                                  mnemonicParsing="false" onAction="#moveContent" text="%Move content" />
+                          <Button fx:id="swapContentButton"
+                                  mnemonicParsing="false" onAction="#swapContent" text="%Swap content" />
+                      </children>
+                  </HBox>
+            <HBox alignment="CENTER_LEFT" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" GridPane.columnSpan="3" GridPane.rowSpan="2">
+               <children>
+                      <Label alignment="BOTTOM_LEFT" minHeight="-Infinity" minWidth="-Infinity" styleClass="sectionHeader" text="%Copy or move the content of one field to another">
+                     <HBox.margin>
+                        <Insets bottom="10.0" />
+                     </HBox.margin>
+                      </Label>
+               </children>
+               <GridPane.margin>
+                  <Insets />
+               </GridPane.margin>
+            </HBox>
+              </children>
+          </GridPane>
+    </children>
+</fx:root>
diff --git a/src/main/java/org/jabref/gui/edit/automaticfiededitor/copyormovecontent/CopyOrMoveFieldContentTabView.java b/src/main/java/org/jabref/gui/edit/automaticfiededitor/copyormovecontent/CopyOrMoveFieldContentTabView.java
new file mode 100644
index 00000000000..af742e708c4
--- /dev/null
+++ b/src/main/java/org/jabref/gui/edit/automaticfiededitor/copyormovecontent/CopyOrMoveFieldContentTabView.java
@@ -0,0 +1,109 @@
+package org.jabref.gui.edit.automaticfiededitor.copyormovecontent;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javafx.application.Platform;
+import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+import javafx.scene.control.CheckBox;
+import javafx.scene.control.ComboBox;
+
+import org.jabref.gui.StateManager;
+import org.jabref.gui.edit.automaticfiededitor.AbstractAutomaticFieldEditorTabView;
+import org.jabref.gui.edit.automaticfiededitor.AutomaticFieldEditorTab;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.model.database.BibDatabase;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.field.Field;
+
+import com.airhacks.afterburner.views.ViewLoader;
+import com.tobiasdiez.easybind.EasyBind;
+import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
+
+import static org.jabref.gui.customentrytypes.CustomEntryTypeDialogViewModel.FIELD_STRING_CONVERTER;
+
+public class CopyOrMoveFieldContentTabView extends AbstractAutomaticFieldEditorTabView implements AutomaticFieldEditorTab {
+    public Button copyContentButton;
+    @FXML
+    private Button moveContentButton;
+
+    @FXML
+    private Button swapContentButton;
+
+    @FXML
+    private ComboBox<Field> fromFieldComboBox;
+    @FXML
+    private ComboBox<Field> toFieldComboBox;
+
+    @FXML
+    private CheckBox overwriteFieldContentCheckBox;
+
+    private CopyOrMoveFieldContentTabViewModel viewModel;
+    private final List<BibEntry> selectedEntries;
+    private final BibDatabase database;
+    private final StateManager stateManager;
+
+    private final ControlsFxVisualizer visualizer = new ControlsFxVisualizer();
+
+    public CopyOrMoveFieldContentTabView(BibDatabase database, StateManager stateManager) {
+        this.selectedEntries = new ArrayList<>(stateManager.getSelectedEntries());
+        this.database = database;
+        this.stateManager = stateManager;
+
+        ViewLoader.view(this)
+                  .root(this)
+                  .load();
+    }
+
+    public void initialize() {
+        viewModel = new CopyOrMoveFieldContentTabViewModel(selectedEntries, database, stateManager);
+        initializeFromAndToComboBox();
+
+        viewModel.overwriteFieldContentProperty().bindBidirectional(overwriteFieldContentCheckBox.selectedProperty());
+
+        moveContentButton.disableProperty().bind(viewModel.canMoveProperty().not());
+        swapContentButton.disableProperty().bind(viewModel.canSwapProperty().not());
+        copyContentButton.disableProperty().bind(viewModel.toFieldValidationStatus().validProperty().not());
+        overwriteFieldContentCheckBox.disableProperty().bind(viewModel.toFieldValidationStatus().validProperty().not());
+
+        Platform.runLater(() -> {
+            visualizer.initVisualization(viewModel.toFieldValidationStatus(), toFieldComboBox, true);
+        });
+    }
+
+    private void initializeFromAndToComboBox() {
+        fromFieldComboBox.getItems().setAll(viewModel.getAllFields());
+        toFieldComboBox.getItems().setAll(viewModel.getAllFields());
+
+        fromFieldComboBox.setConverter(FIELD_STRING_CONVERTER);
+
+        toFieldComboBox.setConverter(FIELD_STRING_CONVERTER);
+
+        fromFieldComboBox.valueProperty().bindBidirectional(viewModel.fromFieldProperty());
+        toFieldComboBox.valueProperty().bindBidirectional(viewModel.toFieldProperty());
+
+        EasyBind.listen(fromFieldComboBox.getEditor().textProperty(), observable -> fromFieldComboBox.commitValue());
+        EasyBind.listen(toFieldComboBox.getEditor().textProperty(), observable -> toFieldComboBox.commitValue());
+    }
+
+    @Override
+    public String getTabName() {
+        return Localization.lang("Copy or Move content");
+    }
+
+    @FXML
+    void copyContent() {
+        viewModel.copyValue();
+    }
+
+    @FXML
+    void moveContent() {
+        viewModel.moveValue();
+    }
+
+    @FXML
+    void swapContent() {
+        viewModel.swapValues();
+    }
+}
diff --git a/src/main/java/org/jabref/gui/edit/automaticfiededitor/copyormovecontent/CopyOrMoveFieldContentTabViewModel.java b/src/main/java/org/jabref/gui/edit/automaticfiededitor/copyormovecontent/CopyOrMoveFieldContentTabViewModel.java
new file mode 100644
index 00000000000..3ed3a1b38ee
--- /dev/null
+++ b/src/main/java/org/jabref/gui/edit/automaticfiededitor/copyormovecontent/CopyOrMoveFieldContentTabViewModel.java
@@ -0,0 +1,183 @@
+package org.jabref.gui.edit.automaticfiededitor.copyormovecontent;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javafx.beans.binding.BooleanBinding;
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.property.SimpleObjectProperty;
+
+import org.jabref.gui.StateManager;
+import org.jabref.gui.edit.automaticfiededitor.AbstractAutomaticFieldEditorTabViewModel;
+import org.jabref.gui.edit.automaticfiededitor.LastAutomaticFieldEditorEdit;
+import org.jabref.gui.edit.automaticfiededitor.MoveFieldValueAction;
+import org.jabref.gui.undo.NamedCompound;
+import org.jabref.gui.undo.UndoableFieldChange;
+import org.jabref.model.database.BibDatabase;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.field.Field;
+import org.jabref.model.entry.field.StandardField;
+import org.jabref.model.strings.StringUtil;
+
+import de.saxsys.mvvmfx.utils.validation.FunctionBasedValidator;
+import de.saxsys.mvvmfx.utils.validation.ValidationMessage;
+import de.saxsys.mvvmfx.utils.validation.ValidationStatus;
+import de.saxsys.mvvmfx.utils.validation.Validator;
+
+public class CopyOrMoveFieldContentTabViewModel extends AbstractAutomaticFieldEditorTabViewModel {
+    public static final int TAB_INDEX = 1;
+    private final ObjectProperty<Field> fromField = new SimpleObjectProperty<>(StandardField.ABSTRACT);
+
+    private final ObjectProperty<Field> toField = new SimpleObjectProperty<>(StandardField.AUTHOR);
+
+    private final BooleanProperty overwriteFieldContent = new SimpleBooleanProperty(Boolean.FALSE);
+    private final List<BibEntry> selectedEntries;
+
+    private final Validator toFieldValidator;
+
+    private final BooleanBinding canMove;
+
+    private final BooleanBinding canSwap;
+
+    public CopyOrMoveFieldContentTabViewModel(List<BibEntry> selectedEntries, BibDatabase bibDatabase, StateManager stateManager) {
+        super(bibDatabase, stateManager);
+        this.selectedEntries = new ArrayList<>(selectedEntries);
+
+        toFieldValidator = new FunctionBasedValidator<>(toField, field -> {
+            if (StringUtil.isBlank(field.getName())) {
+                return ValidationMessage.error("Field name cannot be empty");
+            } else if (StringUtil.containsWhitespace(field.getName())) {
+                return ValidationMessage.error("Field name cannot have whitespace characters");
+            }
+            return null;
+        });
+
+        canMove = BooleanBinding.booleanExpression(toFieldValidationStatus().validProperty())
+                                .and(overwriteFieldContentProperty());
+
+        canSwap = BooleanBinding.booleanExpression(toFieldValidationStatus().validProperty())
+                                .and(overwriteFieldContentProperty());
+    }
+
+    public ValidationStatus toFieldValidationStatus() {
+        return toFieldValidator.getValidationStatus();
+    }
+
+    public BooleanBinding canMoveProperty() {
+        return canMove;
+    }
+
+    public BooleanBinding canSwapProperty() {
+        return canSwap;
+    }
+
+    public Field getFromField() {
+        return fromField.get();
+    }
+
+    public ObjectProperty<Field> fromFieldProperty() {
+        return fromField;
+    }
+
+    public Field getToField() {
+        return toField.get();
+    }
+
+    public ObjectProperty<Field> toFieldProperty() {
+        return toField;
+    }
+
+    public boolean isOverwriteFieldContent() {
+        return overwriteFieldContent.get();
+    }
+
+    public BooleanProperty overwriteFieldContentProperty() {
+        return overwriteFieldContent;
+    }
+
+    public void copyValue() {
+        NamedCompound copyFieldValueEdit = new NamedCompound("COPY_FIELD_VALUE");
+        int affectedEntriesCount = 0;
+        for (BibEntry entry : selectedEntries) {
+            String fromFieldValue = entry.getField(fromField.get()).orElse("");
+            String toFieldValue = entry.getField(toField.get()).orElse("");
+
+            if (overwriteFieldContent.get() || StringUtil.isBlank(toFieldValue)) {
+                if (StringUtil.isNotBlank(fromFieldValue)) {
+                    entry.setField(toField.get(), fromFieldValue);
+                    copyFieldValueEdit.addEdit(new UndoableFieldChange(entry,
+                            toField.get(),
+                            toFieldValue,
+                            fromFieldValue));
+                    affectedEntriesCount++;
+                }
+            }
+        }
+        if (copyFieldValueEdit.hasEdits()) {
+            copyFieldValueEdit.end();
+        }
+        stateManager.setLastAutomaticFieldEditorEdit(new LastAutomaticFieldEditorEdit(
+                affectedEntriesCount, TAB_INDEX, copyFieldValueEdit
+        ));
+    }
+
+    public void moveValue() {
+        NamedCompound moveEdit = new NamedCompound("MOVE_EDIT");
+        int affectedEntriesCount = 0;
+        if (overwriteFieldContent.get()) {
+            affectedEntriesCount = new MoveFieldValueAction(fromField.get(),
+                    toField.get(),
+                    selectedEntries,
+                    moveEdit).executeAndGetAffectedEntriesCount();
+
+            if (moveEdit.hasEdits()) {
+                moveEdit.end();
+            }
+        }
+        stateManager.setLastAutomaticFieldEditorEdit(new LastAutomaticFieldEditorEdit(
+                affectedEntriesCount, TAB_INDEX, moveEdit
+        ));
+    }
+
+    public void swapValues() {
+        NamedCompound swapFieldValuesEdit = new NamedCompound("SWAP_FIELD_VALUES");
+        int affectedEntriesCount = 0;
+        for (BibEntry entry : selectedEntries) {
+            String fromFieldValue = entry.getField(fromField.get()).orElse("");
+            String toFieldValue = entry.getField(toField.get()).orElse("");
+
+            if (overwriteFieldContent.get() && StringUtil.isNotBlank(fromFieldValue) && StringUtil.isNotBlank(toFieldValue)) {
+                entry.setField(toField.get(), fromFieldValue);
+                entry.setField(fromField.get(), toFieldValue);
+
+                swapFieldValuesEdit.addEdit(new UndoableFieldChange(
+                        entry,
+                        toField.get(),
+                        toFieldValue,
+                        fromFieldValue
+                ));
+
+                swapFieldValuesEdit.addEdit(new UndoableFieldChange(
+                        entry,
+                        fromField.get(),
+                        fromFieldValue,
+                        toFieldValue
+                ));
+                affectedEntriesCount++;
+            }
+        }
+
+        if (swapFieldValuesEdit.hasEdits()) {
+            swapFieldValuesEdit.end();
+        }
+        stateManager.setLastAutomaticFieldEditorEdit(new LastAutomaticFieldEditorEdit(
+                affectedEntriesCount, TAB_INDEX, swapFieldValuesEdit
+        ));
+    }
+
+    public List<BibEntry> getSelectedEntries() {
+        return selectedEntries;
+    }
+}
diff --git a/src/main/java/org/jabref/gui/edit/automaticfiededitor/editfieldcontent/EditFieldContentTab.fxml b/src/main/java/org/jabref/gui/edit/automaticfiededitor/editfieldcontent/EditFieldContentTab.fxml
new file mode 100644
index 00000000000..1beac33dd48
--- /dev/null
+++ b/src/main/java/org/jabref/gui/edit/automaticfiededitor/editfieldcontent/EditFieldContentTab.fxml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.CheckBox?>
+<?import javafx.scene.control.ComboBox?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.Separator?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.ColumnConstraints?>
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.RowConstraints?>
+
+
+<?import org.jabref.gui.icon.JabRefIconView?>
+<fx:root prefHeight="400.0" prefWidth="600.0" type="AnchorPane" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.edit.automaticfiededitor.editfieldcontent.EditFieldContentTabView">
+   <children>
+      <GridPane hgap="8.0" prefWidth="568.0" vgap="8.0" AnchorPane.leftAnchor="16.0" AnchorPane.rightAnchor="16.0" AnchorPane.topAnchor="0.0">
+        <columnConstraints>
+          <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+            <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+          <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+        </columnConstraints>
+        <rowConstraints>
+          <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+            <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+          <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+          <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+            <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+            <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+        </rowConstraints>
+         <children>
+            <CheckBox fx:id="overwriteFieldContentCheckBox"
+                      mnemonicParsing="false" text="%Overwrite field content" GridPane.columnSpan="2147483647" GridPane.rowIndex="3">
+               <GridPane.margin>
+                  <Insets left="2.0" />
+               </GridPane.margin>
+            </CheckBox>
+            <HBox prefHeight="100.0" prefWidth="200.0" spacing="8.0" GridPane.columnSpan="2147483647" GridPane.rowIndex="4">
+               <children>
+                  <Button fx:id="setValueButton" mnemonicParsing="false" onAction="#setFieldValue" text="%Set" />
+                  <Button fx:id="appendValueButton" mnemonicParsing="false" onAction="#appendToFieldValue" text="%Append" />
+                  <Separator maxHeight="1.7976931348623157E308" minWidth="10.0" orientation="VERTICAL" prefWidth="11.0" />
+                  <Button fx:id="clearFieldButton" mnemonicParsing="false" onAction="#clearField" text="%Clear field content" >
+                      <graphic>
+                          <JabRefIconView glyph="DELETE_ENTRY"/>
+                      </graphic>
+                  </Button>
+               </children>
+            </HBox>
+            <HBox spacing="8.0" GridPane.columnSpan="3" GridPane.hgrow="ALWAYS" GridPane.rowIndex="2" GridPane.vgrow="NEVER">
+               <children>
+                  <ComboBox fx:id="fieldComboBox" editable="true" maxHeight="1.7976931348623157E308" minHeight="36.0" prefHeight="36.0" prefWidth="184.0" HBox.hgrow="ALWAYS" />
+                  <TextField fx:id="fieldValueTextField" minHeight="32.0" minWidth="-Infinity" prefHeight="36.0" prefWidth="184.0" promptText="%Set or append content" HBox.hgrow="ALWAYS"/>
+               </children>
+            </HBox>
+            <HBox alignment="BOTTOM_LEFT" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="-Infinity" minWidth="-Infinity" GridPane.hgrow="ALWAYS" GridPane.rowSpan="2" GridPane.vgrow="ALWAYS">
+               <children>
+                  <Label alignment="BOTTOM_LEFT" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" styleClass="sectionHeader" text="%Edit field content for selected entries">
+                     <HBox.margin>
+                        <Insets bottom="10.0" />
+                     </HBox.margin>
+                  </Label>
+               </children>
+            </HBox>
+         </children>
+      </GridPane>
+   </children>
+</fx:root>
diff --git a/src/main/java/org/jabref/gui/edit/automaticfiededitor/editfieldcontent/EditFieldContentTabView.java b/src/main/java/org/jabref/gui/edit/automaticfiededitor/editfieldcontent/EditFieldContentTabView.java
new file mode 100644
index 00000000000..af1b4f9d9c1
--- /dev/null
+++ b/src/main/java/org/jabref/gui/edit/automaticfiededitor/editfieldcontent/EditFieldContentTabView.java
@@ -0,0 +1,100 @@
+package org.jabref.gui.edit.automaticfiededitor.editfieldcontent;
+
+import java.util.List;
+
+import javafx.application.Platform;
+import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+import javafx.scene.control.CheckBox;
+import javafx.scene.control.ComboBox;
+import javafx.scene.control.TextField;
+
+import org.jabref.gui.StateManager;
+import org.jabref.gui.edit.automaticfiededitor.AbstractAutomaticFieldEditorTabView;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.model.database.BibDatabase;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.field.Field;
+
+import com.airhacks.afterburner.views.ViewLoader;
+import com.tobiasdiez.easybind.EasyBind;
+import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
+
+import static org.jabref.gui.customentrytypes.CustomEntryTypeDialogViewModel.FIELD_STRING_CONVERTER;
+
+public class EditFieldContentTabView extends AbstractAutomaticFieldEditorTabView {
+    public Button appendValueButton;
+    public Button clearFieldButton;
+    public Button setValueButton;
+    @FXML
+    private ComboBox<Field> fieldComboBox;
+
+    @FXML
+    private TextField fieldValueTextField;
+
+    @FXML
+    private CheckBox overwriteFieldContentCheckBox;
+
+    private final List<BibEntry> selectedEntries;
+    private final BibDatabase database;
+
+    private EditFieldContentViewModel viewModel;
+
+    private final StateManager stateManager;
+
+    private final ControlsFxVisualizer visualizer = new ControlsFxVisualizer();
+
+    public EditFieldContentTabView(BibDatabase database, StateManager stateManager) {
+        this.selectedEntries = stateManager.getSelectedEntries();
+        this.database = database;
+        this.stateManager = stateManager;
+
+        ViewLoader.view(this)
+                  .root(this)
+                  .load();
+    }
+
+    @FXML
+    public void initialize() {
+        viewModel = new EditFieldContentViewModel(database, selectedEntries, stateManager);
+        fieldComboBox.setConverter(FIELD_STRING_CONVERTER);
+
+        fieldComboBox.getItems().setAll(viewModel.getAllFields());
+
+        fieldComboBox.getSelectionModel().selectFirst();
+
+        fieldComboBox.valueProperty().bindBidirectional(viewModel.selectedFieldProperty());
+        EasyBind.listen(fieldComboBox.getEditor().textProperty(), observable -> fieldComboBox.commitValue());
+
+        fieldValueTextField.textProperty().bindBidirectional(viewModel.fieldValueProperty());
+
+        overwriteFieldContentCheckBox.selectedProperty().bindBidirectional(viewModel.overwriteFieldContentProperty());
+
+        appendValueButton.disableProperty().bind(viewModel.canAppendProperty().not());
+        setValueButton.disableProperty().bind(viewModel.fieldValidationStatus().validProperty().not());
+        clearFieldButton.disableProperty().bind(viewModel.fieldValidationStatus().validProperty().not());
+        overwriteFieldContentCheckBox.disableProperty().bind(viewModel.fieldValidationStatus().validProperty().not());
+
+        Platform.runLater(() -> visualizer.initVisualization(viewModel.fieldValidationStatus(), fieldComboBox, true));
+    }
+
+    @Override
+    public String getTabName() {
+        return Localization.lang("Edit content");
+    }
+
+    @FXML
+    void appendToFieldValue() {
+        viewModel.appendToFieldValue();
+    }
+
+    @FXML
+    void clearField() {
+        viewModel.clearSelectedField();
+    }
+
+    @FXML
+    void setFieldValue() {
+        viewModel.setFieldValue();
+    }
+}
diff --git a/src/main/java/org/jabref/gui/edit/automaticfiededitor/editfieldcontent/EditFieldContentViewModel.java b/src/main/java/org/jabref/gui/edit/automaticfiededitor/editfieldcontent/EditFieldContentViewModel.java
new file mode 100644
index 00000000000..933e1d4f87b
--- /dev/null
+++ b/src/main/java/org/jabref/gui/edit/automaticfiededitor/editfieldcontent/EditFieldContentViewModel.java
@@ -0,0 +1,164 @@
+package org.jabref.gui.edit.automaticfiededitor.editfieldcontent;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+import javafx.beans.binding.Bindings;
+import javafx.beans.binding.BooleanBinding;
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+
+import org.jabref.gui.StateManager;
+import org.jabref.gui.edit.automaticfiededitor.AbstractAutomaticFieldEditorTabViewModel;
+import org.jabref.gui.edit.automaticfiededitor.LastAutomaticFieldEditorEdit;
+import org.jabref.gui.undo.NamedCompound;
+import org.jabref.gui.undo.UndoableFieldChange;
+import org.jabref.model.database.BibDatabase;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.field.Field;
+import org.jabref.model.entry.field.StandardField;
+import org.jabref.model.strings.StringUtil;
+
+import de.saxsys.mvvmfx.utils.validation.FunctionBasedValidator;
+import de.saxsys.mvvmfx.utils.validation.ValidationMessage;
+import de.saxsys.mvvmfx.utils.validation.ValidationStatus;
+import de.saxsys.mvvmfx.utils.validation.Validator;
+
+public class EditFieldContentViewModel extends AbstractAutomaticFieldEditorTabViewModel {
+    public static final int TAB_INDEX = 0;
+
+    private final List<BibEntry> selectedEntries;
+
+    private final StringProperty fieldValue = new SimpleStringProperty("");
+
+    private final ObjectProperty<Field> selectedField = new SimpleObjectProperty<>(StandardField.AUTHOR);
+
+    private final BooleanProperty overwriteFieldContent = new SimpleBooleanProperty(Boolean.FALSE);
+
+    private final Validator fieldValidator;
+    private final BooleanBinding canAppend;
+
+    public EditFieldContentViewModel(BibDatabase database, List<BibEntry> selectedEntries, StateManager stateManager) {
+        super(database, stateManager);
+        this.selectedEntries = new ArrayList<>(selectedEntries);
+
+        fieldValidator = new FunctionBasedValidator<>(selectedField, field -> {
+            if (StringUtil.isBlank(field.getName())) {
+                return ValidationMessage.error("Field name cannot be empty");
+            } else if (StringUtil.containsWhitespace(field.getName())) {
+                return ValidationMessage.error("Field name cannot have whitespace characters");
+            }
+            return null;
+        });
+
+        canAppend = Bindings.and(overwriteFieldContentProperty(), fieldValidationStatus().validProperty());
+    }
+
+    public ValidationStatus fieldValidationStatus() {
+        return fieldValidator.getValidationStatus();
+    }
+
+    public BooleanBinding canAppendProperty() {
+        return canAppend;
+    }
+
+    public void clearSelectedField() {
+        NamedCompound clearFieldEdit = new NamedCompound("CLEAR_SELECTED_FIELD");
+        int affectedEntriesCount = 0;
+        for (BibEntry entry : selectedEntries) {
+            Optional<String> oldFieldValue = entry.getField(selectedField.get());
+            if (oldFieldValue.isPresent()) {
+                entry.clearField(selectedField.get())
+                        .ifPresent(fieldChange -> clearFieldEdit.addEdit(new UndoableFieldChange(fieldChange)));
+                affectedEntriesCount++;
+            }
+        }
+
+        if (clearFieldEdit.hasEdits()) {
+            clearFieldEdit.end();
+        }
+        stateManager.setLastAutomaticFieldEditorEdit(new LastAutomaticFieldEditorEdit(
+                affectedEntriesCount,
+                TAB_INDEX,
+                clearFieldEdit
+        ));
+    }
+
+    public void setFieldValue() {
+        NamedCompound setFieldEdit = new NamedCompound("CHANGE_SELECTED_FIELD");
+        String toSetFieldValue = fieldValue.getValue();
+        int affectedEntriesCount = 0;
+        for (BibEntry entry : selectedEntries) {
+            Optional<String> oldFieldValue = entry.getField(selectedField.get());
+            if (oldFieldValue.isEmpty() || overwriteFieldContent.get()) {
+                entry.setField(selectedField.get(), toSetFieldValue)
+                     .ifPresent(fieldChange -> setFieldEdit.addEdit(new UndoableFieldChange(fieldChange)));
+                fieldValue.set("");
+                // TODO: increment affected entries only when UndoableFieldChange.isPresent()
+                affectedEntriesCount++;
+            }
+        }
+
+        if (setFieldEdit.hasEdits()) {
+            setFieldEdit.end();
+        }
+        stateManager.setLastAutomaticFieldEditorEdit(new LastAutomaticFieldEditorEdit(
+                affectedEntriesCount,
+                TAB_INDEX,
+                setFieldEdit
+        ));
+    }
+
+    public void appendToFieldValue() {
+        NamedCompound appendToFieldEdit = new NamedCompound("APPEND_TO_SELECTED_FIELD");
+        String toAppendFieldValue = fieldValue.getValue();
+        int affectedEntriesCount = 0;
+        for (BibEntry entry : selectedEntries) {
+            Optional<String> oldFieldValue = entry.getField(selectedField.get());
+            // Append button should be disabled if 'overwriteNonEmptyFields' is false
+            if (overwriteFieldContent.get()) {
+                String newFieldValue = oldFieldValue.orElse("").concat(toAppendFieldValue);
+
+                entry.setField(selectedField.get(), newFieldValue)
+                        .ifPresent(fieldChange -> appendToFieldEdit.addEdit(new UndoableFieldChange(fieldChange)));
+
+                fieldValue.set("");
+                affectedEntriesCount++;
+            }
+        }
+
+        if (appendToFieldEdit.hasEdits()) {
+            appendToFieldEdit.end();
+        }
+        stateManager.setLastAutomaticFieldEditorEdit(new LastAutomaticFieldEditorEdit(
+                affectedEntriesCount,
+                TAB_INDEX,
+                appendToFieldEdit
+        ));
+    }
+
+    public ObjectProperty<Field> selectedFieldProperty() {
+        return selectedField;
+    }
+
+    public Field getSelectedField() {
+        return selectedFieldProperty().get();
+    }
+
+    public String getFieldValue() {
+        return fieldValue.get();
+    }
+
+    public StringProperty fieldValueProperty() {
+        return fieldValue;
+    }
+
+    public BooleanProperty overwriteFieldContentProperty() {
+        return overwriteFieldContent;
+    }
+}
diff --git a/src/main/java/org/jabref/gui/edit/automaticfiededitor/renamefield/RenameFieldTab.fxml b/src/main/java/org/jabref/gui/edit/automaticfiededitor/renamefield/RenameFieldTab.fxml
new file mode 100644
index 00000000000..9e4b5b54269
--- /dev/null
+++ b/src/main/java/org/jabref/gui/edit/automaticfiededitor/renamefield/RenameFieldTab.fxml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.ComboBox?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.ColumnConstraints?>
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.RowConstraints?>
+
+<fx:root prefHeight="400.0" prefWidth="600.0" type="AnchorPane" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.edit.automaticfiededitor.renamefield.RenameFieldTabView">
+   <children>
+      <GridPane hgap="8.0" layoutY="85.0" prefWidth="568.0" vgap="8.0" AnchorPane.leftAnchor="16.0" AnchorPane.rightAnchor="16.0" AnchorPane.topAnchor="0.0">
+        <columnConstraints>
+          <ColumnConstraints hgrow="SOMETIMES" maxWidth="279.20001220703125" minWidth="10.0" prefWidth="164.0" />
+          <ColumnConstraints hgrow="SOMETIMES" maxWidth="404.0" minWidth="10.0" prefWidth="404.0" />
+        </columnConstraints>
+        <rowConstraints>
+          <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+          <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+          <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+            <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+            <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+        </rowConstraints>
+         <children>
+             <HBox alignment="BOTTOM_LEFT" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="-Infinity" minWidth="-Infinity" GridPane.hgrow="ALWAYS" GridPane.rowSpan="2" GridPane.vgrow="ALWAYS">
+                 <children>
+                     <Label alignment="BOTTOM_LEFT" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" styleClass="sectionHeader" text="%Rename field">
+                         <HBox.margin>
+                             <Insets bottom="10.0" />
+                         </HBox.margin>
+                     </Label>
+                 </children>
+             </HBox>
+            <HBox maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" GridPane.columnSpan="2" GridPane.rowIndex="3" GridPane.rowSpan="2">
+               <children>
+                  <Button fx:id="renameButton" alignment="TOP_LEFT" mnemonicParsing="false" onAction="#renameField" text="%Rename">
+                     <HBox.margin>
+                        <Insets top="4.0" />
+                     </HBox.margin>
+                  </Button>
+               </children>
+            </HBox>
+            <HBox prefHeight="100.0" prefWidth="200.0" spacing="8.0" GridPane.columnSpan="2" GridPane.rowIndex="2">
+               <children>
+                  <ComboBox fx:id="fieldComboBox" editable="true" minWidth="-Infinity" prefHeight="36.0" prefWidth="184.0" HBox.hgrow="ALWAYS" />
+                  <TextField fx:id="newFieldNameTextField" minHeight="-Infinity" prefHeight="36.0" promptText="%New field name" HBox.hgrow="ALWAYS" />
+               </children>
+            </HBox>
+         </children>
+      </GridPane>
+   </children>
+</fx:root>
diff --git a/src/main/java/org/jabref/gui/edit/automaticfiededitor/renamefield/RenameFieldTabView.java b/src/main/java/org/jabref/gui/edit/automaticfiededitor/renamefield/RenameFieldTabView.java
new file mode 100644
index 00000000000..f39ae2efc86
--- /dev/null
+++ b/src/main/java/org/jabref/gui/edit/automaticfiededitor/renamefield/RenameFieldTabView.java
@@ -0,0 +1,79 @@
+package org.jabref.gui.edit.automaticfiededitor.renamefield;
+
+import java.util.List;
+
+import javafx.application.Platform;
+import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+import javafx.scene.control.ComboBox;
+import javafx.scene.control.TextField;
+
+import org.jabref.gui.StateManager;
+import org.jabref.gui.edit.automaticfiededitor.AbstractAutomaticFieldEditorTabView;
+import org.jabref.gui.edit.automaticfiededitor.AutomaticFieldEditorTab;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.model.database.BibDatabase;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.field.Field;
+
+import com.airhacks.afterburner.views.ViewLoader;
+import com.tobiasdiez.easybind.EasyBind;
+import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
+
+import static org.jabref.gui.customentrytypes.CustomEntryTypeDialogViewModel.FIELD_STRING_CONVERTER;
+
+public class RenameFieldTabView extends AbstractAutomaticFieldEditorTabView implements AutomaticFieldEditorTab {
+    @FXML
+    private Button renameButton;
+    @FXML
+    private ComboBox<Field> fieldComboBox;
+    @FXML
+    private TextField newFieldNameTextField;
+    private final List<BibEntry> selectedEntries;
+    private final BibDatabase database;
+    private final StateManager stateManager;
+    private RenameFieldViewModel viewModel;
+
+    private final ControlsFxVisualizer visualizer = new ControlsFxVisualizer();
+
+    public RenameFieldTabView(BibDatabase database, StateManager stateManager) {
+        this.selectedEntries = stateManager.getSelectedEntries();
+        this.database = database;
+        this.stateManager = stateManager;
+
+        ViewLoader.view(this)
+                  .root(this)
+                  .load();
+    }
+
+    @FXML
+    public void initialize() {
+        viewModel = new RenameFieldViewModel(selectedEntries, database, stateManager);
+
+        fieldComboBox.getItems().setAll(viewModel.getAllFields());
+        fieldComboBox.getSelectionModel().selectFirst();
+
+        fieldComboBox.setConverter(FIELD_STRING_CONVERTER);
+
+        fieldComboBox.valueProperty().bindBidirectional(viewModel.selectedFieldProperty());
+        EasyBind.listen(fieldComboBox.getEditor().textProperty(), observable -> fieldComboBox.commitValue());
+
+        renameButton.disableProperty().bind(viewModel.canRenameProperty().not());
+
+        newFieldNameTextField.textProperty().bindBidirectional(viewModel.newFieldNameProperty());
+
+        Platform.runLater(() -> {
+            visualizer.initVisualization(viewModel.fieldNameValidationStatus(), newFieldNameTextField, true);
+        });
+    }
+
+    @Override
+    public String getTabName() {
+        return Localization.lang("Rename field");
+    }
+
+    @FXML
+    void renameField() {
+        viewModel.renameField();
+    }
+}
diff --git a/src/main/java/org/jabref/gui/edit/automaticfiededitor/renamefield/RenameFieldViewModel.java b/src/main/java/org/jabref/gui/edit/automaticfiededitor/renamefield/RenameFieldViewModel.java
new file mode 100644
index 00000000000..6f22623d466
--- /dev/null
+++ b/src/main/java/org/jabref/gui/edit/automaticfiededitor/renamefield/RenameFieldViewModel.java
@@ -0,0 +1,114 @@
+package org.jabref.gui.edit.automaticfiededitor.renamefield;
+
+import java.util.List;
+
+import javafx.beans.binding.Bindings;
+import javafx.beans.binding.BooleanBinding;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+
+import org.jabref.gui.StateManager;
+import org.jabref.gui.edit.automaticfiededitor.AbstractAutomaticFieldEditorTabViewModel;
+import org.jabref.gui.edit.automaticfiededitor.LastAutomaticFieldEditorEdit;
+import org.jabref.gui.edit.automaticfiededitor.MoveFieldValueAction;
+import org.jabref.gui.undo.NamedCompound;
+import org.jabref.model.database.BibDatabase;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.field.Field;
+import org.jabref.model.entry.field.FieldFactory;
+import org.jabref.model.entry.field.StandardField;
+import org.jabref.model.strings.StringUtil;
+
+import de.saxsys.mvvmfx.utils.validation.FunctionBasedValidator;
+import de.saxsys.mvvmfx.utils.validation.ValidationMessage;
+import de.saxsys.mvvmfx.utils.validation.ValidationStatus;
+import de.saxsys.mvvmfx.utils.validation.Validator;
+
+public class RenameFieldViewModel extends AbstractAutomaticFieldEditorTabViewModel {
+    public static final int TAB_INDEX = 2;
+    private final StringProperty newFieldName = new SimpleStringProperty("");
+    private final ObjectProperty<Field> selectedField = new SimpleObjectProperty<>(StandardField.AUTHOR);
+    private final List<BibEntry> selectedEntries;
+
+    private final Validator fieldValidator;
+
+    private final Validator fieldNameValidator;
+
+    private final BooleanBinding canRename;
+
+    public RenameFieldViewModel(List<BibEntry> selectedEntries, BibDatabase database, StateManager stateManager) {
+        super(database, stateManager);
+        this.selectedEntries = selectedEntries;
+
+        fieldValidator = new FunctionBasedValidator<>(selectedField, field -> StringUtil.isNotBlank(field.getName()),
+                ValidationMessage.error("Field cannot be empty"));
+        fieldNameValidator = new FunctionBasedValidator<>(newFieldName, fieldName -> {
+            if (StringUtil.isBlank(fieldName)) {
+                return ValidationMessage.error("Field name cannot be empty");
+            } else if (StringUtil.containsWhitespace(fieldName)) {
+                return ValidationMessage.error("Field name cannot have whitespace characters");
+            }
+            return null;
+        });
+
+        canRename = Bindings.and(fieldValidationStatus().validProperty(), fieldNameValidationStatus().validProperty());
+    }
+
+    public ValidationStatus fieldValidationStatus() {
+        return fieldValidator.getValidationStatus();
+    }
+
+    public ValidationStatus fieldNameValidationStatus() {
+        return fieldNameValidator.getValidationStatus();
+    }
+
+    public BooleanBinding canRenameProperty() {
+        return canRename;
+    }
+
+    public String getNewFieldName() {
+        return newFieldName.get();
+    }
+
+    public StringProperty newFieldNameProperty() {
+        return newFieldName;
+    }
+
+    public void setNewFieldName(String newName) {
+        newFieldNameProperty().set(newName);
+    }
+
+    public Field getSelectedField() {
+        return selectedField.get();
+    }
+
+    public ObjectProperty<Field> selectedFieldProperty() {
+        return selectedField;
+    }
+
+    public void selectField(Field field) {
+        selectedFieldProperty().set(field);
+    }
+
+    public void renameField() {
+        NamedCompound renameEdit = new NamedCompound("RENAME_EDIT");
+        int affectedEntriesCount = 0;
+        if (fieldNameValidationStatus().isValid()) {
+            affectedEntriesCount = new MoveFieldValueAction(selectedField.get(),
+                    FieldFactory.parseField(newFieldName.get()),
+                    selectedEntries,
+                    renameEdit,
+                    false).executeAndGetAffectedEntriesCount();
+
+            if (renameEdit.hasEdits()) {
+                renameEdit.end();
+            }
+        }
+
+        stateManager.setLastAutomaticFieldEditorEdit(new LastAutomaticFieldEditorEdit(
+                affectedEntriesCount, TAB_INDEX, renameEdit
+        ));
+    }
+}
diff --git a/src/main/java/org/jabref/gui/entryeditor/DeprecatedFieldsTab.java b/src/main/java/org/jabref/gui/entryeditor/DeprecatedFieldsTab.java
index 90a5e963b26..d5bc20da9e6 100644
--- a/src/main/java/org/jabref/gui/entryeditor/DeprecatedFieldsTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/DeprecatedFieldsTab.java
@@ -3,6 +3,7 @@
 import java.util.Collections;
 import java.util.Optional;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 import javax.swing.undo.UndoManager;
 
@@ -11,7 +12,6 @@
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.autocompleter.SuggestionProviders;
-import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.theme.ThemeManager;
 import org.jabref.gui.util.TaskExecutor;
@@ -38,10 +38,9 @@ public DeprecatedFieldsTab(BibDatabaseContext databaseContext,
                                ThemeManager themeManager,
                                IndexingTaskManager indexingTaskManager,
                                BibEntryTypesManager entryTypesManager,
-                               ExternalFileTypes externalFileTypes,
                                TaskExecutor taskExecutor,
                                JournalAbbreviationRepository journalAbbreviationRepository) {
-        super(false, databaseContext, suggestionProviders, undoManager, dialogService, preferences, stateManager, themeManager, externalFileTypes, taskExecutor, journalAbbreviationRepository, indexingTaskManager);
+        super(false, databaseContext, suggestionProviders, undoManager, dialogService, preferences, stateManager, themeManager, taskExecutor, journalAbbreviationRepository, indexingTaskManager);
         this.entryTypesManager = entryTypesManager;
 
         setText(Localization.lang("Deprecated fields"));
@@ -53,8 +52,7 @@ public DeprecatedFieldsTab(BibDatabaseContext databaseContext,
     protected Set<Field> determineFieldsToShow(BibEntry entry) {
         Optional<BibEntryType> entryType = entryTypesManager.enrich(entry.getType(), databaseContext.getMode());
         if (entryType.isPresent()) {
-            return entryType.get().getDeprecatedFields();
-
+            return entryType.get().getDeprecatedFields().stream().filter(field -> !entry.getField(field).isEmpty()).collect(Collectors.toSet());
         } else {
             // Entry type unknown -> treat all fields as required
             return Collections.emptySet();
diff --git a/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java b/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
index 1b8cd4b4846..6e3d662bd6e 100644
--- a/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
+++ b/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
@@ -2,6 +2,7 @@
 
 import java.io.File;
 import java.nio.file.Path;
+import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -27,17 +28,16 @@
 import javafx.scene.layout.BorderPane;
 
 import org.jabref.gui.DialogService;
-import org.jabref.gui.Globals;
 import org.jabref.gui.LibraryTab;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.citationkeypattern.GenerateCitationKeySingleAction;
 import org.jabref.gui.entryeditor.fileannotationtab.FileAnnotationTab;
 import org.jabref.gui.entryeditor.fileannotationtab.FulltextSearchResultsTab;
 import org.jabref.gui.externalfiles.ExternalFilesEntryLinker;
-import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.help.HelpAction;
 import org.jabref.gui.importer.GrobidOptInDialogHelper;
 import org.jabref.gui.keyboard.KeyBinding;
+import org.jabref.gui.keyboard.KeyBindingRepository;
 import org.jabref.gui.menus.ChangeEntryTypeMenu;
 import org.jabref.gui.mergeentries.FetchAndMergeEntry;
 import org.jabref.gui.theme.ThemeManager;
@@ -49,6 +49,7 @@
 import org.jabref.logic.importer.EntryBasedFetcher;
 import org.jabref.logic.importer.WebFetchers;
 import org.jabref.logic.importer.fileformat.PdfMergeMetadataImporter;
+import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.BibEntryTypesManager;
@@ -106,10 +107,12 @@ public class EntryEditor extends BorderPane {
     @Inject private FileUpdateMonitor fileMonitor;
     @Inject private CountingUndoManager undoManager;
     @Inject private BibEntryTypesManager bibEntryTypesManager;
+    @Inject private KeyBindingRepository keyBindingRepository;
+    @Inject private JournalAbbreviationRepository journalAbbreviationRepository;
 
     private final List<EntryEditorTab> entryEditorTabs = new LinkedList<>();
 
-    public EntryEditor(LibraryTab libraryTab, ExternalFileTypes externalFileTypes) {
+    public EntryEditor(LibraryTab libraryTab) {
         this.libraryTab = libraryTab;
         this.databaseContext = libraryTab.getBibDatabaseContext();
 
@@ -118,8 +121,7 @@ public EntryEditor(LibraryTab libraryTab, ExternalFileTypes externalFileTypes) {
                   .load();
 
         this.entryEditorPreferences = preferencesService.getEntryEditorPreferences();
-        this.fileLinker = new ExternalFilesEntryLinker(externalFileTypes, preferencesService.getFilePreferences(),
-                databaseContext);
+        this.fileLinker = new ExternalFilesEntryLinker(preferencesService.getFilePreferences(), databaseContext);
 
         EasyBind.subscribe(tabbed.getSelectionModel().selectedItemProperty(), tab -> {
             EntryEditorTab activeTab = (EntryEditorTab) tab;
@@ -172,7 +174,7 @@ public EntryEditor(LibraryTab libraryTab, ExternalFileTypes externalFileTypes) {
      */
     private void setupKeyBindings() {
         this.addEventHandler(KeyEvent.KEY_PRESSED, event -> {
-            Optional<KeyBinding> keyBinding = Globals.getKeyPrefs().mapToKeyBinding(event);
+            Optional<KeyBinding> keyBinding = keyBindingRepository.mapToKeyBinding(event);
             if (keyBinding.isPresent()) {
                 switch (keyBinding.get()) {
                     case ENTRY_EDITOR_NEXT_PANEL:
@@ -194,7 +196,7 @@ private void setupKeyBindings() {
                         event.consume();
                         break;
                     case HELP:
-                        HelpAction.openHelpPage(HelpFile.ENTRY_EDITOR);
+                        new HelpAction(HelpFile.ENTRY_EDITOR, dialogService).execute();
                         event.consume();
                         break;
                     case CLOSE:
@@ -238,22 +240,22 @@ private void navigateToNextEntry() {
 
     private List<EntryEditorTab> createTabs() {
         // Preview tab
-        entryEditorTabs.add(new PreviewTab(databaseContext, dialogService, preferencesService, stateManager, themeManager, libraryTab.getIndexingTaskManager(), ExternalFileTypes.getInstance()));
+        entryEditorTabs.add(new PreviewTab(databaseContext, dialogService, preferencesService, stateManager, themeManager, libraryTab.getIndexingTaskManager()));
 
         // Required fields
-        entryEditorTabs.add(new RequiredFieldsTab(databaseContext, libraryTab.getSuggestionProviders(), undoManager, dialogService, preferencesService, stateManager, themeManager, libraryTab.getIndexingTaskManager(), bibEntryTypesManager, ExternalFileTypes.getInstance(), taskExecutor, Globals.journalAbbreviationRepository));
+        entryEditorTabs.add(new RequiredFieldsTab(databaseContext, libraryTab.getSuggestionProviders(), undoManager, dialogService, preferencesService, stateManager, themeManager, libraryTab.getIndexingTaskManager(), bibEntryTypesManager, taskExecutor, journalAbbreviationRepository));
 
         // Optional fields
-        entryEditorTabs.add(new OptionalFieldsTab(databaseContext, libraryTab.getSuggestionProviders(), undoManager, dialogService, preferencesService, stateManager, themeManager, libraryTab.getIndexingTaskManager(), bibEntryTypesManager, ExternalFileTypes.getInstance(), taskExecutor, Globals.journalAbbreviationRepository));
-        entryEditorTabs.add(new OptionalFields2Tab(databaseContext, libraryTab.getSuggestionProviders(), undoManager, dialogService, preferencesService, stateManager, themeManager, libraryTab.getIndexingTaskManager(), bibEntryTypesManager, ExternalFileTypes.getInstance(), taskExecutor, Globals.journalAbbreviationRepository));
-        entryEditorTabs.add(new DeprecatedFieldsTab(databaseContext, libraryTab.getSuggestionProviders(), undoManager, dialogService, preferencesService, stateManager, themeManager, libraryTab.getIndexingTaskManager(), bibEntryTypesManager, ExternalFileTypes.getInstance(), taskExecutor, Globals.journalAbbreviationRepository));
+        entryEditorTabs.add(new OptionalFieldsTab(databaseContext, libraryTab.getSuggestionProviders(), undoManager, dialogService, preferencesService, stateManager, themeManager, libraryTab.getIndexingTaskManager(), bibEntryTypesManager, taskExecutor, journalAbbreviationRepository));
+        entryEditorTabs.add(new OptionalFields2Tab(databaseContext, libraryTab.getSuggestionProviders(), undoManager, dialogService, preferencesService, stateManager, themeManager, libraryTab.getIndexingTaskManager(), bibEntryTypesManager, taskExecutor, journalAbbreviationRepository));
+        entryEditorTabs.add(new DeprecatedFieldsTab(databaseContext, libraryTab.getSuggestionProviders(), undoManager, dialogService, preferencesService, stateManager, themeManager, libraryTab.getIndexingTaskManager(), bibEntryTypesManager, taskExecutor, journalAbbreviationRepository));
 
         // Other fields
-        entryEditorTabs.add(new OtherFieldsTab(databaseContext, libraryTab.getSuggestionProviders(), undoManager, dialogService, preferencesService, stateManager, themeManager, libraryTab.getIndexingTaskManager(), bibEntryTypesManager, ExternalFileTypes.getInstance(), taskExecutor, Globals.journalAbbreviationRepository));
+        entryEditorTabs.add(new OtherFieldsTab(databaseContext, libraryTab.getSuggestionProviders(), undoManager, dialogService, preferencesService, stateManager, themeManager, libraryTab.getIndexingTaskManager(), bibEntryTypesManager, taskExecutor, journalAbbreviationRepository));
 
         // General fields from preferences
         for (Map.Entry<String, Set<Field>> tab : entryEditorPreferences.getEntryEditorTabList().entrySet()) {
-            entryEditorTabs.add(new UserDefinedFieldsTab(tab.getKey(), tab.getValue(), databaseContext, libraryTab.getSuggestionProviders(), undoManager, dialogService, preferencesService, stateManager, themeManager, libraryTab.getIndexingTaskManager(), bibEntryTypesManager, ExternalFileTypes.getInstance(), taskExecutor, Globals.journalAbbreviationRepository));
+            entryEditorTabs.add(new UserDefinedFieldsTab(tab.getKey(), tab.getValue(), databaseContext, libraryTab.getSuggestionProviders(), undoManager, dialogService, preferencesService, stateManager, themeManager, libraryTab.getIndexingTaskManager(), taskExecutor, journalAbbreviationRepository));
         }
 
         // Special tabs
@@ -270,7 +272,7 @@ private List<EntryEditorTab> createTabs() {
                 fileMonitor,
                 dialogService,
                 stateManager,
-                Globals.getKeyPrefs());
+                keyBindingRepository);
         entryEditorTabs.add(sourceTab);
 
         // LaTeX citations tab
@@ -360,7 +362,7 @@ private void setupToolBar() {
         typeLabel.setText(typedEntry.getTypeForDisplay());
 
         // Add type change menu
-        ContextMenu typeMenu = new ChangeEntryTypeMenu().getChangeEntryTypePopupMenu(entry, databaseContext, undoManager);
+        ContextMenu typeMenu = new ChangeEntryTypeMenu(Collections.singletonList(entry), databaseContext, undoManager, keyBindingRepository, bibEntryTypesManager).asContextMenu();
         typeLabel.setOnMouseClicked(event -> typeMenu.show(typeLabel, Side.RIGHT, 0, 0));
         typeChangeButton.setOnMouseClicked(event -> typeMenu.show(typeChangeButton, Side.RIGHT, 0, 0));
 
@@ -370,21 +372,18 @@ private void setupToolBar() {
                 preferencesService.getImporterPreferences(),
                 preferencesService.getImportFormatPreferences(),
                 preferencesService.getFilePreferences(),
-                databaseContext,
-                preferencesService.getGeneralPreferences().getDefaultEncoding());
+                databaseContext);
         for (EntryBasedFetcher fetcher : entryBasedFetchers) {
             MenuItem fetcherMenuItem = new MenuItem(fetcher.getName());
             if (fetcher instanceof PdfMergeMetadataImporter.EntryBasedFetcherWrapper) {
                 // Handle Grobid Opt-In in case of the PdfMergeMetadataImporter
                 fetcherMenuItem.setOnAction(event -> {
-                    GrobidOptInDialogHelper.showAndWaitIfUserIsUndecided(dialogService, preferencesService.getImporterPreferences());
+                    GrobidOptInDialogHelper.showAndWaitIfUserIsUndecided(dialogService, preferencesService.getGrobidPreferences());
                     PdfMergeMetadataImporter.EntryBasedFetcherWrapper pdfMergeMetadataImporter =
                             new PdfMergeMetadataImporter.EntryBasedFetcherWrapper(
-                                    preferencesService.getImporterPreferences(),
                                     preferencesService.getImportFormatPreferences(),
                                     preferencesService.getFilePreferences(),
-                                    databaseContext,
-                                    preferencesService.getGeneralPreferences().getDefaultEncoding());
+                                    databaseContext);
                     fetchAndMerge(pdfMergeMetadataImporter);
                 });
             } else {
diff --git a/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java b/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java
index 342a519d6b7..49fc1d8715b 100644
--- a/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java
@@ -26,7 +26,6 @@
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.autocompleter.SuggestionProviders;
-import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.fieldeditors.FieldEditorFX;
 import org.jabref.gui.fieldeditors.FieldEditors;
 import org.jabref.gui.fieldeditors.FieldNameLabel;
@@ -53,7 +52,6 @@ abstract class FieldsEditorTab extends EntryEditorTab {
     private final DialogService dialogService;
     private final PreferencesService preferences;
     private final ThemeManager themeManager;
-    private final ExternalFileTypes externalFileTypes;
     private final TaskExecutor taskExecutor;
     private final JournalAbbreviationRepository journalAbbreviationRepository;
     private final StateManager stateManager;
@@ -71,7 +69,6 @@ public FieldsEditorTab(boolean compressed,
                            PreferencesService preferences,
                            StateManager stateManager,
                            ThemeManager themeManager,
-                           ExternalFileTypes externalFileTypes,
                            TaskExecutor taskExecutor,
                            JournalAbbreviationRepository journalAbbreviationRepository,
                            IndexingTaskManager indexingTaskManager) {
@@ -82,7 +79,6 @@ public FieldsEditorTab(boolean compressed,
         this.dialogService = Objects.requireNonNull(dialogService);
         this.preferences = Objects.requireNonNull(preferences);
         this.themeManager = themeManager;
-        this.externalFileTypes = Objects.requireNonNull(externalFileTypes);
         this.taskExecutor = Objects.requireNonNull(taskExecutor);
         this.journalAbbreviationRepository = Objects.requireNonNull(journalAbbreviationRepository);
         this.stateManager = stateManager;
@@ -246,7 +242,7 @@ private void initPanel() {
             scrollPane.setFitToHeight(true);
 
             SplitPane container = new SplitPane(scrollPane);
-            previewPanel = new PreviewPanel(databaseContext, dialogService, externalFileTypes, preferences.getKeyBindingRepository(), preferences, stateManager, themeManager, indexingTaskManager);
+            previewPanel = new PreviewPanel(databaseContext, dialogService, preferences.getKeyBindingRepository(), preferences, stateManager, themeManager, indexingTaskManager);
             EasyBind.subscribe(preferences.getPreviewPreferences().showPreviewAsExtraTabProperty(), show -> {
                 if (show) {
                     container.getItems().remove(previewPanel);
diff --git a/src/main/java/org/jabref/gui/entryeditor/MathSciNetTab.java b/src/main/java/org/jabref/gui/entryeditor/MathSciNetTab.java
index a674f062540..3113d016542 100644
--- a/src/main/java/org/jabref/gui/entryeditor/MathSciNetTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/MathSciNetTab.java
@@ -7,6 +7,7 @@
 import javafx.scene.web.WebView;
 
 import org.jabref.logic.l10n.Localization;
+import org.jabref.logic.util.WebViewStore;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.identifier.MathSciNetId;
@@ -25,7 +26,7 @@ private StackPane getPane(BibEntry entry) {
         StackPane root = new StackPane();
         ProgressIndicator progress = new ProgressIndicator();
         progress.setMaxSize(100, 100);
-        WebView browser = new WebView();
+        WebView browser = WebViewStore.get();
 
         // Quick hack to disable navigating
         browser.addEventFilter(javafx.scene.input.MouseEvent.ANY, javafx.scene.input.MouseEvent::consume);
diff --git a/src/main/java/org/jabref/gui/entryeditor/OptionalFields2Tab.java b/src/main/java/org/jabref/gui/entryeditor/OptionalFields2Tab.java
index 07090e543ee..97c38da58dd 100644
--- a/src/main/java/org/jabref/gui/entryeditor/OptionalFields2Tab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/OptionalFields2Tab.java
@@ -5,7 +5,6 @@
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.autocompleter.SuggestionProviders;
-import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.theme.ThemeManager;
 import org.jabref.gui.util.TaskExecutor;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
@@ -25,7 +24,6 @@ public OptionalFields2Tab(BibDatabaseContext databaseContext,
                               ThemeManager themeManager,
                               IndexingTaskManager indexingTaskManager,
                               BibEntryTypesManager entryTypesManager,
-                              ExternalFileTypes externalFileTypes,
                               TaskExecutor taskExecutor,
                               JournalAbbreviationRepository journalAbbreviationRepository) {
         super(
@@ -40,7 +38,6 @@ public OptionalFields2Tab(BibDatabaseContext databaseContext,
                 themeManager,
                 indexingTaskManager,
                 entryTypesManager,
-                externalFileTypes,
                 taskExecutor,
                 journalAbbreviationRepository
         );
diff --git a/src/main/java/org/jabref/gui/entryeditor/OptionalFieldsTab.java b/src/main/java/org/jabref/gui/entryeditor/OptionalFieldsTab.java
index 0035e806258..93a6ff4b6f1 100644
--- a/src/main/java/org/jabref/gui/entryeditor/OptionalFieldsTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/OptionalFieldsTab.java
@@ -5,7 +5,6 @@
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.autocompleter.SuggestionProviders;
-import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.theme.ThemeManager;
 import org.jabref.gui.util.TaskExecutor;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
@@ -25,7 +24,6 @@ public OptionalFieldsTab(BibDatabaseContext databaseContext,
                              ThemeManager themeManager,
                              IndexingTaskManager indexingTaskManager,
                              BibEntryTypesManager entryTypesManager,
-                             ExternalFileTypes externalFileTypes,
                              TaskExecutor taskExecutor,
                              JournalAbbreviationRepository journalAbbreviationRepository) {
         super(
@@ -40,7 +38,6 @@ public OptionalFieldsTab(BibDatabaseContext databaseContext,
                 themeManager,
                 indexingTaskManager,
                 entryTypesManager,
-                externalFileTypes,
                 taskExecutor,
                 journalAbbreviationRepository
         );
diff --git a/src/main/java/org/jabref/gui/entryeditor/OptionalFieldsTabBase.java b/src/main/java/org/jabref/gui/entryeditor/OptionalFieldsTabBase.java
index 52c88a8c809..af1a5f9f0b6 100644
--- a/src/main/java/org/jabref/gui/entryeditor/OptionalFieldsTabBase.java
+++ b/src/main/java/org/jabref/gui/entryeditor/OptionalFieldsTabBase.java
@@ -11,7 +11,6 @@
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.autocompleter.SuggestionProviders;
-import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.theme.ThemeManager;
 import org.jabref.gui.util.TaskExecutor;
@@ -40,7 +39,6 @@ public OptionalFieldsTabBase(String title,
                                  ThemeManager themeManager,
                                  IndexingTaskManager indexingTaskManager,
                                  BibEntryTypesManager entryTypesManager,
-                                 ExternalFileTypes externalFileTypes,
                                  TaskExecutor taskExecutor,
                                  JournalAbbreviationRepository journalAbbreviationRepository) {
         super(true,
@@ -51,7 +49,6 @@ public OptionalFieldsTabBase(String title,
                 preferences,
                 stateManager,
                 themeManager,
-                externalFileTypes,
                 taskExecutor,
                 journalAbbreviationRepository,
                 indexingTaskManager);
diff --git a/src/main/java/org/jabref/gui/entryeditor/OtherFieldsTab.java b/src/main/java/org/jabref/gui/entryeditor/OtherFieldsTab.java
index 08802ceb27c..0fe1281c077 100644
--- a/src/main/java/org/jabref/gui/entryeditor/OtherFieldsTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/OtherFieldsTab.java
@@ -14,7 +14,6 @@
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.autocompleter.SuggestionProviders;
-import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.theme.ThemeManager;
 import org.jabref.gui.util.TaskExecutor;
@@ -44,7 +43,6 @@ public OtherFieldsTab(BibDatabaseContext databaseContext,
                           ThemeManager themeManager,
                           IndexingTaskManager indexingTaskManager,
                           BibEntryTypesManager entryTypesManager,
-                          ExternalFileTypes externalFileTypes,
                           TaskExecutor taskExecutor,
                           JournalAbbreviationRepository journalAbbreviationRepository) {
         super(false,
@@ -55,7 +53,6 @@ public OtherFieldsTab(BibDatabaseContext databaseContext,
                 preferences,
                 stateManager,
                 themeManager,
-                externalFileTypes,
                 taskExecutor,
                 journalAbbreviationRepository,
                 indexingTaskManager);
diff --git a/src/main/java/org/jabref/gui/entryeditor/PreviewTab.java b/src/main/java/org/jabref/gui/entryeditor/PreviewTab.java
index b66b3c49a18..4212506b8f6 100644
--- a/src/main/java/org/jabref/gui/entryeditor/PreviewTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/PreviewTab.java
@@ -2,7 +2,6 @@
 
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
-import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.preview.PreviewPanel;
 import org.jabref.gui.theme.ThemeManager;
@@ -19,7 +18,6 @@ public class PreviewTab extends EntryEditorTab {
     private final StateManager stateManager;
     private final ThemeManager themeManager;
     private final IndexingTaskManager indexingTaskManager;
-    private final ExternalFileTypes externalFileTypes;
     private PreviewPanel previewPanel;
 
     public PreviewTab(BibDatabaseContext databaseContext,
@@ -27,15 +25,13 @@ public PreviewTab(BibDatabaseContext databaseContext,
                       PreferencesService preferences,
                       StateManager stateManager,
                       ThemeManager themeManager,
-                      IndexingTaskManager indexingTaskManager,
-                      ExternalFileTypes externalFileTypes) {
+                      IndexingTaskManager indexingTaskManager) {
         this.databaseContext = databaseContext;
         this.dialogService = dialogService;
         this.preferences = preferences;
         this.stateManager = stateManager;
         this.themeManager = themeManager;
         this.indexingTaskManager = indexingTaskManager;
-        this.externalFileTypes = externalFileTypes;
 
         setGraphic(IconTheme.JabRefIcons.TOGGLE_ENTRY_PREVIEW.getGraphicNode());
         setText(Localization.lang("Preview"));
@@ -63,7 +59,7 @@ public boolean shouldShow(BibEntry entry) {
     @Override
     protected void bindToEntry(BibEntry entry) {
         if (previewPanel == null) {
-            previewPanel = new PreviewPanel(databaseContext, dialogService, externalFileTypes, preferences.getKeyBindingRepository(), preferences, stateManager, themeManager, indexingTaskManager);
+            previewPanel = new PreviewPanel(databaseContext, dialogService, preferences.getKeyBindingRepository(), preferences, stateManager, themeManager, indexingTaskManager);
             setContent(previewPanel);
         }
 
diff --git a/src/main/java/org/jabref/gui/entryeditor/RequiredFieldsTab.java b/src/main/java/org/jabref/gui/entryeditor/RequiredFieldsTab.java
index 5c078dea5b5..3451f2c8f53 100644
--- a/src/main/java/org/jabref/gui/entryeditor/RequiredFieldsTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/RequiredFieldsTab.java
@@ -11,7 +11,6 @@
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.autocompleter.SuggestionProviders;
-import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.theme.ThemeManager;
 import org.jabref.gui.util.TaskExecutor;
@@ -40,11 +39,10 @@ public RequiredFieldsTab(BibDatabaseContext databaseContext,
                              ThemeManager themeManager,
                              IndexingTaskManager indexingTaskManager,
                              BibEntryTypesManager entryTypesManager,
-                             ExternalFileTypes externalFileTypes,
                              TaskExecutor taskExecutor,
                              JournalAbbreviationRepository journalAbbreviationRepository) {
         super(false, databaseContext, suggestionProviders, undoManager, dialogService,
-                preferences, stateManager, themeManager, externalFileTypes, taskExecutor, journalAbbreviationRepository, indexingTaskManager);
+                preferences, stateManager, themeManager, taskExecutor, journalAbbreviationRepository, indexingTaskManager);
         this.entryTypesManager = entryTypesManager;
 
         setText(Localization.lang("Required fields"));
diff --git a/src/main/java/org/jabref/gui/entryeditor/SourceTab.java b/src/main/java/org/jabref/gui/entryeditor/SourceTab.java
index 71b742190bf..1e3de019011 100644
--- a/src/main/java/org/jabref/gui/entryeditor/SourceTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/SourceTab.java
@@ -194,8 +194,12 @@ private void setupSourceEditor() {
         sourceValidator.getValidationStatus().getMessages().addListener((InvalidationListener) c -> {
             ValidationStatus sourceValidationStatus = sourceValidator.getValidationStatus();
             if (!sourceValidationStatus.isValid()) {
-                sourceValidationStatus.getHighestMessage().ifPresent(message ->
-                        dialogService.showErrorDialogAndWait(message.getMessage()));
+                sourceValidationStatus.getHighestMessage().ifPresent(message -> {
+                    String content = Localization.lang("User input via entry-editor in `{}bibtex source` tab led to failure.")
+                            + "\n" + Localization.lang("Please check your library file for wrong syntax.")
+                            + "\n\n" + message.getMessage();
+                    dialogService.showWarningDialogAndWait(Localization.lang("SourceTab error"), content);
+                });
             }
         });
 
@@ -335,5 +339,4 @@ private void listenForSaveKeybinding(KeyEvent event) {
             }
         });
     }
-
 }
diff --git a/src/main/java/org/jabref/gui/entryeditor/UserDefinedFieldsTab.java b/src/main/java/org/jabref/gui/entryeditor/UserDefinedFieldsTab.java
index bc084a8e77b..aa4e65b48e3 100644
--- a/src/main/java/org/jabref/gui/entryeditor/UserDefinedFieldsTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/UserDefinedFieldsTab.java
@@ -8,7 +8,6 @@
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.autocompleter.SuggestionProviders;
-import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.theme.ThemeManager;
 import org.jabref.gui.util.TaskExecutor;
@@ -16,7 +15,6 @@
 import org.jabref.logic.pdf.search.indexing.IndexingTaskManager;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
-import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.entry.field.Field;
 import org.jabref.preferences.PreferencesService;
 
@@ -33,11 +31,9 @@ public UserDefinedFieldsTab(String name,
                                 StateManager stateManager,
                                 ThemeManager themeManager,
                                 IndexingTaskManager indexingTaskManager,
-                                BibEntryTypesManager entryTypesManager,
-                                ExternalFileTypes externalFileTypes,
                                 TaskExecutor taskExecutor,
                                 JournalAbbreviationRepository journalAbbreviationRepository) {
-        super(false, databaseContext, suggestionProviders, undoManager, dialogService, preferences, stateManager, themeManager, externalFileTypes, taskExecutor, journalAbbreviationRepository, indexingTaskManager);
+        super(false, databaseContext, suggestionProviders, undoManager, dialogService, preferences, stateManager, themeManager, taskExecutor, journalAbbreviationRepository, indexingTaskManager);
 
         this.fields = new LinkedHashSet<>(fields);
 
diff --git a/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationViewModel.java b/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationViewModel.java
index 6f90512195a..62cd3d53491 100644
--- a/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationViewModel.java
+++ b/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationViewModel.java
@@ -4,7 +4,6 @@
 import javafx.beans.property.StringProperty;
 
 import org.jabref.logic.formatter.bibtexfields.RemoveHyphenatedNewlinesFormatter;
-import org.jabref.logic.formatter.bibtexfields.RemoveNewlinesFormatter;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.pdf.FileAnnotation;
 import org.jabref.model.pdf.FileAnnotationType;
@@ -33,22 +32,23 @@ private void setupContentProperties(FileAnnotation annotation) {
             String annotationContent = annotation.getContent();
             String illegibleTextMessage = Localization.lang("The marked area does not contain any legible text!");
             String markingContent = (annotationContent.isEmpty() ? illegibleTextMessage : annotationContent);
-            // remove newlines && hyphens before linebreaks
-            markingContent = markingContent.replaceAll("-" + NEWLINE, "");
-            new RemoveHyphenatedNewlinesFormatter().format(markingContent);
-            // remove new lines not preceded by '.' or ':'
-            markingContent = markingContent.replaceAll("(?<![.|:])" + NEWLINE, " ");
-            this.marking.set(markingContent);
+            this.marking.set(removePunctuationMark(markingContent));
         } else {
             String content = annotation.getContent();
-            // remove newlines && hyphens before linebreaks
-            content = new RemoveHyphenatedNewlinesFormatter().format(content);
-            content = new RemoveNewlinesFormatter().format(content);
-            this.content.set(content);
+            this.content.set(removePunctuationMark(content));
             this.marking.set("");
         }
     }
 
+    public String removePunctuationMark(String content) {
+        // remove newlines && hyphens before linebreaks
+        content = content.replaceAll("-" + NEWLINE, "");
+        content = new RemoveHyphenatedNewlinesFormatter().format(content);
+        // remove new lines not preceded by '.' or ':'
+        content = content.replaceAll("(?<![.|:])" + NEWLINE, " ");
+        return content;
+    }
+
     public String getAuthor() {
         return author.get();
     }
diff --git a/src/main/java/org/jabref/gui/errorconsole/ErrorConsoleView.java b/src/main/java/org/jabref/gui/errorconsole/ErrorConsoleView.java
index 93f32746c23..fa58509d6d2 100644
--- a/src/main/java/org/jabref/gui/errorconsole/ErrorConsoleView.java
+++ b/src/main/java/org/jabref/gui/errorconsole/ErrorConsoleView.java
@@ -80,7 +80,6 @@ private void initialize() {
 
     private Callback<ListView<LogEventViewModel>, ListCell<LogEventViewModel>> createCellFactory() {
         return cell -> new ListCell<>() {
-
             private HBox graphic;
             private Node icon;
             private VBox message;
diff --git a/src/main/java/org/jabref/gui/errorconsole/ErrorConsoleViewModel.java b/src/main/java/org/jabref/gui/errorconsole/ErrorConsoleViewModel.java
index 3d2752a42ef..bd3bb87da8c 100644
--- a/src/main/java/org/jabref/gui/errorconsole/ErrorConsoleViewModel.java
+++ b/src/main/java/org/jabref/gui/errorconsole/ErrorConsoleViewModel.java
@@ -2,9 +2,6 @@
 
 import java.io.IOException;
 import java.net.URISyntaxException;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
@@ -30,8 +27,6 @@
 public class ErrorConsoleViewModel extends AbstractViewModel {
     private static final Logger LOGGER = LoggerFactory.getLogger(ErrorConsoleViewModel.class);
 
-    private final DateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
-    private final Date date = new Date();
     private final DialogService dialogService;
     private final ClipBoardManager clipBoardManager;
     private final BuildInfo buildInfo;
diff --git a/src/main/java/org/jabref/gui/exporter/CreateModifyExporterDialogViewModel.java b/src/main/java/org/jabref/gui/exporter/CreateModifyExporterDialogViewModel.java
index 994602ddc92..ae8ee9b7234 100644
--- a/src/main/java/org/jabref/gui/exporter/CreateModifyExporterDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/exporter/CreateModifyExporterDialogViewModel.java
@@ -62,7 +62,6 @@ public ExporterViewModel saveExporter() {
         // Check that there are no empty strings.
         if (layoutFile.get().isEmpty() || name.get().isEmpty() || extension.get().isEmpty()
                 || !layoutFile.get().endsWith(".layout")) {
-
             LOGGER.info("One of the fields is empty or invalid!");
             return null;
         }
diff --git a/src/main/java/org/jabref/gui/exporter/ExportCommand.java b/src/main/java/org/jabref/gui/exporter/ExportCommand.java
index 4511c7107ac..f3c6812a764 100644
--- a/src/main/java/org/jabref/gui/exporter/ExportCommand.java
+++ b/src/main/java/org/jabref/gui/exporter/ExportCommand.java
@@ -1,5 +1,6 @@
 package org.jabref.gui.exporter;
 
+import java.io.IOException;
 import java.nio.file.Path;
 import java.util.Collections;
 import java.util.Comparator;
@@ -7,12 +8,17 @@
 import java.util.stream.Collectors;
 
 import javafx.stage.FileChooser;
+import javafx.util.Duration;
 
 import org.jabref.gui.DialogService;
 import org.jabref.gui.Globals;
+import org.jabref.gui.JabRefFrame;
+import org.jabref.gui.LibraryTab;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.ActionHelper;
 import org.jabref.gui.actions.SimpleCommand;
+import org.jabref.gui.desktop.JabRefDesktop;
+import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.util.BackgroundTask;
 import org.jabref.gui.util.FileDialogConfiguration;
 import org.jabref.gui.util.FileFilterConverter;
@@ -28,6 +34,7 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.preferences.PreferencesService;
 
+import org.controlsfx.control.action.Action;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -36,25 +43,28 @@
  */
 public class ExportCommand extends SimpleCommand {
 
+    public enum ExportMethod { EXPORT_ALL, EXPORT_SELECTED }
+
     private static final Logger LOGGER = LoggerFactory.getLogger(ExportCommand.class);
-    private final boolean selectedOnly;
+
+    private final ExportMethod exportMethod;
+    private final JabRefFrame frame;
     private final StateManager stateManager;
     private final PreferencesService preferences;
     private final DialogService dialogService;
 
-    /**
-     * @param selectedOnly true if only the selected entries should be exported, otherwise all entries are exported
-     */
-    public ExportCommand(boolean selectedOnly,
+    public ExportCommand(ExportMethod exportMethod,
+                         JabRefFrame frame,
                          StateManager stateManager,
                          DialogService dialogService,
                          PreferencesService preferences) {
-        this.selectedOnly = selectedOnly;
+        this.exportMethod = exportMethod;
+        this.frame = frame;
         this.stateManager = stateManager;
         this.preferences = preferences;
         this.dialogService = dialogService;
 
-        this.executable.bind(selectedOnly
+        this.executable.bind(exportMethod == ExportMethod.EXPORT_SELECTED
                 ? ActionHelper.needsEntriesSelected(stateManager)
                 : ActionHelper.needsDatabase(stateManager));
     }
@@ -91,7 +101,7 @@ private void export(Path file, FileChooser.ExtensionFilter selectedExtensionFilt
         final Exporter format = FileFilterConverter.getExporter(selectedExtensionFilter, exporters)
                                                    .orElseThrow(() -> new IllegalStateException("User didn't selected a file type for the extension"));
         List<BibEntry> entries;
-        if (selectedOnly) {
+        if (exportMethod == ExportMethod.EXPORT_SELECTED) {
             // Selected entries
             entries = stateManager.getSelectedEntries();
         } else {
@@ -114,18 +124,29 @@ private void export(Path file, FileChooser.ExtensionFilter selectedExtensionFilt
         preferences.getImportExportPreferences().setExportWorkingDirectory(file.getParent());
 
         final List<BibEntry> finEntries = entries;
+
         BackgroundTask
                 .wrap(() -> {
                     format.export(stateManager.getActiveDatabase().get(),
                             file,
-                            stateManager.getActiveDatabase().get()
-                                 .getMetaData()
-                                 .getEncoding()
-                                 .orElse(preferences.getGeneralPreferences().getDefaultEncoding()),
                             finEntries);
                     return null; // can not use BackgroundTask.wrap(Runnable) because Runnable.run() can't throw Exceptions
                 })
-                .onSuccess(x -> dialogService.notify(Localization.lang("%0 export successful", format.getName())))
+                .onSuccess(save -> {
+                    LibraryTab.DatabaseNotification notificationPane = frame.getCurrentLibraryTab().getNotificationPane();
+                    notificationPane.notify(
+                            IconTheme.JabRefIcons.FOLDER.getGraphicNode(),
+                            Localization.lang("Export operation finished successfully."),
+                            List.of(new Action(Localization.lang("Reveal in File Explorer"), event -> {
+                                try {
+                                    JabRefDesktop.openFolderAndSelectFile(file, preferences, dialogService);
+                                } catch (IOException e) {
+                                    LOGGER.error("Could not open export folder.", e);
+                                }
+                                notificationPane.hide();
+                            })),
+                            Duration.seconds(5));
+                })
                 .onFailure(this::handleError)
                 .executeWith(Globals.TASK_EXECUTOR);
     }
diff --git a/src/main/java/org/jabref/gui/exporter/ExportToClipboardAction.java b/src/main/java/org/jabref/gui/exporter/ExportToClipboardAction.java
index 80247e2c335..3407c25c153 100644
--- a/src/main/java/org/jabref/gui/exporter/ExportToClipboardAction.java
+++ b/src/main/java/org/jabref/gui/exporter/ExportToClipboardAction.java
@@ -1,14 +1,11 @@
 package org.jabref.gui.exporter;
 
-import java.io.BufferedReader;
 import java.io.IOException;
-import java.nio.charset.Charset;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
-import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -26,7 +23,6 @@
 import org.jabref.logic.exporter.ExporterFactory;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.FileType;
-import org.jabref.logic.util.OS;
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.preferences.PreferencesService;
@@ -124,14 +120,10 @@ private ExportResult exportToClipboard(Exporter exporter) throws Exception {
 
             // Write to file:
             exporter.export(stateManager.getActiveDatabase().get(), tmp,
-                    stateManager.getActiveDatabase().get()
-                                .getMetaData()
-                                .getEncoding()
-                                .orElse(preferences.getGeneralPreferences().getDefaultEncoding()),
                     entries);
             // Read the file and put the contents on the clipboard:
 
-            return new ExportResult(readFileToString(tmp), exporter.getFileType());
+            return new ExportResult(Files.readString(tmp), exporter.getFileType());
         } finally {
             // Clean up:
             if ((tmp != null) && Files.exists(tmp)) {
@@ -160,18 +152,6 @@ private void setContentToClipboard(ExportResult result) {
         dialogService.notify(Localization.lang("Entries exported to clipboard") + ": " + entries.size());
     }
 
-    private String readFileToString(Path tmp) throws IOException {
-        Charset defaultEncoding = Objects.requireNonNull(preferences.getGeneralPreferences().getDefaultEncoding());
-        try (BufferedReader reader = Files.newBufferedReader(tmp, stateManager.getActiveDatabase()
-                                                                              .map(db -> db.getMetaData()
-                                                                                           .getEncoding()
-                                                                                           .orElse(defaultEncoding))
-                                                                              .orElse(defaultEncoding))) {
-            return reader.lines().collect(Collectors.joining(OS.NEWLINE));
-        }
-    }
-
     private record ExportResult(String content, FileType fileType) {
-
     }
 }
diff --git a/src/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java b/src/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java
index 8dcc142e81f..84bf9346e23 100644
--- a/src/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java
+++ b/src/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java
@@ -2,6 +2,7 @@
 
 import java.io.IOException;
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.nio.charset.UnsupportedCharsetException;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -18,7 +19,6 @@
 import org.jabref.gui.DialogService;
 import org.jabref.gui.JabRefFrame;
 import org.jabref.gui.LibraryTab;
-import org.jabref.gui.dialogs.AutosaveUiManager;
 import org.jabref.gui.util.BackgroundTask;
 import org.jabref.gui.util.FileDialogConfiguration;
 import org.jabref.logic.autosaveandbackup.AutosaveManager;
@@ -92,7 +92,7 @@ public boolean saveAs(Path file) {
     public void saveSelectedAsPlain() {
         askForSavePath().ifPresent(path -> {
             try {
-                saveDatabase(path, true, preferences.getGeneralPreferences().getDefaultEncoding(), SavePreferences.DatabaseSaveType.PLAIN_BIBTEX);
+                saveDatabase(path, true, StandardCharsets.UTF_8, SavePreferences.DatabaseSaveType.PLAIN_BIBTEX);
                 frame.getFileHistory().newFile(path);
                 dialogService.notify(Localization.lang("Saved selected to '%0'.", path.toString()));
             } catch (SaveException ex) {
@@ -103,7 +103,7 @@ public void saveSelectedAsPlain() {
     }
 
     /**
-     * @param file the new file name to save the data base to. This is stored in the database context of the panel upon
+     * @param file the new file name to save the database to. This is stored in the database context of the panel upon
      *             successful save.
      * @return true on successful save
      */
@@ -130,19 +130,13 @@ boolean saveAs(Path file, SaveDatabaseMode mode) {
 
         if (saveResult) {
             // we managed to successfully save the file
-            // thus, we can store the store the path into the context
+            // thus, we can store the path into the context
             context.setDatabasePath(file);
             libraryTab.updateTabTitle(false);
 
-            // Reinstall AutosaveManager and BackupManager for the new file name
-            libraryTab.resetChangeMonitorAndChangePane();
-            if (readyForAutosave(context)) {
-                AutosaveManager autosaver = AutosaveManager.start(context);
-                autosaver.registerListener(new AutosaveUiManager(libraryTab));
-            }
-            if (readyForBackup(context)) {
-                BackupManager.start(context, entryTypesManager, preferences);
-            }
+            // Reset (here: uninstall and install again) AutosaveManager and BackupManager for the new file name
+            libraryTab.resetChangeMonitor();
+            libraryTab.installAutosaveManagerAndBackupManager();
 
             frame.getFileHistory().newFile(file);
         }
@@ -198,13 +192,21 @@ private boolean save(Path targetPath, SaveDatabaseMode mode) {
             dialogService.notify(String.format("%s...", Localization.lang("Saving library")));
         }
 
-        libraryTab.setSaving(true);
+        synchronized (libraryTab) {
+            if (libraryTab.isSaving()) {
+                // if another thread is saving, we do not need to save
+                return true;
+            }
+            libraryTab.setSaving(true);
+        }
+
         try {
             Charset encoding = libraryTab.getBibDatabaseContext()
                                          .getMetaData()
                                          .getEncoding()
-                                         .orElse(preferences.getGeneralPreferences().getDefaultEncoding());
-            // Make sure to remember which encoding we used.
+                                         .orElse(StandardCharsets.UTF_8);
+
+            // Make sure to remember which encoding we used
             libraryTab.getBibDatabaseContext().getMetaData().setEncoding(encoding, ChangePropagation.DO_NOT_POST_EVENT);
 
             // Save the database
@@ -227,32 +229,35 @@ private boolean save(Path targetPath, SaveDatabaseMode mode) {
     }
 
     private boolean saveDatabase(Path file, boolean selectedOnly, Charset encoding, SavePreferences.DatabaseSaveType saveType) throws SaveException {
+        // if this code is adapted, please also adapt org.jabref.logic.autosaveandbackup.BackupManager.performBackup
+
         GeneralPreferences generalPreferences = this.preferences.getGeneralPreferences();
         SavePreferences savePreferences = this.preferences.getSavePreferences()
                                                       .withSaveType(saveType);
-        try (AtomicFileWriter fileWriter = new AtomicFileWriter(file, encoding, savePreferences.shouldMakeBackup())) {
-            BibDatabaseContext bibDatabaseContext = libraryTab.getBibDatabaseContext();
-            BibWriter bibWriter = new BibWriter(fileWriter, bibDatabaseContext.getDatabase().getNewLineSeparator());
-            BibtexDatabaseWriter databaseWriter = new BibtexDatabaseWriter(bibWriter, generalPreferences, savePreferences, entryTypesManager);
-
-            if (selectedOnly) {
-                databaseWriter.savePartOfDatabase(bibDatabaseContext, libraryTab.getSelectedEntries());
-            } else {
-                databaseWriter.saveDatabase(bibDatabaseContext);
-            }
+        BibDatabaseContext bibDatabaseContext = libraryTab.getBibDatabaseContext();
+        synchronized (bibDatabaseContext) {
+            try (AtomicFileWriter fileWriter = new AtomicFileWriter(file, encoding, savePreferences.shouldMakeBackup())) {
+                BibWriter bibWriter = new BibWriter(fileWriter, bibDatabaseContext.getDatabase().getNewLineSeparator());
+                BibtexDatabaseWriter databaseWriter = new BibtexDatabaseWriter(bibWriter, generalPreferences, savePreferences, entryTypesManager);
+
+                if (selectedOnly) {
+                    databaseWriter.savePartOfDatabase(bibDatabaseContext, libraryTab.getSelectedEntries());
+                } else {
+                    databaseWriter.saveDatabase(bibDatabaseContext);
+                }
 
-            libraryTab.registerUndoableChanges(databaseWriter.getSaveActionsFieldChanges());
+                libraryTab.registerUndoableChanges(databaseWriter.getSaveActionsFieldChanges());
 
-            if (fileWriter.hasEncodingProblems()) {
-                saveWithDifferentEncoding(file, selectedOnly, encoding, fileWriter.getEncodingProblems(), saveType);
+                if (fileWriter.hasEncodingProblems()) {
+                    saveWithDifferentEncoding(file, selectedOnly, encoding, fileWriter.getEncodingProblems(), saveType);
+                }
+            } catch (UnsupportedCharsetException ex) {
+                throw new SaveException(Localization.lang("Character encoding '%0' is not supported.", encoding.displayName()), ex);
+            } catch (IOException ex) {
+                throw new SaveException("Problems saving: " + ex, ex);
             }
-        } catch (UnsupportedCharsetException ex) {
-            throw new SaveException(Localization.lang("Character encoding '%0' is not supported.", encoding.displayName()), ex);
-        } catch (IOException ex) {
-            throw new SaveException("Problems saving: " + ex, ex);
+            return true;
         }
-
-        return true;
     }
 
     private void saveWithDifferentEncoding(Path file, boolean selectedOnly, Charset encoding, Set<Character> encodingProblems, SavePreferences.DatabaseSaveType saveType) throws SaveException {
@@ -281,15 +286,4 @@ private void saveWithDifferentEncoding(Path file, boolean selectedOnly, Charset
             }
         }
     }
-
-    private boolean readyForAutosave(BibDatabaseContext context) {
-        return ((context.getLocation() == DatabaseLocation.SHARED)
-                || ((context.getLocation() == DatabaseLocation.LOCAL)
-                && preferences.getImportExportPreferences().shouldAutoSave()))
-                && context.getDatabasePath().isPresent();
-    }
-
-    private boolean readyForBackup(BibDatabaseContext context) {
-        return (context.getLocation() == DatabaseLocation.LOCAL) && context.getDatabasePath().isPresent();
-    }
 }
diff --git a/src/main/java/org/jabref/gui/exporter/WriteMetadataToPdfAction.java b/src/main/java/org/jabref/gui/exporter/WriteMetadataToPdfAction.java
index 2e72706e0ba..34d39b2c8d4 100644
--- a/src/main/java/org/jabref/gui/exporter/WriteMetadataToPdfAction.java
+++ b/src/main/java/org/jabref/gui/exporter/WriteMetadataToPdfAction.java
@@ -1,12 +1,10 @@
 package org.jabref.gui.exporter;
 
-import java.nio.charset.Charset;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
-import java.util.stream.Collectors;
 
 import javafx.application.Platform;
 import javafx.geometry.Insets;
@@ -35,7 +33,6 @@
 import org.jabref.logic.xmp.XmpUtilWriter;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.database.BibDatabaseContext;
-import org.jabref.model.database.BibDatabaseMode;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.preferences.FilePreferences;
@@ -45,12 +42,12 @@
 public class WriteMetadataToPdfAction extends SimpleCommand {
 
     private final StateManager stateManager;
+    private final BibEntryTypesManager entryTypesManager;
+    private final FieldWriterPreferences fieldWriterPreferences;
     private final DialogService dialogService;
     private final TaskExecutor taskExecutor;
     private final FilePreferences filePreferences;
     private final XmpPreferences xmpPreferences;
-    private final EmbeddedBibFilePdfExporter embeddedBibExporter;
-    private final Charset encoding;
 
     private OptionsDialog optionsDialog;
 
@@ -62,14 +59,14 @@ public class WriteMetadataToPdfAction extends SimpleCommand {
     private int entriesChanged;
     private int errors;
 
-    public WriteMetadataToPdfAction(StateManager stateManager, BibDatabaseMode databaseMode, BibEntryTypesManager entryTypesManager, FieldWriterPreferences fieldWriterPreferences, DialogService dialogService, TaskExecutor taskExecutor, FilePreferences filePreferences, XmpPreferences xmpPreferences, Charset encoding) {
+    public WriteMetadataToPdfAction(StateManager stateManager, BibEntryTypesManager entryTypesManager, FieldWriterPreferences fieldWriterPreferences, DialogService dialogService, TaskExecutor taskExecutor, FilePreferences filePreferences, XmpPreferences xmpPreferences) {
         this.stateManager = stateManager;
+        this.entryTypesManager = entryTypesManager;
+        this.fieldWriterPreferences = fieldWriterPreferences;
         this.dialogService = dialogService;
         this.taskExecutor = taskExecutor;
         this.filePreferences = filePreferences;
         this.xmpPreferences = xmpPreferences;
-        this.encoding = encoding;
-        this.embeddedBibExporter = new EmbeddedBibFilePdfExporter(databaseMode, entryTypesManager, fieldWriterPreferences);
 
         this.executable.bind(needsDatabase(stateManager));
     }
@@ -91,7 +88,6 @@ public void init() {
         entries = stateManager.getSelectedEntries();
 
         if (entries.isEmpty()) {
-
             entries = database.getEntries();
 
             if (entries.isEmpty()) {
@@ -132,8 +128,8 @@ private void writeMetadata() {
                                     .map(file -> file.findIn(stateManager.getActiveDatabase().get(), filePreferences))
                                     .filter(Optional::isPresent)
                                     .map(Optional::get)
-                                    .filter(path -> FileUtil.isPDFFile(path))
-                                    .collect(Collectors.toList());
+                                    .filter(FileUtil::isPDFFile)
+                                    .toList();
 
             Platform.runLater(() -> optionsDialog.getProgressArea()
                                                  .appendText(entry.getCitationKey().orElse(Localization.lang("undefined")) + "\n"));
@@ -147,13 +143,14 @@ private void writeMetadata() {
                     if (Files.exists(file)) {
                         try {
                             writeMetadataToFile(file, entry, stateManager.getActiveDatabase().get(), database);
-                            Platform.runLater(
-                                    () -> optionsDialog.getProgressArea().appendText("  " + Localization.lang("OK") + ".\n"));
+                            Platform.runLater(() ->
+                                    optionsDialog.getProgressArea()
+                                                 .appendText("  " + Localization.lang("OK") + ".\n"));
                             entriesChanged++;
                         } catch (Exception e) {
                             Platform.runLater(() -> {
-                                optionsDialog.getProgressArea().appendText("  " + Localization.lang("Error while writing") + " '"
-                                        + file.toString() + "':\n");
+                                optionsDialog.getProgressArea()
+                                             .appendText("  " + Localization.lang("Error while writing") + " '" + file + "':\n");
                                 optionsDialog.getProgressArea().appendText("    " + e.getLocalizedMessage() + "\n");
                             });
                             errors++;
@@ -163,23 +160,24 @@ private void writeMetadata() {
                         Platform.runLater(() -> {
                             optionsDialog.getProgressArea()
                                          .appendText("  " + Localization.lang("Skipped - PDF does not exist") + ":\n");
-                            optionsDialog.getProgressArea().appendText("    " + file.toString() + "\n");
+                            optionsDialog.getProgressArea()
+                                         .appendText("    " + file + "\n");
                         });
                     }
                 }
             }
 
             if (optionsDialog.isCanceled()) {
-                Platform.runLater(
-                        () -> optionsDialog.getProgressArea().appendText("\n" + Localization.lang("Operation canceled.") + "\n"));
+                Platform.runLater(() ->
+                        optionsDialog.getProgressArea().appendText("\n" + Localization.lang("Operation canceled.") + "\n"));
                 break;
             }
         }
         Platform.runLater(() -> {
             optionsDialog.getProgressArea()
                          .appendText("\n"
-                                 + Localization.lang("Finished writing metadata for %0 file (%1 skipped, %2 errors).", String
-                                 .valueOf(entriesChanged), String.valueOf(skipped), String.valueOf(errors)));
+                                 + Localization.lang("Finished writing metadata for %0 file (%1 skipped, %2 errors).",
+                                 String.valueOf(entriesChanged), String.valueOf(skipped), String.valueOf(errors)));
             optionsDialog.done();
         });
 
@@ -191,12 +189,14 @@ private void writeMetadata() {
                 String.valueOf(entriesChanged), String.valueOf(skipped), String.valueOf(errors)));
     }
 
-    private void writeMetadataToFile(Path file, BibEntry entry, BibDatabaseContext databaseContext, BibDatabase database) throws Exception {
-        // XMP
-        XmpUtilWriter.writeXmp(file, entry, database, xmpPreferences);
+    /**
+     * This writes both XMP data and embeds a corresponding .bib file
+     */
+    synchronized private void writeMetadataToFile(Path file, BibEntry entry, BibDatabaseContext databaseContext, BibDatabase database) throws Exception {
+        new XmpUtilWriter(xmpPreferences).writeXmp(file, entry, database);
 
-        // Embedded Bib File
-        embeddedBibExporter.exportToFileByPath(databaseContext, database, encoding, filePreferences, file);
+        EmbeddedBibFilePdfExporter embeddedBibExporter = new EmbeddedBibFilePdfExporter(databaseContext.getMode(), entryTypesManager, fieldWriterPreferences);
+        embeddedBibExporter.exportToFileByPath(databaseContext, database, filePreferences, file);
     }
 
     class OptionsDialog extends FXDialog {
diff --git a/src/main/java/org/jabref/gui/externalfiles/AutoLinkFilesAction.java b/src/main/java/org/jabref/gui/externalfiles/AutoLinkFilesAction.java
index 6c51f8889dd..689d79dca69 100644
--- a/src/main/java/org/jabref/gui/externalfiles/AutoLinkFilesAction.java
+++ b/src/main/java/org/jabref/gui/externalfiles/AutoLinkFilesAction.java
@@ -9,7 +9,6 @@
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.SimpleCommand;
-import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.undo.NamedCompound;
 import org.jabref.gui.util.BindingsHelper;
 import org.jabref.gui.util.TaskExecutor;
@@ -51,8 +50,7 @@ public void execute() {
         final AutoSetFileLinksUtil util = new AutoSetFileLinksUtil(
                 database,
                 preferences.getFilePreferences(),
-                preferences.getAutoLinkPreferences(),
-                ExternalFileTypes.getInstance());
+                preferences.getAutoLinkPreferences());
         final NamedCompound nc = new NamedCompound(Localization.lang("Automatically set file links"));
 
         Task<AutoSetFileLinksUtil.LinkFilesResult> linkFilesTask = new Task<>() {
diff --git a/src/main/java/org/jabref/gui/externalfiles/AutoSetFileLinksUtil.java b/src/main/java/org/jabref/gui/externalfiles/AutoSetFileLinksUtil.java
index e783ee0aed3..4d1f35e3b40 100644
--- a/src/main/java/org/jabref/gui/externalfiles/AutoSetFileLinksUtil.java
+++ b/src/main/java/org/jabref/gui/externalfiles/AutoSetFileLinksUtil.java
@@ -55,16 +55,16 @@ public List<IOException> getFileExceptions() {
     private static final Logger LOGGER = LoggerFactory.getLogger(AutoSetFileLinksUtil.class);
     private final List<Path> directories;
     private final AutoLinkPreferences autoLinkPreferences;
-    private final ExternalFileTypes externalFileTypes;
+    private final FilePreferences filePreferences;
 
-    public AutoSetFileLinksUtil(BibDatabaseContext databaseContext, FilePreferences filePreferences, AutoLinkPreferences autoLinkPreferences, ExternalFileTypes externalFileTypes) {
-        this(databaseContext.getFileDirectories(filePreferences), autoLinkPreferences, externalFileTypes);
+    public AutoSetFileLinksUtil(BibDatabaseContext databaseContext, FilePreferences filePreferences, AutoLinkPreferences autoLinkPreferences) {
+        this(databaseContext.getFileDirectories(filePreferences), filePreferences, autoLinkPreferences);
     }
 
-    private AutoSetFileLinksUtil(List<Path> directories, AutoLinkPreferences autoLinkPreferences, ExternalFileTypes externalFileTypes) {
+    private AutoSetFileLinksUtil(List<Path> directories, FilePreferences filePreferences, AutoLinkPreferences autoLinkPreferences) {
         this.directories = directories;
         this.autoLinkPreferences = autoLinkPreferences;
-        this.externalFileTypes = externalFileTypes;
+        this.filePreferences = filePreferences;
     }
 
     public LinkFilesResult linkAssociatedFiles(List<BibEntry> entries, NamedCompound ce) {
@@ -107,7 +107,7 @@ public LinkFilesResult linkAssociatedFiles(List<BibEntry> entries, NamedCompound
     public List<LinkedFile> findAssociatedNotLinkedFiles(BibEntry entry) throws IOException {
         List<LinkedFile> linkedFiles = new ArrayList<>();
 
-        List<String> extensions = externalFileTypes.getExternalFileTypeSelection().stream().map(ExternalFileType::getExtension).collect(Collectors.toList());
+        List<String> extensions = filePreferences.getExternalFileTypes().stream().map(ExternalFileType::getExtension).collect(Collectors.toList());
 
         // Run the search operation
         FileFinder fileFinder = FileFinders.constructFromConfiguration(autoLinkPreferences);
@@ -128,7 +128,7 @@ public List<LinkedFile> findAssociatedNotLinkedFiles(BibEntry entry) throws IOEx
 
             if (!fileAlreadyLinked) {
                 Optional<ExternalFileType> type = FileHelper.getFileExtension(foundFile)
-                                                            .map(externalFileTypes::getExternalFileTypeByExt)
+                                                            .map(extension -> ExternalFileTypes.getExternalFileTypeByExt(extension, filePreferences))
                                                             .orElse(Optional.of(new UnknownExternalFileType("")));
 
                 String strType = type.isPresent() ? type.get().getName() : "";
diff --git a/src/main/java/org/jabref/gui/externalfiles/ChainedFilters.java b/src/main/java/org/jabref/gui/externalfiles/ChainedFilters.java
new file mode 100644
index 00000000000..4162c9c674f
--- /dev/null
+++ b/src/main/java/org/jabref/gui/externalfiles/ChainedFilters.java
@@ -0,0 +1,35 @@
+package org.jabref.gui.externalfiles;
+
+import java.io.IOException;
+import java.nio.file.DirectoryStream;
+import java.nio.file.Path;
+import java.util.Arrays;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Chains the given filters - if ALL of them accept, the result is also accepted
+ */
+public class ChainedFilters implements DirectoryStream.Filter<Path> {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(ChainedFilters.class);
+
+    private DirectoryStream.Filter<Path>[] filters;
+
+    public ChainedFilters(DirectoryStream.Filter<Path>... filters) {
+        this.filters = filters;
+    }
+
+    @Override
+    public boolean accept(Path entry) throws IOException {
+        return Arrays.stream(filters).allMatch(filter -> {
+            try {
+                return filter.accept(entry);
+            } catch (IOException e) {
+                LOGGER.error("Could not apply filter", e);
+                return true;
+            }
+        });
+    }
+}
diff --git a/src/main/java/org/jabref/gui/externalfiles/DownloadFullTextAction.java b/src/main/java/org/jabref/gui/externalfiles/DownloadFullTextAction.java
index 56068fa847e..be8b74ede44 100644
--- a/src/main/java/org/jabref/gui/externalfiles/DownloadFullTextAction.java
+++ b/src/main/java/org/jabref/gui/externalfiles/DownloadFullTextAction.java
@@ -14,7 +14,6 @@
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.ActionHelper;
 import org.jabref.gui.actions.SimpleCommand;
-import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.fieldeditors.LinkedFileViewModel;
 import org.jabref.logic.importer.FulltextFetchers;
 import org.jabref.logic.l10n.Localization;
@@ -85,7 +84,9 @@ protected Map<BibEntry, Optional<URL>> call() {
                 Map<BibEntry, Optional<URL>> downloads = new ConcurrentHashMap<>();
                 int count = 0;
                 for (BibEntry entry : entries) {
-                    FulltextFetchers fetchers = new FulltextFetchers(preferences.getImportFormatPreferences());
+                    FulltextFetchers fetchers = new FulltextFetchers(
+                            preferences.getImportFormatPreferences(),
+                            preferences.getImporterPreferences());
                     downloads.put(entry, fetchers.findFullTextPDF(entry));
                     updateProgress(++count, entries.size());
                 }
@@ -144,8 +145,7 @@ private void addLinkedFileFromURL(BibDatabaseContext databaseContext, URL url, B
                     databaseContext,
                     Globals.TASK_EXECUTOR,
                     dialogService,
-                    preferences,
-                    ExternalFileTypes.getInstance());
+                    preferences);
 
             onlineFile.download();
         } else {
diff --git a/src/main/java/org/jabref/gui/externalfiles/ExternalFilesEntryLinker.java b/src/main/java/org/jabref/gui/externalfiles/ExternalFilesEntryLinker.java
index b62748a4959..7f9591c60f4 100644
--- a/src/main/java/org/jabref/gui/externalfiles/ExternalFilesEntryLinker.java
+++ b/src/main/java/org/jabref/gui/externalfiles/ExternalFilesEntryLinker.java
@@ -26,14 +26,12 @@ public class ExternalFilesEntryLinker {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ExternalFilesEntryLinker.class);
 
-    private final ExternalFileTypes externalFileTypes;
     private final FilePreferences filePreferences;
     private final BibDatabaseContext bibDatabaseContext;
     private final MoveFilesCleanup moveFilesCleanup;
     private final RenamePdfCleanup renameFilesCleanup;
 
-    public ExternalFilesEntryLinker(ExternalFileTypes externalFileTypes, FilePreferences filePreferences, BibDatabaseContext bibDatabaseContext) {
-        this.externalFileTypes = externalFileTypes;
+    public ExternalFilesEntryLinker(FilePreferences filePreferences, BibDatabaseContext bibDatabaseContext) {
         this.filePreferences = filePreferences;
         this.bibDatabaseContext = bibDatabaseContext;
         this.moveFilesCleanup = new MoveFilesCleanup(bibDatabaseContext, filePreferences);
@@ -62,7 +60,7 @@ public void moveLinkedFilesToFileDir(BibEntry entry) {
     public void addFilesToEntry(BibEntry entry, List<Path> files) {
         for (Path file : files) {
             FileUtil.getFileExtension(file).ifPresent(ext -> {
-                ExternalFileType type = externalFileTypes.getExternalFileTypeByExt(ext)
+                ExternalFileType type = ExternalFileTypes.getExternalFileTypeByExt(ext, filePreferences)
                                                          .orElse(new UnknownExternalFileType(ext));
                 Path relativePath = FileUtil.relativize(file, bibDatabaseContext.getFileDirectories(filePreferences));
                 LinkedFile linkedfile = new LinkedFile("", relativePath, type.getName());
diff --git a/src/main/java/org/jabref/gui/externalfiles/FileExtensionViewModel.java b/src/main/java/org/jabref/gui/externalfiles/FileExtensionViewModel.java
index 121517bf5bc..edab9aa8644 100644
--- a/src/main/java/org/jabref/gui/externalfiles/FileExtensionViewModel.java
+++ b/src/main/java/org/jabref/gui/externalfiles/FileExtensionViewModel.java
@@ -11,17 +11,18 @@
 import org.jabref.gui.util.FileFilterConverter;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.FileType;
+import org.jabref.preferences.FilePreferences;
 
 public class FileExtensionViewModel {
 
     private final String description;
     private final List<String> extensions;
-    private final ExternalFileTypes externalFileTypes;
+    private final FilePreferences filePreferences;
 
-    FileExtensionViewModel(FileType fileType, ExternalFileTypes externalFileTypes) {
+    FileExtensionViewModel(FileType fileType, FilePreferences filePreferences) {
         this.description = Localization.lang("%0 file", fileType.getName());
-        this.extensions = fileType.getExtensionsWithDot();
-        this.externalFileTypes = externalFileTypes;
+        this.extensions = fileType.getExtensionsWithAsteriskAndDot();
+        this.filePreferences = filePreferences;
     }
 
     public String getDescription() {
@@ -29,7 +30,7 @@ public String getDescription() {
     }
 
     public JabRefIcon getIcon() {
-        return externalFileTypes.getExternalFileTypeByExt(extensions.get(0))
+        return ExternalFileTypes.getExternalFileTypeByExt(extensions.get(0), filePreferences)
                                 .map(ExternalFileType::getIcon)
                                 .orElse(null);
     }
diff --git a/src/main/java/org/jabref/gui/externalfiles/FileFilterUtils.java b/src/main/java/org/jabref/gui/externalfiles/FileFilterUtils.java
index 28e1f20929a..6c9e48d13e3 100644
--- a/src/main/java/org/jabref/gui/externalfiles/FileFilterUtils.java
+++ b/src/main/java/org/jabref/gui/externalfiles/FileFilterUtils.java
@@ -16,10 +16,10 @@
 public class FileFilterUtils {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(FileFilterUtils.class);
-    
+
     /* Returns the last edited time of a file as LocalDateTime. */
     public static LocalDateTime getFileTime(Path path) {
-        FileTime lastEditedTime = null;
+        FileTime lastEditedTime;
         try {
             lastEditedTime = Files.getLastModifiedTime(path);
         } catch (IOException e) {
@@ -33,28 +33,28 @@ public static LocalDateTime getFileTime(Path path) {
         return localDateTime;
     }
 
-    /* Returns true if a file with a specific path 
+    /* Returns true if a file with a specific path
      * was edited during the last 24 hours. */
     public boolean isDuringLastDay(LocalDateTime fileEditTime) {
         LocalDateTime NOW = LocalDateTime.now(ZoneId.systemDefault());
         return fileEditTime.isAfter(NOW.minusHours(24));
     }
 
-    /* Returns true if a file with a specific path 
+    /* Returns true if a file with a specific path
      * was edited during the last 7 days. */
     public boolean isDuringLastWeek(LocalDateTime fileEditTime) {
         LocalDateTime NOW = LocalDateTime.now(ZoneId.systemDefault());
         return fileEditTime.isAfter(NOW.minusDays(7));
     }
 
-    /* Returns true if a file with a specific path 
+    /* Returns true if a file with a specific path
      * was edited during the last 30 days. */
     public boolean isDuringLastMonth(LocalDateTime fileEditTime) {
         LocalDateTime NOW = LocalDateTime.now(ZoneId.systemDefault());
         return fileEditTime.isAfter(NOW.minusDays(30));
     }
 
-    /* Returns true if a file with a specific path 
+    /* Returns true if a file with a specific path
      * was edited during the last 365 days. */
     public boolean isDuringLastYear(LocalDateTime fileEditTime) {
         LocalDateTime NOW = LocalDateTime.now(ZoneId.systemDefault());
@@ -75,8 +75,10 @@ public static boolean filterByDate(Path path, DateRange filter) {
         return isInDateRange;
     }
 
-    /* Sorts a list of Path objects according to the last edited date 
-     * of their corresponding files, from newest to oldest. */
+    /**
+     * Sorts a list of Path objects according to the last edited date
+     * of their corresponding files, from newest to oldest.
+     */
     public List<Path> sortByDateAscending(List<Path> files) {
         return files.stream()
                 .sorted(Comparator.comparingLong(file -> FileFilterUtils.getFileTime(file)
@@ -86,8 +88,10 @@ public List<Path> sortByDateAscending(List<Path> files) {
                 .collect(Collectors.toList());
     }
 
-    /* Sorts a list of Path objects according to the last edited date 
-     * of their corresponding files, from oldest to newest. */
+    /**
+     * Sorts a list of Path objects according to the last edited date
+     * of their corresponding files, from oldest to newest.
+     */
     public List<Path> sortByDateDescending(List<Path> files) {
         return files.stream()
                 .sorted(Comparator.comparingLong(file -> -FileFilterUtils.getFileTime(file)
@@ -97,8 +101,10 @@ public List<Path> sortByDateDescending(List<Path> files) {
                 .collect(Collectors.toList());
     }
 
-    /* Sorts a list of Path objects according to the last edited date
-     * the order depends on the specified sorter type. */
+    /**
+     * Sorts a list of Path objects according to the last edited date
+     * the order depends on the specified sorter type.
+     */
     public static List<Path> sortByDate(List<Path> files, ExternalFileSorter sortType) {
         FileFilterUtils fileFilter = new FileFilterUtils();
         List<Path> sortedFiles = switch (sortType) {
diff --git a/src/main/java/org/jabref/gui/externalfiles/GitIgnoreFileFilter.java b/src/main/java/org/jabref/gui/externalfiles/GitIgnoreFileFilter.java
new file mode 100644
index 00000000000..64f01de977b
--- /dev/null
+++ b/src/main/java/org/jabref/gui/externalfiles/GitIgnoreFileFilter.java
@@ -0,0 +1,66 @@
+package org.jabref.gui.externalfiles;
+
+import java.io.IOException;
+import java.nio.file.DirectoryStream;
+import java.nio.file.FileSystems;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.PathMatcher;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static java.util.function.Predicate.not;
+
+public class GitIgnoreFileFilter implements DirectoryStream.Filter<Path> {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(GitIgnoreFileFilter.class);
+
+    private Set<PathMatcher> gitIgnorePatterns;
+
+    public GitIgnoreFileFilter(Path path) {
+        Path currentPath = path;
+        while ((currentPath != null) && !Files.exists(currentPath.resolve(".gitignore"))) {
+            currentPath = currentPath.getParent();
+        }
+        if (currentPath == null) {
+            // we did not find any gitignore, lets use the default
+            gitIgnorePatterns = Set.of(".git", ".DS_Store", "desktop.ini", "Thumbs.db").stream()
+                                   // duplicate code as below
+                                   .map(line -> "glob:" + line)
+                                   .map(matcherString -> FileSystems.getDefault().getPathMatcher(matcherString))
+                                   .collect(Collectors.toSet());
+        } else {
+            Path gitIgnore = currentPath.resolve(".gitignore");
+            try {
+                Set<PathMatcher> plainGitIgnorePatternsFromGitIgnoreFile = Files.readAllLines(gitIgnore).stream()
+                                                                                .map(line -> line.trim())
+                                                                                .filter(not(String::isEmpty))
+                                                                                .filter(line -> !line.startsWith("#"))
+                                                                                // convert to Java syntax for Glob patterns
+                                                                                .map(line -> "glob:" + line)
+                                                                                .map(matcherString -> FileSystems.getDefault().getPathMatcher(matcherString))
+                                                                                .collect(Collectors.toSet());
+                gitIgnorePatterns = new HashSet<>(plainGitIgnorePatternsFromGitIgnoreFile);
+                // we want to ignore ".gitignore" itself
+                gitIgnorePatterns.add(FileSystems.getDefault().getPathMatcher("glob:.gitignore"));
+            } catch (IOException e) {
+                LOGGER.info("Could not read .gitignore from {}", gitIgnore, e);
+                gitIgnorePatterns = Set.of();
+            }
+        }
+    }
+
+    @Override
+    public boolean accept(Path path) throws IOException {
+        // We assume that git does not stop at a patern, but tries all. We implement that behavior
+        return gitIgnorePatterns.stream().noneMatch(filter ->
+                // we need this one for "*.png"
+                filter.matches(path.getFileName()) ||
+                // we need this one for "**/*.png"
+                filter.matches(path));
+    }
+}
diff --git a/src/main/java/org/jabref/gui/externalfiles/ImportHandler.java b/src/main/java/org/jabref/gui/externalfiles/ImportHandler.java
index 53c2f0398d7..b417e49fc3e 100644
--- a/src/main/java/org/jabref/gui/externalfiles/ImportHandler.java
+++ b/src/main/java/org/jabref/gui/externalfiles/ImportHandler.java
@@ -1,23 +1,37 @@
 package org.jabref.gui.externalfiles;
 
+import java.io.ByteArrayInputStream;
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
+import java.util.Optional;
 
 import javax.swing.undo.CompoundEdit;
 import javax.swing.undo.UndoManager;
 
+import org.jabref.gui.DialogService;
+import org.jabref.gui.Globals;
 import org.jabref.gui.StateManager;
-import org.jabref.gui.externalfiletype.ExternalFileTypes;
+import org.jabref.gui.duplicationFinder.DuplicateResolverDialog;
 import org.jabref.gui.undo.UndoableInsertEntries;
 import org.jabref.gui.util.BackgroundTask;
 import org.jabref.gui.util.DefaultTaskExecutor;
 import org.jabref.logic.citationkeypattern.CitationKeyGenerator;
+import org.jabref.logic.database.DuplicateCheck;
 import org.jabref.logic.externalfiles.ExternalFilesContentImporter;
+import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.ImportCleanup;
+import org.jabref.logic.importer.ImportException;
+import org.jabref.logic.importer.ImportFormatReader;
+import org.jabref.logic.importer.ImportFormatReader.UnknownFormatImport;
+import org.jabref.logic.importer.ParseException;
+import org.jabref.logic.importer.fetcher.ArXiv;
+import org.jabref.logic.importer.fetcher.DoiFetcher;
+import org.jabref.logic.importer.fileformat.BibtexParser;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.UpdateField;
 import org.jabref.logic.util.io.FileUtil;
@@ -25,9 +39,12 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
+import org.jabref.model.entry.identifier.ArXivIdentifier;
+import org.jabref.model.entry.identifier.DOI;
 import org.jabref.model.groups.GroupEntryChanger;
 import org.jabref.model.groups.GroupTreeNode;
 import org.jabref.model.util.FileUpdateMonitor;
+import org.jabref.model.util.OptionalUtil;
 import org.jabref.preferences.PreferencesService;
 
 import org.slf4j.Logger;
@@ -36,31 +53,33 @@
 public class ImportHandler {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ImportHandler.class);
-    private final BibDatabaseContext bibdatabase;
+    private final BibDatabaseContext bibDatabaseContext;
     private final PreferencesService preferencesService;
     private final FileUpdateMonitor fileUpdateMonitor;
     private final ExternalFilesEntryLinker linker;
     private final ExternalFilesContentImporter contentImporter;
     private final UndoManager undoManager;
     private final StateManager stateManager;
+    private final DialogService dialogService;
+    private final ImportFormatReader importFormatReader;
 
     public ImportHandler(BibDatabaseContext database,
-                         ExternalFileTypes externalFileTypes,
                          PreferencesService preferencesService,
                          FileUpdateMonitor fileupdateMonitor,
                          UndoManager undoManager,
-                         StateManager stateManager) {
+                         StateManager stateManager,
+                         DialogService dialogService,
+                         ImportFormatReader importFormatReader) {
 
-        this.bibdatabase = database;
+        this.bibDatabaseContext = database;
         this.preferencesService = preferencesService;
         this.fileUpdateMonitor = fileupdateMonitor;
         this.stateManager = stateManager;
+        this.dialogService = dialogService;
+        this.importFormatReader = importFormatReader;
 
-        this.linker = new ExternalFilesEntryLinker(externalFileTypes, preferencesService.getFilePreferences(), database);
-        this.contentImporter = new ExternalFilesContentImporter(
-                preferencesService.getGeneralPreferences(),
-                preferencesService.getImporterPreferences(),
-                preferencesService.getImportFormatPreferences());
+        this.linker = new ExternalFilesEntryLinker(preferencesService.getFilePreferences(), database);
+        this.contentImporter = new ExternalFilesContentImporter(preferencesService.getImportFormatPreferences());
         this.undoManager = undoManager;
     }
 
@@ -68,18 +87,17 @@ public ExternalFilesEntryLinker getLinker() {
         return linker;
     }
 
-    public BackgroundTask<List<ImportFilesResultItemViewModel>> importFilesInBackground(List<Path> files) {
+    public BackgroundTask<List<ImportFilesResultItemViewModel>> importFilesInBackground(final List<Path> files) {
         return new BackgroundTask<>() {
             private int counter;
-            private List<BibEntry> entriesToAdd;
             private final List<ImportFilesResultItemViewModel> results = new ArrayList<>();
 
             @Override
             protected List<ImportFilesResultItemViewModel> call() {
                 counter = 1;
                 CompoundEdit ce = new CompoundEdit();
-                for (Path file: files) {
-                    entriesToAdd = Collections.emptyList();
+                for (final Path file : files) {
+                    final List<BibEntry> entriesToAdd = new ArrayList<>();
 
                     if (isCanceled()) {
                         break;
@@ -87,7 +105,7 @@ protected List<ImportFilesResultItemViewModel> call() {
 
                     DefaultTaskExecutor.runInJavaFXThread(() -> {
                         updateMessage(Localization.lang("Processing file %0", file.getFileName()));
-                        updateProgress(counter, files.size() - 1);
+                        updateProgress(counter, files.size() - 1d);
                     });
 
                     try {
@@ -100,10 +118,10 @@ protected List<ImportFilesResultItemViewModel> call() {
                             }
 
                             if (!pdfEntriesInFile.isEmpty()) {
-                                entriesToAdd = pdfEntriesInFile;
+                                entriesToAdd.addAll(pdfEntriesInFile);
                                 addResultToList(file, true, Localization.lang("Importing using extracted PDF data"));
                             } else {
-                                entriesToAdd = Collections.singletonList(createEmptyEntryWithLink(file));
+                                entriesToAdd.add(createEmptyEntryWithLink(file));
                                 addResultToList(file, false, Localization.lang("No metadata found. Creating empty entry with file link"));
                             }
                         } else if (FileUtil.isBibFile(file)) {
@@ -112,10 +130,10 @@ protected List<ImportFilesResultItemViewModel> call() {
                                 addResultToList(file, false, bibtexParserResult.getErrorMessage());
                             }
 
-                            entriesToAdd = bibtexParserResult.getDatabaseContext().getEntries();
+                            entriesToAdd.addAll(bibtexParserResult.getDatabaseContext().getEntries());
                             addResultToList(file, false, Localization.lang("Importing bib entry"));
                         } else {
-                            entriesToAdd = Collections.singletonList(createEmptyEntryWithLink(file));
+                            entriesToAdd.add(createEmptyEntryWithLink(file));
                             addResultToList(file, false, Localization.lang("No BibTeX data found. Creating empty entry with file link"));
                         }
                     } catch (IOException ex) {
@@ -128,7 +146,7 @@ protected List<ImportFilesResultItemViewModel> call() {
                     // We need to run the actual import on the FX Thread, otherwise we will get some deadlocks with the UIThreadList
                     DefaultTaskExecutor.runInJavaFXThread(() -> importEntries(entriesToAdd));
 
-                    ce.addEdit(new UndoableInsertEntries(bibdatabase.getDatabase(), entriesToAdd));
+                    ce.addEdit(new UndoableInsertEntries(bibDatabaseContext.getDatabase(), entriesToAdd));
                     ce.end();
                     undoManager.addEdit(ce);
 
@@ -152,9 +170,9 @@ private BibEntry createEmptyEntryWithLink(Path file) {
     }
 
     public void importEntries(List<BibEntry> entries) {
-        ImportCleanup cleanup = new ImportCleanup(bibdatabase.getMode());
+        ImportCleanup cleanup = new ImportCleanup(bibDatabaseContext.getMode());
         cleanup.doPostCleanup(entries);
-        bibdatabase.getDatabase().insertEntries(entries);
+        bibDatabaseContext.getDatabase().insertEntries(entries);
 
         // Set owner/timestamp
         UpdateField.setAutomaticFields(entries,
@@ -167,7 +185,46 @@ public void importEntries(List<BibEntry> entries) {
         }
 
         // Add to group
-        addToGroups(entries, stateManager.getSelectedGroup(bibdatabase));
+        addToGroups(entries, stateManager.getSelectedGroup(bibDatabaseContext));
+    }
+
+    public void importEntryWithDuplicateCheck(BibDatabaseContext bibDatabaseContext, BibEntry entry) {
+        ImportCleanup cleanup = new ImportCleanup(bibDatabaseContext.getMode());
+        BibEntry cleanedEntry = cleanup.doPostCleanup(entry);
+        BibEntry entryToInsert = cleanedEntry;
+
+        Optional<BibEntry> existingDuplicateInLibrary = new DuplicateCheck(Globals.entryTypesManager).containsDuplicate(bibDatabaseContext.getDatabase(), entryToInsert, bibDatabaseContext.getMode());
+        if (existingDuplicateInLibrary.isPresent()) {
+            DuplicateResolverDialog dialog = new DuplicateResolverDialog(existingDuplicateInLibrary.get(), entryToInsert, DuplicateResolverDialog.DuplicateResolverType.IMPORT_CHECK, bibDatabaseContext, stateManager, dialogService);
+            switch (dialogService.showCustomDialogAndWait(dialog).orElse(DuplicateResolverDialog.DuplicateResolverResult.BREAK)) {
+                case KEEP_LEFT:
+                    bibDatabaseContext.getDatabase().removeEntry(existingDuplicateInLibrary.get());
+                    break;
+                case KEEP_BOTH:
+                    break;
+                case KEEP_MERGE:
+                    bibDatabaseContext.getDatabase().removeEntry(existingDuplicateInLibrary.get());
+                    entryToInsert = dialog.getMergedEntry();
+                    break;
+                case KEEP_RIGHT:
+                case AUTOREMOVE_EXACT:
+                case BREAK:
+                default:
+                   return;
+            }
+        }
+        // Regenerate CiteKey of imported BibEntry
+        if (preferencesService.getImporterPreferences().isGenerateNewKeyOnImport()) {
+            generateKeys(List.of(entryToInsert));
+        }
+        bibDatabaseContext.getDatabase().insertEntry(entryToInsert);
+
+        // Set owner/timestamp
+        UpdateField.setAutomaticFields(List.of(entryToInsert),
+                                       preferencesService.getOwnerPreferences(),
+                                       preferencesService.getTimestampPreferences());
+
+        addToGroups(List.of(entry), stateManager.getSelectedGroup(this.bibDatabaseContext));
     }
 
     private void addToGroups(List<BibEntry> entries, Collection<GroupTreeNode> groups) {
@@ -190,13 +247,61 @@ private void addToGroups(List<BibEntry> entries, Collection<GroupTreeNode> group
      */
     private void generateKeys(List<BibEntry> entries) {
         CitationKeyGenerator keyGenerator = new CitationKeyGenerator(
-                bibdatabase.getMetaData().getCiteKeyPattern(preferencesService.getCitationKeyPatternPreferences()
-                                                                              .getKeyPattern()),
-                bibdatabase.getDatabase(),
+                bibDatabaseContext.getMetaData().getCiteKeyPattern(preferencesService.getCitationKeyPatternPreferences()
+                                                                                     .getKeyPattern()),
+                bibDatabaseContext.getDatabase(),
                 preferencesService.getCitationKeyPatternPreferences());
 
         for (BibEntry entry : entries) {
             keyGenerator.generateAndSetKey(entry);
         }
     }
+
+    public List<BibEntry> handleBibTeXData(String entries) {
+        BibtexParser parser = new BibtexParser(preferencesService.getImportFormatPreferences(), Globals.getFileUpdateMonitor());
+        try {
+            return parser.parseEntries(new ByteArrayInputStream(entries.getBytes(StandardCharsets.UTF_8)));
+        } catch (ParseException ex) {
+            LOGGER.error("Could not paste", ex);
+            return Collections.emptyList();
+        }
+    }
+
+    public List<BibEntry> handleStringData(String data) throws FetcherException {
+        if ((data == null) || data.isEmpty()) {
+            return Collections.emptyList();
+        }
+
+        Optional<DOI> doi = DOI.parse(data);
+        if (doi.isPresent()) {
+            return fetchByDOI(doi.get());
+        }
+        Optional<ArXivIdentifier> arXiv = ArXivIdentifier.parse(data);
+        if (arXiv.isPresent()) {
+            return fetchByArXiv(arXiv.get());
+        }
+
+        return tryImportFormats(data);
+    }
+
+    private List<BibEntry> tryImportFormats(String data) {
+        try {
+            UnknownFormatImport unknownFormatImport = importFormatReader.importUnknownFormat(data);
+            return unknownFormatImport.parserResult.getDatabase().getEntries();
+        } catch (ImportException ignored) {
+            return Collections.emptyList();
+        }
+    }
+
+    private List<BibEntry> fetchByDOI(DOI doi) throws FetcherException {
+        LOGGER.info("Found DOI in clipboard");
+        Optional<BibEntry> entry = new DoiFetcher(preferencesService.getImportFormatPreferences()).performSearchById(doi.getDOI());
+        return OptionalUtil.toList(entry);
+    }
+
+    private List<BibEntry> fetchByArXiv(ArXivIdentifier arXivIdentifier) throws FetcherException {
+        LOGGER.info("Found arxiv identifier in clipboard");
+        Optional<BibEntry> entry = new ArXiv(preferencesService.getImportFormatPreferences()).performSearchById(arXivIdentifier.getNormalizedWithoutVersion());
+        return OptionalUtil.toList(entry);
+    }
 }
diff --git a/src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesCrawler.java b/src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesCrawler.java
index 53ebad10fc5..ef26c177a25 100644
--- a/src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesCrawler.java
+++ b/src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesCrawler.java
@@ -66,52 +66,76 @@ protected FileNodeViewModel call() throws IOException {
      * 'state' must be set to 1, to keep the recursion running. When the states value changes, the method will resolve
      * its recursion and return what it has saved so far.
      * <br>
-     * The files are filtered according to the {@link DateRange} filter value 
+     * The files are filtered according to the {@link DateRange} filter value
      * and then sorted according to the {@link ExternalFileSorter} value.
      *
+     * @param unlinkedPDFFileFilter contains a BibDatabaseContext which is used to determine whether the file is linked
+     *
+     * @return FileNodeViewModel containing the data of the current directory and all subdirectories
      * @throws IOException if directory is not a directory or empty
      */
-    private FileNodeViewModel searchDirectory(Path directory, UnlinkedPDFFileFilter fileFilter) throws IOException {
+    FileNodeViewModel searchDirectory(Path directory, UnlinkedPDFFileFilter unlinkedPDFFileFilter) throws IOException {
         // Return null if the directory is not valid.
         if ((directory == null) || !Files.isDirectory(directory)) {
             throw new IOException(String.format("Invalid directory for searching: %s", directory));
         }
 
-        FileNodeViewModel parent = new FileNodeViewModel(directory);
-        Map<Boolean, List<Path>> fileListPartition;
+        FileNodeViewModel fileNodeViewModelForCurrentDirectory = new FileNodeViewModel(directory);
 
-        try (Stream<Path> filesStream = StreamSupport.stream(Files.newDirectoryStream(directory, fileFilter).spliterator(), false)) {
-            fileListPartition = filesStream.collect(Collectors.partitioningBy(Files::isDirectory));
+        // Map from isDirectory (true/false) to full path
+        // Result: Contains only files not matching the filter (i.e., PDFs not linked and files not ignored)
+        // Filters:
+        //   1. UnlinkedPDFFileFilter
+        //   2. GitIgnoreFilter
+        ChainedFilters filters = new ChainedFilters(unlinkedPDFFileFilter, new GitIgnoreFileFilter(directory));
+        Map<Boolean, List<Path>> directoryAndFilePartition;
+        try (Stream<Path> filesStream = StreamSupport.stream(Files.newDirectoryStream(directory, filters).spliterator(), false)) {
+            directoryAndFilePartition = filesStream.collect(Collectors.partitioningBy(Files::isDirectory));
         } catch (IOException e) {
-            LOGGER.error(String.format("%s while searching files: %s", e.getClass().getName(), e.getMessage()));
-            return parent;
+            LOGGER.error("Error while searching files", e);
+            return fileNodeViewModelForCurrentDirectory;
         }
+        List<Path> subDirectories = directoryAndFilePartition.get(true);
+        List<Path> files = directoryAndFilePartition.get(false);
 
-        List<Path> subDirectories = fileListPartition.get(true);
-        List<Path> files = new ArrayList<>(fileListPartition.get(false));
-        int fileCount = 0;
+        // at this point, only unlinked PDFs AND unignored files are contained
 
-        for (Path subDirectory : subDirectories) {
-            FileNodeViewModel subRoot = searchDirectory(subDirectory, fileFilter);
+        // initially, we find no files at all
+        int fileCountOfSubdirectories = 0;
 
+        // now we crawl into the found subdirectories first (!)
+        for (Path subDirectory : subDirectories) {
+            FileNodeViewModel subRoot = searchDirectory(subDirectory, unlinkedPDFFileFilter);
             if (!subRoot.getChildren().isEmpty()) {
-                fileCount += subRoot.getFileCount();
-                parent.getChildren().add(subRoot);
+                fileCountOfSubdirectories += subRoot.getFileCount();
+                fileNodeViewModelForCurrentDirectory.getChildren().add(subRoot);
             }
         }
+        // now we have the data of all subdirectories
+        // it is stored in fileNodeViewModelForCurrentDirectory.getChildren()
+
+        // now we handle the files in the current directory
+
         // filter files according to last edited date.
-        List<Path> filteredFiles = new ArrayList<Path>();
+        // Note that we do not use the "StreamSupport.stream" filtering functionality, because refactoring the code to that would lead to more code
+        List<Path> resultingFiles = new ArrayList<>();
         for (Path path : files) {
             if (FileFilterUtils.filterByDate(path, dateFilter)) {
-                filteredFiles.add(path);
+                resultingFiles.add(path);
             }
         }
+
         // sort files according to last edited date.
-        filteredFiles = FileFilterUtils.sortByDate(filteredFiles, sorter);
-        parent.setFileCount(filteredFiles.size() + fileCount);
-        parent.getChildren().addAll(filteredFiles.stream()
+        resultingFiles = FileFilterUtils.sortByDate(resultingFiles, sorter);
+
+        // the count of all files is the count of the found files in current directory plus the count of all files in the subdirectories
+        fileNodeViewModelForCurrentDirectory.setFileCount(resultingFiles.size() + fileCountOfSubdirectories);
+
+        // create and add FileNodeViewModel to the FileNodeViewModel for the current directory
+        fileNodeViewModelForCurrentDirectory.getChildren().addAll(resultingFiles.stream()
                 .map(FileNodeViewModel::new)
                 .collect(Collectors.toList()));
-        return parent;
+
+        return fileNodeViewModelForCurrentDirectory;
     }
 }
diff --git a/src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesDialogView.java b/src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesDialogView.java
index 2d1af899d12..9ccdfa8ec82 100644
--- a/src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesDialogView.java
+++ b/src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesDialogView.java
@@ -31,7 +31,6 @@
 import org.jabref.gui.actions.ActionFactory;
 import org.jabref.gui.actions.SimpleCommand;
 import org.jabref.gui.actions.StandardActions;
-import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.icon.JabRefIcon;
 import org.jabref.gui.theme.ThemeManager;
 import org.jabref.gui.util.BaseDialog;
@@ -42,6 +41,7 @@
 import org.jabref.gui.util.ValueTableCellFactory;
 import org.jabref.gui.util.ViewModelListCellFactory;
 import org.jabref.gui.util.ViewModelTreeCellFactory;
+import org.jabref.logic.importer.ImportFormatReader;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.util.FileUpdateMonitor;
 import org.jabref.preferences.PreferencesService;
@@ -81,6 +81,7 @@ public class UnlinkedFilesDialogView extends BaseDialog<Void> {
     @Inject private TaskExecutor taskExecutor;
     @Inject private FileUpdateMonitor fileUpdateMonitor;
     @Inject private ThemeManager themeManager;
+    @Inject private ImportFormatReader importFormatReader;
 
     private final ControlsFxVisualizer validationVisualizer;
     private UnlinkedFilesDialogViewModel viewModel;
@@ -106,7 +107,7 @@ public UnlinkedFilesDialogView() {
 
     @FXML
     private void initialize() {
-        viewModel = new UnlinkedFilesDialogViewModel(dialogService, ExternalFileTypes.getInstance(), undoManager, fileUpdateMonitor, preferencesService, stateManager, taskExecutor);
+        viewModel = new UnlinkedFilesDialogViewModel(dialogService, undoManager, fileUpdateMonitor, preferencesService, stateManager, taskExecutor, importFormatReader);
 
         progressDisplay.progressProperty().bind(viewModel.progressValueProperty());
         progressText.textProperty().bind(viewModel.progressTextProperty());
diff --git a/src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesDialogViewModel.java b/src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesDialogViewModel.java
index c516be37f86..2129e473c4a 100644
--- a/src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesDialogViewModel.java
@@ -30,12 +30,12 @@
 
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
-import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.util.BackgroundTask;
 import org.jabref.gui.util.DirectoryDialogConfiguration;
 import org.jabref.gui.util.FileDialogConfiguration;
 import org.jabref.gui.util.FileNodeViewModel;
 import org.jabref.gui.util.TaskExecutor;
+import org.jabref.logic.importer.ImportFormatReader;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.model.database.BibDatabaseContext;
@@ -81,28 +81,29 @@ public class UnlinkedFilesDialogViewModel {
     private final FunctionBasedValidator<String> scanDirectoryValidator;
 
     public UnlinkedFilesDialogViewModel(DialogService dialogService,
-                                        ExternalFileTypes externalFileTypes,
                                         UndoManager undoManager,
                                         FileUpdateMonitor fileUpdateMonitor,
                                         PreferencesService preferences,
                                         StateManager stateManager,
-                                        TaskExecutor taskExecutor) {
+                                        TaskExecutor taskExecutor,
+                                        ImportFormatReader importFormatReader) {
         this.preferences = preferences;
         this.dialogService = dialogService;
         this.taskExecutor = taskExecutor;
         this.bibDatabase = stateManager.getActiveDatabase().orElseThrow(() -> new NullPointerException("Database null"));
         importHandler = new ImportHandler(
                 bibDatabase,
-                externalFileTypes,
                 preferences,
                 fileUpdateMonitor,
                 undoManager,
-                stateManager);
+                stateManager,
+                dialogService,
+                importFormatReader);
 
         this.fileFilterList = FXCollections.observableArrayList(
-                new FileExtensionViewModel(StandardFileType.ANY_FILE, externalFileTypes),
-                new FileExtensionViewModel(StandardFileType.BIBTEX_DB, externalFileTypes),
-                new FileExtensionViewModel(StandardFileType.PDF, externalFileTypes));
+                new FileExtensionViewModel(StandardFileType.ANY_FILE, preferences.getFilePreferences()),
+                new FileExtensionViewModel(StandardFileType.BIBTEX_DB, preferences.getFilePreferences()),
+                new FileExtensionViewModel(StandardFileType.PDF, preferences.getFilePreferences()));
 
         this.dateFilterList = FXCollections.observableArrayList(DateRange.values());
 
diff --git a/src/main/java/org/jabref/gui/externalfiles/UnlinkedPDFFileFilter.java b/src/main/java/org/jabref/gui/externalfiles/UnlinkedPDFFileFilter.java
index 0cdb7263263..0532801d222 100644
--- a/src/main/java/org/jabref/gui/externalfiles/UnlinkedPDFFileFilter.java
+++ b/src/main/java/org/jabref/gui/externalfiles/UnlinkedPDFFileFilter.java
@@ -32,7 +32,6 @@ public UnlinkedPDFFileFilter(DirectoryStream.Filter<Path> fileFilter, BibDatabas
 
     @Override
     public boolean accept(Path pathname) throws IOException {
-
         if (Files.isDirectory(pathname)) {
             return true;
         } else {
diff --git a/src/main/java/org/jabref/gui/externalfiletype/ExternalFileType.java b/src/main/java/org/jabref/gui/externalfiletype/ExternalFileType.java
index 15e4a869b51..0a5a44259cf 100644
--- a/src/main/java/org/jabref/gui/externalfiletype/ExternalFileType.java
+++ b/src/main/java/org/jabref/gui/externalfiletype/ExternalFileType.java
@@ -11,6 +11,10 @@ public interface ExternalFileType {
 
     String getMimeType();
 
+    String getOpenWithApplication();
+
+    JabRefIcon getIcon();
+
     /**
      * Get the bibtex field name used for this file type. Currently we assume that field name equals filename extension.
      *
@@ -20,7 +24,14 @@ default Field getField() {
         return FieldFactory.parseField(getExtension());
     }
 
-    String getOpenWithApplication();
-
-    JabRefIcon getIcon();
+    /**
+     * Return a String array representing this file type. This is used for storage into
+     * Preferences, and the same array can be used to construct the file type later,
+     * using the String[] constructor.
+     *
+     * @return A String[] containing all information about this file type.
+     */
+    default String[] toStringArray() {
+        return new String[]{getName(), getExtension(), getMimeType(), getOpenWithApplication(), getIcon().name()};
+    }
 }
diff --git a/src/main/java/org/jabref/gui/externalfiletype/ExternalFileTypes.java b/src/main/java/org/jabref/gui/externalfiletype/ExternalFileTypes.java
index fec93600501..3cba8ebd4fa 100644
--- a/src/main/java/org/jabref/gui/externalfiletype/ExternalFileTypes.java
+++ b/src/main/java/org/jabref/gui/externalfiletype/ExternalFileTypes.java
@@ -3,18 +3,18 @@
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Comparator;
+import java.util.Collection;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
 import java.util.Optional;
 import java.util.Set;
-import java.util.TreeSet;
 
-import org.jabref.gui.Globals;
 import org.jabref.logic.bibtex.FileFieldWriter;
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.model.strings.StringUtil;
 import org.jabref.model.util.FileHelper;
+import org.jabref.preferences.FilePreferences;
 
 // Do not make this class final, as it otherwise can't be mocked for tests
 public class ExternalFileTypes {
@@ -22,40 +22,23 @@ public class ExternalFileTypes {
     // This String is used in the encoded list in prefs of external file type
     // modifications, in order to indicate a removed default file type:
     private static final String FILE_TYPE_REMOVED_FLAG = "REMOVED";
-    // The only instance of this class:
-    private static ExternalFileTypes singleton;
-    // Map containing all registered external file types:
-    private final Set<ExternalFileType> externalFileTypes = new TreeSet<>(Comparator.comparing(ExternalFileType::getName));
-
-    private final ExternalFileType HTML_FALLBACK_TYPE = StandardExternalFileType.URL;
+    private static final ExternalFileType HTML_FALLBACK_TYPE = StandardExternalFileType.URL;
 
     private ExternalFileTypes() {
-        updateExternalFileTypes();
-    }
-
-    public static ExternalFileTypes getInstance() {
-        if (ExternalFileTypes.singleton == null) {
-            ExternalFileTypes.singleton = new ExternalFileTypes();
-        }
-        return ExternalFileTypes.singleton;
     }
 
     public static List<ExternalFileType> getDefaultExternalFileTypes() {
         return Arrays.asList(StandardExternalFileType.values());
     }
 
-    public Set<ExternalFileType> getExternalFileTypeSelection() {
-        return externalFileTypes;
-    }
-
     /**
      * Look up the external file type registered with this name, if any.
      *
      * @param name The file type name.
      * @return The ExternalFileType registered, or null if none.
      */
-    public Optional<ExternalFileType> getExternalFileTypeByName(String name) {
-        Optional<ExternalFileType> externalFileType = externalFileTypes.stream().filter(type -> type.getName().equals(name)).findFirst();
+    public static Optional<ExternalFileType> getExternalFileTypeByName(String name, FilePreferences filePreferences) {
+        Optional<ExternalFileType> externalFileType = filePreferences.getExternalFileTypes().stream().filter(type -> type.getName().equals(name)).findFirst();
         if (externalFileType.isPresent()) {
             return externalFileType;
         }
@@ -69,9 +52,9 @@ public Optional<ExternalFileType> getExternalFileTypeByName(String name) {
      * @param extension The file extension.
      * @return The ExternalFileType registered, or null if none.
      */
-    public Optional<ExternalFileType> getExternalFileTypeByExt(String extension) {
+    public static Optional<ExternalFileType> getExternalFileTypeByExt(String extension, FilePreferences filePreferences) {
         String extensionCleaned = extension.replace(".", "").replace("*", "");
-        return externalFileTypes.stream().filter(type -> type.getExtension().equalsIgnoreCase(extensionCleaned)).findFirst();
+        return filePreferences.getExternalFileTypes().stream().filter(type -> type.getExtension().equalsIgnoreCase(extensionCleaned)).findFirst();
     }
 
     /**
@@ -80,8 +63,8 @@ public Optional<ExternalFileType> getExternalFileTypeByExt(String extension) {
      * @param extension The file extension.
      * @return true if an ExternalFileType with the extension exists, false otherwise
      */
-    public boolean isExternalFileTypeByExt(String extension) {
-        return externalFileTypes.stream().anyMatch(type -> type.getExtension().equalsIgnoreCase(extension));
+    public static boolean isExternalFileTypeByExt(String extension, FilePreferences filePreferences) {
+        return filePreferences.getExternalFileTypes().stream().anyMatch(type -> type.getExtension().equalsIgnoreCase(extension));
     }
 
     /**
@@ -90,10 +73,10 @@ public boolean isExternalFileTypeByExt(String extension) {
      * @param filename The name of the file whose type to look up.
      * @return The ExternalFileType registered, or null if none.
      */
-    public Optional<ExternalFileType> getExternalFileTypeForName(String filename) {
+    public static Optional<ExternalFileType> getExternalFileTypeForName(String filename, FilePreferences filePreferences) {
         int longestFound = -1;
         ExternalFileType foundType = null;
-        for (ExternalFileType type : externalFileTypes) {
+        for (ExternalFileType type : filePreferences.getExternalFileTypes()) {
             if (!type.getExtension().isEmpty() && filename.toLowerCase(Locale.ROOT).endsWith(type.getExtension().toLowerCase(Locale.ROOT))
                     && (type.getExtension().length() > longestFound)) {
                 longestFound = type.getExtension().length();
@@ -110,12 +93,12 @@ public Optional<ExternalFileType> getExternalFileTypeForName(String filename) {
      * @return The ExternalFileType registered, or null if none. For the mime type "text/html", a valid file type is
      *         guaranteed to be returned.
      */
-    public Optional<ExternalFileType> getExternalFileTypeByMimeType(String mimeType) {
+    public static Optional<ExternalFileType> getExternalFileTypeByMimeType(String mimeType, FilePreferences filePreferences) {
         // Ignores parameters according to link: (https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/MIME_types)
         if (mimeType.indexOf(';') != -1) {
             mimeType = mimeType.substring(0, mimeType.indexOf(';')).trim();
         }
-        for (ExternalFileType type : externalFileTypes) {
+        for (ExternalFileType type : filePreferences.getExternalFileTypes()) {
             if (type.getMimeType().equalsIgnoreCase(mimeType)) {
                 return Optional.of(type);
             }
@@ -127,22 +110,44 @@ public Optional<ExternalFileType> getExternalFileTypeByMimeType(String mimeType)
         }
     }
 
+    public static Optional<ExternalFileType> getExternalFileTypeByFile(Path file, FilePreferences filePreferences) {
+        final String filePath = file.toString();
+        final Optional<String> extension = FileHelper.getFileExtension(filePath);
+        return extension.flatMap(ext -> getExternalFileTypeByExt(ext, filePreferences));
+    }
+
+    public static Optional<ExternalFileType> getExternalFileTypeByLinkedFile(LinkedFile linkedFile, boolean deduceUnknownType, FilePreferences filePreferences) {
+        Optional<ExternalFileType> type = getExternalFileTypeByName(linkedFile.getFileType(), filePreferences);
+        boolean isUnknownType = type.isEmpty() || (type.get() instanceof UnknownExternalFileType);
+
+        if (isUnknownType && deduceUnknownType) {
+            // No file type was recognized. Try to find a usable file type based on mime type:
+            Optional<ExternalFileType> mimeType = getExternalFileTypeByMimeType(linkedFile.getFileType(), filePreferences);
+            if (mimeType.isPresent()) {
+                return mimeType;
+            }
+
+            // No type could be found from mime type. Try based on the extension:
+            return FileHelper.getFileExtension(linkedFile.getLink())
+                             .flatMap(extension -> getExternalFileTypeByExt(extension, filePreferences));
+        } else {
+            return type;
+        }
+    }
+
     /**
-     * Reset the List of external file types after user customization.
-     *
-     * @param types The new List of external file types. This is the complete list, not just new entries.
+     * @return A StringList of customized and removed file types compared to the default list of external file types for storing
      */
-    public void setExternalFileTypes(List<ExternalFileType> types) {
-
+    public static String toStringList(Collection<ExternalFileType> fileTypes) {
         // First find a list of the default types:
         List<ExternalFileType> defTypes = new ArrayList<>(getDefaultExternalFileTypes());
         // Make a list of types that are unchanged:
         List<ExternalFileType> unchanged = new ArrayList<>();
+        // Create a result list
+        List<ExternalFileType> results = new ArrayList<>();
 
-        externalFileTypes.clear();
-        for (ExternalFileType type : types) {
-            externalFileTypes.add(type);
-
+        for (ExternalFileType type : fileTypes) {
+            results.add(type);
             // See if we can find a type with matching name in the default type list:
             ExternalFileType found = null;
             for (ExternalFileType defType : defTypes) {
@@ -167,52 +172,38 @@ public void setExternalFileTypes(List<ExternalFileType> types) {
         // and from the list of defaults, since we don't need to mention these in prefs:
         for (ExternalFileType type : unchanged) {
             defTypes.remove(type);
-            types.remove(type);
+            results.remove(type);
         }
 
         // Now set up the array to write to prefs, containing all new types, all modified
         // types, and a flag denoting each default type that has been removed:
-        String[][] array = new String[types.size() + defTypes.size()][];
+        String[][] array = new String[results.size() + defTypes.size()][];
         int i = 0;
-        for (ExternalFileType type : types) {
-            array[i] = getStringArrayRepresentation(type);
+        for (ExternalFileType type : results) {
+            array[i] = type.toStringArray();
             i++;
         }
         for (ExternalFileType type : defTypes) {
             array[i] = new String[] {type.getName(), FILE_TYPE_REMOVED_FLAG};
             i++;
         }
-        Globals.prefs.storeExternalFileTypes(FileFieldWriter.encodeStringArray(array));
+        return FileFieldWriter.encodeStringArray(array);
     }
 
     /**
-     * Return a String array representing this file type. This is used for storage into
-     * Preferences, and the same array can be used to construct the file type later,
-     * using the String[] constructor.
-     *
-     * @return A String[] containing all information about this file type.
+     * Set up the list of external file types, either from default values, or from values recorded in PreferencesService.
      */
-    private String[] getStringArrayRepresentation(ExternalFileType type) {
-        return new String[] {type.getName(), type.getExtension(), type.getMimeType(), type.getOpenWithApplication(), type.getIcon().name()};
-    }
-
-    /**
-     * Set up the list of external file types, either from default values, or from values recorded in Preferences.
-     */
-    private void updateExternalFileTypes() {
+    public static Set<ExternalFileType> fromString(String storedFileTypes) {
         // First get a list of the default file types as a starting point:
-        List<ExternalFileType> types = new ArrayList<>(getDefaultExternalFileTypes());
+        Set<ExternalFileType> types = new HashSet<>(getDefaultExternalFileTypes());
+
         // If no changes have been stored, simply use the defaults:
-        Optional<String> storedFileTypes = Globals.prefs.getExternalFileTypes();
-        if (storedFileTypes.isEmpty()) {
-            externalFileTypes.clear();
-            externalFileTypes.addAll(types);
-            return;
+        if (StringUtil.isBlank(storedFileTypes)) {
+            return types;
         }
 
         // Read the prefs information for file types:
-        String[][] vals = StringUtil
-                .decodeStringDoubleArray(storedFileTypes.orElse(""));
+        String[][] vals = StringUtil.decodeStringDoubleArray(storedFileTypes);
         for (String[] val : vals) {
             if ((val.length == 2) && val[1].equals(FILE_TYPE_REMOVED_FLAG)) {
                 // This entry indicates that a default entry type should be removed:
@@ -249,32 +240,6 @@ private void updateExternalFileTypes() {
             }
         }
 
-        // Finally, build the list of types based on the modified defaults list:
-        externalFileTypes.addAll(types);
-    }
-
-    public Optional<ExternalFileType> getExternalFileTypeByFile(Path file) {
-        final String filePath = file.toString();
-        final Optional<String> extension = FileHelper.getFileExtension(filePath);
-        return extension.flatMap(this::getExternalFileTypeByExt);
-    }
-
-    public Optional<ExternalFileType> fromLinkedFile(LinkedFile linkedFile, boolean deduceUnknownType) {
-        Optional<ExternalFileType> type = getExternalFileTypeByName(linkedFile.getFileType());
-        boolean isUnknownType = type.isEmpty() || (type.get() instanceof UnknownExternalFileType);
-
-        if (isUnknownType && deduceUnknownType) {
-            // No file type was recognized. Try to find a usable file type based on mime type:
-            Optional<ExternalFileType> mimeType = getExternalFileTypeByMimeType(linkedFile.getFileType());
-            if (mimeType.isPresent()) {
-                return mimeType;
-            }
-
-            // No type could be found from mime type. Try based on the extension:
-            return FileHelper.getFileExtension(linkedFile.getLink())
-                             .flatMap(this::getExternalFileTypeByExt);
-        } else {
-            return type;
-        }
+        return types;
     }
 }
diff --git a/src/main/java/org/jabref/gui/fieldeditors/DateEditorViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/DateEditorViewModel.java
index 96ffe10c09e..de7bdeb7583 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/DateEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/DateEditorViewModel.java
@@ -22,7 +22,6 @@ public DateEditorViewModel(Field field, SuggestionProvider<?> suggestionProvider
 
     public StringConverter<TemporalAccessor> getDateToStringConverter() {
         return new StringConverter<TemporalAccessor>() {
-
             @Override
             public String toString(TemporalAccessor date) {
                 if (date != null) {
diff --git a/src/main/java/org/jabref/gui/fieldeditors/IdentifierEditor.java b/src/main/java/org/jabref/gui/fieldeditors/IdentifierEditor.java
index 567d643bdfd..69d27a2b91f 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/IdentifierEditor.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/IdentifierEditor.java
@@ -50,7 +50,6 @@ public IdentifierEditor(Field field,
                 new Tooltip(Localization.lang("Look up %0", field.getDisplayName())));
 
         if (field.equals(StandardField.DOI)) {
-
             textArea.initContextMenu(EditorMenus.getDOIMenu(textArea));
         } else {
             textArea.initContextMenu(new DefaultMenu(textArea));
diff --git a/src/main/java/org/jabref/gui/fieldeditors/IdentifierEditorViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/IdentifierEditorViewModel.java
index 04025e60be7..5d69547367d 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/IdentifierEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/IdentifierEditorViewModel.java
@@ -15,6 +15,8 @@
 import org.jabref.gui.mergeentries.FetchAndMergeEntry;
 import org.jabref.gui.util.BackgroundTask;
 import org.jabref.gui.util.TaskExecutor;
+import org.jabref.logic.importer.FetcherClientException;
+import org.jabref.logic.importer.FetcherServerException;
 import org.jabref.logic.importer.WebFetchers;
 import org.jabref.logic.importer.util.IdentifierParser;
 import org.jabref.logic.integrity.FieldCheckers;
@@ -27,8 +29,13 @@
 import org.jabref.preferences.PreferencesService;
 
 import com.tobiasdiez.easybind.EasyBind;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class IdentifierEditorViewModel extends AbstractEditorViewModel {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(IdentifierEditorViewModel.class);
+
     private final BooleanProperty validIdentifierIsNotPresent = new SimpleBooleanProperty(true);
     private final BooleanProperty identifierLookupInProgress = new SimpleBooleanProperty(false);
     private final BooleanProperty idFetcherAvailable = new SimpleBooleanProperty(true);
@@ -119,8 +126,19 @@ public void lookupIdentifier(BibEntry entry) {
                             dialogService.notify(Localization.lang("No %0 found", field.getDisplayName()));
                         }
                     })
-                    .onFailure(dialogService::showErrorDialogAndWait)
-                    .executeWith(taskExecutor);
+                      .onFailure(exception -> {
+                          LOGGER.error("Error while fetching bibliographic information", exception);
+                          if (exception instanceof FetcherClientException) {
+                              dialogService.showInformationDialogAndWait(Localization.lang("Look up %0", idFetcher.getName()), Localization.lang("No data was found for the identifier"));
+                          } else if (exception instanceof FetcherServerException) {
+                              dialogService.showInformationDialogAndWait(Localization.lang("Look up %0", idFetcher.getName()), Localization.lang("Server not available"));
+                          } else if (exception.getCause() != null) {
+                              dialogService.showWarningDialogAndWait(Localization.lang("Look up %0", idFetcher.getName()), Localization.lang("Error occured %0", exception.getCause().getMessage()));
+                          } else {
+                              dialogService.showWarningDialogAndWait(Localization.lang("Look up %0", idFetcher.getName()), Localization.lang("Error occured %0", exception.getCause().getMessage()));
+                          }
+                      })
+                      .executeWith(taskExecutor);
         });
     }
 }
diff --git a/src/main/java/org/jabref/gui/fieldeditors/LinkedEntriesEditorViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/LinkedEntriesEditorViewModel.java
index 947294e5234..f5d89d80321 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/LinkedEntriesEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/LinkedEntriesEditorViewModel.java
@@ -36,7 +36,6 @@ public ListProperty<ParsedEntryLink> linkedEntriesProperty() {
 
     public StringConverter<ParsedEntryLink> getStringConverter() {
         return new StringConverter<>() {
-
             @Override
             public String toString(ParsedEntryLink linkedEntry) {
                 if (linkedEntry == null) {
diff --git a/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java
index 50f27f6bb5e..14fcf013668 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java
@@ -14,21 +14,22 @@
 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.HttpsURLConnection;
 import javax.net.ssl.SSLSocketFactory;
-import javax.xml.transform.TransformerException;
 
 import javafx.beans.Observable;
+import javafx.beans.binding.Bindings;
+import javafx.beans.binding.ObjectBinding;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.DoubleProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleDoubleProperty;
 import javafx.beans.property.StringProperty;
+import javafx.scene.Node;
 import javafx.scene.control.Alert.AlertType;
 import javafx.scene.control.ButtonBar.ButtonData;
 import javafx.scene.control.ButtonType;
 
 import org.jabref.gui.AbstractViewModel;
 import org.jabref.gui.DialogService;
-import org.jabref.gui.Globals;
 import org.jabref.gui.desktop.JabRefDesktop;
 import org.jabref.gui.externalfiles.FileDownloadTask;
 import org.jabref.gui.externalfiletype.ExternalFileType;
@@ -41,7 +42,6 @@
 import org.jabref.gui.util.BackgroundTask;
 import org.jabref.gui.util.ControlHelper;
 import org.jabref.gui.util.TaskExecutor;
-import org.jabref.logic.exporter.EmbeddedBibFilePdfExporter;
 import org.jabref.logic.externalfiles.LinkedFileHandler;
 import org.jabref.logic.importer.Importer;
 import org.jabref.logic.importer.ParserResult;
@@ -54,7 +54,6 @@
 import org.jabref.logic.net.URLDownload;
 import org.jabref.logic.util.io.FileNameUniqueness;
 import org.jabref.logic.util.io.FileUtil;
-import org.jabref.logic.xmp.XmpUtilWriter;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.LinkedFile;
@@ -86,7 +85,8 @@ public class LinkedFileViewModel extends AbstractViewModel {
     private final TaskExecutor taskExecutor;
     private final PreferencesService preferences;
     private final LinkedFileHandler linkedFileHandler;
-    private final ExternalFileTypes externalFileTypes;
+
+    private ObjectBinding<Node> linkedFileIconBinding;
 
     private final Validator fileExistsValidator;
 
@@ -95,8 +95,7 @@ public LinkedFileViewModel(LinkedFile linkedFile,
                                BibDatabaseContext databaseContext,
                                TaskExecutor taskExecutor,
                                DialogService dialogService,
-                               PreferencesService preferences,
-                               ExternalFileTypes externalFileTypes) {
+                               PreferencesService preferences) {
 
         this.linkedFile = linkedFile;
         this.preferences = preferences;
@@ -105,7 +104,6 @@ public LinkedFileViewModel(LinkedFile linkedFile,
         this.entry = entry;
         this.dialogService = dialogService;
         this.taskExecutor = taskExecutor;
-        this.externalFileTypes = externalFileTypes;
 
         fileExistsValidator = new FunctionBasedValidator<>(
                 linkedFile.linkProperty(),
@@ -180,11 +178,19 @@ public Optional<Path> findIn(List<Path> directories) {
     }
 
     public JabRefIcon getTypeIcon() {
-        return externalFileTypes.fromLinkedFile(linkedFile, false)
+        return ExternalFileTypes.getExternalFileTypeByLinkedFile(linkedFile, false, preferences.getFilePreferences())
                                 .map(ExternalFileType::getIcon)
                                 .orElse(IconTheme.JabRefIcons.FILE);
     }
 
+    public ObjectBinding<Node> typeIconProperty() {
+        if (linkedFileIconBinding == null) {
+            linkedFileIconBinding = Bindings.createObjectBinding(() -> this.getTypeIcon().getGraphicNode(), linkedFile.fileTypeProperty());
+        }
+
+        return linkedFileIconBinding;
+    }
+
     public void markAsAutomaticallyFound() {
         isAutomaticallyFound.setValue(true);
     }
@@ -203,7 +209,7 @@ public Observable[] getObservables() {
 
     public void open() {
         try {
-            Optional<ExternalFileType> type = ExternalFileTypes.getInstance().fromLinkedFile(linkedFile, true);
+            Optional<ExternalFileType> type = ExternalFileTypes.getExternalFileTypeByLinkedFile(linkedFile, true, preferences.getFilePreferences());
             boolean successful = JabRefDesktop.openExternalFileAnyFormat(databaseContext, preferences, linkedFile.getLink(), type);
             if (!successful) {
                 dialogService.showErrorDialogAndWait(Localization.lang("File not found"), Localization.lang("Could not find file '%0'.", linkedFile.getLink()));
@@ -222,7 +228,7 @@ public void openFolder() {
                         preferences.getFilePreferences());
 
                 if (resolvedPath.isPresent()) {
-                    JabRefDesktop.openFolderAndSelectFile(resolvedPath.get(), preferences);
+                    JabRefDesktop.openFolderAndSelectFile(resolvedPath.get(), preferences, dialogService);
                 } else {
                     dialogService.showErrorDialogAndWait(Localization.lang("File not found"));
                 }
@@ -417,28 +423,8 @@ public void edit() {
         });
     }
 
-    public void writeMetadataToPdf() {
-        BackgroundTask<Void> writeTask = BackgroundTask.wrap(() -> {
-            Optional<Path> file = linkedFile.findIn(databaseContext, preferences.getFilePreferences());
-            if (file.isEmpty()) {
-                // TODO: Print error message
-                // Localization.lang("PDF does not exist");
-            } else {
-                try {
-                    XmpUtilWriter.writeXmp(file.get(), entry, databaseContext.getDatabase(), preferences.getXmpPreferences());
-
-                    EmbeddedBibFilePdfExporter embeddedBibExporter = new EmbeddedBibFilePdfExporter(preferences.getGeneralPreferences().getDefaultBibDatabaseMode(), Globals.entryTypesManager, preferences.getFieldWriterPreferences());
-                    embeddedBibExporter.exportToFileByPath(databaseContext, databaseContext.getDatabase(), preferences.getGeneralPreferences().getDefaultEncoding(), preferences.getFilePreferences(), file.get());
-                } catch (IOException | TransformerException ex) {
-                    // TODO: Print error message
-                    // Localization.lang("Error while writing") + " '" + file.toString() + "': " + ex;
-                }
-            }
-            return null;
-        });
-
-        // TODO: Show progress
-        taskExecutor.execute(writeTask);
+    public WriteMetadataToPdfCommand createWriteMetadataToPdfCommand() {
+        return new WriteMetadataToPdfCommand(linkedFile, databaseContext, preferences, dialogService, entry, LOGGER, taskExecutor);
     }
 
     public void download() {
@@ -459,7 +445,7 @@ public void download() {
 
             BackgroundTask<Path> downloadTask = prepareDownloadTask(targetDirectory.get(), urlDownload);
             downloadTask.onSuccess(destination -> {
-                boolean isDuplicate = false;
+                boolean isDuplicate;
                 try {
                     isDuplicate = FileNameUniqueness.isDuplicatedFile(targetDirectory.get(), destination.getFileName(), dialogService);
                 } catch (IOException e) {
@@ -468,7 +454,10 @@ public void download() {
                 }
 
                 if (!isDuplicate) {
-                    LinkedFile newLinkedFile = LinkedFilesEditorViewModel.fromFile(destination, databaseContext.getFileDirectories(preferences.getFilePreferences()), externalFileTypes);
+                    LinkedFile newLinkedFile = LinkedFilesEditorViewModel.fromFile(
+                            destination,
+                            databaseContext.getFileDirectories(preferences.getFilePreferences()),
+                            preferences.getFilePreferences());
                     List<LinkedFile> linkedFiles = entry.getFiles();
 
                     entry.addLinkedFile(entry, linkedFile, newLinkedFile, linkedFiles);
@@ -485,6 +474,10 @@ public void download() {
             downloadTask.messageProperty().set(
                     Localization.lang("Fulltext for") + ": " + entry.getCitationKey().orElse(Localization.lang("New entry")));
             downloadTask.showToUser(true);
+            downloadTask.onFailure(ex -> {
+                LOGGER.error("Error downloading", ex);
+                dialogService.showErrorDialogAndWait(Localization.lang("Error downloading"), ex);
+            });
             taskExecutor.execute(downloadTask);
         } catch (MalformedURLException exception) {
             dialogService.showErrorDialogAndWait(Localization.lang("Invalid URL"), exception);
@@ -524,8 +517,7 @@ public BackgroundTask<Path> prepareDownloadTask(Path targetDirectory, URLDownloa
                     return targetDirectory.resolve(fulltextDir).resolve(suggestedName);
                 })
                 .then(destination -> new FileDownloadTask(urlDownload.getSource(), destination))
-                .onFinished(() -> URLDownload.setSSLVerification(defaultSSLSocketFactory, defaultHostnameVerifier))
-                .onFailure(exception -> dialogService.showErrorDialogAndWait("Download failed", exception));
+                .onFinished(() -> URLDownload.setSSLVerification(defaultSSLSocketFactory, defaultHostnameVerifier));
         return downloadTask;
     }
 
@@ -544,15 +536,15 @@ private Optional<ExternalFileType> inferFileTypeFromMimeType(URLDownload urlDown
 
         if (mimeType != null) {
             LOGGER.debug("MIME Type suggested: " + mimeType);
-            return externalFileTypes.getExternalFileTypeByMimeType(mimeType);
+            return ExternalFileTypes.getExternalFileTypeByMimeType(mimeType, preferences.getFilePreferences());
         } else {
             return Optional.empty();
         }
     }
 
     private Optional<ExternalFileType> inferFileTypeFromURL(String url) {
-        return URLUtil.getSuffix(url)
-                      .flatMap(externalFileTypes::getExternalFileTypeByExt);
+        return URLUtil.getSuffix(url, preferences.getFilePreferences())
+                      .flatMap(extension -> ExternalFileTypes.getExternalFileTypeByExt(extension, preferences.getFilePreferences()));
     }
 
     public LinkedFile getFile() {
@@ -569,8 +561,8 @@ public void parsePdfMetadataAndShowMergeDialog() {
             dialog.addSource(Localization.lang("Entry"), entry);
             dialog.addSource(Localization.lang("Verbatim"), wrapImporterToSupplier(new PdfVerbatimBibTextImporter(preferences.getImportFormatPreferences()), filePath));
             dialog.addSource(Localization.lang("Embedded"), wrapImporterToSupplier(new PdfEmbeddedBibFileImporter(preferences.getImportFormatPreferences()), filePath));
-            if (preferences.getImporterPreferences().isGrobidEnabled()) {
-                dialog.addSource("Grobid", wrapImporterToSupplier(new PdfGrobidImporter(preferences.getImporterPreferences(), preferences.getImportFormatPreferences()), filePath));
+            if (preferences.getGrobidPreferences().isGrobidEnabled()) {
+                dialog.addSource("Grobid", wrapImporterToSupplier(new PdfGrobidImporter(preferences.getImportFormatPreferences()), filePath));
             }
             dialog.addSource(Localization.lang("XMP metadata"), wrapImporterToSupplier(new PdfXmpImporter(preferences.getXmpPreferences()), filePath));
             dialog.addSource(Localization.lang("Content"), wrapImporterToSupplier(new PdfContentImporter(preferences.getImportFormatPreferences()), filePath));
@@ -584,7 +576,7 @@ public void parsePdfMetadataAndShowMergeDialog() {
     private Supplier<BibEntry> wrapImporterToSupplier(Importer importer, Path filePath) {
         return () -> {
             try {
-                ParserResult parserResult = importer.importDatabase(filePath, preferences.getGeneralPreferences().getDefaultEncoding());
+                ParserResult parserResult = importer.importDatabase(filePath);
                 if (parserResult.isInvalid() || parserResult.isEmpty() || !parserResult.getDatabase().hasEntries()) {
                     return null;
                 }
diff --git a/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditor.fxml b/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditor.fxml
index a0d6fd60f6d..5f61cfd109c 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditor.fxml
+++ b/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditor.fxml
@@ -6,40 +6,40 @@
 <?import javafx.scene.control.Tooltip?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.StackPane?>
+<?import javafx.scene.layout.VBox?>
 <?import org.jabref.gui.icon.JabRefIconView?>
 <fx:root xmlns:fx="http://javafx.com/fxml/1" type="HBox" xmlns="http://javafx.com/javafx/8.0.112"
          fx:controller="org.jabref.gui.fieldeditors.LinkedFilesEditor">
-    <ListView fx:id="listView" prefHeight="0" HBox.hgrow="ALWAYS" maxHeight="100"/>
-    <Button onAction="#addNewFile"
-            styleClass="icon-button">
-        <graphic>
-            <JabRefIconView glyph="NEW_FILE"/>
-        </graphic>
-        <tooltip>
-            <Tooltip text="%Open"/>
-        </tooltip>
-    </Button>
-    <Button onAction="#fetchFulltext" styleClass="icon-button">
-        <graphic>
-            <StackPane>
-                <JabRefIconView glyph="FETCH_FULLTEXT"
-                                visible="${controller.viewModel.fulltextLookupInProgress == false}"/>
-                <ProgressIndicator maxHeight="12.0" maxWidth="12.0"
-                                   visible="${controller.viewModel.fulltextLookupInProgress}"/>
-            </StackPane>
-        </graphic>
-        <tooltip>
-            <Tooltip text="%Get fulltext"/>
-        </tooltip>
-    </Button>
-    <Button
-            onAction="#addFromURL"
-            styleClass="icon-button">
-        <graphic>
-            <JabRefIconView glyph="DOWNLOAD"/>
-        </graphic>
-        <tooltip>
-            <Tooltip text="%Download from URL"/>
-        </tooltip>
-    </Button>
+    <ListView fx:id="listView" prefHeight="0" HBox.hgrow="ALWAYS" maxHeight="100" />
+    <VBox>
+        <Button onAction="#addNewFile" styleClass="icon-button">
+            <graphic>
+                <JabRefIconView glyph="LINKED_FILE_ADD"/>
+            </graphic>
+            <tooltip>
+                <Tooltip text="%Open"/>
+            </tooltip>
+        </Button>
+        <Button onAction="#fetchFulltext" styleClass="icon-button">
+            <graphic>
+                <StackPane>
+                    <JabRefIconView glyph="FETCH_FULLTEXT"
+                                    visible="${controller.viewModel.fulltextLookupInProgress == false}"/>
+                    <ProgressIndicator maxHeight="12.0" maxWidth="12.0"
+                                       visible="${controller.viewModel.fulltextLookupInProgress}"/>
+                </StackPane>
+            </graphic>
+            <tooltip>
+                <Tooltip text="%Get fulltext"/>
+            </tooltip>
+        </Button>
+        <Button onAction="#addFromURL" styleClass="icon-button">
+            <graphic>
+                <JabRefIconView glyph="DOWNLOAD"/>
+            </graphic>
+            <tooltip>
+                <Tooltip text="%Download from URL"/>
+            </tooltip>
+        </Button>
+    </VBox>
 </fx:root>
diff --git a/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditor.java b/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditor.java
index ab8bac582aa..e93c3952858 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditor.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditor.java
@@ -1,5 +1,6 @@
 package org.jabref.gui.fieldeditors;
 
+import java.util.List;
 import java.util.Optional;
 
 import javafx.beans.binding.Bindings;
@@ -11,8 +12,11 @@
 import javafx.scene.Parent;
 import javafx.scene.control.Button;
 import javafx.scene.control.ContextMenu;
+import javafx.scene.control.Label;
 import javafx.scene.control.ListView;
+import javafx.scene.control.OverrunStyle;
 import javafx.scene.control.ProgressBar;
+import javafx.scene.control.SelectionMode;
 import javafx.scene.control.SeparatorMenuItem;
 import javafx.scene.control.Tooltip;
 import javafx.scene.input.ClipboardContent;
@@ -82,7 +86,7 @@ public LinkedFilesEditor(Field field,
                   .load();
 
         ViewModelListCellFactory<LinkedFileViewModel> cellFactory = new ViewModelListCellFactory<LinkedFileViewModel>()
-                .withStringTooltip(LinkedFileViewModel::getDescription)
+                .withStringTooltip(LinkedFileViewModel::getDescriptionAndLink)
                 .withGraphic(this::createFileDisplay)
                 .withContextMenu(this::createContextMenuForFile)
                 .withOnMouseClickedEvent(this::handleItemMouseClick)
@@ -92,6 +96,7 @@ public LinkedFilesEditor(Field field,
                 .withValidation(LinkedFileViewModel::fileExistsValidationStatus);
 
         listView.setCellFactory(cellFactory);
+        listView.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE);
 
         decoratedModelList = new UiThreadObservableList<>(viewModel.filesProperty());
         Bindings.bindContentBidirectional(listView.itemsProperty().get(), decoratedModelList);
@@ -123,20 +128,19 @@ private void handleOnDragDropped(LinkedFileViewModel originalItem, DragEvent eve
         ObservableList<LinkedFileViewModel> items = listView.itemsProperty().get();
 
         if (dragboard.hasContent(DragAndDropDataFormats.LINKED_FILE)) {
-
             LinkedFile linkedFile = (LinkedFile) dragboard.getContent(DragAndDropDataFormats.LINKED_FILE);
-            LinkedFileViewModel transferedItem = null;
+            LinkedFileViewModel transferredItem = null;
             int draggedIdx = 0;
             for (int i = 0; i < items.size(); i++) {
                 if (items.get(i).getFile().equals(linkedFile)) {
                     draggedIdx = i;
-                    transferedItem = items.get(i);
+                    transferredItem = items.get(i);
                     break;
                 }
             }
             int thisIdx = items.indexOf(originalItem);
             items.set(draggedIdx, originalItem);
-            items.set(thisIdx, transferedItem);
+            items.set(thisIdx, transferredItem);
             success = true;
         }
 
@@ -163,10 +167,17 @@ private Node createFileDisplay(LinkedFileViewModel linkedFile) {
         progressIndicator.progressProperty().bind(linkedFile.downloadProgressProperty());
         progressIndicator.visibleProperty().bind(linkedFile.downloadOngoingProperty());
 
+        Label label = new Label();
+        label.graphicProperty().bind(linkedFile.typeIconProperty());
+        label.textProperty().bind(linkedFile.linkProperty());
+        label.getStyleClass().setAll("file-row-text");
+        label.textOverrunProperty().setValue(OverrunStyle.LEADING_ELLIPSIS);
+        EasyBind.subscribe(linkedFile.isAutomaticallyFoundProperty(), found -> label.pseudoClassStateChanged(opacity, found));
+
         HBox info = new HBox(8);
         HBox.setHgrow(info, Priority.ALWAYS);
         info.setStyle("-fx-padding: 0.5em 0 0.5em 0;"); // To align with buttons below which also have 0.5em padding
-        info.getChildren().setAll(icon, link, desc, progressIndicator);
+        info.getChildren().setAll(label, progressIndicator);
 
         Button acceptAutoLinkedFile = IconTheme.JabRefIcons.AUTO_LINKED_FILE.asButton();
         acceptAutoLinkedFile.setTooltip(new Tooltip(Localization.lang("This file was found automatically. Do you want to link it to this entry?")));
@@ -175,24 +186,27 @@ private Node createFileDisplay(LinkedFileViewModel linkedFile) {
         acceptAutoLinkedFile.setOnAction(event -> linkedFile.acceptAsLinked());
         acceptAutoLinkedFile.getStyleClass().setAll("icon-button");
 
-        Button writeMetadataToPdf = IconTheme.JabRefIcons.IMPORT.asButton();
+        Button writeMetadataToPdf = IconTheme.JabRefIcons.PDF_METADATA_WRITE.asButton();
         writeMetadataToPdf.setTooltip(new Tooltip(Localization.lang("Write BibTeXEntry metadata to PDF.")));
         writeMetadataToPdf.visibleProperty().bind(linkedFile.isOfflinePdfProperty());
-        writeMetadataToPdf.setOnAction(event -> linkedFile.writeMetadataToPdf());
         writeMetadataToPdf.getStyleClass().setAll("icon-button");
 
-        Button parsePdfMetadata = IconTheme.JabRefIcons.FILE_SEARCH.asButton();
+        WriteMetadataToPdfCommand writeMetadataToPdfCommand = linkedFile.createWriteMetadataToPdfCommand();
+        writeMetadataToPdf.disableProperty().bind(writeMetadataToPdfCommand.executableProperty().not());
+        writeMetadataToPdf.setOnAction(event -> writeMetadataToPdfCommand.execute());
+
+        Button parsePdfMetadata = IconTheme.JabRefIcons.PDF_METADATA_READ.asButton();
         parsePdfMetadata.setTooltip(new Tooltip(Localization.lang("Parse Metadata from PDF.")));
         parsePdfMetadata.visibleProperty().bind(linkedFile.isOfflinePdfProperty());
         parsePdfMetadata.setOnAction(event -> {
-            GrobidOptInDialogHelper.showAndWaitIfUserIsUndecided(dialogService, preferencesService.getImporterPreferences());
+            GrobidOptInDialogHelper.showAndWaitIfUserIsUndecided(dialogService, preferencesService.getGrobidPreferences());
             linkedFile.parsePdfMetadataAndShowMergeDialog();
         });
         parsePdfMetadata.getStyleClass().setAll("icon-button");
 
-        HBox container = new HBox(10);
+        HBox container = new HBox(2);
         container.setPrefHeight(Double.NEGATIVE_INFINITY);
-
+        container.maxWidthProperty().bind(listView.widthProperty().subtract(20d));
         container.getChildren().addAll(acceptAutoLinkedFile, info, writeMetadataToPdf, parsePdfMetadata);
 
         return container;
@@ -204,8 +218,8 @@ private void setUpKeyBindings() {
             if (keyBinding.isPresent()) {
                 switch (keyBinding.get()) {
                     case DELETE_ENTRY:
-                        LinkedFileViewModel selectedItem = listView.getSelectionModel().getSelectedItem();
-                        if (selectedItem != null) {
+                        List<LinkedFileViewModel> toBeDeleted = List.copyOf(listView.getSelectionModel().getSelectedItems());
+                        for (LinkedFileViewModel selectedItem : toBeDeleted) {
                             viewModel.deleteFile(selectedItem);
                         }
                         event.consume();
@@ -248,7 +262,6 @@ private void addFromURL() {
     }
 
     private void handleItemMouseClick(LinkedFileViewModel linkedFile, MouseEvent event) {
-
         if (event.getButton().equals(MouseButton.PRIMARY) && (event.getClickCount() == 2)) {
             // Double click -> open
             linkedFile.open();
@@ -257,7 +270,7 @@ private void handleItemMouseClick(LinkedFileViewModel linkedFile, MouseEvent eve
 
     @Override
     public double getWeight() {
-        return 2;
+        return 3;
     }
 
     private ContextMenu createContextMenuForFile(LinkedFileViewModel linkedFile) {
diff --git a/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditorViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditorViewModel.java
index f9c7f1e67e5..44a3f15d538 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditorViewModel.java
@@ -38,6 +38,7 @@
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.util.FileHelper;
+import org.jabref.preferences.FilePreferences;
 import org.jabref.preferences.PreferencesService;
 
 public class LinkedFilesEditorViewModel extends AbstractEditorViewModel {
@@ -48,7 +49,6 @@ public class LinkedFilesEditorViewModel extends AbstractEditorViewModel {
     private final BibDatabaseContext databaseContext;
     private final TaskExecutor taskExecutor;
     private final PreferencesService preferences;
-    private final ExternalFileTypes externalFileTypes = ExternalFileTypes.getInstance();
 
     public LinkedFilesEditorViewModel(Field field, SuggestionProvider<?> suggestionProvider,
                                       DialogService dialogService,
@@ -87,27 +87,25 @@ private static String getStringRepresentation(List<LinkedFileViewModel> files) {
      *
      * TODO: Move this method to {@link LinkedFile} as soon as {@link CustomExternalFileType} lives in model.
      */
-    public static LinkedFile fromFile(Path file, List<Path> fileDirectories, ExternalFileTypes externalFileTypesFile) {
+    public static LinkedFile fromFile(Path file, List<Path> fileDirectories, FilePreferences filePreferences) {
         String fileExtension = FileHelper.getFileExtension(file).orElse("");
-        ExternalFileType suggestedFileType = externalFileTypesFile
-                .getExternalFileTypeByExt(fileExtension)
-                .orElse(new UnknownExternalFileType(fileExtension));
+        ExternalFileType suggestedFileType = ExternalFileTypes.getExternalFileTypeByExt(fileExtension, filePreferences)
+                                                              .orElse(new UnknownExternalFileType(fileExtension));
         Path relativePath = FileUtil.relativize(file, fileDirectories);
         return new LinkedFile("", relativePath, suggestedFileType.getName());
     }
 
-    public LinkedFileViewModel fromFile(Path file) {
+    public LinkedFileViewModel fromFile(Path file, FilePreferences filePreferences) {
         List<Path> fileDirectories = databaseContext.getFileDirectories(preferences.getFilePreferences());
 
-        LinkedFile linkedFile = fromFile(file, fileDirectories, externalFileTypes);
+        LinkedFile linkedFile = fromFile(file, fileDirectories, filePreferences);
         return new LinkedFileViewModel(
                 linkedFile,
                 entry,
                 databaseContext,
                 taskExecutor,
                 dialogService,
-                preferences,
-                externalFileTypes);
+                preferences);
     }
 
     public boolean isFulltextLookupInProgress() {
@@ -122,8 +120,7 @@ private List<LinkedFileViewModel> parseToFileViewModel(String stringValue) {
                                       databaseContext,
                                       taskExecutor,
                                       dialogService,
-                                      preferences,
-                                      externalFileTypes))
+                                      preferences))
                               .collect(Collectors.toList());
     }
 
@@ -144,16 +141,15 @@ public void addNewFile() {
                 .build();
 
         List<Path> fileDirectories = databaseContext.getFileDirectories(preferences.getFilePreferences());
-        dialogService.showFileOpenDialog(fileDialogConfiguration).ifPresent(newFile -> {
-            LinkedFile newLinkedFile = fromFile(newFile, fileDirectories, externalFileTypes);
+        dialogService.showFileOpenDialogAndGetMultipleFiles(fileDialogConfiguration).forEach(newFile -> {
+            LinkedFile newLinkedFile = fromFile(newFile, fileDirectories, preferences.getFilePreferences());
             files.add(new LinkedFileViewModel(
                     newLinkedFile,
                     entry,
                     databaseContext,
                     taskExecutor,
                     dialogService,
-                    preferences,
-                    externalFileTypes));
+                    preferences));
         });
     }
 
@@ -178,8 +174,7 @@ private List<LinkedFileViewModel> findAssociatedNotLinkedFiles(BibEntry entry) {
         AutoSetFileLinksUtil util = new AutoSetFileLinksUtil(
                 databaseContext,
                 preferences.getFilePreferences(),
-                preferences.getAutoLinkPreferences(),
-                ExternalFileTypes.getInstance());
+                preferences.getAutoLinkPreferences());
         try {
             List<LinkedFile> linkedFiles = util.findAssociatedNotLinkedFiles(entry);
             for (LinkedFile linkedFile : linkedFiles) {
@@ -189,8 +184,7 @@ private List<LinkedFileViewModel> findAssociatedNotLinkedFiles(BibEntry entry) {
                         databaseContext,
                         taskExecutor,
                         dialogService,
-                        preferences,
-                        externalFileTypes);
+                        preferences);
                 newLinkedFile.markAsAutomaticallyFound();
                 result.add(newLinkedFile);
             }
@@ -202,7 +196,9 @@ private List<LinkedFileViewModel> findAssociatedNotLinkedFiles(BibEntry entry) {
     }
 
     public void fetchFulltext() {
-        FulltextFetchers fetcher = new FulltextFetchers(preferences.getImportFormatPreferences());
+        FulltextFetchers fetcher = new FulltextFetchers(
+                preferences.getImportFormatPreferences(),
+                preferences.getImporterPreferences());
         BackgroundTask
                 .wrap(() -> fetcher.findFullTextPDF(entry))
                 .onRunning(() -> fulltextLookupInProgress.setValue(true))
@@ -239,8 +235,7 @@ private void addFromURL(URL url) {
                 databaseContext,
                 taskExecutor,
                 dialogService,
-                preferences,
-                externalFileTypes);
+                preferences);
         files.add(onlineFile);
         onlineFile.download();
     }
diff --git a/src/main/java/org/jabref/gui/fieldeditors/MapBasedEditorViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/MapBasedEditorViewModel.java
index 81a492222a9..3f03b961cf3 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/MapBasedEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/MapBasedEditorViewModel.java
@@ -29,7 +29,6 @@ public MapBasedEditorViewModel(Field field, SuggestionProvider<?> suggestionProv
     @Override
     public StringConverter<T> getStringConverter() {
         return new StringConverter<T>() {
-
             @Override
             public String toString(T object) {
                 if (object == null) {
diff --git a/src/main/java/org/jabref/gui/fieldeditors/URLUtil.java b/src/main/java/org/jabref/gui/fieldeditors/URLUtil.java
index bb73b95a6d9..d7f58db7c00 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/URLUtil.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/URLUtil.java
@@ -8,6 +8,7 @@
 import java.util.Optional;
 
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
+import org.jabref.preferences.FilePreferences;
 
 public class URLUtil {
     private static final String URL_EXP = "^(https?|ftp)://.+";
@@ -74,7 +75,12 @@ public static String cleanGoogleSearchURL(String url) {
      * @return true if <c>url</c> contains a valid URL
      */
     public static boolean isURL(String url) {
-        return url.contains("://");
+        try {
+            new URL(url);
+            return true;
+        } catch (MalformedURLException e) {
+            return false;
+        }
     }
 
     /**
@@ -85,7 +91,7 @@ public static boolean isURL(String url) {
      * @param link The link
      * @return The suffix, excluding the dot (e.g. "pdf")
      */
-    public static Optional<String> getSuffix(final String link) {
+    public static Optional<String> getSuffix(final String link, FilePreferences filePreferences) {
         String strippedLink = link;
         try {
             // Try to strip the query string, if any, to get the correct suffix:
@@ -105,7 +111,7 @@ public static Optional<String> getSuffix(final String link) {
         } else {
             suffix = strippedLink.substring(strippedLinkIndex + 1);
         }
-        if (!ExternalFileTypes.getInstance().isExternalFileTypeByExt(suffix)) {
+        if (!ExternalFileTypes.isExternalFileTypeByExt(suffix, filePreferences)) {
             // If the suffix doesn't seem to give any reasonable file type, try
             // with the non-stripped link:
             int index = link.lastIndexOf('.');
diff --git a/src/main/java/org/jabref/gui/fieldeditors/WriteMetadataToPdfCommand.java b/src/main/java/org/jabref/gui/fieldeditors/WriteMetadataToPdfCommand.java
new file mode 100644
index 00000000000..6f5ed16cca3
--- /dev/null
+++ b/src/main/java/org/jabref/gui/fieldeditors/WriteMetadataToPdfCommand.java
@@ -0,0 +1,72 @@
+package org.jabref.gui.fieldeditors;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.Optional;
+
+import javax.xml.transform.TransformerException;
+
+import org.jabref.gui.DialogService;
+import org.jabref.gui.Globals;
+import org.jabref.gui.actions.SimpleCommand;
+import org.jabref.gui.util.BackgroundTask;
+import org.jabref.gui.util.TaskExecutor;
+import org.jabref.logic.exporter.EmbeddedBibFilePdfExporter;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.logic.xmp.XmpUtilWriter;
+import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.LinkedFile;
+import org.jabref.preferences.PreferencesService;
+
+import org.slf4j.Logger;
+
+public class WriteMetadataToPdfCommand extends SimpleCommand {
+    private final LinkedFile linkedFile;
+    private final BibDatabaseContext databaseContext;
+    private final PreferencesService preferences;
+    private final DialogService dialogService;
+    private final BibEntry entry;
+    private final Logger logger;
+    private final TaskExecutor taskExecutor;
+
+    public WriteMetadataToPdfCommand(LinkedFile linkedFile, BibDatabaseContext databaseContext, PreferencesService preferences, DialogService dialogService, BibEntry entry, Logger logger, TaskExecutor taskExecutor) {
+        this.linkedFile = linkedFile;
+        this.databaseContext = databaseContext;
+        this.preferences = preferences;
+        this.dialogService = dialogService;
+        this.entry = entry;
+        this.logger = logger;
+        this.taskExecutor = taskExecutor;
+    }
+
+    @Override
+    public void execute() {
+        BackgroundTask<Void> writeTask = BackgroundTask.wrap(() -> {
+            Optional<Path> file = linkedFile.findIn(databaseContext, preferences.getFilePreferences());
+            if (file.isEmpty()) {
+                dialogService.notify(Localization.lang("Failed to write metadata, file %1 not found.", file.map(Path::toString).orElse("")));
+            } else {
+                synchronized (linkedFile) {
+                    try {
+                        // Similar code can be found at {@link org.jabref.gui.exporter.WriteMetadataToPdfAction.writeMetadataToFile}
+                        new XmpUtilWriter(preferences.getXmpPreferences()).writeXmp(file.get(), entry, databaseContext.getDatabase());
+
+                        EmbeddedBibFilePdfExporter embeddedBibExporter = new EmbeddedBibFilePdfExporter(databaseContext.getMode(), Globals.entryTypesManager, preferences.getFieldWriterPreferences());
+                        embeddedBibExporter.exportToFileByPath(databaseContext, databaseContext.getDatabase(), preferences.getFilePreferences(), file.get());
+
+                        dialogService.notify(Localization.lang("Success! Finished writing metadata."));
+                    } catch (IOException | TransformerException ex) {
+                        dialogService.notify(Localization.lang("Error while writing metadata. See the error log for details."));
+                        logger.error("Error while writing metadata to {}", file.map(Path::toString).orElse(""), ex);
+                    }
+                }
+            }
+            return null;
+        });
+        writeTask
+                .onRunning(() -> setExecutable(false))
+                .onFinished(() -> setExecutable(true));
+        taskExecutor.execute(writeTask);
+    }
+}
diff --git a/src/main/java/org/jabref/gui/groups/GroupDialogView.java b/src/main/java/org/jabref/gui/groups/GroupDialogView.java
index 32047ec21a4..218c64379f0 100644
--- a/src/main/java/org/jabref/gui/groups/GroupDialogView.java
+++ b/src/main/java/org/jabref/gui/groups/GroupDialogView.java
@@ -247,7 +247,6 @@ private void openIconPicker() {
         popOver.setCornerRadius(0);
         popOver.setTitle("Icon picker");
         popOver.show(iconPickerButton);
-
     }
 
     public class IkonliCell extends GridCell<Ikon> {
diff --git a/src/main/java/org/jabref/gui/groups/GroupDialogViewModel.java b/src/main/java/org/jabref/gui/groups/GroupDialogViewModel.java
index 522d129bb08..0a1de76104c 100644
--- a/src/main/java/org/jabref/gui/groups/GroupDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/groups/GroupDialogViewModel.java
@@ -269,6 +269,7 @@ private void setupValidation() {
 
     /**
      * Gets the absolute path relative to the LatexFileDirectory, if given a relative path
+     *
      * @param input the user input path
      * @return an absolute path if LatexFileDirectory exists; otherwise, returns input
      */
@@ -445,7 +446,7 @@ public void texGroupBrowse() {
     }
 
     public void openHelpPage() {
-        HelpAction.openHelpPage(HelpFile.GROUPS);
+        new HelpAction(HelpFile.GROUPS, dialogService).execute();
     }
 
     private List<Path> getFileDirectoriesAsPaths() {
diff --git a/src/main/java/org/jabref/gui/groups/GroupTreeView.java b/src/main/java/org/jabref/gui/groups/GroupTreeView.java
index 54187562858..b4d3ea75a61 100644
--- a/src/main/java/org/jabref/gui/groups/GroupTreeView.java
+++ b/src/main/java/org/jabref/gui/groups/GroupTreeView.java
@@ -112,15 +112,19 @@ private void createNodes() {
 
         mainColumn = new TreeTableColumn<>();
         mainColumn.setId("mainColumn");
+        mainColumn.setResizable(true);
         numberColumn = new TreeTableColumn<>();
         numberColumn.getStyleClass().add("numberColumn");
-        numberColumn.setMinWidth(50d);
-        numberColumn.setMaxWidth(70d);
-        numberColumn.setPrefWidth(60d);
+        numberColumn.setMinWidth(40d);
+        numberColumn.setMaxWidth(40d);
+        numberColumn.setPrefWidth(40d);
+        numberColumn.setResizable(false);
         expansionNodeColumn = new TreeTableColumn<>();
         expansionNodeColumn.getStyleClass().add("expansionNodeColumn");
-        expansionNodeColumn.setMaxWidth(25d);
-        expansionNodeColumn.setMinWidth(25d);
+        expansionNodeColumn.setMaxWidth(20d);
+        expansionNodeColumn.setMinWidth(20d);
+        expansionNodeColumn.setPrefWidth(20d);
+        expansionNodeColumn.setResizable(false);
 
         groupTree = new TreeTableView<>();
         groupTree.setId("groupTree");
@@ -128,6 +132,8 @@ private void createNodes() {
         groupTree.getColumns().addAll(List.of(mainColumn, numberColumn, expansionNodeColumn));
         this.setCenter(groupTree);
 
+        mainColumn.prefWidthProperty().bind(groupTree.widthProperty().subtract(60d).subtract(15));
+
         addNewGroup = new Button(Localization.lang("Add group"));
         addNewGroup.setId("addNewGroup");
         addNewGroup.setMaxWidth(Double.MAX_VALUE);
@@ -263,6 +269,10 @@ private void initialize() {
                 if (event.getButton() == MouseButton.SECONDARY) {
                     // Prevent right-click to select group
                     event.consume();
+                } else if (event.getTarget() instanceof StackPane pane) {
+                    if (pane.getStyleClass().contains("arrow") || pane.getStyleClass().contains("tree-disclosure-node")) {
+                        event.consume();
+                    }
                 }
             });
 
@@ -392,7 +402,6 @@ private Optional<TreeItem<GroupNodeViewModel>> getTreeItemByValue(TreeItem<Group
     }
 
     private ContextMenu createContextMenuForGroup(GroupNodeViewModel group) {
-
         ContextMenu menu = new ContextMenu();
         Menu removeGroup = new Menu(Localization.lang("Remove group"));
 
diff --git a/src/main/java/org/jabref/gui/groups/GroupTreeViewModel.java b/src/main/java/org/jabref/gui/groups/GroupTreeViewModel.java
index f295e421b42..670130757ad 100644
--- a/src/main/java/org/jabref/gui/groups/GroupTreeViewModel.java
+++ b/src/main/java/org/jabref/gui/groups/GroupTreeViewModel.java
@@ -1,5 +1,6 @@
 package org.jabref.gui.groups;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
@@ -16,6 +17,9 @@
 import javafx.beans.property.StringProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
+import javafx.scene.control.Alert;
+import javafx.scene.control.ButtonBar;
+import javafx.scene.control.ButtonType;
 
 import org.jabref.gui.AbstractViewModel;
 import org.jabref.gui.DialogService;
@@ -28,6 +32,7 @@
 import org.jabref.model.groups.AbstractGroup;
 import org.jabref.model.groups.ExplicitGroup;
 import org.jabref.model.groups.GroupTreeNode;
+import org.jabref.model.groups.WordKeywordGroup;
 import org.jabref.model.metadata.MetaData;
 import org.jabref.preferences.PreferencesService;
 
@@ -191,9 +196,21 @@ public void editGroup(GroupNodeViewModel oldGroup) {
 
             newGroup.ifPresent(group -> {
                 // TODO: Keep assignments
-                boolean keepPreviousAssignments = dialogService.showConfirmationDialogAndWait(
+                String content = Localization.lang("Assign the original group's entries to this group?");
+                ButtonType keepAssignments = new ButtonType(Localization.lang("Assign"), ButtonBar.ButtonData.YES);
+                ButtonType removeAssignments = new ButtonType(Localization.lang("Do not assign"), ButtonBar.ButtonData.NO);
+                ButtonType cancel = new ButtonType(Localization.lang("Cancel"), ButtonBar.ButtonData.CANCEL_CLOSE);
+
+                if (newGroup.get().getClass() == WordKeywordGroup.class) {
+                    content = content + "\n\n" +
+                            Localization.lang("(Note: If original entries lack keywords to qualify for the new group configuration, confirming here will add them)");
+                }
+                Optional<ButtonType> previousAssignments = dialogService.showCustomButtonDialogAndWait(Alert.AlertType.WARNING,
                         Localization.lang("Change of Grouping Method"),
-                        Localization.lang("Assign the original group's entries to this group?"));
+                        content,
+                        keepAssignments,
+                        removeAssignments,
+                        cancel);
                 //        WarnAssignmentSideEffects.warnAssignmentSideEffects(newGroup, panel.frame());
                 boolean removePreviousAssignments = (oldGroup.getGroupNode().getGroup() instanceof ExplicitGroup)
                         && (group instanceof ExplicitGroup);
@@ -208,11 +225,22 @@ public void editGroup(GroupNodeViewModel oldGroup) {
                     removePreviousAssignments = false;
                 }
 
-                oldGroup.getGroupNode().setGroup(
-                        group,
-                        keepPreviousAssignments,
-                        removePreviousAssignments,
-                        database.getEntries());
+                if (previousAssignments.isPresent() && (previousAssignments.get().getButtonData() == ButtonBar.ButtonData.YES)) {
+                    oldGroup.getGroupNode().setGroup(
+                            group,
+                            true,
+                            removePreviousAssignments,
+                            database.getEntries());
+                } else if (previousAssignments.isPresent() && (previousAssignments.get().getButtonData() == ButtonBar.ButtonData.NO)) {
+                    oldGroup.getGroupNode().setGroup(
+                            group,
+                            false,
+                            removePreviousAssignments,
+                            database.getEntries());
+                } else if (previousAssignments.isPresent() && (previousAssignments.get().getButtonData() == ButtonBar.ButtonData.CANCEL_CLOSE)) {
+                    return;
+                }
+
                 // stateManager.getEntriesInCurrentDatabase());
 
                 // TODO: Add undo
@@ -259,20 +287,38 @@ public void removeSubgroups(GroupNodeViewModel group) {
     }
 
     public void removeGroupKeepSubgroups(GroupNodeViewModel group) {
-        boolean confirmation = dialogService.showConfirmationDialogAndWait(
-                Localization.lang("Remove group"),
-                Localization.lang("Remove group \"%0\"?", group.getDisplayName()));
+        boolean confirmed;
+        if (selectedGroups.size() <= 1) {
+            confirmed = dialogService.showConfirmationDialogAndWait(
+                    Localization.lang("Remove group"),
+                    Localization.lang("Remove group \"%0\" and keep its subgroups?", group.getDisplayName()),
+                    Localization.lang("Remove"));
+        } else {
+            confirmed = dialogService.showConfirmationDialogAndWait(
+                    Localization.lang("Remove groups"),
+                    Localization.lang("Remove all selected groups and keep their subgroups?"),
+                    Localization.lang("Remove all"));
+        }
 
-        if (confirmation) {
+        if (confirmed) {
             // TODO: Add undo
             // final UndoableAddOrRemoveGroup undo = new UndoableAddOrRemoveGroup(groupsRoot, node, UndoableAddOrRemoveGroup.REMOVE_NODE_KEEP_CHILDREN);
             // panel.getUndoManager().addEdit(undo);
-            GroupTreeNode groupNode = group.getGroupNode();
-            groupNode.getParent()
-                     .ifPresent(parent -> groupNode.moveAllChildrenTo(parent, parent.getIndexOfChild(groupNode).get()));
-            groupNode.removeFromParent();
 
-            dialogService.notify(Localization.lang("Removed group \"%0\".", group.getDisplayName()));
+            List<GroupNodeViewModel> selectedGroupNodes = new ArrayList<>(selectedGroups);
+            selectedGroupNodes.forEach(eachNode -> {
+                GroupTreeNode groupNode = eachNode.getGroupNode();
+
+                groupNode.getParent()
+                         .ifPresent(parent -> groupNode.moveAllChildrenTo(parent, parent.getIndexOfChild(groupNode).get()));
+                groupNode.removeFromParent();
+            });
+
+            if (selectedGroupNodes.size() > 1) {
+                dialogService.notify(Localization.lang("Removed all selected groups."));
+            } else {
+                dialogService.notify(Localization.lang("Removed group \"%0\".", group.getDisplayName()));
+            }
             writeGroupChangesToMetaData();
         }
     }
@@ -281,20 +327,35 @@ public void removeGroupKeepSubgroups(GroupNodeViewModel group) {
      * Removes the specified group and its subgroups (after asking for confirmation).
      */
     public void removeGroupAndSubgroups(GroupNodeViewModel group) {
-        boolean confirmed = dialogService.showConfirmationDialogAndWait(
-                Localization.lang("Remove group and subgroups"),
-                Localization.lang("Remove group \"%0\" and its subgroups?", group.getDisplayName()),
-                Localization.lang("Remove"));
+        boolean confirmed;
+        if (selectedGroups.size() <= 1) {
+            confirmed = dialogService.showConfirmationDialogAndWait(
+                    Localization.lang("Remove group and subgroups"),
+                    Localization.lang("Remove group \"%0\" and its subgroups?", group.getDisplayName()),
+                    Localization.lang("Remove"));
+        } else {
+            confirmed = dialogService.showConfirmationDialogAndWait(
+                    Localization.lang("Remove groups and subgroups"),
+                    Localization.lang("Remove all selected groups and their subgroups?"),
+                    Localization.lang("Remove all"));
+        }
+
         if (confirmed) {
             // TODO: Add undo
             // final UndoableAddOrRemoveGroup undo = new UndoableAddOrRemoveGroup(groupsRoot, node, UndoableAddOrRemoveGroup.REMOVE_NODE_AND_CHILDREN);
             // panel.getUndoManager().addEdit(undo);
 
-            removeGroupsAndSubGroupsFromEntries(group);
-
-            group.getGroupNode().removeFromParent();
+            ArrayList<GroupNodeViewModel> selectedGroupNodes = new ArrayList<>(selectedGroups);
+            selectedGroupNodes.forEach(eachNode -> {
+                removeGroupsAndSubGroupsFromEntries(eachNode);
+                eachNode.getGroupNode().removeFromParent();
+            });
 
-            dialogService.notify(Localization.lang("Removed group \"%0\" and its subgroups.", group.getDisplayName()));
+            if (selectedGroupNodes.size() > 1) {
+                dialogService.notify(Localization.lang("Removed all selected groups and their subgroups."));
+            } else {
+                dialogService.notify(Localization.lang("Removed group \"%0\" and its subgroups.", group.getDisplayName()));
+            }
             writeGroupChangesToMetaData();
         }
     }
diff --git a/src/main/java/org/jabref/gui/help/AboutDialogViewModel.java b/src/main/java/org/jabref/gui/help/AboutDialogViewModel.java
index b4df1160ba0..2d38961064f 100644
--- a/src/main/java/org/jabref/gui/help/AboutDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/help/AboutDialogViewModel.java
@@ -1,6 +1,7 @@
 package org.jabref.gui.help;
 
 import java.io.IOException;
+import java.util.Locale;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
@@ -57,8 +58,11 @@ public AboutDialogViewModel(DialogService dialogService, ClipBoardManager clipBo
         maintainers.set(buildInfo.maintainers);
         license.set(Localization.lang("License") + ":");
         changelogUrl = buildInfo.version.getChangelogUrl();
+
+        String javafx_version = System.getProperty("javafx.runtime.version", BuildInfo.UNKNOWN_VERSION).toLowerCase(Locale.ROOT);
+
         versionInfo = String.format("JabRef %s%n%s %s %s %nJava %s %nJavaFX %s", buildInfo.version, BuildInfo.OS,
-                BuildInfo.OS_VERSION, BuildInfo.OS_ARCH, BuildInfo.JAVA_VERSION, BuildInfo.JAVAFX_VERSION);
+                BuildInfo.OS_VERSION, BuildInfo.OS_ARCH, BuildInfo.JAVA_VERSION, javafx_version);
     }
 
     public String getDevelopmentVersion() {
diff --git a/src/main/java/org/jabref/gui/help/HelpAction.java b/src/main/java/org/jabref/gui/help/HelpAction.java
index 1cfe14937ff..0447f7331ed 100644
--- a/src/main/java/org/jabref/gui/help/HelpAction.java
+++ b/src/main/java/org/jabref/gui/help/HelpAction.java
@@ -1,5 +1,6 @@
 package org.jabref.gui.help;
 
+import org.jabref.gui.DialogService;
 import org.jabref.gui.actions.SimpleCommand;
 import org.jabref.gui.desktop.JabRefDesktop;
 import org.jabref.logic.help.HelpFile;
@@ -10,25 +11,18 @@
  */
 public class HelpAction extends SimpleCommand {
 
-    private HelpFile helpPage;
+    private final HelpFile helpPage;
+    private final DialogService dialogService;
 
-    public HelpAction(HelpFile helpPage) {
+    public HelpAction(HelpFile helpPage, DialogService dialogService) {
         this.helpPage = helpPage;
+        this.dialogService = dialogService;
     }
 
-    public static void openHelpPage(HelpFile helpPage) {
+    void openHelpPage(HelpFile helpPage) {
         StringBuilder sb = new StringBuilder("https://docs.jabref.org/");
         sb.append(helpPage.getPageName());
-        JabRefDesktop.openBrowserShowPopup(sb.toString());
-    }
-
-    public static SimpleCommand getMainHelpPageCommand() {
-        return new SimpleCommand() {
-            @Override
-            public void execute() {
-                openHelpPage(HelpFile.CONTENTS);
-            }
-        };
+        JabRefDesktop.openBrowserShowPopup(sb.toString(), dialogService);
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/help/NewVersionDialog.java b/src/main/java/org/jabref/gui/help/NewVersionDialog.java
index 2ab73b250a5..f026d0d7295 100644
--- a/src/main/java/org/jabref/gui/help/NewVersionDialog.java
+++ b/src/main/java/org/jabref/gui/help/NewVersionDialog.java
@@ -7,6 +7,7 @@
 import javafx.scene.control.Label;
 import javafx.scene.layout.VBox;
 
+import org.jabref.gui.DialogService;
 import org.jabref.gui.desktop.JabRefDesktop;
 import org.jabref.gui.util.BaseDialog;
 import org.jabref.logic.l10n.Localization;
@@ -14,7 +15,7 @@
 
 public class NewVersionDialog extends BaseDialog<Boolean> {
 
-    public NewVersionDialog(Version currentVersion, Version latestVersion) {
+    public NewVersionDialog(Version currentVersion, Version latestVersion, DialogService dialogService) {
         this.setTitle(Localization.lang("New version available"));
 
         ButtonType btnIgnoreUpdate = new ButtonType(Localization.lang("Ignore this update"), ButtonBar.ButtonData.CANCEL_CLOSE);
@@ -25,7 +26,7 @@ public NewVersionDialog(Version currentVersion, Version latestVersion) {
             if (button == btnIgnoreUpdate) {
                 return false;
             } else if (button == btnDownloadUpdate) {
-                JabRefDesktop.openBrowserShowPopup(Version.JABREF_DOWNLOAD_URL);
+                JabRefDesktop.openBrowserShowPopup(Version.JABREF_DOWNLOAD_URL, dialogService);
             }
             return true;
         });
@@ -34,7 +35,7 @@ public NewVersionDialog(Version currentVersion, Version latestVersion) {
 
         Hyperlink lblMoreInformation = new Hyperlink(Localization.lang("To see what is new view the changelog."));
         lblMoreInformation.setOnAction(event ->
-                JabRefDesktop.openBrowserShowPopup(latestVersion.getChangelogUrl())
+                JabRefDesktop.openBrowserShowPopup(latestVersion.getChangelogUrl(), dialogService)
         );
 
         VBox container = new VBox(
diff --git a/src/main/java/org/jabref/gui/help/VersionWorker.java b/src/main/java/org/jabref/gui/help/VersionWorker.java
index 66579e67a40..b4760f58c9b 100644
--- a/src/main/java/org/jabref/gui/help/VersionWorker.java
+++ b/src/main/java/org/jabref/gui/help/VersionWorker.java
@@ -95,7 +95,7 @@ private void showUpdateInfo(Optional<Version> newerVersion, boolean manualExecut
             }
         } else {
             // notify the user about a newer version
-            if (dialogService.showCustomDialogAndWait(new NewVersionDialog(installedVersion, newerVersion.get())).orElse(true)) {
+            if (dialogService.showCustomDialogAndWait(new NewVersionDialog(installedVersion, newerVersion.get(), dialogService)).orElse(true)) {
                 internalPreferences.setIgnoredVersion(newerVersion.get());
             }
         }
diff --git a/src/main/java/org/jabref/gui/icon/IconTheme.java b/src/main/java/org/jabref/gui/icon/IconTheme.java
index cbaa6fac7d8..a573bf6c74c 100644
--- a/src/main/java/org/jabref/gui/icon/IconTheme.java
+++ b/src/main/java/org/jabref/gui/icon/IconTheme.java
@@ -192,6 +192,8 @@ public enum JabRefIcons implements JabRefIcon {
         DELETE_ENTRY(MaterialDesignD.DELETE),
         SEARCH(MaterialDesignM.MAGNIFY),
         FILE_SEARCH(MaterialDesignF.FILE_FIND),
+        PDF_METADATA_READ(MaterialDesignF.FORMAT_ALIGN_TOP),
+        PDF_METADATA_WRITE(MaterialDesignF.FORMAT_ALIGN_BOTTOM),
         ADVANCED_SEARCH(Color.CYAN, MaterialDesignM.MAGNIFY),
         PREFERENCES(MaterialDesignC.COG),
         SELECTORS(MaterialDesignS.STAR_SETTINGS),
@@ -309,6 +311,7 @@ public enum JabRefIcons implements JabRefIcon {
         NEW_GROUP(MaterialDesignP.PLUS),
         OPEN_LINK(MaterialDesignO.OPEN_IN_NEW),
         LOOKUP_IDENTIFIER(MaterialDesignS.SEARCH_WEB),
+        LINKED_FILE_ADD(MaterialDesignP.PLUS),
         FETCH_FULLTEXT(MaterialDesignS.SEARCH_WEB),
         FETCH_BY_IDENTIFIER(MaterialDesignC.CLIPBOARD_ARROW_DOWN),
         TOGGLE_ABBREVIATION(MaterialDesignF.FORMAT_ALIGN_CENTER),
@@ -339,7 +342,13 @@ public enum JabRefIcons implements JabRefIcon {
         KEEP_SEARCH_STRING(MaterialDesignE.EARTH),
         KEEP_ON_TOP(MaterialDesignP.PIN),
         KEEP_ON_TOP_OFF(MaterialDesignP.PIN_OFF_OUTLINE),
-        OPEN_GLOBAL_SEARCH(MaterialDesignO.OPEN_IN_NEW);
+        OPEN_GLOBAL_SEARCH(MaterialDesignO.OPEN_IN_NEW),
+
+        ACCEPT_LEFT(MaterialDesignS.SUBDIRECTORY_ARROW_LEFT),
+
+        ACCEPT_RIGHT(MaterialDesignS.SUBDIRECTORY_ARROW_RIGHT),
+
+        MERGE_GROUPS(MaterialDesignS.SOURCE_MERGE);
 
         private final JabRefIcon icon;
 
diff --git a/src/main/java/org/jabref/gui/icon/InternalMaterialDesignIcon.java b/src/main/java/org/jabref/gui/icon/InternalMaterialDesignIcon.java
index 7ce8a4879ca..7beb065f7c2 100644
--- a/src/main/java/org/jabref/gui/icon/InternalMaterialDesignIcon.java
+++ b/src/main/java/org/jabref/gui/icon/InternalMaterialDesignIcon.java
@@ -75,5 +75,4 @@ public String getCode() {
     public Ikon getIkon() {
         return icons.get(0);
     }
-
 }
diff --git a/src/main/java/org/jabref/gui/icon/JabRefIconView.java b/src/main/java/org/jabref/gui/icon/JabRefIconView.java
index 1c831ae2077..ed0f4e54b29 100644
--- a/src/main/java/org/jabref/gui/icon/JabRefIconView.java
+++ b/src/main/java/org/jabref/gui/icon/JabRefIconView.java
@@ -29,7 +29,6 @@ public JabRefIconView(JabRefIcons icon, int size) {
     }
 
     public JabRefIconView(IconTheme.JabRefIcons icon) {
-
         super(icon.getIkon());
         Size size = new Size(1.0, SizeUnits.EM);
         this.glyph = new SimpleObjectProperty<>(icon);
diff --git a/src/main/java/org/jabref/gui/icon/JabRefIkonHandler.java b/src/main/java/org/jabref/gui/icon/JabRefIkonHandler.java
index d35ad446bb6..2f9bc45e0d1 100644
--- a/src/main/java/org/jabref/gui/icon/JabRefIkonHandler.java
+++ b/src/main/java/org/jabref/gui/icon/JabRefIkonHandler.java
@@ -34,5 +34,4 @@ public InputStream getFontResourceAsStream() {
     public String getFontFamily() {
         return "JabRefMaterialDesign";
     }
-
 }
diff --git a/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdAction.java b/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdAction.java
index d0f86008ab1..95e2eb99d53 100644
--- a/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdAction.java
+++ b/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdAction.java
@@ -7,13 +7,13 @@
 import org.jabref.gui.LibraryTab;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.SimpleCommand;
+import org.jabref.gui.externalfiles.ImportHandler;
 import org.jabref.gui.util.BackgroundTask;
 import org.jabref.gui.util.TaskExecutor;
-import org.jabref.logic.JabRefException;
-import org.jabref.logic.database.DuplicateCheck;
 import org.jabref.logic.importer.CompositeIdFetcher;
+import org.jabref.logic.importer.FetcherClientException;
 import org.jabref.logic.importer.FetcherException;
-import org.jabref.logic.importer.ImportCleanup;
+import org.jabref.logic.importer.FetcherServerException;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.types.StandardEntryType;
@@ -31,7 +31,13 @@ public class GenerateEntryFromIdAction extends SimpleCommand {
     private final PopOver entryFromIdPopOver;
     private final StateManager stateManager;
 
-    public GenerateEntryFromIdAction(LibraryTab libraryTab, DialogService dialogService, PreferencesService preferencesService, TaskExecutor taskExecutor, PopOver entryFromIdPopOver, String identifier, StateManager stateManager) {
+    public GenerateEntryFromIdAction(LibraryTab libraryTab,
+                                     DialogService dialogService,
+                                     PreferencesService preferencesService,
+                                     TaskExecutor taskExecutor,
+                                     PopOver entryFromIdPopOver,
+                                     String identifier,
+                                     StateManager stateManager) {
         this.libraryTab = libraryTab;
         this.dialogService = dialogService;
         this.preferencesService = preferencesService;
@@ -47,57 +53,48 @@ public void execute() {
         backgroundTask.titleProperty().set(Localization.lang("Import by ID"));
         backgroundTask.showToUser(true);
         backgroundTask.onRunning(() -> dialogService.notify("%s".formatted(backgroundTask.messageProperty().get())));
-        backgroundTask.onFailure((e) -> {
-            // When unable to import by ID, present the user options to cancel or add entry manually
-            boolean addEntryFlag = dialogService.showConfirmationDialogAndWait(Localization.lang("Failed to import by ID"),
-                                    e.getMessage(),
-                                   Localization.lang("Add entry manually"));
+        backgroundTask.onFailure((exception) -> {
+            String fetcherExceptionMessage = exception.getMessage();
+
+            boolean addEntryFlag;
+            if (exception instanceof FetcherClientException) {
+                addEntryFlag = dialogService.showConfirmationDialogAndWait(Localization.lang("Failed to import by ID"), Localization.lang("Bibliographic data not found. Cause is likely the client side. Please check connection and identifier for correctness.") + "\n" + fetcherExceptionMessage, Localization.lang("Add entry manually"));
+            } else if (exception instanceof FetcherServerException) {
+                addEntryFlag = dialogService.showConfirmationDialogAndWait(Localization.lang("Failed to import by ID"), Localization.lang("Bibliographic data not found. Cause is likely the server side. Please try agan later.") + "\n" + fetcherExceptionMessage, Localization.lang("Add entry manually"));
+            } else {
+                addEntryFlag = dialogService.showConfirmationDialogAndWait(Localization.lang("Failed to import by ID"), Localization.lang("Error message %0", fetcherExceptionMessage), Localization.lang("Add entry manually"));
+            }
             if (addEntryFlag) {
                 // add entry manually
                 new NewEntryAction(libraryTab.frame(), StandardEntryType.Article, dialogService,
-                                    preferencesService, stateManager).execute();
+                                   preferencesService, stateManager).execute();
+            }
+        });
+        backgroundTask.onSuccess((bibEntry) -> {
+            Optional<BibEntry> result = bibEntry;
+            if (result.isPresent()) {
+                final BibEntry entry = result.get();
+                ImportHandler handler = new ImportHandler(libraryTab.getBibDatabaseContext(), preferencesService, Globals.getFileUpdateMonitor(), libraryTab.getUndoManager(), stateManager, dialogService, null);
+                handler.importEntryWithDuplicateCheck(libraryTab.getBibDatabaseContext(), entry);
+            } else {
+                dialogService.notify("No entry found or import canceled");
             }
+
+            entryFromIdPopOver.hide();
         });
-        backgroundTask.onSuccess((bibEntry) -> bibEntry.ifPresentOrElse((entry) -> {
-                libraryTab.insertEntry(entry);
-                entryFromIdPopOver.hide();
-                dialogService.notify(Localization.lang("Imported one entry"));
-                },
-                () -> dialogService.notify(Localization.lang("Import canceled"))
-        ));
         backgroundTask.executeWith(taskExecutor);
     }
 
     private BackgroundTask<Optional<BibEntry>> searchAndImportEntryInBackground() {
         return new BackgroundTask<>() {
             @Override
-            protected Optional<BibEntry> call() throws JabRefException {
+            protected Optional<BibEntry> call() throws FetcherException {
                 if (isCanceled()) {
                     return Optional.empty();
                 }
-
                 updateMessage(Localization.lang("Searching..."));
-                try {
-                    Optional<BibEntry> result = new CompositeIdFetcher(preferencesService.getImportFormatPreferences()).performSearchById(identifier);
-                    if (result.isPresent()) {
-                        final BibEntry entry = result.get();
-                        ImportCleanup cleanup = new ImportCleanup(libraryTab.getBibDatabaseContext().getMode());
-                        cleanup.doPostCleanup(entry);
-                        // DuplicateCheck only covers DOI and ISBN at the moment.
-                        Optional<BibEntry> duplicate = new DuplicateCheck(Globals.entryTypesManager).containsDuplicate(libraryTab.getDatabase(), entry, libraryTab.getBibDatabaseContext().getMode());
-                        if (duplicate.isPresent()) {
-                            throw new JabRefException(Localization.lang("Entry already exists"));
-                        }
-                    } else {
-                        throw new JabRefException(Localization.lang("Could not find any bibliographic information."));
-                    }
-                    updateMessage(Localization.lang("Imported one entry"));
-                    return result;
-                } catch (FetcherException fetcherException) {
-                    throw new JabRefException("Fetcher error: %s".formatted(fetcherException.getMessage()));
-                }
+                return new CompositeIdFetcher(preferencesService.getImportFormatPreferences()).performSearchById(identifier);
             }
         };
     }
-
 }
diff --git a/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdDialog.java b/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdDialog.java
index 15e742ff5a1..e2159d369f4 100644
--- a/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdDialog.java
+++ b/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdDialog.java
@@ -68,5 +68,4 @@ public void setEntryFromIdPopOver(PopOver entryFromIdPopOver) {
     public DialogPane getDialogPane() {
         return dialogPane;
     }
-
 }
diff --git a/src/main/java/org/jabref/gui/importer/GrobidOptInDialogHelper.java b/src/main/java/org/jabref/gui/importer/GrobidOptInDialogHelper.java
index 4809acfc5a2..cf21a38a30c 100644
--- a/src/main/java/org/jabref/gui/importer/GrobidOptInDialogHelper.java
+++ b/src/main/java/org/jabref/gui/importer/GrobidOptInDialogHelper.java
@@ -1,23 +1,24 @@
 package org.jabref.gui.importer;
 
 import org.jabref.gui.DialogService;
-import org.jabref.logic.importer.ImporterPreferences;
+import org.jabref.logic.importer.fetcher.GrobidPreferences;
 import org.jabref.logic.l10n.Localization;
 
 /**
  * Metadata extraction from PDFs and plaintext works very well using Grobid, but we do not want to enable it by default
  * due to data privacy concerns.
- * To make users aware of the feature, we ask each time before querrying Grobid, giving the option to opt-out.
+ * To make users aware of the feature, we ask each time before querying Grobid, giving the option to opt-out.
  */
 public class GrobidOptInDialogHelper {
 
     /**
-     * If Grobid is not enabled but the user has not expicitly opted-out of Grobid, we ask for permission to send data
+     * If Grobid is not enabled but the user has not explicitly opted-out of Grobid, we ask for permission to send data
      * to Grobid using a dialog and giving an opt-out option.
+     *
      * @param dialogService the DialogService to use
      * @return if the user enabled Grobid, either in the past or after being asked by the dialog.
      */
-    public static boolean showAndWaitIfUserIsUndecided(DialogService dialogService, ImporterPreferences preferences) {
+    public static boolean showAndWaitIfUserIsUndecided(DialogService dialogService, GrobidPreferences preferences) {
         if (preferences.isGrobidEnabled()) {
             return true;
         }
diff --git a/src/main/java/org/jabref/gui/importer/ImportAction.java b/src/main/java/org/jabref/gui/importer/ImportAction.java
index a4eeea9e99a..4b32d0d74db 100644
--- a/src/main/java/org/jabref/gui/importer/ImportAction.java
+++ b/src/main/java/org/jabref/gui/importer/ImportAction.java
@@ -77,6 +77,10 @@ public void automatedImport(List<String> filenames) {
                 if (importError == null) {
                     // TODO: No control flow using exceptions
                     throw new JabRefException(Localization.lang("No entries found. Please make sure you are using the correct import filter."));
+                } else if (importError instanceof ImportException) {
+                    String content = Localization.lang("Please check your library file for wrong syntax.") + "\n\n"
+                            + importError.getLocalizedMessage();
+                    DefaultTaskExecutor.runAndWaitInJavaFXThread(() -> dialogService.showWarningDialogAndWait(Localization.lang("Import error"), content));
                 } else {
                     throw importError;
                 }
@@ -117,8 +121,11 @@ private List<ImportFormatReader.UnknownFormatImport> doImport(List<Path> files)
                 if (importer.isEmpty()) {
                     // Unknown format:
                     DefaultTaskExecutor.runAndWaitInJavaFXThread(() -> {
-                        if (fileIsPdf(filename) && GrobidOptInDialogHelper.showAndWaitIfUserIsUndecided(frame.getDialogService(), prefs.getImporterPreferences())) {
-                            Globals.IMPORT_FORMAT_READER.resetImportFormats(prefs.getImporterPreferences(), prefs.getGeneralPreferences(), prefs.getImportFormatPreferences(), prefs.getXmpPreferences(), Globals.getFileUpdateMonitor());
+                        if (fileIsPdf(filename) && GrobidOptInDialogHelper.showAndWaitIfUserIsUndecided(frame.getDialogService(), prefs.getGrobidPreferences())) {
+                            Globals.IMPORT_FORMAT_READER.resetImportFormats(
+                                    prefs.getImporterPreferences(),
+                                    prefs.getImportFormatPreferences(),
+                                    Globals.getFileUpdateMonitor());
                         }
                         frame.getDialogService().notify(Localization.lang("Importing in unknown format") + "...");
                     });
@@ -126,13 +133,18 @@ private List<ImportFormatReader.UnknownFormatImport> doImport(List<Path> files)
                     imports.add(Globals.IMPORT_FORMAT_READER.importUnknownFormat(filename, Globals.getFileUpdateMonitor()));
                 } else {
                     DefaultTaskExecutor.runAndWaitInJavaFXThread(() -> {
-                        if (importer.get() instanceof PdfGrobidImporter || importer.get() instanceof PdfMergeMetadataImporter && GrobidOptInDialogHelper.showAndWaitIfUserIsUndecided(frame.getDialogService(), prefs.getImporterPreferences())) {
-                                Globals.IMPORT_FORMAT_READER.resetImportFormats(prefs.getImporterPreferences(), prefs.getGeneralPreferences(), prefs.getImportFormatPreferences(), prefs.getXmpPreferences(), Globals.getFileUpdateMonitor());
+                        if ((importer.get() instanceof PdfGrobidImporter) || (
+                                (importer.get() instanceof PdfMergeMetadataImporter)
+                                && GrobidOptInDialogHelper.showAndWaitIfUserIsUndecided(frame.getDialogService(), prefs.getGrobidPreferences()))) {
+                                Globals.IMPORT_FORMAT_READER.resetImportFormats(
+                                        prefs.getImporterPreferences(),
+                                        prefs.getImportFormatPreferences(),
+                                        Globals.getFileUpdateMonitor());
                         }
                         frame.getDialogService().notify(Localization.lang("Importing in %0 format", importer.get().getName()) + "...");
                     });
                     // Specific importer:
-                    ParserResult pr = importer.get().importDatabase(filename, prefs.getGeneralPreferences().getDefaultEncoding());
+                    ParserResult pr = importer.get().importDatabase(filename);
                     imports.add(new ImportFormatReader.UnknownFormatImport(importer.get().getName(), pr));
                 }
             } catch (ImportException | IOException e) {
diff --git a/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.css b/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.css
index 5adbe79d227..03251b85b89 100644
--- a/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.css
+++ b/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.css
@@ -11,10 +11,15 @@
     /*-fx-padding: 0.5em 0em 0.5em 0em;*/
 }
 
-.list-cell {
+.list-cell .summary > Text {
     -fx-padding: 0.5em 0 1em 0.5em;
+    -fx-fill: -js-summary-text-color;
 }
 
 .list-cell:entry-selected {
-    -fx-background-color: derive(-jr-selected, 60%);
+    -fx-background-color: derive(-jr-selected, 35%);
+}
+
+.list-cell:entry-selected .summary > Text {
+    -fx-fill: js-summary-text-color-selected;
 }
diff --git a/src/main/java/org/jabref/gui/importer/ImportEntriesViewModel.java b/src/main/java/org/jabref/gui/importer/ImportEntriesViewModel.java
index 52ccab28413..0f75519e910 100644
--- a/src/main/java/org/jabref/gui/importer/ImportEntriesViewModel.java
+++ b/src/main/java/org/jabref/gui/importer/ImportEntriesViewModel.java
@@ -12,11 +12,11 @@
 
 import org.jabref.gui.AbstractViewModel;
 import org.jabref.gui.DialogService;
+import org.jabref.gui.Globals;
 import org.jabref.gui.JabRefGUI;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.duplicationFinder.DuplicateResolverDialog;
 import org.jabref.gui.externalfiles.ImportHandler;
-import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.fieldeditors.LinkedFileViewModel;
 import org.jabref.gui.util.BackgroundTask;
 import org.jabref.gui.util.TaskExecutor;
@@ -148,8 +148,7 @@ public void importEntries(List<BibEntry> entriesToImport, boolean shouldDownload
                                 databaseContext,
                                 taskExecutor,
                                 dialogService,
-                                preferences,
-                                ExternalFileTypes.getInstance()).download());
+                                preferences).download());
             }
         }
 
@@ -165,11 +164,12 @@ public void importEntries(List<BibEntry> entriesToImport, boolean shouldDownload
     private void buildImportHandlerThenImportEntries(List<BibEntry> entriesToImport) {
         ImportHandler importHandler = new ImportHandler(
                 databaseContext,
-                ExternalFileTypes.getInstance(),
                 preferences,
                 fileUpdateMonitor,
                 undoManager,
-                stateManager);
+                stateManager,
+                dialogService,
+                Globals.IMPORT_FORMAT_READER);
         importHandler.importEntries(entriesToImport);
         dialogService.notify(Localization.lang("Number of entries successfully imported") + ": " + entriesToImport.size());
     }
@@ -197,7 +197,7 @@ public void resolveDuplicate(BibEntry entry) {
         Optional<BibEntry> other = new DuplicateCheck(entryTypesManager).containsDuplicate(databaseContext.getDatabase(), entry, databaseContext.getMode());
         if (other.isPresent()) {
             DuplicateResolverDialog dialog = new DuplicateResolverDialog(other.get(),
-                    entry, DuplicateResolverDialog.DuplicateResolverType.INSPECTION, databaseContext, stateManager);
+                    entry, DuplicateResolverDialog.DuplicateResolverType.INSPECTION, databaseContext, stateManager, dialogService);
 
             DuplicateResolverDialog.DuplicateResolverResult result = dialogService.showCustomDialogAndWait(dialog)
                                                                                   .orElse(DuplicateResolverDialog.DuplicateResolverResult.BREAK);
@@ -228,7 +228,7 @@ public void resolveDuplicate(BibEntry entry) {
         other = findInternalDuplicate(entry);
         if (other.isPresent()) {
             DuplicateResolverDialog diag = new DuplicateResolverDialog(entry,
-                    other.get(), DuplicateResolverDialog.DuplicateResolverType.DUPLICATE_SEARCH, databaseContext, stateManager);
+                    other.get(), DuplicateResolverDialog.DuplicateResolverType.DUPLICATE_SEARCH, databaseContext, stateManager, dialogService);
 
             DuplicateResolverDialog.DuplicateResolverResult answer = dialogService.showCustomDialogAndWait(diag)
                                                                                   .orElse(DuplicateResolverDialog.DuplicateResolverResult.BREAK);
diff --git a/src/main/java/org/jabref/gui/importer/actions/GUIPostOpenAction.java b/src/main/java/org/jabref/gui/importer/actions/GUIPostOpenAction.java
index acdbd8726a7..cc943956861 100644
--- a/src/main/java/org/jabref/gui/importer/actions/GUIPostOpenAction.java
+++ b/src/main/java/org/jabref/gui/importer/actions/GUIPostOpenAction.java
@@ -17,6 +17,7 @@ public interface GUIPostOpenAction {
     /**
      * This method is queried in order to find out whether the action needs to be
      * performed or not.
+     *
      * @param pr The result of the BIB parse operation.
      * @return true if the action should be called, false otherwise.
      */
diff --git a/src/main/java/org/jabref/gui/importer/actions/OpenDatabaseAction.java b/src/main/java/org/jabref/gui/importer/actions/OpenDatabaseAction.java
index c79bc929950..45e95158e29 100644
--- a/src/main/java/org/jabref/gui/importer/actions/OpenDatabaseAction.java
+++ b/src/main/java/org/jabref/gui/importer/actions/OpenDatabaseAction.java
@@ -5,8 +5,6 @@
 import java.nio.file.Path;
 import java.sql.SQLException;
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -21,9 +19,11 @@
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.SimpleCommand;
 import org.jabref.gui.dialogs.BackupUIManager;
+import org.jabref.gui.menus.FileHistoryMenu;
 import org.jabref.gui.shared.SharedDatabaseUIManager;
 import org.jabref.gui.theme.ThemeManager;
 import org.jabref.gui.util.BackgroundTask;
+import org.jabref.gui.util.DefaultTaskExecutor;
 import org.jabref.gui.util.FileDialogConfiguration;
 import org.jabref.logic.autosaveandbackup.BackupManager;
 import org.jabref.logic.importer.OpenDatabase;
@@ -41,10 +41,11 @@
 // The action concerned with opening an existing database.
 public class OpenDatabaseAction extends SimpleCommand {
 
-    public static final Logger LOGGER = LoggerFactory.getLogger(OpenDatabaseAction.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(OpenDatabaseAction.class);
+
     // List of actions that may need to be called after opening the file. Such as
     // upgrade actions etc. that may depend on the JabRef version that wrote the file:
-    private static final List<GUIPostOpenAction> POST_OPEN_ACTIONS = Arrays.asList(
+    private static final List<GUIPostOpenAction> POST_OPEN_ACTIONS = List.of(
             // Migrations:
             // Warning for migrating the Review into the Comment field
             new MergeReviewIntoCommentAction(),
@@ -67,7 +68,6 @@ public OpenDatabaseAction(JabRefFrame frame,
         this.dialogService = dialogService;
         this.stateManager = stateManager;
         this.themeManager = themeManager;
-
     }
 
     /**
@@ -94,7 +94,7 @@ public void execute() {
                 .build();
 
         List<Path> filesToOpen = dialogService.showFileOpenDialogAndGetMultipleFiles(fileDialogConfiguration);
-        openFiles(filesToOpen, true);
+        openFiles(filesToOpen);
     }
 
     /**
@@ -110,20 +110,22 @@ private Path getInitialDirectory() {
     }
 
     /**
-     * Opens the given file. If null or 404, nothing happens
+     * Opens the given file. If null or 404, nothing happens.
+     * In case the file is already opened, that panel is raised.
      *
      * @param file the file, may be null or not existing
      */
-    public void openFile(Path file, boolean raisePanel) {
-        openFiles(new ArrayList<>(List.of(file)), raisePanel);
+    public void openFile(Path file) {
+        openFiles(new ArrayList<>(List.of(file)));
     }
 
     /**
-     * Opens the given files. If one of it is null or 404, nothing happens
+     * Opens the given files. If one of it is null or 404, nothing happens.
+     * In case the file is already opened, that panel is raised.
      *
      * @param filesToOpen the filesToOpen, may be null or not existing
      */
-    public void openFiles(List<Path> filesToOpen, boolean raisePanel) {
+    public void openFiles(List<Path> filesToOpen) {
         LibraryTab toRaise = null;
         int initialCount = filesToOpen.size();
         int removed = 0;
@@ -151,16 +153,12 @@ public void openFiles(List<Path> filesToOpen, boolean raisePanel) {
         // Run the actual open in a thread to prevent the program
         // locking until the file is loaded.
         if (!filesToOpen.isEmpty()) {
-            final List<Path> theFiles = Collections.unmodifiableList(filesToOpen);
-
-            for (Path theFile : theFiles) {
+            FileHistoryMenu fileHistory = frame.getFileHistory();
+            filesToOpen.forEach(theFile -> {
                 // This method will execute the concrete file opening and loading in a background thread
-                openTheFile(theFile, raisePanel);
-            }
-
-            for (Path theFile : theFiles) {
-                frame.getFileHistory().newFile(theFile);
-            }
+                openTheFile(theFile);
+                fileHistory.newFile(theFile);
+            });
         } else if (toRaise != null) {
             // If no files are remaining to open, this could mean that a file was
             // already open. If so, we may have to raise the correct tab:
@@ -169,9 +167,11 @@ public void openFiles(List<Path> filesToOpen, boolean raisePanel) {
     }
 
     /**
-     * @param file the file, may be null or not existing
+     * This is the real file opening. Should be called via {@link #openFile(Path)}
+     *
+     * @param file the file, may be NOT null, but may not be existing
      */
-    private void openTheFile(Path file, boolean raisePanel) {
+    private void openTheFile(Path file) {
         Objects.requireNonNull(file);
         if (!Files.exists(file)) {
             return;
@@ -179,11 +179,15 @@ private void openTheFile(Path file, boolean raisePanel) {
 
         BackgroundTask<ParserResult> backgroundTask = BackgroundTask.wrap(() -> loadDatabase(file));
         LibraryTab.Factory libraryTabFactory = new LibraryTab.Factory();
-        LibraryTab newTab = libraryTabFactory.createLibraryTab(frame, preferencesService, stateManager, themeManager, file, backgroundTask);
+        LibraryTab newTab = libraryTabFactory.createLibraryTab(frame, preferencesService, stateManager, themeManager, file, backgroundTask, Globals.IMPORT_FORMAT_READER);
 
         backgroundTask.onFinished(() -> trackOpenNewDatabase(newTab));
     }
 
+    /**
+     * This method is similar to {@link org.jabref.gui.JabRefGUI#openLastEditedDatabases()}.
+     * This method also has the capability to open remote shared databases
+     */
     private ParserResult loadDatabase(Path file) throws Exception {
         Path fileToLoad = file.toAbsolutePath();
 
@@ -198,9 +202,14 @@ private ParserResult loadDatabase(Path file) throws Exception {
         ParserResult result;
         try {
             result = OpenDatabase.loadDatabase(fileToLoad,
-                    preferencesService.getGeneralPreferences(),
                     preferencesService.getImportFormatPreferences(),
                     Globals.getFileUpdateMonitor());
+            if (result.hasWarnings()) {
+                String content = Localization.lang("Please check your library file for wrong syntax.")
+                        + "\n\n" + result.getErrorMessage();
+                DefaultTaskExecutor.runInJavaFXThread(() ->
+                        dialogService.showWarningDialogAndWait(Localization.lang("Open library error"), content));
+            }
         } catch (IOException e) {
             result = ParserResult.fromError(e);
             LOGGER.error("Error opening file '{}'", fileToLoad, e);
diff --git a/src/main/java/org/jabref/gui/importer/fetcher/LookupIdentifierAction.java b/src/main/java/org/jabref/gui/importer/fetcher/LookupIdentifierAction.java
index 65bfba288aa..314781ec9a1 100644
--- a/src/main/java/org/jabref/gui/importer/fetcher/LookupIdentifierAction.java
+++ b/src/main/java/org/jabref/gui/importer/fetcher/LookupIdentifierAction.java
@@ -63,7 +63,6 @@ public void execute() {
 
     public Action getAction() {
         return new Action() {
-
             @Override
             public Optional<JabRefIcon> getIcon() {
                 return Optional.empty();
diff --git a/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneView.java b/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneView.java
index a37a4b1f670..df252ccc8df 100644
--- a/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneView.java
+++ b/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneView.java
@@ -30,9 +30,11 @@ public class WebSearchPaneView extends VBox {
 
     private final WebSearchPaneViewModel viewModel;
     private final PreferencesService preferences;
+    private final DialogService dialogService;
 
     public WebSearchPaneView(PreferencesService preferences, DialogService dialogService, StateManager stateManager) {
         this.preferences = preferences;
+        this.dialogService = dialogService;
         this.viewModel = new WebSearchPaneViewModel(preferences, dialogService, stateManager);
         initialize();
     }
@@ -51,7 +53,7 @@ private void initialize() {
         ActionFactory factory = new ActionFactory(preferences.getKeyBindingRepository());
         EasyBind.subscribe(viewModel.selectedFetcherProperty(), fetcher -> {
             if ((fetcher != null) && fetcher.getHelpPage().isPresent()) {
-                Button helpButton = factory.createIconButton(StandardActions.HELP, new HelpAction(fetcher.getHelpPage().get()));
+                Button helpButton = factory.createIconButton(StandardActions.HELP, new HelpAction(fetcher.getHelpPage().get(), dialogService));
                 helpButtonContainer.getChildren().setAll(helpButton);
             } else {
                 helpButtonContainer.getChildren().clear();
diff --git a/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneViewModel.java b/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneViewModel.java
index bb24c28f4bb..6aa6e7177d5 100644
--- a/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneViewModel.java
+++ b/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneViewModel.java
@@ -52,7 +52,9 @@ public WebSearchPaneViewModel(PreferencesService preferencesService, DialogServi
         this.dialogService = dialogService;
         this.stateManager = stateManager;
 
-        SortedSet<SearchBasedFetcher> allFetchers = WebFetchers.getSearchBasedFetchers(preferencesService.getImportFormatPreferences());
+        SortedSet<SearchBasedFetcher> allFetchers = WebFetchers.getSearchBasedFetchers(
+                preferencesService.getImportFormatPreferences(),
+                preferencesService.getImporterPreferences());
         fetchers.setAll(allFetchers);
 
         // Choose last-selected fetcher as default
@@ -128,7 +130,8 @@ public void search() {
         }
 
         SearchBasedFetcher activeFetcher = getSelectedFetcher();
-        Globals.getTelemetryClient().ifPresent(client -> client.trackEvent("search", Map.of("fetcher", activeFetcher.getName()), Map.of()));
+        Globals.getTelemetryClient().ifPresent(client ->
+                client.trackEvent("search", Map.of("fetcher", activeFetcher.getName()), Map.of()));
 
         BackgroundTask<ParserResult> task;
         task = BackgroundTask.wrap(() -> new ParserResult(activeFetcher.performSearch(query)))
diff --git a/src/main/java/org/jabref/gui/integrity/IntegrityCheckAction.java b/src/main/java/org/jabref/gui/integrity/IntegrityCheckAction.java
index e0bda0f8d33..809a2020c78 100644
--- a/src/main/java/org/jabref/gui/integrity/IntegrityCheckAction.java
+++ b/src/main/java/org/jabref/gui/integrity/IntegrityCheckAction.java
@@ -42,7 +42,6 @@ public void execute() {
         IntegrityCheck check = new IntegrityCheck(database,
                 Globals.prefs.getFilePreferences(),
                 Globals.prefs.getCitationKeyPatternPreferences(),
-                Globals.prefs.getGeneralPreferences().getDefaultEncoding(),
                 Globals.journalAbbreviationRepository,
                 Globals.prefs.getEntryEditorPreferences().shouldAllowIntegerEditionBibtex());
 
diff --git a/src/main/java/org/jabref/gui/journals/AbbreviateAction.java b/src/main/java/org/jabref/gui/journals/AbbreviateAction.java
index 81c5ea15322..4a94a38e55e 100644
--- a/src/main/java/org/jabref/gui/journals/AbbreviateAction.java
+++ b/src/main/java/org/jabref/gui/journals/AbbreviateAction.java
@@ -61,7 +61,6 @@ public AbbreviateAction(StandardActions action,
 
     @Override
     public void execute() {
-
         if (action == StandardActions.ABBREVIATE_DEFAULT
                 || action == StandardActions.ABBREVIATE_MEDLINE
                 || action == StandardActions.ABBREVIATE_SHORTEST_UNIQUE) {
@@ -72,7 +71,6 @@ public void execute() {
                                   .onSuccess(dialogService::notify)
                                   .executeWith(Globals.TASK_EXECUTOR));
         } else if (action == StandardActions.UNABBREVIATE) {
-
             dialogService.notify(Localization.lang("Unabbreviating..."));
             stateManager.getActiveDatabase().ifPresent(databaseContext ->
                     BackgroundTask.wrap(() -> unabbreviate(stateManager.getActiveDatabase().get(), stateManager.getSelectedEntries()))
diff --git a/src/main/java/org/jabref/gui/keyboard/TextInputKeyBindings.java b/src/main/java/org/jabref/gui/keyboard/TextInputKeyBindings.java
index d195f0bdef8..d63ac9459c2 100644
--- a/src/main/java/org/jabref/gui/keyboard/TextInputKeyBindings.java
+++ b/src/main/java/org/jabref/gui/keyboard/TextInputKeyBindings.java
@@ -90,6 +90,10 @@ public static void call(Scene scene, KeyEvent event) {
                         focusedTextField.positionCaret(res.caretPosition);
                         event.consume();
                     }
+                    case CLOSE -> {
+                        focusedTextField.clear();
+                        event.consume();
+                    }
                 }
             });
         }
diff --git a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesViewModel.java b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesViewModel.java
index 6922d3ee80e..078d36f838a 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesViewModel.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesViewModel.java
@@ -15,7 +15,6 @@ public class LibraryPropertiesViewModel {
     private final ObservableList<PropertiesTab> propertiesTabs;
 
     public LibraryPropertiesViewModel(BibDatabaseContext databaseContext) {
-
         propertiesTabs = FXCollections.observableArrayList(
                 new GeneralPropertiesView(databaseContext),
                 new SavingPropertiesView(databaseContext),
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 16f43d77a70..0e83f999963 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/constants/ConstantsPropertiesView.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/constants/ConstantsPropertiesView.java
@@ -12,6 +12,7 @@
 import javafx.scene.control.Tooltip;
 import javafx.util.converter.DefaultStringConverter;
 
+import org.jabref.gui.DialogService;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.libraryproperties.AbstractPropertiesTabView;
 import org.jabref.gui.libraryproperties.PropertiesTab;
@@ -33,6 +34,7 @@ public class ConstantsPropertiesView extends AbstractPropertiesTabView<Constants
     @FXML private ButtonType saveButton;
 
     @Inject private PreferencesService preferencesService;
+    @Inject private DialogService dialogService;
 
     public ConstantsPropertiesView(BibDatabaseContext databaseContext) {
         this.databaseContext = databaseContext;
@@ -48,7 +50,7 @@ public String getTabName() {
     }
 
     public void initialize() {
-        this.viewModel = new ConstantsPropertiesViewModel(databaseContext);
+        this.viewModel = new ConstantsPropertiesViewModel(databaseContext, dialogService);
 
         addStringButton.setTooltip(new Tooltip(Localization.lang("New string")));
 
diff --git a/src/main/java/org/jabref/gui/libraryproperties/constants/ConstantsPropertiesViewModel.java b/src/main/java/org/jabref/gui/libraryproperties/constants/ConstantsPropertiesViewModel.java
index 4651b14e7e5..8616f4e6b3f 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/constants/ConstantsPropertiesViewModel.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/constants/ConstantsPropertiesViewModel.java
@@ -11,6 +11,7 @@
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 
+import org.jabref.gui.DialogService;
 import org.jabref.gui.help.HelpAction;
 import org.jabref.gui.libraryproperties.PropertiesTabViewModel;
 import org.jabref.logic.bibtex.comparator.BibtexStringComparator;
@@ -31,8 +32,11 @@ public class ConstantsPropertiesViewModel implements PropertiesTabViewModel {
 
     private final BibDatabaseContext databaseContext;
 
-    public ConstantsPropertiesViewModel(BibDatabaseContext databaseContext) {
+    private final DialogService dialogService;
+
+    public ConstantsPropertiesViewModel(BibDatabaseContext databaseContext, DialogService dialogService) {
         this.databaseContext = databaseContext;
+        this.dialogService = dialogService;
 
         ObservableList<ObservableValue<Boolean>> allValidProperty =
                 EasyBind.map(stringsListProperty, ConstantsItemModel::combinedValidationValidProperty);
@@ -90,7 +94,7 @@ public Optional<ConstantsItemModel> labelAlreadyExists(String label) {
     }
 
     public void openHelpPage() {
-        HelpAction.openHelpPage(HelpFile.STRING_EDITOR);
+        new HelpAction(HelpFile.STRING_EDITOR, dialogService).execute();
     }
 
     public ListProperty<ConstantsItemModel> stringsListProperty() {
diff --git a/src/main/java/org/jabref/gui/libraryproperties/general/GeneralPropertiesViewModel.java b/src/main/java/org/jabref/gui/libraryproperties/general/GeneralPropertiesViewModel.java
index 9fbdf98c565..65dc1d0b9ef 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/general/GeneralPropertiesViewModel.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/general/GeneralPropertiesViewModel.java
@@ -1,6 +1,7 @@
 package org.jabref.gui.libraryproperties.general;
 
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 
 import javax.swing.undo.UndoManager;
@@ -62,7 +63,7 @@ public void setValues() {
         boolean isShared = (databaseContext.getLocation() == DatabaseLocation.SHARED);
         encodingDisableProperty.setValue(isShared); // the encoding of shared database is always UTF-8
 
-        selectedEncodingProperty.setValue(metaData.getEncoding().orElse(preferencesService.getGeneralPreferences().getDefaultEncoding()));
+        selectedEncodingProperty.setValue(metaData.getEncoding().orElse(StandardCharsets.UTF_8));
         selectedDatabaseModeProperty.setValue(metaData.getMode().orElse(BibDatabaseMode.BIBLATEX));
         generalFileDirectoryProperty.setValue(metaData.getDefaultFileDirectory().orElse("").trim());
         userSpecificFileDirectoryProperty.setValue(metaData.getUserFileDirectory(preferencesService.getFilePreferences().getUser()).orElse("").trim());
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 a47eabc2db3..74035d4cd03 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/keypattern/KeyPatternPropertiesView.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/keypattern/KeyPatternPropertiesView.java
@@ -48,7 +48,7 @@ public void initialize() {
         bibtexKeyPatternTable.defaultKeyPatternProperty().bindBidirectional(viewModel.defaultKeyPatternProperty());
 
         ActionFactory actionFactory = new ActionFactory(Globals.getKeyPrefs());
-        actionFactory.configureIconButton(StandardActions.HELP_KEY_PATTERNS, new HelpAction(HelpFile.CITATION_KEY_PATTERN), keyPatternHelp);
+        actionFactory.configureIconButton(StandardActions.HELP_KEY_PATTERNS, new HelpAction(HelpFile.CITATION_KEY_PATTERN, dialogService), keyPatternHelp);
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/linkedfile/AttachFileAction.java b/src/main/java/org/jabref/gui/linkedfile/AttachFileAction.java
index 00e0c1f3b4b..8dad9f0399c 100644
--- a/src/main/java/org/jabref/gui/linkedfile/AttachFileAction.java
+++ b/src/main/java/org/jabref/gui/linkedfile/AttachFileAction.java
@@ -8,7 +8,6 @@
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.ActionHelper;
 import org.jabref.gui.actions.SimpleCommand;
-import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.fieldeditors.LinkedFilesEditorViewModel;
 import org.jabref.gui.undo.UndoableFieldChange;
 import org.jabref.gui.util.FileDialogConfiguration;
@@ -62,9 +61,10 @@ public void execute() {
                 .build();
 
         dialogService.showFileOpenDialog(fileDialogConfiguration).ifPresent(newFile -> {
-            LinkedFile linkedFile = LinkedFilesEditorViewModel.fromFile(newFile,
+            LinkedFile linkedFile = LinkedFilesEditorViewModel.fromFile(
+                    newFile,
                     databaseContext.getFileDirectories(filePreferences),
-                    ExternalFileTypes.getInstance());
+                    filePreferences);
 
             LinkedFileEditDialogView dialog = new LinkedFileEditDialogView(linkedFile);
 
diff --git a/src/main/java/org/jabref/gui/linkedfile/LinkedFileEditDialog.fxml b/src/main/java/org/jabref/gui/linkedfile/LinkedFileEditDialog.fxml
index 592a99d1567..364f3da9214 100644
--- a/src/main/java/org/jabref/gui/linkedfile/LinkedFileEditDialog.fxml
+++ b/src/main/java/org/jabref/gui/linkedfile/LinkedFileEditDialog.fxml
@@ -1,42 +1,52 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.ComboBox?>
 <?import javafx.scene.control.DialogPane?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.TextField?>
+<?import javafx.scene.control.Tooltip?>
 <?import javafx.scene.layout.ColumnConstraints?>
 <?import javafx.scene.layout.GridPane?>
 <?import javafx.scene.layout.RowConstraints?>
-<DialogPane minHeight="-Infinity" prefHeight="150.0" prefWidth="536.0" xmlns="http://javafx.com/javafx/8.0.141" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.linkedfile.LinkedFileEditDialogView">
+<?import org.jabref.gui.icon.JabRefIconView?>
+<DialogPane minHeight="140.0" minWidth="550.0"
+            xmlns="http://javafx.com/javafx/8.0.141" xmlns:fx="http://javafx.com/fxml/1"
+            fx:controller="org.jabref.gui.linkedfile.LinkedFileEditDialogView">
     <content>
-        <GridPane>
+        <GridPane vgap="4" hgap="4">
             <columnConstraints>
                 <ColumnConstraints hgrow="NEVER" minWidth="10.0" prefWidth="100.0"/>
-                <ColumnConstraints hgrow="ALWAYS" minWidth="10.0" prefWidth="200.0"/>
-                <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="108.0"/>
+                <ColumnConstraints hgrow="ALWAYS" minWidth="10.0"/>
+                <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0"/>
             </columnConstraints>
             <rowConstraints>
-                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
-                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
-                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
+                <RowConstraints/>
+                <RowConstraints/>
+                <RowConstraints/>
             </rowConstraints>
-            <Label minWidth="95.0" text="%Link"/>
-            <TextField fx:id="link" minHeight="-Infinity" minWidth="-Infinity" prefHeight="25.0" prefWidth="150.0"
+
+            <Label text="%Link"/>
+            <TextField fx:id="link" prefHeight="25.0"
                        GridPane.columnIndex="1" GridPane.hgrow="ALWAYS"/>
-            <Label text="Description" GridPane.rowIndex="1"/>
-            <TextField fx:id="description" minHeight="-Infinity" minWidth="-Infinity" prefHeight="25.0"
-                       prefWidth="150.0" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="1"/>
-            <ComboBox fx:id="fileType" minHeight="-Infinity" prefWidth="150.0" GridPane.columnIndex="1"
-                      GridPane.columnSpan="2" GridPane.hgrow="ALWAYS" GridPane.rowIndex="2"/>
-            <Button id="browse" mnemonicParsing="false" onAction="#openBrowseDialog" text="%Browse"
-                    GridPane.columnIndex="2">
-                <GridPane.margin>
-                    <Insets left="10.0"/>
-                </GridPane.margin>
+            <Button id="browse" onAction="#openBrowseDialog"
+                    styleClass="icon-button,narrow"
+                    prefHeight="20.0" prefWidth="20.0" GridPane.columnIndex="2">
+                <graphic>
+                    <JabRefIconView glyph="OPEN"/>
+                </graphic>
+                <tooltip>
+                    <Tooltip text="%Browse"/>
+                </tooltip>
             </Button>
+
+            <Label text="Description" GridPane.rowIndex="1"/>
+            <TextField fx:id="description" prefHeight="25.0"
+                       GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="1"/>
+
             <Label text="Filetype" GridPane.rowIndex="2"/>
+            <ComboBox fx:id="fileType"
+                      GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="2"/>
         </GridPane>
     </content>
 </DialogPane>
diff --git a/src/main/java/org/jabref/gui/linkedfile/LinkedFileEditDialogView.java b/src/main/java/org/jabref/gui/linkedfile/LinkedFileEditDialogView.java
index b470265e78d..3d6149a203b 100644
--- a/src/main/java/org/jabref/gui/linkedfile/LinkedFileEditDialogView.java
+++ b/src/main/java/org/jabref/gui/linkedfile/LinkedFileEditDialogView.java
@@ -11,8 +11,9 @@
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.externalfiletype.ExternalFileType;
-import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.util.BaseDialog;
+import org.jabref.gui.util.ViewModelListCellFactory;
+import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.preferences.PreferencesService;
 
@@ -32,17 +33,17 @@ public class LinkedFileEditDialogView extends BaseDialog<LinkedFile> {
     private LinkedFilesEditDialogViewModel viewModel;
 
     private final LinkedFile linkedFile;
-    private final ExternalFileTypes externalFileTypes;
 
     public LinkedFileEditDialogView(LinkedFile linkedFile) {
         this.linkedFile = linkedFile;
 
-        this.externalFileTypes = ExternalFileTypes.getInstance();
         ViewLoader.view(this)
                   .load()
                   .setAsContent(this.getDialogPane());
 
         this.getDialogPane().getButtonTypes().addAll(ButtonType.APPLY, ButtonType.CANCEL);
+        this.setResizable(false);
+        this.setTitle(Localization.lang("Edit file link"));
 
         this.setResultConverter(button -> {
             if (button == ButtonType.APPLY) {
@@ -55,9 +56,13 @@ public LinkedFileEditDialogView(LinkedFile linkedFile) {
 
     @FXML
     private void initialize() {
-
-        viewModel = new LinkedFilesEditDialogViewModel(linkedFile, stateManager.getActiveDatabase().get(), dialogService, preferences.getFilePreferences(), externalFileTypes);
+        viewModel = new LinkedFilesEditDialogViewModel(linkedFile, stateManager.getActiveDatabase().get(), dialogService, preferences.getFilePreferences());
         fileType.itemsProperty().bindBidirectional(viewModel.externalFileTypeProperty());
+        new ViewModelListCellFactory<ExternalFileType>()
+                .withIcon(ExternalFileType::getIcon)
+                .withText(ExternalFileType::getName)
+                .install(fileType);
+
         description.textProperty().bindBidirectional(viewModel.descriptionProperty());
         link.textProperty().bindBidirectional(viewModel.linkProperty());
         fileType.valueProperty().bindBidirectional(viewModel.selectedExternalFileTypeProperty());
diff --git a/src/main/java/org/jabref/gui/linkedfile/LinkedFilesEditDialogViewModel.java b/src/main/java/org/jabref/gui/linkedfile/LinkedFilesEditDialogViewModel.java
index 2d5175bd3d4..a46e908c358 100644
--- a/src/main/java/org/jabref/gui/linkedfile/LinkedFilesEditDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/linkedfile/LinkedFilesEditDialogViewModel.java
@@ -41,14 +41,15 @@ public class LinkedFilesEditDialogViewModel extends AbstractViewModel {
     private final BibDatabaseContext database;
     private final DialogService dialogService;
     private final FilePreferences filePreferences;
-    private final ExternalFileTypes externalFileTypes;
 
-    public LinkedFilesEditDialogViewModel(LinkedFile linkedFile, BibDatabaseContext database, DialogService dialogService, FilePreferences filePreferences, ExternalFileTypes externalFileTypes) {
+    public LinkedFilesEditDialogViewModel(LinkedFile linkedFile,
+                                          BibDatabaseContext database,
+                                          DialogService dialogService,
+                                          FilePreferences filePreferences) {
         this.database = database;
         this.dialogService = dialogService;
         this.filePreferences = filePreferences;
-        this.externalFileTypes = externalFileTypes;
-        allExternalFileTypes.set(FXCollections.observableArrayList(externalFileTypes.getExternalFileTypeSelection()));
+        allExternalFileTypes.set(FXCollections.observableArrayList(filePreferences.getExternalFileTypes()));
 
         monadicSelectedExternalFileType = EasyBind.wrapNullable(selectedExternalFileType);
         setValues(linkedFile);
@@ -56,15 +57,16 @@ public LinkedFilesEditDialogViewModel(LinkedFile linkedFile, BibDatabaseContext
 
     private void setExternalFileTypeByExtension(String link) {
         if (!link.isEmpty()) {
-
             // Check if this looks like a remote link:
             if (REMOTE_LINK_PATTERN.matcher(link).matches()) {
-                externalFileTypes.getExternalFileTypeByExt("html").ifPresent(selectedExternalFileType::setValue);
+                ExternalFileTypes.getExternalFileTypeByExt("html", filePreferences)
+                                 .ifPresent(selectedExternalFileType::setValue);
             }
 
             // Try to guess the file type:
             String theLink = link.trim();
-            externalFileTypes.getExternalFileTypeForName(theLink).ifPresent(selectedExternalFileType::setValue);
+            ExternalFileTypes.getExternalFileTypeForName(theLink, filePreferences)
+                             .ifPresent(selectedExternalFileType::setValue);
         }
     }
 
@@ -102,7 +104,7 @@ public void setValues(LinkedFile linkedFile) {
         selectedExternalFileType.setValue(null);
 
         // See what is a reasonable selection for the type combobox:
-        Optional<ExternalFileType> fileType = externalFileTypes.fromLinkedFile(linkedFile, false);
+        Optional<ExternalFileType> fileType = ExternalFileTypes.getExternalFileTypeByLinkedFile(linkedFile, false, filePreferences);
         if (fileType.isPresent() && !(fileType.get() instanceof UnknownExternalFileType)) {
             selectedExternalFileType.setValue(fileType.get());
         } else if ((linkedFile.getLink() != null) && (!linkedFile.getLink().isEmpty())) {
diff --git a/src/main/java/org/jabref/gui/logging/ApplicationInsightsLogEvent.java b/src/main/java/org/jabref/gui/logging/ApplicationInsightsLogEvent.java
index fc5a453552e..8753c29fd29 100644
--- a/src/main/java/org/jabref/gui/logging/ApplicationInsightsLogEvent.java
+++ b/src/main/java/org/jabref/gui/logging/ApplicationInsightsLogEvent.java
@@ -65,7 +65,6 @@ public Exception getException() {
 
     @Override
     public Map<String, String> getCustomParameters() {
-
         Map<String, String> metaData = new HashMap<>();
 
         metaData.put("SourceType", "slf4j");
@@ -78,13 +77,11 @@ public Map<String, String> getCustomParameters() {
             addLogEventProperty("Logger Message", getMessage(), metaData);
 
             for (StackTraceElement stackTraceElement : logEvent.getException().getStackTrace()) {
-
                 addLogEventProperty("ClassName", stackTraceElement.getClassName(), metaData);
                 addLogEventProperty("FileName", stackTraceElement.getFileName(), metaData);
                 addLogEventProperty("MethodName", stackTraceElement.getMethodName(), metaData);
                 addLogEventProperty("LineNumber", String.valueOf(stackTraceElement.getLineNumber()), metaData);
             }
-
         }
 
         for (Entry<String, String> entry : logEvent.getContext().entrySet()) {
@@ -102,7 +99,6 @@ public SeverityLevel getNormalizedSeverityLevel() {
         org.tinylog.Level logEventLevel = logEvent.getLevel();
 
         switch (logEventLevel) {
-
             case ERROR:
                 return SeverityLevel.Error;
             case WARN:
diff --git a/src/main/java/org/jabref/gui/logging/ApplicationInsightsWriter.java b/src/main/java/org/jabref/gui/logging/ApplicationInsightsWriter.java
index d9b10a6c0f6..47fb4bcc15f 100644
--- a/src/main/java/org/jabref/gui/logging/ApplicationInsightsWriter.java
+++ b/src/main/java/org/jabref/gui/logging/ApplicationInsightsWriter.java
@@ -55,6 +55,5 @@ public void flush() throws Exception {
 
     @Override
     public void close() throws Exception {
-
     }
 }
diff --git a/src/main/java/org/jabref/gui/logging/GuiWriter.java b/src/main/java/org/jabref/gui/logging/GuiWriter.java
index 5a0b3b4e0d6..f8d560f7187 100644
--- a/src/main/java/org/jabref/gui/logging/GuiWriter.java
+++ b/src/main/java/org/jabref/gui/logging/GuiWriter.java
@@ -39,5 +39,4 @@ public void flush() throws Exception {
     @Override
     public void close() throws Exception {
     }
-
 }
diff --git a/src/main/java/org/jabref/gui/maintable/CellFactory.java b/src/main/java/org/jabref/gui/maintable/CellFactory.java
index 9f0940831d4..13c65f6a336 100644
--- a/src/main/java/org/jabref/gui/maintable/CellFactory.java
+++ b/src/main/java/org/jabref/gui/maintable/CellFactory.java
@@ -8,7 +8,6 @@
 import javafx.scene.Node;
 
 import org.jabref.gui.externalfiletype.ExternalFileType;
-import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.icon.JabRefIcon;
 import org.jabref.gui.specialfields.SpecialFieldViewModel;
@@ -22,7 +21,7 @@ public class CellFactory {
 
     private final Map<Field, JabRefIcon> TABLE_ICONS = new HashMap<>();
 
-    public CellFactory(ExternalFileTypes externalFileTypes, PreferencesService preferencesService, UndoManager undoManager) {
+    public CellFactory(PreferencesService preferencesService, UndoManager undoManager) {
         JabRefIcon icon;
         icon = IconTheme.JabRefIcons.PDF_FILE;
         // icon.setToo(Localization.lang("Open") + " PDF");
@@ -56,7 +55,7 @@ public CellFactory(ExternalFileTypes externalFileTypes, PreferencesService prefe
         // icon.setToolTipText(Localization.lang("Open file"));
         TABLE_ICONS.put(StandardField.FILE, icon);
 
-        for (ExternalFileType fileType : externalFileTypes.getExternalFileTypeSelection()) {
+        for (ExternalFileType fileType : preferencesService.getFilePreferences().getExternalFileTypes()) {
             icon = fileType.getIcon();
             // icon.setToolTipText(Localization.lang("Open %0 file", fileType.getName()));
             TABLE_ICONS.put(fileType.getField(), icon);
diff --git a/src/main/java/org/jabref/gui/maintable/MainTable.java b/src/main/java/org/jabref/gui/maintable/MainTable.java
index a57b367f0ef..8f7fff99355 100644
--- a/src/main/java/org/jabref/gui/maintable/MainTable.java
+++ b/src/main/java/org/jabref/gui/maintable/MainTable.java
@@ -3,6 +3,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Path;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
@@ -24,6 +25,7 @@
 import javafx.scene.input.MouseEvent;
 import javafx.scene.input.TransferMode;
 
+import org.jabref.gui.ClipBoardManager;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.DragAndDropDataFormats;
 import org.jabref.gui.Globals;
@@ -32,7 +34,6 @@
 import org.jabref.gui.actions.StandardActions;
 import org.jabref.gui.edit.EditAction;
 import org.jabref.gui.externalfiles.ImportHandler;
-import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.keyboard.KeyBinding;
 import org.jabref.gui.keyboard.KeyBindingRepository;
 import org.jabref.gui.maintable.columns.LibraryColumn;
@@ -41,11 +42,12 @@
 import org.jabref.gui.util.CustomLocalDragboard;
 import org.jabref.gui.util.DefaultTaskExecutor;
 import org.jabref.gui.util.ViewModelTableRowFactory;
-import org.jabref.logic.importer.ImportCleanup;
+import org.jabref.logic.importer.FetcherClientException;
+import org.jabref.logic.importer.FetcherException;
+import org.jabref.logic.importer.FetcherServerException;
+import org.jabref.logic.importer.ImportFormatReader;
 import org.jabref.logic.l10n.Localization;
-import org.jabref.logic.util.OS;
 import org.jabref.model.database.BibDatabaseContext;
-import org.jabref.model.database.BibDatabaseMode;
 import org.jabref.model.database.event.EntriesAddedEvent;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.preferences.PreferencesService;
@@ -66,7 +68,7 @@ public class MainTable extends TableView<BibEntryTableViewModel> {
 
     private final ImportHandler importHandler;
     private final CustomLocalDragboard localDragboard;
-
+    private final ClipBoardManager clipBoardManager;
     private long lastKeyPressTime;
     private String columnSearchTerm;
 
@@ -76,8 +78,9 @@ public MainTable(MainTableDataModel model,
                      PreferencesService preferencesService,
                      DialogService dialogService,
                      StateManager stateManager,
-                     ExternalFileTypes externalFileTypes,
-                     KeyBindingRepository keyBindingRepository) {
+                     KeyBindingRepository keyBindingRepository,
+                     ClipBoardManager clipBoardManager,
+                     ImportFormatReader importFormatReader) {
         super();
 
         this.libraryTab = libraryTab;
@@ -85,15 +88,18 @@ public MainTable(MainTableDataModel model,
         this.stateManager = stateManager;
         this.database = Objects.requireNonNull(database);
         this.model = model;
+        this.clipBoardManager = clipBoardManager;
         UndoManager undoManager = libraryTab.getUndoManager();
         MainTablePreferences mainTablePreferences = preferencesService.getMainTablePreferences();
 
         importHandler = new ImportHandler(
-                database, externalFileTypes,
+                database,
                 preferencesService,
                 Globals.getFileUpdateMonitor(),
                 undoManager,
-                stateManager);
+                stateManager,
+                dialogService,
+                importFormatReader);
 
         localDragboard = stateManager.getLocalDragboard();
 
@@ -105,7 +111,6 @@ public MainTable(MainTableDataModel model,
                         database,
                         preferencesService,
                         preferencesService.getColumnPreferences(),
-                        externalFileTypes,
                         libraryTab.getUndoManager(),
                         dialogService,
                         stateManager).createColumns());
@@ -126,7 +131,8 @@ public MainTable(MainTableDataModel model,
                         preferencesService,
                         undoManager,
                         Globals.getClipboardManager(),
-                        Globals.TASK_EXECUTOR))
+                        Globals.TASK_EXECUTOR,
+                        Globals.entryTypesManager))
                 .setOnDragDetected(this::handleOnDragDetected)
                 .setOnDragDropped(this::handleOnDragDropped)
                 .setOnDragOver(this::handleOnDragOver)
@@ -223,8 +229,8 @@ public void listen(EntriesAddedEvent event) {
     }
 
     public void clearAndSelect(BibEntry bibEntry) {
+        getSelectionModel().clearSelection();
         findEntry(bibEntry).ifPresent(entry -> {
-            getSelectionModel().clearSelection();
             getSelectionModel().select(entry);
             scrollTo(entry);
         });
@@ -249,7 +255,7 @@ public void cut() {
     }
 
     private void setupKeyBindings(KeyBindingRepository keyBindings) {
-        this.addEventHandler(KeyEvent.KEY_PRESSED, event -> {
+        this.addEventFilter(KeyEvent.KEY_PRESSED, event -> {
             if (event.getCode() == KeyCode.ENTER) {
                 getSelectedEntries().stream()
                                     .findFirst()
@@ -270,9 +276,7 @@ private void setupKeyBindings(KeyBindingRepository keyBindings) {
                         event.consume();
                         break;
                     case PASTE:
-                        if (!OS.OS_X) {
-                            new EditAction(StandardActions.PASTE, libraryTab.frame(), stateManager).execute();
-                        }
+                        new EditAction(StandardActions.PASTE, libraryTab.frame(), stateManager).execute();
                         event.consume();
                         break;
                     case COPY:
@@ -306,17 +310,43 @@ private void clearAndSelectLast() {
         scrollTo(getItems().size() - 1);
     }
 
-    public void paste(BibDatabaseMode bibDatabaseMode) {
-        // Find entries in clipboard
-        List<BibEntry> entriesToAdd = Globals.getClipboardManager().extractData();
-        ImportCleanup cleanup = new ImportCleanup(bibDatabaseMode);
-        cleanup.doPostCleanup(entriesToAdd);
-        libraryTab.insertEntries(entriesToAdd);
+    public void paste() {
+        List<BibEntry> entriesToAdd = new ArrayList<>();
+            entriesToAdd = this.clipBoardManager.getBibTeXEntriesFromClipbaord()
+            .map(importHandler::handleBibTeXData)
+            .orElseGet(this::handleNonBibteXStringData);
+
+        for (BibEntry entry : entriesToAdd) {
+            importHandler.importEntryWithDuplicateCheck(database, entry);
+        }
         if (!entriesToAdd.isEmpty()) {
             this.requestFocus();
         }
     }
 
+    private List<BibEntry> handleNonBibteXStringData() {
+        String data = this.clipBoardManager.getContents();
+        List<BibEntry> entries = new ArrayList<>();
+        try {
+            entries = this.importHandler.handleStringData(data);
+        } catch (FetcherException exception) {
+            if (exception instanceof FetcherClientException) {
+                dialogService.showInformationDialogAndWait(Localization.lang("Look up identifier"), Localization.lang("No data was found for the identifier"));
+            } else if (exception instanceof FetcherServerException) {
+                dialogService.showInformationDialogAndWait(Localization.lang("Look up identifier"), Localization.lang("Server not available"));
+            } else {
+                dialogService.showErrorDialogAndWait(exception);
+            }
+        }
+        return entries;
+    }
+
+    public void dropEntry(List<BibEntry> entriesToAdd) {
+        for (BibEntry entry : entriesToAdd) {
+            importHandler.importEntryWithDuplicateCheck(database, (BibEntry) entry.clone());
+        }
+    }
+
     private void handleOnDragOver(TableRow<BibEntryTableViewModel> row, BibEntryTableViewModel item, DragEvent event) {
         if (event.getDragboard().hasFiles()) {
             event.acceptTransferModes(TransferMode.ANY);
@@ -353,8 +383,9 @@ private void handleOnDragDetected(TableRow<BibEntryTableViewModel> row, BibEntry
 
         // The following is necesary to initiate the drag and drop in javafx, although we don't need the contents
         // It doesn't work without
+        // Drag'n'drop to other tabs use COPY TransferMode, drop to group sidepane use MOVE
         ClipboardContent content = new ClipboardContent();
-        Dragboard dragboard = startDragAndDrop(TransferMode.MOVE);
+        Dragboard dragboard = startDragAndDrop(TransferMode.COPY_OR_MOVE);
         content.put(DragAndDropDataFormats.ENTRIES, "");
         dragboard.setContent(content);
 
diff --git a/src/main/java/org/jabref/gui/maintable/MainTableColumnFactory.java b/src/main/java/org/jabref/gui/maintable/MainTableColumnFactory.java
index ece234f9ff4..52cf6a2f04f 100644
--- a/src/main/java/org/jabref/gui/maintable/MainTableColumnFactory.java
+++ b/src/main/java/org/jabref/gui/maintable/MainTableColumnFactory.java
@@ -23,7 +23,6 @@
 
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
-import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.maintable.columns.FieldColumn;
 import org.jabref.gui.maintable.columns.FileColumn;
@@ -54,7 +53,6 @@ public class MainTableColumnFactory {
 
     private final PreferencesService preferencesService;
     private final ColumnPreferences columnPreferences;
-    private final ExternalFileTypes externalFileTypes;
     private final BibDatabaseContext database;
     private final CellFactory cellFactory;
     private final UndoManager undoManager;
@@ -64,16 +62,14 @@ public class MainTableColumnFactory {
     public MainTableColumnFactory(BibDatabaseContext database,
                                   PreferencesService preferencesService,
                                   ColumnPreferences abstractColumnPrefs,
-                                  ExternalFileTypes externalFileTypes,
                                   UndoManager undoManager,
                                   DialogService dialogService,
                                   StateManager stateManager) {
         this.database = Objects.requireNonNull(database);
         this.preferencesService = Objects.requireNonNull(preferencesService);
         this.columnPreferences = abstractColumnPrefs;
-        this.externalFileTypes = Objects.requireNonNull(externalFileTypes);
         this.dialogService = dialogService;
-        this.cellFactory = new CellFactory(externalFileTypes, preferencesService, undoManager);
+        this.cellFactory = new CellFactory(preferencesService, undoManager);
         this.undoManager = undoManager;
         this.stateManager = stateManager;
     }
@@ -233,7 +229,6 @@ private TableColumn<BibEntryTableViewModel, Optional<SpecialFieldValueViewModel>
     private TableColumn<BibEntryTableViewModel, List<LinkedFile>> createFilesColumn(MainTableColumnModel columnModel) {
         return new FileColumn(columnModel,
                 database,
-                externalFileTypes,
                 dialogService,
                 preferencesService);
     }
@@ -244,7 +239,6 @@ private TableColumn<BibEntryTableViewModel, List<LinkedFile>> createFilesColumn(
     private TableColumn<BibEntryTableViewModel, List<LinkedFile>> createExtraFileColumn(MainTableColumnModel columnModel) {
         return new FileColumn(columnModel,
                 database,
-                externalFileTypes,
                 dialogService,
                 preferencesService,
                 columnModel.getQualifier());
diff --git a/src/main/java/org/jabref/gui/maintable/MainTableDataModel.java b/src/main/java/org/jabref/gui/maintable/MainTableDataModel.java
index 7bc7fadbda9..90cd9c8f2e8 100644
--- a/src/main/java/org/jabref/gui/maintable/MainTableDataModel.java
+++ b/src/main/java/org/jabref/gui/maintable/MainTableDataModel.java
@@ -47,7 +47,10 @@ public MainTableDataModel(BibDatabaseContext context, PreferencesService prefere
 
         entriesFiltered = new FilteredList<>(entriesViewModel);
         entriesFiltered.predicateProperty().bind(
-                EasyBind.combine(stateManager.activeGroupProperty(), stateManager.activeSearchQueryProperty(), (groups, query) -> entry -> isMatched(groups, query, entry))
+                EasyBind.combine(stateManager.activeGroupProperty(),
+                        stateManager.activeSearchQueryProperty(),
+                        groupsPreferences.groupViewModeProperty(),
+                        (groups, query, groupViewMode) -> entry -> isMatched(groups, query, entry))
         );
 
         IntegerProperty resultSize = new SimpleIntegerProperty();
diff --git a/src/main/java/org/jabref/gui/maintable/OpenExternalFileAction.java b/src/main/java/org/jabref/gui/maintable/OpenExternalFileAction.java
index 9f669a18431..499f07a3526 100644
--- a/src/main/java/org/jabref/gui/maintable/OpenExternalFileAction.java
+++ b/src/main/java/org/jabref/gui/maintable/OpenExternalFileAction.java
@@ -8,7 +8,6 @@
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.ActionHelper;
 import org.jabref.gui.actions.SimpleCommand;
-import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.fieldeditors.LinkedFileViewModel;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.BibEntry;
@@ -68,8 +67,7 @@ public void execute() {
                                 databaseContext,
                                 Globals.TASK_EXECUTOR,
                                 dialogService,
-                                preferencesService,
-                                ExternalFileTypes.getInstance());
+                                preferencesService);
 
                         linkedFileViewModelList.add(linkedFileViewModel);
                     }
@@ -93,8 +91,7 @@ public void execute() {
                         databaseContext,
                         Globals.TASK_EXECUTOR,
                         dialogService,
-                        preferencesService,
-                        ExternalFileTypes.getInstance());
+                        preferencesService);
                 linkedFileViewModel.open();
             }
         });
diff --git a/src/main/java/org/jabref/gui/maintable/OpenFolderAction.java b/src/main/java/org/jabref/gui/maintable/OpenFolderAction.java
index 8ce16f62f1b..92c8404ca39 100644
--- a/src/main/java/org/jabref/gui/maintable/OpenFolderAction.java
+++ b/src/main/java/org/jabref/gui/maintable/OpenFolderAction.java
@@ -5,7 +5,6 @@
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.ActionHelper;
 import org.jabref.gui.actions.SimpleCommand;
-import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.fieldeditors.LinkedFileViewModel;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.LinkedFile;
@@ -49,9 +48,7 @@ public void execute() {
                                 databaseContext,
                                 Globals.TASK_EXECUTOR,
                                 dialogService,
-                                preferencesService,
-                                ExternalFileTypes.getInstance()
-                        );
+                                preferencesService);
                         linkedFileViewModel.openFolder();
                     });
                 } else {
@@ -61,9 +58,7 @@ public void execute() {
                             databaseContext,
                             Globals.TASK_EXECUTOR,
                             dialogService,
-                            preferencesService,
-                            ExternalFileTypes.getInstance()
-                    );
+                            preferencesService);
                     linkedFileViewModel.openFolder();
                 }
             });
diff --git a/src/main/java/org/jabref/gui/maintable/RightClickMenu.java b/src/main/java/org/jabref/gui/maintable/RightClickMenu.java
index e7987ebd9bf..79b2a95006c 100644
--- a/src/main/java/org/jabref/gui/maintable/RightClickMenu.java
+++ b/src/main/java/org/jabref/gui/maintable/RightClickMenu.java
@@ -27,6 +27,7 @@
 import org.jabref.gui.util.TaskExecutor;
 import org.jabref.logic.citationstyle.CitationStyleOutputFormat;
 import org.jabref.logic.citationstyle.CitationStylePreviewLayout;
+import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.entry.field.SpecialField;
 import org.jabref.preferences.PreferencesService;
 import org.jabref.preferences.PreviewPreferences;
@@ -41,7 +42,8 @@ public static ContextMenu create(BibEntryTableViewModel entry,
                                      PreferencesService preferencesService,
                                      UndoManager undoManager,
                                      ClipBoardManager clipBoardManager,
-                                     TaskExecutor taskExecutor) {
+                                     TaskExecutor taskExecutor,
+                                     BibEntryTypesManager entryTypesManager) {
         ActionFactory factory = new ActionFactory(keyBindingRepository);
         ContextMenu contextMenu = new ContextMenu();
 
@@ -50,7 +52,7 @@ public static ContextMenu create(BibEntryTableViewModel entry,
                 createCopySubMenu(factory, dialogService, stateManager, preferencesService, clipBoardManager, taskExecutor),
                 factory.createMenuItem(StandardActions.PASTE, new EditAction(StandardActions.PASTE, libraryTab.frame(), stateManager)),
                 factory.createMenuItem(StandardActions.CUT, new EditAction(StandardActions.CUT, libraryTab.frame(), stateManager)),
-                factory.createMenuItem(StandardActions.MERGE_ENTRIES, new MergeEntriesAction(libraryTab.frame(), dialogService, stateManager)),
+                factory.createMenuItem(StandardActions.MERGE_ENTRIES, new MergeEntriesAction(dialogService, stateManager)),
                 factory.createMenuItem(StandardActions.DELETE_ENTRY, new EditAction(StandardActions.DELETE_ENTRY, libraryTab.frame(), stateManager)),
 
                 new SeparatorMenuItem(),
@@ -76,7 +78,7 @@ public static ContextMenu create(BibEntryTableViewModel entry,
 
                 new SeparatorMenuItem(),
 
-                new ChangeEntryTypeMenu().getChangeEntryTypeMenu(entry.getEntry(), libraryTab.getBibDatabaseContext(), libraryTab.getUndoManager()),
+                new ChangeEntryTypeMenu(libraryTab.getSelectedEntries(), libraryTab.getBibDatabaseContext(), libraryTab.getUndoManager(), keyBindingRepository, entryTypesManager).asSubMenu(),
                 factory.createMenuItem(StandardActions.MERGE_WITH_FETCHED_ENTRY, new MergeWithFetchedEntryAction(libraryTab, dialogService, stateManager))
         );
 
diff --git a/src/main/java/org/jabref/gui/maintable/columns/FileColumn.java b/src/main/java/org/jabref/gui/maintable/columns/FileColumn.java
index c963ed87b23..5aaeeb207a0 100644
--- a/src/main/java/org/jabref/gui/maintable/columns/FileColumn.java
+++ b/src/main/java/org/jabref/gui/maintable/columns/FileColumn.java
@@ -32,7 +32,6 @@
  */
 public class FileColumn extends MainTableColumn<List<LinkedFile>> {
 
-    private final ExternalFileTypes externalFileTypes;
     private final DialogService dialogService;
     private final BibDatabaseContext database;
     private final PreferencesService preferencesService;
@@ -42,11 +41,9 @@ public class FileColumn extends MainTableColumn<List<LinkedFile>> {
      */
     public FileColumn(MainTableColumnModel model,
                       BibDatabaseContext database,
-                      ExternalFileTypes externalFileTypes,
                       DialogService dialogService,
                       PreferencesService preferencesService) {
         super(model);
-        this.externalFileTypes = Objects.requireNonNull(externalFileTypes);
         this.database = Objects.requireNonNull(database);
         this.dialogService = dialogService;
         this.preferencesService = preferencesService;
@@ -68,8 +65,7 @@ public FileColumn(MainTableColumnModel model,
                                 entry.getEntry(),
                                 database, Globals.TASK_EXECUTOR,
                                 dialogService,
-                                preferencesService,
-                                externalFileTypes);
+                                preferencesService);
                         linkedFileViewModel.open();
                     }
                 })
@@ -81,22 +77,19 @@ public FileColumn(MainTableColumnModel model,
      */
     public FileColumn(MainTableColumnModel model,
                       BibDatabaseContext database,
-                      ExternalFileTypes externalFileTypes,
                       DialogService dialogService,
                       PreferencesService preferencesService,
                       String fileType) {
         super(model);
-        this.externalFileTypes = Objects.requireNonNull(externalFileTypes);
         this.database = Objects.requireNonNull(database);
         this.dialogService = dialogService;
         this.preferencesService = preferencesService;
 
         setCommonSettings();
 
-        this.setGraphic(externalFileTypes
-                .getExternalFileTypeByName(fileType)
-                .map(ExternalFileType::getIcon).orElse(IconTheme.JabRefIcons.FILE)
-                .getGraphicNode());
+        this.setGraphic(ExternalFileTypes.getExternalFileTypeByName(fileType, preferencesService.getFilePreferences())
+                                         .map(ExternalFileType::getIcon).orElse(IconTheme.JabRefIcons.FILE)
+                                         .getGraphicNode());
 
         new ValueTableCellFactory<BibEntryTableViewModel, List<LinkedFile>>()
                 .withGraphic(linkedFiles -> createFileIcon(linkedFiles.stream().filter(linkedFile ->
@@ -131,8 +124,7 @@ private ContextMenu createFileMenu(BibEntryTableViewModel entry, List<LinkedFile
                     database,
                     Globals.TASK_EXECUTOR,
                     dialogService,
-                    preferencesService,
-                    externalFileTypes);
+                    preferencesService);
 
             MenuItem menuItem = new MenuItem(linkedFileViewModel.getTruncatedDescriptionAndLink(),
                     linkedFileViewModel.getTypeIcon().getGraphicNode());
@@ -147,7 +139,7 @@ private Node createFileIcon(List<LinkedFile> linkedFiles) {
         if (linkedFiles.size() > 1) {
             return IconTheme.JabRefIcons.FILE_MULTIPLE.getGraphicNode();
         } else if (linkedFiles.size() == 1) {
-            return externalFileTypes.fromLinkedFile(linkedFiles.get(0), false)
+            return ExternalFileTypes.getExternalFileTypeByLinkedFile(linkedFiles.get(0), true, preferencesService.getFilePreferences())
                                     .map(ExternalFileType::getIcon)
                                     .orElse(IconTheme.JabRefIcons.FILE)
                                     .getGraphicNode();
diff --git a/src/main/java/org/jabref/gui/maintable/columns/LibraryColumn.java b/src/main/java/org/jabref/gui/maintable/columns/LibraryColumn.java
index 1fafd9c3b14..61e2e1ba154 100644
--- a/src/main/java/org/jabref/gui/maintable/columns/LibraryColumn.java
+++ b/src/main/java/org/jabref/gui/maintable/columns/LibraryColumn.java
@@ -21,5 +21,4 @@ public LibraryColumn(MainTableColumnModel model) {
     public LibraryColumn() {
         this(new MainTableColumnModel(Type.LIBRARY_NAME));
     }
-
 }
diff --git a/src/main/java/org/jabref/gui/maintable/columns/LinkedIdentifierColumn.java b/src/main/java/org/jabref/gui/maintable/columns/LinkedIdentifierColumn.java
index d150bcde358..97c5bda3ecb 100644
--- a/src/main/java/org/jabref/gui/maintable/columns/LinkedIdentifierColumn.java
+++ b/src/main/java/org/jabref/gui/maintable/columns/LinkedIdentifierColumn.java
@@ -60,8 +60,9 @@ public LinkedIdentifierColumn(MainTableColumnModel model,
                 .withTooltip(this::createIdentifierTooltip)
                 .withMenu(this::createIdentifierMenu)
                 .withOnMouseClickedEvent((entry, linkedFiles) -> event -> {
-                    if ((event.getButton() == MouseButton.PRIMARY)) {
-                        new OpenUrlAction(dialogService, stateManager, preferences).execute();
+                    // If we only have one identifer, open directly
+                    if ((linkedFiles.size() == 1) && (event.getButton() == MouseButton.PRIMARY)) {
+                       new OpenUrlAction(dialogService, stateManager, preferences).execute();
                     }
                 })
                 .install(this);
diff --git a/src/main/java/org/jabref/gui/maintable/columns/SpecialFieldColumn.java b/src/main/java/org/jabref/gui/maintable/columns/SpecialFieldColumn.java
index 271a7abe4cb..971bb5e0f69 100644
--- a/src/main/java/org/jabref/gui/maintable/columns/SpecialFieldColumn.java
+++ b/src/main/java/org/jabref/gui/maintable/columns/SpecialFieldColumn.java
@@ -9,6 +9,7 @@
 import javafx.scene.control.MenuItem;
 import javafx.scene.control.Tooltip;
 import javafx.scene.input.MouseButton;
+import javafx.scene.input.MouseEvent;
 
 import org.jabref.gui.icon.JabRefIcon;
 import org.jabref.gui.maintable.BibEntryTableViewModel;
@@ -55,7 +56,7 @@ public SpecialFieldColumn(MainTableColumnModel model, PreferencesService prefere
             MainTableColumnFactory.setExactWidth(this, SpecialFieldsPreferences.COLUMN_RANKING_WIDTH);
             this.setResizable(false);
             new OptionalValueTableCellFactory<BibEntryTableViewModel, SpecialFieldValueViewModel>()
-                    .withGraphicIfPresent(this::createSpecialRating)
+                    .withGraphic(this::createSpecialRating)
                     .install(this);
         } else {
             MainTableColumnFactory.setExactWidth(this, ColumnPreferences.ICON_COLUMN_WIDTH);
@@ -89,9 +90,24 @@ public SpecialFieldColumn(MainTableColumnModel model, PreferencesService prefere
         this.setSortable(true);
     }
 
-    private Rating createSpecialRating(BibEntryTableViewModel entry, SpecialFieldValueViewModel value) {
+    private Rating createSpecialRating(BibEntryTableViewModel entry, Optional<SpecialFieldValueViewModel> value) {
         Rating ranking = new Rating();
-        ranking.setRating(value.getValue().toRating());
+
+        if (value.isPresent()) {
+            ranking.setRating(value.get().getValue().toRating());
+        } else {
+            ranking.setRating(0);
+        }
+
+        ranking.addEventFilter(MouseEvent.MOUSE_CLICKED, event -> {
+            if (event.getButton().equals(MouseButton.PRIMARY) && event.getClickCount() == 2) {
+                ranking.setRating(0);
+                event.consume();
+            } else if (event.getButton().equals(MouseButton.SECONDARY)) {
+                event.consume();
+            }
+        });
+
         EasyBind.subscribe(ranking.ratingProperty(), rating ->
                 new SpecialFieldViewModel(SpecialField.RANKING, preferencesService, undoManager)
                         .setSpecialFieldValue(entry.getEntry(), SpecialFieldValue.getRating(rating.intValue())));
diff --git a/src/main/java/org/jabref/gui/menus/ChangeEntryTypeAction.java b/src/main/java/org/jabref/gui/menus/ChangeEntryTypeAction.java
new file mode 100644
index 00000000000..97037881c5d
--- /dev/null
+++ b/src/main/java/org/jabref/gui/menus/ChangeEntryTypeAction.java
@@ -0,0 +1,49 @@
+package org.jabref.gui.menus;
+
+import java.util.List;
+
+import javax.swing.undo.UndoManager;
+
+import javafx.beans.property.ReadOnlyStringProperty;
+import javafx.beans.property.ReadOnlyStringWrapper;
+
+import org.jabref.gui.EntryTypeView;
+import org.jabref.gui.actions.SimpleCommand;
+import org.jabref.gui.undo.NamedCompound;
+import org.jabref.gui.undo.UndoableChangeType;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.types.EntryType;
+
+public class ChangeEntryTypeAction extends SimpleCommand {
+
+    private final EntryType type;
+    private final List<BibEntry> entries;
+    private final UndoManager undoManager;
+    private final ReadOnlyStringWrapper statusMessageProperty;
+
+    public ChangeEntryTypeAction(EntryType type, List<BibEntry> entries, UndoManager undoManager) {
+        this.type = type;
+        this.entries = entries;
+        this.undoManager = undoManager;
+        this.statusMessageProperty = new ReadOnlyStringWrapper(EntryTypeView.getDescription(type));
+    }
+
+    @Override
+    public void execute() {
+        NamedCompound compound = new NamedCompound(Localization.lang("Change entry type"));
+        entries.forEach(e -> e.setType(type)
+                              .ifPresent(change -> compound.addEdit(new UndoableChangeType(change))));
+        undoManager.addEdit(compound);
+    }
+
+    @Override
+    public String getStatusMessage() {
+        return statusMessage.get();
+    }
+
+    @Override
+    public ReadOnlyStringProperty statusMessageProperty() {
+        return statusMessageProperty.getReadOnlyProperty();
+    }
+}
diff --git a/src/main/java/org/jabref/gui/menus/ChangeEntryTypeMenu.java b/src/main/java/org/jabref/gui/menus/ChangeEntryTypeMenu.java
index 8504dc6ca84..df9c8c4ef66 100644
--- a/src/main/java/org/jabref/gui/menus/ChangeEntryTypeMenu.java
+++ b/src/main/java/org/jabref/gui/menus/ChangeEntryTypeMenu.java
@@ -2,104 +2,111 @@
 
 import java.util.Collection;
 import java.util.List;
+import java.util.Optional;
 
 import javax.swing.undo.UndoManager;
 
+import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.scene.control.ContextMenu;
-import javafx.scene.control.CustomMenuItem;
-import javafx.scene.control.Label;
 import javafx.scene.control.Menu;
 import javafx.scene.control.MenuItem;
 import javafx.scene.control.SeparatorMenuItem;
-import javafx.scene.control.Tooltip;
 
-import org.jabref.gui.EntryTypeView;
-import org.jabref.gui.Globals;
-import org.jabref.gui.undo.CountingUndoManager;
-import org.jabref.gui.undo.NamedCompound;
-import org.jabref.gui.undo.UndoableChangeType;
+import org.jabref.gui.actions.ActionFactory;
+import org.jabref.gui.keyboard.KeyBindingRepository;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.database.BibDatabaseMode;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.BibEntryType;
+import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.entry.types.BibtexEntryTypeDefinitions;
-import org.jabref.model.entry.types.EntryType;
 import org.jabref.model.entry.types.IEEETranEntryTypeDefinitions;
-import org.jabref.model.strings.StringUtil;
 
 public class ChangeEntryTypeMenu {
 
-    public ChangeEntryTypeMenu() {
-
+    private final List<BibEntry> entries;
+    private final BibDatabaseContext bibDatabaseContext;
+    private final UndoManager undoManager;
+    private final ActionFactory factory;
+    private final BibEntryTypesManager entryTypesManager;
+
+    public ChangeEntryTypeMenu(List<BibEntry> entries,
+                               BibDatabaseContext bibDatabaseContext,
+                               UndoManager undoManager,
+                               KeyBindingRepository keyBindingRepository,
+                               BibEntryTypesManager entryTypesManager) {
+        this.entries = entries;
+        this.bibDatabaseContext = bibDatabaseContext;
+        this.undoManager = undoManager;
+        this.entryTypesManager = entryTypesManager;
+        this.factory = new ActionFactory(keyBindingRepository);
     }
 
-    public static MenuItem createMenuItem(EntryType type, BibEntry entry, UndoManager undoManager) {
-        CustomMenuItem menuItem = new CustomMenuItem(new Label(type.getDisplayName()));
-        menuItem.setOnAction(event -> {
-            NamedCompound compound = new NamedCompound(Localization.lang("Change entry type"));
-            entry.setType(type)
-                 .ifPresent(change -> compound.addEdit(new UndoableChangeType(change)));
-            undoManager.addEdit(compound);
-        });
-        String description = EntryTypeView.getDescription(type);
-        if (StringUtil.isNotBlank(description)) {
-            Tooltip tooltip = new Tooltip(description);
-            Tooltip.install(menuItem.getContent(), tooltip);
-        }
-        return menuItem;
-    }
-
-    public ContextMenu getChangeEntryTypePopupMenu(BibEntry entry, BibDatabaseContext bibDatabaseContext, CountingUndoManager undoManager) {
+    public ContextMenu asContextMenu() {
         ContextMenu menu = new ContextMenu();
-        populateComplete(menu.getItems(), entry, bibDatabaseContext, undoManager);
+        menu.getItems().setAll(getMenuItems(entries, bibDatabaseContext, undoManager));
         return menu;
     }
 
-    public Menu getChangeEntryTypeMenu(BibEntry entry, BibDatabaseContext bibDatabaseContext, CountingUndoManager undoManager) {
-        Menu menu = new Menu();
-        menu.setText(Localization.lang("Change entry type"));
-        populateComplete(menu.getItems(), entry, bibDatabaseContext, undoManager);
+    public Menu asSubMenu() {
+        Menu menu = new Menu(Localization.lang("Change entry type"));
+        menu.getItems().setAll(getMenuItems(entries, bibDatabaseContext, undoManager));
         return menu;
     }
 
-    private void populateComplete(ObservableList<MenuItem> items, BibEntry entry, BibDatabaseContext bibDatabaseContext, CountingUndoManager undoManager) {
+    private ObservableList<MenuItem> getMenuItems(List<BibEntry> entries, BibDatabaseContext bibDatabaseContext, UndoManager undoManager) {
+        ObservableList<MenuItem> items = FXCollections.observableArrayList();
+
         if (bibDatabaseContext.isBiblatexMode()) {
             // Default BibLaTeX
-            populate(items, Globals.entryTypesManager.getAllTypes(BibDatabaseMode.BIBLATEX), entry, undoManager);
+            items.addAll(fromEntryTypes(entryTypesManager.getAllTypes(BibDatabaseMode.BIBLATEX), entries, undoManager));
 
             // Custom types
-            populateSubMenu(items, Localization.lang("Custom"), Globals.entryTypesManager.getAllCustomTypes(BibDatabaseMode.BIBLATEX), entry, undoManager);
+            createSubMenu(Localization.lang("Custom"), entryTypesManager.getAllCustomTypes(BibDatabaseMode.BIBLATEX), entries, undoManager)
+                    .ifPresent(subMenu ->
+                            items.addAll(new SeparatorMenuItem(),
+                            subMenu
+                    ));
         } else {
             // Default BibTeX
-            populateSubMenu(items, BibDatabaseMode.BIBTEX.getFormattedName(), BibtexEntryTypeDefinitions.ALL, entry, undoManager);
-            items.remove(0); // Remove separator
+            createSubMenu(BibDatabaseMode.BIBTEX.getFormattedName(), BibtexEntryTypeDefinitions.ALL, entries, undoManager)
+                    .ifPresent(items::add);
 
             // IEEETran
-            populateSubMenu(items, "IEEETran", IEEETranEntryTypeDefinitions.ALL, entry, undoManager);
+            createSubMenu("IEEETran", IEEETranEntryTypeDefinitions.ALL, entries, undoManager)
+                    .ifPresent(subMenu -> items.addAll(
+                            new SeparatorMenuItem(),
+                            subMenu
+                    ));
 
             // Custom types
-            populateSubMenu(items, Localization.lang("Custom"), Globals.entryTypesManager.getAllCustomTypes(BibDatabaseMode.BIBTEX), entry, undoManager);
+            createSubMenu(Localization.lang("Custom"), entryTypesManager.getAllCustomTypes(BibDatabaseMode.BIBTEX), entries, undoManager)
+                    .ifPresent(subMenu -> items.addAll(
+                            new SeparatorMenuItem(),
+                            subMenu
+                    ));
         }
+
+        return items;
     }
 
-    private void populateSubMenu(ObservableList<MenuItem> items, String text, List<BibEntryType> entryTypes, BibEntry entry, CountingUndoManager undoManager) {
+    private Optional<Menu> createSubMenu(String text, List<BibEntryType> entryTypes, List<BibEntry> entries, UndoManager undoManager) {
+        Menu subMenu = null;
+
         if (!entryTypes.isEmpty()) {
-            items.add(new SeparatorMenuItem());
-            Menu custom = new Menu(text);
-            populate(custom, entryTypes, entry, undoManager);
-            items.add(custom);
+            subMenu = factory.createMenu(() -> text);
+            subMenu.getItems().addAll(fromEntryTypes(entryTypes, entries, undoManager));
         }
-    }
 
-    private void populate(ObservableList<MenuItem> items, Collection<BibEntryType> types, BibEntry entry, UndoManager undoManager) {
-        for (BibEntryType type : types) {
-            items.add(createMenuItem(type.getType(), entry, undoManager));
-        }
+        return Optional.ofNullable(subMenu);
     }
 
-    private void populate(Menu menu, Collection<BibEntryType> types, BibEntry entry, UndoManager undoManager) {
-        populate(menu.getItems(), types, entry, undoManager);
+    private List<MenuItem> fromEntryTypes(Collection<BibEntryType> types, List<BibEntry> entries, UndoManager undoManager) {
+        return types.stream()
+                    .map(BibEntryType::getType)
+                    .map(type -> factory.createMenuItem(type::getDisplayName, new ChangeEntryTypeAction(type, entries, undoManager)))
+                    .toList();
     }
 }
diff --git a/src/main/java/org/jabref/gui/menus/FileHistoryMenu.java b/src/main/java/org/jabref/gui/menus/FileHistoryMenu.java
index da640b11016..43a80641bf1 100644
--- a/src/main/java/org/jabref/gui/menus/FileHistoryMenu.java
+++ b/src/main/java/org/jabref/gui/menus/FileHistoryMenu.java
@@ -36,6 +36,7 @@ public FileHistoryMenu(PreferencesService preferences, DialogService dialogServi
 
     /**
      * This method is to use typed letters to access recent libraries in menu.
+     *
      * @param keyEvent a KeyEvent.
      * @return false if typed char is invalid or not a number.
      */
@@ -91,6 +92,6 @@ public void openFile(Path file) {
             setItems();
             return;
         }
-        openDatabaseAction.openFile(file, true);
+        openDatabaseAction.openFile(file);
     }
 }
diff --git a/src/main/java/org/jabref/gui/mergeentries/EntriesMergeResult.java b/src/main/java/org/jabref/gui/mergeentries/EntriesMergeResult.java
new file mode 100644
index 00000000000..b134b11688a
--- /dev/null
+++ b/src/main/java/org/jabref/gui/mergeentries/EntriesMergeResult.java
@@ -0,0 +1,8 @@
+package org.jabref.gui.mergeentries;
+
+import org.jabref.model.entry.BibEntry;
+
+public record EntriesMergeResult(
+        BibEntry originalLeftEntry, BibEntry originalRightEntry, BibEntry newLeftEntry, BibEntry newRightEntry, BibEntry mergedEntry
+) {
+}
diff --git a/src/main/java/org/jabref/gui/mergeentries/FetchAndMergeEntry.java b/src/main/java/org/jabref/gui/mergeentries/FetchAndMergeEntry.java
index 7c1a9e127ba..e6aff3d4ea2 100644
--- a/src/main/java/org/jabref/gui/mergeentries/FetchAndMergeEntry.java
+++ b/src/main/java/org/jabref/gui/mergeentries/FetchAndMergeEntry.java
@@ -17,6 +17,8 @@
 import org.jabref.gui.util.BackgroundTask;
 import org.jabref.gui.util.TaskExecutor;
 import org.jabref.logic.importer.EntryBasedFetcher;
+import org.jabref.logic.importer.FetcherClientException;
+import org.jabref.logic.importer.FetcherServerException;
 import org.jabref.logic.importer.IdBasedFetcher;
 import org.jabref.logic.importer.ImportCleanup;
 import org.jabref.logic.importer.WebFetcher;
@@ -76,7 +78,13 @@ public void fetchAndMerge(BibEntry entry, List<Field> fields) {
                                   })
                                   .onFailure(exception -> {
                                       LOGGER.error("Error while fetching bibliographic information", exception);
-                                      dialogService.showErrorDialogAndWait(exception);
+                                      if (exception instanceof FetcherClientException) {
+                                          dialogService.showInformationDialogAndWait(Localization.lang("Fetching information using %0", fetcher.get().getName()), Localization.lang("No data was found for the identifier"));
+                                      } else if (exception instanceof FetcherServerException) {
+                                          dialogService.showInformationDialogAndWait(Localization.lang("Fetching information using %0", fetcher.get().getName()), Localization.lang("Server not available"));
+                                      } else {
+                                          dialogService.showInformationDialogAndWait(Localization.lang("Fetching information using %0", fetcher.get().getName()), Localization.lang("Error occured %0", exception.getMessage()));
+                                      }
                                   })
                                   .executeWith(Globals.TASK_EXECUTOR);
                 }
@@ -91,7 +99,8 @@ private void showMergeDialog(BibEntry originalEntry, BibEntry fetchedEntry, WebF
         dialog.setTitle(Localization.lang("Merge entry with %0 information", fetcher.getName()));
         dialog.setLeftHeaderText(Localization.lang("Original entry"));
         dialog.setRightHeaderText(Localization.lang("Entry from %0", fetcher.getName()));
-        Optional<BibEntry> mergedEntry = dialogService.showCustomDialogAndWait(dialog);
+        Optional<BibEntry> mergedEntry = dialogService.showCustomDialogAndWait(dialog).map(EntriesMergeResult::mergedEntry);
+        
         if (mergedEntry.isPresent()) {
             NamedCompound ce = new NamedCompound(Localization.lang("Merge entry with %0 information", fetcher.getName()));
 
@@ -158,7 +167,7 @@ public void fetchAndMerge(BibEntry entry, EntryBasedFetcher fetcher) {
                           }
                       })
                       .onFailure(exception -> {
-                          LOGGER.error("Error while fetching entry with " + fetcher.getName(), exception);
+                          LOGGER.error("Error while fetching entry with {} ", fetcher.getName(), exception);
                           dialogService.showErrorDialogAndWait(Localization.lang("Error while fetching from %0", fetcher.getName()), exception);
                       })
                       .executeWith(taskExecutor);
diff --git a/src/main/java/org/jabref/gui/mergeentries/MergeEntries.css b/src/main/java/org/jabref/gui/mergeentries/MergeEntries.css
deleted file mode 100644
index 82f5ca6d3ee..00000000000
--- a/src/main/java/org/jabref/gui/mergeentries/MergeEntries.css
+++ /dev/null
@@ -1,12 +0,0 @@
-.text-changed {
-    -fx-fill: darkgreen;
-}
-
-.text-added {
-    -fx-fill: #54A3F2;
-}
-
-.text-removed {
-    -fx-fill: #FA5B68;
-}
-
diff --git a/src/main/java/org/jabref/gui/mergeentries/MergeEntries.java b/src/main/java/org/jabref/gui/mergeentries/MergeEntries.java
deleted file mode 100644
index 510733bc5ef..00000000000
--- a/src/main/java/org/jabref/gui/mergeentries/MergeEntries.java
+++ /dev/null
@@ -1,421 +0,0 @@
-package org.jabref.gui.mergeentries;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.TreeSet;
-import java.util.stream.Collectors;
-
-import javafx.collections.FXCollections;
-import javafx.geometry.HPos;
-import javafx.geometry.Insets;
-import javafx.scene.control.Button;
-import javafx.scene.control.ComboBox;
-import javafx.scene.control.Label;
-import javafx.scene.control.RadioButton;
-import javafx.scene.control.ScrollPane;
-import javafx.scene.control.ToggleGroup;
-import javafx.scene.control.Tooltip;
-import javafx.scene.layout.BorderPane;
-import javafx.scene.layout.ColumnConstraints;
-import javafx.scene.layout.GridPane;
-import javafx.scene.layout.HBox;
-import javafx.scene.layout.Priority;
-import javafx.scene.text.Text;
-import javafx.scene.text.TextFlow;
-
-import org.jabref.gui.Globals;
-import org.jabref.gui.icon.IconTheme.JabRefIcons;
-import org.jabref.gui.util.ViewModelListCellFactory;
-import org.jabref.gui.util.component.DiffHighlightingTextPane;
-import org.jabref.logic.l10n.Localization;
-import org.jabref.model.entry.BibEntry;
-import org.jabref.model.entry.field.Field;
-import org.jabref.model.entry.field.FieldFactory;
-
-import com.tobiasdiez.easybind.EasyBind;
-
-public class MergeEntries extends BorderPane {
-
-    private static final int NUMBER_OF_COLUMNS = 6;
-    private static final int LEFT_RADIOBUTTON_INDEX = 0;
-    private static final int RIGHT_RADIOBUTTON_INDEX = 2;
-    private final ComboBox<DiffMode> diffMode = new ComboBox<>();
-
-    // Headings
-    private final List<String> columnHeadings = Arrays.asList(
-            Localization.lang("Field"),
-            Localization.lang("Left entry"),
-            "left icon",
-            Localization.lang("None"),
-            "right icon",
-            Localization.lang("Right entry"));
-    private final Set<Field> identicalFields = new HashSet<>();
-    private final Set<Field> differentFields = new HashSet<>();
-    private final BibEntry mergedEntry = new BibEntry();
-    private final BibEntry leftEntry;
-    private final BibEntry rightEntry;
-    private final Map<Field, TextFlow> leftTextPanes = new HashMap<>();
-    private final Set<Field> allFields = new TreeSet<>(Comparator.comparing(Field::getName));
-    private final Map<Field, TextFlow> rightTextPanes = new HashMap<>();
-    private final Map<Field, List<RadioButton>> radioButtons = new HashMap<>();
-    private Boolean identicalTypes;
-    private List<RadioButton> typeRadioButtons;
-    private final DefaultRadioButtonSelectionMode defaultRadioButtonSelectionMode;
-    private final List<RadioButton> leftRadioButtons = new ArrayList<>();
-    private final List<RadioButton> rightRadioButtons = new ArrayList<>();
-
-    /**
-     * Constructor with optional column captions for the two entries
-     *
-     * @param entryLeft                       Left entry
-     * @param entryRight                      Right entry
-     * @param headingLeft                     Heading for left entry
-     * @param headingRight                    Heading for right entry
-     * @param defaultRadioButtonSelectionMode If the left or the right side of the radio button should be preselected
-     */
-    public MergeEntries(BibEntry entryLeft, BibEntry entryRight, String headingLeft, String headingRight, DefaultRadioButtonSelectionMode defaultRadioButtonSelectionMode) {
-        this.leftEntry = entryLeft;
-        this.rightEntry = entryRight;
-        this.defaultRadioButtonSelectionMode = defaultRadioButtonSelectionMode;
-
-        initialize();
-        setLeftHeaderText(headingLeft);
-        setRightHeaderText(headingRight);
-    }
-
-    /**
-     * Constructor with optional column captions for the two entries
-     *
-     * @param entryLeft    Left entry
-     * @param entryRight   Right entry
-     * @param headingLeft  Heading for left entry
-     * @param headingRight Heading for right entry
-     */
-    public MergeEntries(BibEntry entryLeft, BibEntry entryRight, String headingLeft, String headingRight) {
-        this(entryLeft, entryRight, headingLeft, headingRight, DefaultRadioButtonSelectionMode.LEFT);
-    }
-
-    /**
-     * Constructor taking two entries
-     *
-     * @param entryLeft                       Left entry
-     * @param entryRight                      Right entry
-     * @param defaultRadioButtonSelectionMode If the left or the right side of the radio button should be preselected
-     */
-    public MergeEntries(BibEntry entryLeft, BibEntry entryRight, DefaultRadioButtonSelectionMode defaultRadioButtonSelectionMode) {
-        leftEntry = entryLeft;
-        rightEntry = entryRight;
-        this.defaultRadioButtonSelectionMode = defaultRadioButtonSelectionMode;
-        initialize();
-    }
-
-    /**
-     * Constructor taking two entries
-     *
-     * @param entryLeft  Left entry
-     * @param entryRight Right entry
-     */
-    public MergeEntries(BibEntry entryLeft, BibEntry entryRight) {
-        this(entryLeft, entryRight, DefaultRadioButtonSelectionMode.LEFT);
-    }
-
-    private static String getDisplayText(DiffMode mode) {
-        return switch (mode) {
-            case PLAIN -> Localization.lang("Plain text");
-            case WORD -> Localization.lang("Show diff") + " - " + Localization.lang("word");
-            case CHARACTER -> Localization.lang("Show diff") + " - " + Localization.lang("character");
-            case WORD_SYMMETRIC -> Localization.lang("Show symmetric diff") + " - " + Localization.lang("word");
-            case CHARACTER_SYMMETRIC -> Localization.lang("Show symmetric diff") + " - " + Localization.lang("character");
-        };
-    }
-
-    /**
-     * Main function for building the merge entry JPanel
-     */
-    private void initialize() {
-        setPrefWidth(800);
-
-        setupFields();
-
-        fillDiffModes();
-
-        GridPane mergePanel = new GridPane();
-        mergePanel.setVgap(10);
-        mergePanel.setHgap(15);
-        ColumnConstraints columnLabel = new ColumnConstraints();
-        columnLabel.setHgrow(Priority.ALWAYS);
-        ColumnConstraints columnValues = new ColumnConstraints();
-        columnValues.setHgrow(Priority.NEVER);
-        columnValues.setPercentWidth(40);
-        ColumnConstraints columnSelect = new ColumnConstraints();
-        columnSelect.setHgrow(Priority.NEVER);
-        columnSelect.setHalignment(HPos.CENTER);
-        // See columnHeadings variable for the headings: 1) field, 2) left content, 3) left arrow, 4) "none", 5) right arrow, 6) right content
-        mergePanel.getColumnConstraints().setAll(columnLabel, columnValues, columnSelect, columnSelect, columnSelect, columnValues);
-
-        setupHeadingRows(mergePanel);
-        setupEntryTypeRow(mergePanel);
-        setupFieldRows(mergePanel);
-
-        ScrollPane scrollPane = new ScrollPane(mergePanel);
-        scrollPane.setFitToWidth(true);
-        setCenter(scrollPane);
-
-        updateFieldValues(allFields);
-
-        updateMergedEntry();
-
-        getStylesheets().add(0, MergeEntries.class.getResource("MergeEntries.css").toExternalForm());
-    }
-
-    private void setupFieldRows(GridPane mergePanel) {
-        // For all fields in joint add a row and possibly radio buttons
-        int row = 2;
-        for (Field field : allFields) {
-            Label label = new Label(field.getDisplayName());
-            label.setMinWidth(USE_PREF_SIZE);
-            mergePanel.add(label, 0, row);
-            Optional<String> leftString = leftEntry.getField(field);
-            Optional<String> rightString = rightEntry.getField(field);
-            if (leftString.equals(rightString)) {
-                identicalFields.add(field);
-            } else {
-                differentFields.add(field);
-            }
-
-            // Left text pane
-            if (leftString.isPresent()) {
-                TextFlow tf = new DiffHighlightingTextPane();
-                mergePanel.add(tf, 1, row);
-                leftTextPanes.put(field, tf);
-            }
-
-            // Add radio buttons if the two entries do not have identical fields
-            if (identicalFields.contains(field)) {
-                mergedEntry.setField(field, leftString.get()); // Will only happen if both entries have the field and the content is identical
-            } else {
-                ToggleGroup group = new ToggleGroup();
-                List<RadioButton> list = new ArrayList<>(3);
-                for (int k = 0; k < 3; k++) {
-                    RadioButton button = new RadioButton();
-                    EasyBind.subscribe(button.selectedProperty(), selected -> updateMergedEntry());
-                    group.getToggles().add(button);
-                    mergePanel.add(button, 2 + k, row);
-                    list.add(button);
-                }
-                radioButtons.put(field, list);
-                if (leftString.isPresent()) {
-                    leftRadioButtons.add(list.get(LEFT_RADIOBUTTON_INDEX));
-                    list.get(LEFT_RADIOBUTTON_INDEX).setSelected(true);
-                    if (rightString.isEmpty()) {
-                        list.get(RIGHT_RADIOBUTTON_INDEX).setDisable(true);
-                    } else if (this.defaultRadioButtonSelectionMode == DefaultRadioButtonSelectionMode.RIGHT) {
-                        list.get(RIGHT_RADIOBUTTON_INDEX).setSelected(true);
-                        rightRadioButtons.add(list.get(RIGHT_RADIOBUTTON_INDEX));
-                    } else {
-                        rightRadioButtons.add(list.get(RIGHT_RADIOBUTTON_INDEX));
-                    }
-                } else {
-                    list.get(LEFT_RADIOBUTTON_INDEX).setDisable(true);
-                    list.get(RIGHT_RADIOBUTTON_INDEX).setSelected(true);
-                    rightRadioButtons.add(list.get(RIGHT_RADIOBUTTON_INDEX));
-                }
-            }
-
-            // Right text pane
-            if (rightString.isPresent()) {
-                TextFlow tf = new DiffHighlightingTextPane();
-                mergePanel.add(tf, 5, row);
-                rightTextPanes.put(field, tf);
-            }
-            row++;
-        }
-    }
-
-    private void setupEntryTypeRow(GridPane mergePanel) {
-        // Start with entry type
-        int rowIndex = 1;
-        mergePanel.add(new Label(Localization.lang("Entry type")), 0, rowIndex);
-        if (leftEntry.getType().equals(rightEntry.getType())) {
-            mergePanel.add(DiffHighlighting.forUnchanged(leftEntry.getType().getDisplayName()), 1, rowIndex);
-            mergePanel.add(DiffHighlighting.forUnchanged(rightEntry.getType().getDisplayName()), 5, rowIndex);
-            identicalTypes = true;
-        } else {
-            mergePanel.add(DiffHighlighting.forChanged(leftEntry.getType().getDisplayName()), 1, rowIndex);
-            mergePanel.add(DiffHighlighting.forChanged(rightEntry.getType().getDisplayName()), 5, rowIndex);
-            identicalTypes = false;
-            ToggleGroup group = new ToggleGroup();
-            typeRadioButtons = new ArrayList<>(2);
-
-            for (int k = 0; k < 3; k += 2) {
-                RadioButton button = new RadioButton();
-                EasyBind.subscribe(button.selectedProperty(), selected -> updateMergedEntry());
-                typeRadioButtons.add(button);
-                group.getToggles().add(button);
-                mergePanel.add(button, 2 + k, rowIndex);
-            }
-            if (defaultRadioButtonSelectionMode == DefaultRadioButtonSelectionMode.RIGHT) {
-                typeRadioButtons.get(1).setSelected(true); // This Radio Button list does not have a third option as compared to the fields, so do not use the constants here
-                rightRadioButtons.add(typeRadioButtons.get(1));
-            } else {
-                typeRadioButtons.get(0).setSelected(true);
-                leftRadioButtons.add(typeRadioButtons.get(0));
-            }
-        }
-    }
-
-    private void setupHeadingRows(GridPane mergePanel) {
-        // Set headings
-        for (int i = 0; i < NUMBER_OF_COLUMNS; i++) {
-            if (i == 2) {
-                Button selectAllLeft = new Button();
-                selectAllLeft.setGraphic(JabRefIcons.LEFT.getGraphicNode());
-                selectAllLeft.setOnAction(evt -> this.selectAllLeftRadioButtons());
-                selectAllLeft.setTooltip(new Tooltip(Localization.lang("Select all changes on the left")));
-                mergePanel.add(selectAllLeft, i, 0);
-            } else if (i == 4) {
-                Button selectAllRight = new Button();
-                selectAllRight.setOnAction(evt -> this.selectAllRightRadioButtons());
-                selectAllRight.setGraphic(JabRefIcons.RIGHT.getGraphicNode());
-                selectAllRight.setTooltip(new Tooltip(Localization.lang("Select all changes on the right")));
-                mergePanel.add(selectAllRight, i, 0);
-            } else {
-                Label colHeading = new Label(columnHeadings.get(i));
-                colHeading.setMinWidth(USE_PREF_SIZE);
-                mergePanel.add(colHeading, i, 0);
-            }
-        }
-    }
-
-    private void fillDiffModes() {
-        diffMode.setItems(FXCollections.observableList(Arrays.asList(DiffMode.values())));
-        new ViewModelListCellFactory<DiffMode>()
-                .withText(MergeEntries::getDisplayText)
-                .install(diffMode);
-        DiffMode diffModePref = Globals.prefs.getGuiPreferences().getMergeDiffMode();
-        diffMode.setValue(diffModePref);
-        EasyBind.subscribe(this.diffMode.valueProperty(), mode -> {
-            updateFieldValues(differentFields);
-            Globals.prefs.getGuiPreferences().setMergeDiffMode(mode);
-        });
-
-        HBox heading = new HBox(10);
-        heading.getChildren().setAll(this.diffMode);
-        setTop(heading);
-        BorderPane.setMargin(heading, new Insets(0, 0, 10, 0));
-    }
-
-    private void setupFields() {
-        allFields.addAll(leftEntry.getFields());
-        allFields.addAll(rightEntry.getFields());
-
-        // Do not show internal fields
-        Set<Field> internalFields = allFields.stream().filter(FieldFactory::isInternalField).collect(Collectors.toSet());
-        allFields.removeAll(internalFields);
-    }
-
-    private void updateFieldValues(Collection<Field> fields) {
-        for (Field field : fields) {
-            String leftString = leftEntry.getField(field).orElse("");
-            String rightString = rightEntry.getField(field).orElse("");
-            List<Text> leftText = leftString.isEmpty() ? Collections.emptyList() : Collections.singletonList(DiffHighlighting.forUnchanged(leftString));
-            List<Text> rightText = rightString.isEmpty() ? Collections.emptyList() : Collections.singletonList(DiffHighlighting.forUnchanged(rightString));
-            switch (diffMode.getValue()) {
-                case PLAIN:
-                    break;
-                case WORD:
-                    rightText = DiffHighlighting.generateDiffHighlighting(leftString, rightString, " ");
-                    break;
-                case CHARACTER:
-                    rightText = DiffHighlighting.generateDiffHighlighting(leftString, rightString, "");
-                    break;
-                case WORD_SYMMETRIC:
-                    leftText = DiffHighlighting.generateSymmetricHighlighting(leftString, rightString, " ");
-                    rightText = DiffHighlighting.generateSymmetricHighlighting(rightString, leftString, " ");
-                    break;
-                case CHARACTER_SYMMETRIC:
-                    leftText = DiffHighlighting.generateSymmetricHighlighting(leftString, rightString, "");
-                    rightText = DiffHighlighting.generateSymmetricHighlighting(rightString, leftString, "");
-                    break;
-                default:
-                    throw new UnsupportedOperationException("Not implemented " + diffMode.getValue());
-            }
-            if (!leftText.isEmpty() && leftTextPanes.containsKey(field)) {
-                leftTextPanes.get(field).getChildren().setAll(leftText);
-            }
-            if (!rightText.isEmpty() && rightTextPanes.containsKey(field)) {
-                rightTextPanes.get(field).getChildren().setAll(rightText);
-            }
-        }
-    }
-
-    public void selectAllRightRadioButtons() {
-        for (RadioButton radioButton : rightRadioButtons) {
-            radioButton.setSelected(true);
-        }
-    }
-
-    public void selectAllLeftRadioButtons() {
-        for (RadioButton radioButton : leftRadioButtons) {
-            radioButton.setSelected(true);
-        }
-    }
-
-    /**
-     * @return Merged BibEntry
-     */
-    public BibEntry getMergeEntry() {
-        return mergedEntry;
-    }
-
-    /**
-     * Update the merged entry
-     */
-    private void updateMergedEntry() {
-        // Check if the type has changed
-        if (!identicalTypes && !typeRadioButtons.isEmpty() && typeRadioButtons.get(0).isSelected()) {
-            mergedEntry.setType(leftEntry.getType());
-        } else {
-            mergedEntry.setType(rightEntry.getType());
-        }
-
-        // Check the potentially different fields
-        for (Field field : differentFields) {
-            if (!radioButtons.containsKey(field)) {
-                // May happen during initialization -> just ignore
-                continue;
-            }
-            if (radioButtons.get(field).get(LEFT_RADIOBUTTON_INDEX).isSelected()) {
-                mergedEntry.setField(field, leftEntry.getField(field).get()); // Will only happen if field exists
-            } else if (radioButtons.get(field).get(RIGHT_RADIOBUTTON_INDEX).isSelected()) {
-                mergedEntry.setField(field, rightEntry.getField(field).get()); // Will only happen if field exists
-            } else {
-                mergedEntry.clearField(field);
-            }
-        }
-    }
-
-    public void setLeftHeaderText(String leftHeaderText) {
-        columnHeadings.set(1, leftHeaderText);
-        initialize();
-    }
-
-    public void setRightHeaderText(String rightHeaderText) {
-        columnHeadings.set(5, rightHeaderText);
-        initialize();
-    }
-
-    public enum DefaultRadioButtonSelectionMode {
-        LEFT,
-        RIGHT
-    }
-}
diff --git a/src/main/java/org/jabref/gui/mergeentries/MergeEntriesAction.java b/src/main/java/org/jabref/gui/mergeentries/MergeEntriesAction.java
index 3a24e84246b..a4c04975906 100644
--- a/src/main/java/org/jabref/gui/mergeentries/MergeEntriesAction.java
+++ b/src/main/java/org/jabref/gui/mergeentries/MergeEntriesAction.java
@@ -1,32 +1,22 @@
 package org.jabref.gui.mergeentries;
 
-import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
 
 import org.jabref.gui.DialogService;
-import org.jabref.gui.Globals;
-import org.jabref.gui.JabRefFrame;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.ActionHelper;
 import org.jabref.gui.actions.SimpleCommand;
-import org.jabref.gui.undo.NamedCompound;
-import org.jabref.gui.undo.UndoableInsertEntries;
-import org.jabref.gui.undo.UndoableRemoveEntries;
 import org.jabref.logic.bibtex.comparator.EntryComparator;
 import org.jabref.logic.l10n.Localization;
-import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.InternalField;
 
 public class MergeEntriesAction extends SimpleCommand {
-
-    private final JabRefFrame frame;
     private final DialogService dialogService;
     private final StateManager stateManager;
 
-    public MergeEntriesAction(JabRefFrame frame, DialogService dialogService, StateManager stateManager) {
-        this.frame = frame;
+    public MergeEntriesAction(DialogService dialogService, StateManager stateManager) {
         this.dialogService = dialogService;
         this.stateManager = stateManager;
 
@@ -38,7 +28,6 @@ public void execute() {
         if (stateManager.getActiveDatabase().isEmpty()) {
             return;
         }
-        BibDatabaseContext databaseContext = stateManager.getActiveDatabase().get();
 
         // Check if there are two entries selected
         List<BibEntry> selectedEntries = stateManager.getSelectedEntries();
@@ -66,28 +55,14 @@ public void execute() {
             second = one;
         }
 
-        MergeEntriesDialog dlg = new MergeEntriesDialog(first, second);
-        dlg.setTitle(Localization.lang("Merge entries"));
-        Optional<BibEntry> mergedEntry = dialogService.showCustomDialogAndWait(dlg);
-        if (mergedEntry.isPresent()) {
-            // ToDo: BibDatabase::insertEntry does not contain logic to mark the BasePanel as changed and to mark
-            //  entries with a timestamp, only BasePanel::insertEntry does. Workaround for the moment is to get the
-            //  BasePanel from the constructor injected JabRefFrame. Should be refactored and extracted!
-            frame.getCurrentLibraryTab().insertEntry(mergedEntry.get());
-
-            // Create a new entry and add it to the undo stack
-            // Remove the other two entries and add them to the undo stack (which is not working...)
-            NamedCompound ce = new NamedCompound(Localization.lang("Merge entries"));
-            ce.addEdit(new UndoableInsertEntries(databaseContext.getDatabase(), mergedEntry.get()));
-            List<BibEntry> entriesToRemove = Arrays.asList(one, two);
-            ce.addEdit(new UndoableRemoveEntries(databaseContext.getDatabase(), entriesToRemove));
-            databaseContext.getDatabase().removeEntries(entriesToRemove);
-            ce.end();
-            Globals.undoManager.addEdit(ce); // ToDo: Rework UndoManager and extract Globals
+        MergeEntriesDialog dialog = new MergeEntriesDialog(first, second);
+        dialog.setTitle(Localization.lang("Merge entries"));
+        
+        Optional<EntriesMergeResult> mergeResultOpt = dialogService.showCustomDialogAndWait(dialog);
+        mergeResultOpt.ifPresentOrElse(entriesMergeResult -> {
+            new MergeTwoEntriesAction(entriesMergeResult, stateManager).execute();
 
             dialogService.notify(Localization.lang("Merged entries"));
-        } else {
-            dialogService.notify(Localization.lang("Canceled merging entries"));
-        }
+        }, () -> dialogService.notify(Localization.lang("Canceled merging entries")));
     }
 }
diff --git a/src/main/java/org/jabref/gui/mergeentries/MergeEntriesDialog.java b/src/main/java/org/jabref/gui/mergeentries/MergeEntriesDialog.java
index a64c51a7a6e..ce4149a6bb1 100644
--- a/src/main/java/org/jabref/gui/mergeentries/MergeEntriesDialog.java
+++ b/src/main/java/org/jabref/gui/mergeentries/MergeEntriesDialog.java
@@ -3,16 +3,21 @@
 import javafx.scene.control.ButtonBar;
 import javafx.scene.control.ButtonType;
 
+import org.jabref.gui.mergeentries.newmergedialog.ShowDiffConfig;
+import org.jabref.gui.mergeentries.newmergedialog.ThreeWayMergeView;
 import org.jabref.gui.util.BaseDialog;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.BibEntry;
 
-public class MergeEntriesDialog extends BaseDialog<BibEntry> {
-
-    private final MergeEntries mergeEntries;
+public class MergeEntriesDialog extends BaseDialog<EntriesMergeResult> {
+    private final ThreeWayMergeView threeWayMergeView;
+    private final BibEntry one;
+    private final BibEntry two;
 
     public MergeEntriesDialog(BibEntry one, BibEntry two) {
-        mergeEntries = new MergeEntries(one, two);
+        threeWayMergeView = new ThreeWayMergeView(one, two);
+        this.one = one;
+        this.two = two;
 
         init();
     }
@@ -21,14 +26,17 @@ public MergeEntriesDialog(BibEntry one, BibEntry two) {
      * Sets up the dialog
      */
     private void init() {
-        this.getDialogPane().setContent(mergeEntries);
+        this.setX(20);
+        this.setY(20);
+
+        this.getDialogPane().setContent(threeWayMergeView);
 
         // Create buttons
         ButtonType replaceEntries = new ButtonType(Localization.lang("Merge entries"), ButtonBar.ButtonData.OK_DONE);
         this.getDialogPane().getButtonTypes().setAll(ButtonType.CANCEL, replaceEntries);
         this.setResultConverter(buttonType -> {
             if (buttonType.equals(replaceEntries)) {
-                return mergeEntries.getMergeEntry();
+                return new EntriesMergeResult(one, two, threeWayMergeView.getLeftEntry(), threeWayMergeView.getRightEntry(), threeWayMergeView.getMergedEntry());
             } else {
                 return null;
             }
@@ -36,10 +44,14 @@ private void init() {
     }
 
     public void setLeftHeaderText(String leftHeaderText) {
-        mergeEntries.setLeftHeaderText(leftHeaderText);
+        threeWayMergeView.setLeftHeader(leftHeaderText);
     }
 
     public void setRightHeaderText(String rightHeaderText) {
-        mergeEntries.setRightHeaderText(rightHeaderText);
+        threeWayMergeView.setRightHeader(rightHeaderText);
+    }
+
+    public void configureDiff(ShowDiffConfig diffConfig) {
+        threeWayMergeView.showDiff(diffConfig);
     }
 }
diff --git a/src/main/java/org/jabref/gui/mergeentries/MergeResult.java b/src/main/java/org/jabref/gui/mergeentries/MergeResult.java
new file mode 100644
index 00000000000..6db5a7a60e5
--- /dev/null
+++ b/src/main/java/org/jabref/gui/mergeentries/MergeResult.java
@@ -0,0 +1,8 @@
+package org.jabref.gui.mergeentries;
+
+import org.jabref.model.entry.BibEntry;
+
+public record MergeResult(
+        BibEntry leftEntry, BibEntry rightEntry, BibEntry mergedEntry
+) {
+}
diff --git a/src/main/java/org/jabref/gui/mergeentries/MergeTwoEntriesAction.java b/src/main/java/org/jabref/gui/mergeentries/MergeTwoEntriesAction.java
new file mode 100644
index 00000000000..d5e695b6810
--- /dev/null
+++ b/src/main/java/org/jabref/gui/mergeentries/MergeTwoEntriesAction.java
@@ -0,0 +1,44 @@
+package org.jabref.gui.mergeentries;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.jabref.gui.Globals;
+import org.jabref.gui.StateManager;
+import org.jabref.gui.actions.SimpleCommand;
+import org.jabref.gui.undo.NamedCompound;
+import org.jabref.gui.undo.UndoableInsertEntries;
+import org.jabref.gui.undo.UndoableRemoveEntries;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.model.database.BibDatabase;
+import org.jabref.model.entry.BibEntry;
+
+public class MergeTwoEntriesAction extends SimpleCommand {
+    private final EntriesMergeResult entriesMergeResult;
+    private final StateManager stateManager;
+
+    public MergeTwoEntriesAction(EntriesMergeResult entriesMergeResult, StateManager stateManager) {
+        this.entriesMergeResult = entriesMergeResult;
+        this.stateManager = stateManager;
+    }
+
+    @Override
+    public void execute() {
+        if (stateManager.getActiveDatabase().isEmpty()) {
+            return;
+        }
+
+        BibDatabase database = stateManager.getActiveDatabase().get().getDatabase();
+        List<BibEntry> entriesToRemove = Arrays.asList(entriesMergeResult.originalLeftEntry(), entriesMergeResult.originalRightEntry());
+
+        database.insertEntry(entriesMergeResult.mergedEntry());
+        database.removeEntries(entriesToRemove);
+
+        NamedCompound ce = new NamedCompound(Localization.lang("Merge entries"));
+        ce.addEdit(new UndoableInsertEntries(stateManager.getActiveDatabase().get().getDatabase(), entriesMergeResult.mergedEntry()));
+        ce.addEdit(new UndoableRemoveEntries(database, entriesToRemove));
+        ce.end();
+
+        Globals.undoManager.addEdit(ce);
+    }
+}
diff --git a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/FieldRowView.java b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/FieldRowView.java
new file mode 100644
index 00000000000..9b50e95817d
--- /dev/null
+++ b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/FieldRowView.java
@@ -0,0 +1,258 @@
+package org.jabref.gui.mergeentries.newmergedialog;
+
+import javax.swing.undo.AbstractUndoableEdit;
+import javax.swing.undo.CannotRedoException;
+import javax.swing.undo.CannotUndoException;
+import javax.swing.undo.CompoundEdit;
+
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.ReadOnlyStringProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.scene.control.ToggleGroup;
+import javafx.scene.layout.GridPane;
+
+import org.jabref.gui.actions.SimpleCommand;
+import org.jabref.gui.mergeentries.newmergedialog.cell.FieldNameCell;
+import org.jabref.gui.mergeentries.newmergedialog.cell.FieldValueCell;
+import org.jabref.gui.mergeentries.newmergedialog.cell.MergedFieldCell;
+import org.jabref.gui.mergeentries.newmergedialog.cell.sidebuttons.ToggleMergeUnmergeButton;
+import org.jabref.gui.mergeentries.newmergedialog.diffhighlighter.SplitDiffHighlighter;
+import org.jabref.gui.mergeentries.newmergedialog.diffhighlighter.UnifiedDiffHighlighter;
+import org.jabref.gui.mergeentries.newmergedialog.fieldsmerger.FieldMerger;
+import org.jabref.gui.mergeentries.newmergedialog.fieldsmerger.FieldMergerFactory;
+import org.jabref.gui.mergeentries.newmergedialog.toolbar.ThreeWayMergeToolbar;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.field.Field;
+import org.jabref.model.strings.StringUtil;
+
+import com.tobiasdiez.easybind.EasyBind;
+import org.fxmisc.richtext.StyleClassedTextArea;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static org.jabref.gui.mergeentries.newmergedialog.FieldRowViewModel.Selection;
+
+/**
+ * A controller class to control left, right and merged field values
+ */
+public class FieldRowView {
+    private static final Logger LOGGER = LoggerFactory.getLogger(FieldRowView.class);
+
+    protected final FieldRowViewModel viewModel;
+
+    protected final BooleanProperty shouldShowDiffs = new SimpleBooleanProperty(true);
+    private final FieldNameCell fieldNameCell;
+    private final FieldValueCell leftValueCell;
+    private final FieldValueCell rightValueCell;
+    private final MergedFieldCell mergedValueCell;
+
+    private final ToggleGroup toggleGroup = new ToggleGroup();
+
+    private final CompoundEdit fieldsMergedEdit = new CompoundEdit();
+
+    public FieldRowView(Field field, BibEntry leftEntry, BibEntry rightEntry, BibEntry mergedEntry, FieldMergerFactory fieldMergerFactory, int rowIndex) {
+        viewModel = new FieldRowViewModel(field, leftEntry, rightEntry, mergedEntry);
+
+        fieldNameCell = new FieldNameCell(field.getDisplayName(), rowIndex);
+        leftValueCell = new FieldValueCell(viewModel.getLeftFieldValue(), rowIndex);
+        rightValueCell = new FieldValueCell(viewModel.getRightFieldValue(), rowIndex);
+        mergedValueCell = new MergedFieldCell(viewModel.getMergedFieldValue(), rowIndex);
+
+        if (FieldMergerFactory.canMerge(field)) {
+            ToggleMergeUnmergeButton toggleMergeUnmergeButton = new ToggleMergeUnmergeButton(field);
+            toggleMergeUnmergeButton.setCanMerge(!viewModel.hasEqualLeftAndRightValues());
+            fieldNameCell.addSideButton(toggleMergeUnmergeButton);
+
+            EasyBind.listen(toggleMergeUnmergeButton.fieldStateProperty(), ((observableValue, old, fieldState) -> {
+                LOGGER.debug("Field merge state is {} for field {}", fieldState, field);
+                if (fieldState == ToggleMergeUnmergeButton.FieldState.MERGED) {
+                    new MergeCommand(fieldMergerFactory.create(field)).execute();
+                } else {
+                    new UnmergeCommand().execute();
+                }
+            }));
+        }
+
+        toggleGroup.getToggles().addAll(leftValueCell, rightValueCell);
+
+        mergedValueCell.textProperty().bindBidirectional(viewModel.mergedFieldValueProperty());
+        leftValueCell.textProperty().bindBidirectional(viewModel.leftFieldValueProperty());
+        rightValueCell.textProperty().bindBidirectional(viewModel.rightFieldValueProperty());
+
+        EasyBind.subscribe(viewModel.selectionProperty(), selection -> {
+            if (selection == Selection.LEFT) {
+                toggleGroup.selectToggle(leftValueCell);
+            } else if (selection == Selection.RIGHT) {
+                toggleGroup.selectToggle(rightValueCell);
+            } else if (selection == Selection.NONE) {
+                toggleGroup.selectToggle(null);
+            }
+        });
+
+        EasyBind.subscribe(toggleGroup.selectedToggleProperty(), selectedToggle -> {
+            if (selectedToggle == leftValueCell) {
+                selectLeftValue();
+            } else if (selectedToggle == rightValueCell) {
+                selectRightValue();
+            } else {
+                selectNone();
+            }
+        });
+
+        // Hide rightValueCell and extend leftValueCell to 2 columns when fields are merged
+        EasyBind.subscribe(viewModel.isFieldsMergedProperty(), isFieldsMerged -> {
+            if (isFieldsMerged) {
+                rightValueCell.setVisible(false);
+                GridPane.setColumnSpan(leftValueCell, 2);
+            } else {
+                rightValueCell.setVisible(true);
+                GridPane.setColumnSpan(leftValueCell, 1);
+            }
+        });
+
+        EasyBind.listen(viewModel.hasEqualLeftAndRightBinding(), (obs, old, isEqual) -> {
+            if (isEqual) {
+                LOGGER.debug("Left and right values are equal, LEFT==RIGHT=={}", viewModel.getLeftFieldValue());
+                hideDiff();
+            }
+        });
+    }
+
+    public void selectLeftValue() {
+        viewModel.selectLeftValue();
+    }
+
+    public void selectRightValue() {
+        viewModel.selectRightValue();
+    }
+
+    public void selectNone() {
+        viewModel.selectNone();
+    }
+
+    public String getMergedValue() {
+        return mergedValueProperty().getValue();
+    }
+
+    public ReadOnlyStringProperty mergedValueProperty() {
+        return viewModel.mergedFieldValueProperty();
+    }
+
+    public FieldNameCell getFieldNameCell() {
+        return fieldNameCell;
+    }
+
+    public FieldValueCell getLeftValueCell() {
+        return leftValueCell;
+    }
+
+    public FieldValueCell getRightValueCell() {
+        return rightValueCell;
+    }
+
+    public MergedFieldCell getMergedValueCell() {
+        return mergedValueCell;
+    }
+
+    public void showDiff(ShowDiffConfig diffConfig) {
+        if (!rightValueCell.isVisible() || StringUtil.isNullOrEmpty(viewModel.getLeftFieldValue()) || StringUtil.isNullOrEmpty(viewModel.getRightFieldValue())) {
+            return;
+        }
+        LOGGER.debug("Showing diffs...");
+
+        StyleClassedTextArea leftLabel = leftValueCell.getStyleClassedLabel();
+        StyleClassedTextArea rightLabel = rightValueCell.getStyleClassedLabel();
+        // Clearing old diff styles based on previous diffConfig
+        hideDiff();
+        if (shouldShowDiffs.get()) {
+            if (diffConfig.diffView() == ThreeWayMergeToolbar.DiffView.UNIFIED) {
+                new UnifiedDiffHighlighter(leftLabel, rightLabel, diffConfig.diffHighlightingMethod()).highlight();
+            } else {
+                new SplitDiffHighlighter(leftLabel, rightLabel, diffConfig.diffHighlightingMethod()).highlight();
+            }
+        }
+    }
+
+    public void hideDiff() {
+        if (!rightValueCell.isVisible()) {
+            return;
+        }
+
+        LOGGER.debug("Hiding diffs...");
+
+        int leftValueLength = getLeftValueCell().getStyleClassedLabel().getLength();
+        getLeftValueCell().getStyleClassedLabel().clearStyle(0, leftValueLength);
+        getLeftValueCell().getStyleClassedLabel().replaceText(viewModel.getLeftFieldValue());
+
+        int rightValueLength = getRightValueCell().getStyleClassedLabel().getLength();
+        getRightValueCell().getStyleClassedLabel().clearStyle(0, rightValueLength);
+        getRightValueCell().getStyleClassedLabel().replaceText(viewModel.getRightFieldValue());
+    }
+
+    public class MergeCommand extends SimpleCommand {
+        private final FieldMerger fieldMerger;
+
+        public MergeCommand(FieldMerger fieldMerger) {
+            this.fieldMerger = fieldMerger;
+
+            this.executable.bind(viewModel.hasEqualLeftAndRightBinding().not());
+        }
+
+        @Override
+        public void execute() {
+            assert !viewModel.getLeftFieldValue().equals(viewModel.getRightFieldValue());
+
+            String oldLeftFieldValue = viewModel.getLeftFieldValue();
+            String oldRightFieldValue = viewModel.getRightFieldValue();
+
+            String mergedFields = fieldMerger.merge(viewModel.getLeftFieldValue(), viewModel.getRightFieldValue());
+            viewModel.setLeftFieldValue(mergedFields);
+            viewModel.setRightFieldValue(mergedFields);
+
+            if (fieldsMergedEdit.canRedo()) {
+                fieldsMergedEdit.redo();
+            } else {
+                fieldsMergedEdit.addEdit(new MergeFieldsUndo(oldLeftFieldValue, oldRightFieldValue, mergedFields));
+                fieldsMergedEdit.end();
+            }
+        }
+    }
+
+    public class UnmergeCommand extends SimpleCommand {
+
+        public UnmergeCommand() { }
+
+        @Override
+        public void execute() {
+            if (fieldsMergedEdit.canUndo()) {
+                fieldsMergedEdit.undo();
+            }
+        }
+    }
+
+    class MergeFieldsUndo extends AbstractUndoableEdit {
+        private final String oldLeft;
+        private final String oldRight;
+        private final String mergedFields;
+
+        MergeFieldsUndo(String oldLeft, String oldRight, String mergedFields) {
+            this.oldLeft = oldLeft;
+            this.oldRight = oldRight;
+            this.mergedFields = mergedFields;
+        }
+
+        @Override
+        public void undo() throws CannotUndoException {
+            super.undo();
+            viewModel.setLeftFieldValue(oldLeft);
+            viewModel.setRightFieldValue(oldRight);
+        }
+
+        @Override
+        public void redo() throws CannotRedoException {
+            super.redo();
+            viewModel.setLeftFieldValue(mergedFields);
+            viewModel.setRightFieldValue(mergedFields);
+        }
+    }
+}
diff --git a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/FieldRowViewModel.java b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/FieldRowViewModel.java
new file mode 100644
index 00000000000..06356de4177
--- /dev/null
+++ b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/FieldRowViewModel.java
@@ -0,0 +1,222 @@
+package org.jabref.gui.mergeentries.newmergedialog;
+
+import javafx.beans.binding.Bindings;
+import javafx.beans.binding.BooleanBinding;
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.field.Field;
+import org.jabref.model.entry.field.InternalField;
+import org.jabref.model.entry.types.EntryTypeFactory;
+import org.jabref.model.strings.StringUtil;
+
+import com.tobiasdiez.easybind.EasyBind;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class FieldRowViewModel {
+    public enum Selection {
+        LEFT,
+        RIGHT,
+        /**
+         * When the user types something into the merged field value and neither the left nor
+         * right values match it, NONE is selected
+         * */
+        NONE
+    }
+
+    private final Logger LOGGER = LoggerFactory.getLogger(FieldRowViewModel.class);
+    private final BooleanProperty isFieldsMerged = new SimpleBooleanProperty(Boolean.FALSE);
+
+    private final ObjectProperty<Selection> selection = new SimpleObjectProperty<>();
+
+    private final StringProperty leftFieldValue = new SimpleStringProperty("");
+    private final StringProperty rightFieldValue = new SimpleStringProperty("");
+    private final StringProperty mergedFieldValue = new SimpleStringProperty("");
+
+    private final Field field;
+
+    private final BibEntry leftEntry;
+
+    private final BibEntry rightEntry;
+
+    private final BibEntry mergedEntry;
+
+    private final BooleanBinding hasEqualLeftAndRight;
+
+    public FieldRowViewModel(Field field, BibEntry leftEntry, BibEntry rightEntry, BibEntry mergedEntry) {
+        this.field = field;
+        this.leftEntry = leftEntry;
+        this.rightEntry = rightEntry;
+        this.mergedEntry = mergedEntry;
+
+        if (field.equals(InternalField.TYPE_HEADER)) {
+            setLeftFieldValue(leftEntry.getType().getDisplayName());
+            setRightFieldValue(rightEntry.getType().getDisplayName());
+        } else {
+            setLeftFieldValue(leftEntry.getField(field).orElse(""));
+            setRightFieldValue(rightEntry.getField(field).orElse(""));
+        }
+
+        EasyBind.listen(leftFieldValueProperty(), (obs, old, leftValue) -> leftEntry.setField(field, leftValue));
+        EasyBind.listen(rightFieldValueProperty(), (obs, old, rightValue) -> rightEntry.setField(field, rightValue));
+        EasyBind.listen(mergedFieldValueProperty(), (obs, old, mergedFieldValue) -> {
+            if (field.equals(InternalField.TYPE_HEADER)) {
+                getMergedEntry().setType(EntryTypeFactory.parse(mergedFieldValue));
+            } else {
+                getMergedEntry().setField(field, mergedFieldValue);
+            }
+        });
+
+        hasEqualLeftAndRight = Bindings.createBooleanBinding(this::hasEqualLeftAndRightValues, leftFieldValueProperty(), rightFieldValueProperty());
+
+        selectNonEmptyValue();
+
+        EasyBind.listen(isFieldsMergedProperty(), (obs, old, areFieldsMerged) -> {
+            LOGGER.debug("Field are merged: {}", areFieldsMerged);
+            if (areFieldsMerged) {
+                selectLeftValue();
+            } else {
+                selectNonEmptyValue();
+            }
+        });
+
+        EasyBind.subscribe(selectionProperty(), selection -> {
+            LOGGER.debug("Selecting {}' value for field {}", selection, field.getDisplayName());
+            switch (selection) {
+                case LEFT -> EasyBind.subscribe(leftFieldValueProperty(), this::setMergedFieldValue);
+                case RIGHT -> EasyBind.subscribe(rightFieldValueProperty(), this::setMergedFieldValue);
+            }
+        });
+
+        EasyBind.subscribe(mergedFieldValueProperty(), mergedValue -> {
+            LOGGER.debug("Merged value is {} for field {}", mergedValue, field.getDisplayName());
+            if (mergedValue.equals(getLeftFieldValue())) {
+                selectLeftValue();
+            } else if (getMergedFieldValue().equals(getRightFieldValue())) {
+                selectRightValue();
+            } else {
+                selectNone();
+            }
+        });
+
+        EasyBind.subscribe(hasEqualLeftAndRightBinding(), this::setIsFieldsMerged);
+    }
+
+    public void selectNonEmptyValue() {
+        if (StringUtil.isNullOrEmpty(leftFieldValue.get())) {
+            selectRightValue();
+        } else {
+            selectLeftValue();
+        }
+    }
+
+    public boolean hasEqualLeftAndRightValues() {
+        return leftFieldValue.get().equals(rightFieldValue.get());
+    }
+
+    public void selectLeftValue() {
+        setSelection(Selection.LEFT);
+    }
+
+    public void selectRightValue() {
+        if (isIsFieldsMerged()) {
+            selectLeftValue();
+        } else {
+            setSelection(Selection.RIGHT);
+        }
+    }
+
+    public void selectNone() {
+        setSelection(Selection.NONE);
+    }
+
+    public void setMergedFieldValue(String mergedFieldValue) {
+        mergedFieldValueProperty().set(mergedFieldValue);
+    }
+
+    public StringProperty mergedFieldValueProperty() {
+        return mergedFieldValue;
+    }
+
+    public String getMergedFieldValue() {
+        return mergedFieldValue.get();
+    }
+
+    public void merge() {
+        setIsFieldsMerged(true);
+    }
+
+    public BooleanBinding hasEqualLeftAndRightBinding() {
+        return hasEqualLeftAndRight;
+    }
+
+    public ObjectProperty<Selection> selectionProperty() {
+        return selection;
+    }
+
+    public void setSelection(Selection select) {
+        selectionProperty().set(select);
+    }
+
+    public Selection getSelection() {
+        return selectionProperty().get();
+    }
+
+    public boolean isIsFieldsMerged() {
+        return isFieldsMerged.get();
+    }
+
+    public BooleanProperty isFieldsMergedProperty() {
+        return isFieldsMerged;
+    }
+
+    public void setIsFieldsMerged(boolean isFieldsMerged) {
+        this.isFieldsMerged.set(isFieldsMerged);
+    }
+
+    public String getLeftFieldValue() {
+        return leftFieldValue.get();
+    }
+
+    public StringProperty leftFieldValueProperty() {
+        return leftFieldValue;
+    }
+
+    public void setLeftFieldValue(String leftFieldValue) {
+        this.leftFieldValue.set(leftFieldValue);
+    }
+
+    public String getRightFieldValue() {
+        return rightFieldValue.get();
+    }
+
+    public StringProperty rightFieldValueProperty() {
+        return rightFieldValue;
+    }
+
+    public void setRightFieldValue(String rightFieldValue) {
+        this.rightFieldValue.set(rightFieldValue);
+    }
+
+    public Field getField() {
+        return field;
+    }
+
+    public BibEntry getLeftEntry() {
+        return leftEntry;
+    }
+
+    public BibEntry getRightEntry() {
+        return rightEntry;
+    }
+
+    public BibEntry getMergedEntry() {
+        return mergedEntry;
+    }
+}
diff --git a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/PersonsNameFieldRowView.java b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/PersonsNameFieldRowView.java
new file mode 100644
index 00000000000..e42bb91743b
--- /dev/null
+++ b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/PersonsNameFieldRowView.java
@@ -0,0 +1,34 @@
+package org.jabref.gui.mergeentries.newmergedialog;
+
+import org.jabref.gui.mergeentries.newmergedialog.cell.sidebuttons.InfoButton;
+import org.jabref.gui.mergeentries.newmergedialog.fieldsmerger.FieldMergerFactory;
+import org.jabref.logic.importer.AuthorListParser;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.model.entry.AuthorList;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.field.Field;
+import org.jabref.model.entry.field.FieldProperty;
+
+public class PersonsNameFieldRowView extends FieldRowView {
+    private final AuthorList leftEntryNames;
+    private final AuthorList rightEntryNames;
+
+    public PersonsNameFieldRowView(Field field, BibEntry leftEntry, BibEntry rightEntry, BibEntry mergedEntry, FieldMergerFactory fieldMergerFactory, int rowIndex) {
+        super(field, leftEntry, rightEntry, mergedEntry, fieldMergerFactory, rowIndex);
+        assert field.getProperties().contains(FieldProperty.PERSON_NAMES);
+
+        var authorsParser = new AuthorListParser();
+        leftEntryNames = authorsParser.parse(viewModel.getLeftFieldValue());
+        rightEntryNames = authorsParser.parse(viewModel.getRightFieldValue());
+
+        if (!leftEntry.equals(rightEntry) && leftEntryNames.equals(rightEntryNames)) {
+            showPersonsNamesAreTheSameInfo();
+            shouldShowDiffs.set(false);
+        }
+    }
+
+    private void showPersonsNamesAreTheSameInfo() {
+        InfoButton infoButton = new InfoButton(Localization.lang("The %0s are the same. However, the order of field content differs", viewModel.getField().getName()));
+        getFieldNameCell().addSideButton(infoButton);
+    }
+}
diff --git a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/ShowDiffConfig.java b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/ShowDiffConfig.java
new file mode 100644
index 00000000000..62697e3119b
--- /dev/null
+++ b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/ShowDiffConfig.java
@@ -0,0 +1,9 @@
+package org.jabref.gui.mergeentries.newmergedialog;
+
+import static org.jabref.gui.mergeentries.newmergedialog.diffhighlighter.DiffHighlighter.DiffMethod;
+import static org.jabref.gui.mergeentries.newmergedialog.toolbar.ThreeWayMergeToolbar.DiffView;
+
+public record ShowDiffConfig(
+        DiffView diffView,
+        DiffMethod diffHighlightingMethod) {
+}
diff --git a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/ThreeWayMergeHeaderView.java b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/ThreeWayMergeHeaderView.java
new file mode 100644
index 00000000000..bf896f4b8a5
--- /dev/null
+++ b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/ThreeWayMergeHeaderView.java
@@ -0,0 +1,52 @@
+package org.jabref.gui.mergeentries.newmergedialog;
+
+import javafx.geometry.Insets;
+import javafx.scene.control.Control;
+import javafx.scene.layout.GridPane;
+
+import org.jabref.gui.mergeentries.newmergedialog.cell.HeaderCell;
+import org.jabref.logic.l10n.Localization;
+
+/**
+ * GridPane was used instead of a Hbox because Hbox allocates more space for cells
+ * with longer text, but I wanted all cells to have the same width
+ */
+public class ThreeWayMergeHeaderView extends GridPane {
+    public static final String DEFAULT_STYLE_CLASS = "merge-header";
+    private final HeaderCell leftHeaderCell;
+    private final HeaderCell rightHeaderCell;
+
+    private final HeaderCell mergedHeaderCell;
+
+    public ThreeWayMergeHeaderView(String leftHeader, String rightHeader) {
+        getStyleClass().add(DEFAULT_STYLE_CLASS);
+
+        this.leftHeaderCell = new HeaderCell(leftHeader);
+        this.rightHeaderCell = new HeaderCell(rightHeader);
+        this.mergedHeaderCell = new HeaderCell(Localization.lang("Merged Entry"));
+
+        addRow(0,
+               new HeaderCell(""),
+               leftHeaderCell,
+               rightHeaderCell,
+               mergedHeaderCell
+        );
+
+        setPrefHeight(Control.USE_COMPUTED_SIZE);
+        setMaxHeight(Control.USE_PREF_SIZE);
+        setMinHeight(Control.USE_PREF_SIZE);
+
+        // The fields grid pane is contained within a scroll pane, thus it doesn't allocate the full available width. In
+        // fact, it uses the available width minus the size of the scrollbar which is 8. This leads to header columns being
+        // always wider than fields columns. This hack should fix it.
+        setPadding(new Insets(0, 8, 0, 0));
+    }
+
+    public void setLeftHeader(String leftHeader) {
+        leftHeaderCell.setText(leftHeader);
+    }
+
+    public void setRightHeader(String rightHeader) {
+        rightHeaderCell.setText(rightHeader);
+    }
+}
diff --git a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/ThreeWayMergeView.css b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/ThreeWayMergeView.css
new file mode 100644
index 00000000000..ac73d7593f0
--- /dev/null
+++ b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/ThreeWayMergeView.css
@@ -0,0 +1,51 @@
+.merged-field .styled-text-area {
+    -fx-background-color: -fx-outer-border, -fx-control-inner-background;
+    -fx-background-insets: 0, 1;
+    -fx-prompt-text-fill: -fx-mid-text-color;
+}
+.merged-field .styled-text-area:focused {
+    -fx-highlight-fill: derive(-jr-accent, 20%);
+    -fx-background-color: -jr-accent, -fx-control-inner-background;
+    -fx-background-insets: 0, 2;
+    -fx-highlight-text-fill: -fx-text-inner-color;
+}
+
+.merge-field-value:selected .selection-box {
+    -fx-background-color: -jr-accent-alt;
+    -fx-border-color: -jr-accent;
+}
+
+.merge-field-value .selection-box {
+    -fx-background-color: #0000;
+    -fx-border-color: #0000;
+    -fx-border-radius: 8;
+    -fx-background-radius: 8;
+    -fx-border-width: 2.5;
+}
+
+.styled-text-area .text{
+    -fx-fill: -fx-text-background-color;
+}
+
+.field-cell:odd {
+    -fx-background-color: -jr-row-odd-background;
+}
+
+.field-cell:even {
+    -fx-background-color: -jr-row-even-background;
+}
+
+.merge-toolbox {
+    -fx-background-color: -jr-menu-background;
+}
+
+.merge-header-cell .label{
+    -fx-font-weight: bold;
+    -fx-padding: 1, 0, 1, 0;
+}
+
+.field-name .glyph-icon,
+.field-name .ikonli-font-icon {
+    -fx-icon-size: 17;
+    -fx-icon-color:  -jr-theme-text;
+}
diff --git a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/ThreeWayMergeView.java b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/ThreeWayMergeView.java
new file mode 100644
index 00000000000..06f6861d751
--- /dev/null
+++ b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/ThreeWayMergeView.java
@@ -0,0 +1,171 @@
+package org.jabref.gui.mergeentries.newmergedialog;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javafx.scene.control.ScrollPane;
+import javafx.scene.layout.ColumnConstraints;
+import javafx.scene.layout.GridPane;
+import javafx.scene.layout.Priority;
+import javafx.scene.layout.RowConstraints;
+import javafx.scene.layout.VBox;
+import javafx.stage.Screen;
+
+import org.jabref.gui.Globals;
+import org.jabref.gui.mergeentries.newmergedialog.fieldsmerger.FieldMergerFactory;
+import org.jabref.gui.mergeentries.newmergedialog.toolbar.ThreeWayMergeToolbar;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.field.Field;
+import org.jabref.model.entry.field.FieldProperty;
+
+public class ThreeWayMergeView extends VBox {
+    public static final int GRID_COLUMN_MIN_WIDTH = 250;
+
+    public static final String LEFT_DEFAULT_HEADER = Localization.lang("Left Entry");
+    public static final String RIGHT_DEFAULT_HEADER = Localization.lang("Right Entry");
+
+    private final ColumnConstraints fieldNameColumnConstraints = new ColumnConstraints(150);
+    private final ColumnConstraints leftEntryColumnConstraints = new ColumnConstraints(GRID_COLUMN_MIN_WIDTH, 256, Double.MAX_VALUE);
+    private final ColumnConstraints rightEntryColumnConstraints = new ColumnConstraints(GRID_COLUMN_MIN_WIDTH, 256, Double.MAX_VALUE);
+    private final ColumnConstraints mergedEntryColumnConstraints = new ColumnConstraints(GRID_COLUMN_MIN_WIDTH, 256, Double.MAX_VALUE);
+    private final ThreeWayMergeToolbar toolbar;
+    private final ThreeWayMergeHeaderView headerView;
+    private final ScrollPane scrollPane;
+    private final GridPane mergeGridPane;
+
+    private final ThreeWayMergeViewModel viewModel;
+    private final List<FieldRowView> fieldRows = new ArrayList<>();
+
+    private final FieldMergerFactory fieldMergerFactory;
+
+    public ThreeWayMergeView(BibEntry leftEntry, BibEntry rightEntry, String leftHeader, String rightHeader) {
+        getStylesheets().add(ThreeWayMergeView.class.getResource("ThreeWayMergeView.css").toExternalForm());
+        viewModel = new ThreeWayMergeViewModel((BibEntry) leftEntry.clone(), (BibEntry) rightEntry.clone(), leftHeader, rightHeader);
+        // TODO: Inject 'preferenceService' into the constructor
+        this.fieldMergerFactory = new FieldMergerFactory(Globals.prefs);
+
+        mergeGridPane = new GridPane();
+        scrollPane = new ScrollPane();
+        headerView = new ThreeWayMergeHeaderView(leftHeader, rightHeader);
+        toolbar = new ThreeWayMergeToolbar();
+
+        initializeColumnConstraints();
+        initializeMergeGridPane();
+        initializeScrollPane();
+        initializeHeaderView();
+        initializeToolbar();
+
+        this.setPrefHeight(Screen.getPrimary().getBounds().getHeight() * 0.76);
+        this.setPrefWidth(Screen.getPrimary().getBounds().getWidth() * 0.97);
+
+        getChildren().addAll(toolbar, headerView, scrollPane);
+    }
+
+    public ThreeWayMergeView(BibEntry leftEntry, BibEntry rightEntry) {
+        this(leftEntry, rightEntry, LEFT_DEFAULT_HEADER, RIGHT_DEFAULT_HEADER);
+    }
+
+    private void initializeToolbar() {
+        toolbar.setOnSelectLeftEntryValuesButtonClicked(this::selectLeftEntryValues);
+        toolbar.setOnSelectRightEntryValuesButtonClicked(this::selectRightEntryValues);
+
+        toolbar.showDiffProperty().addListener(e -> updateDiff());
+        toolbar.diffViewProperty().addListener(e -> updateDiff());
+        toolbar.diffHighlightingMethodProperty().addListener(e -> updateDiff());
+    }
+
+    private void updateDiff() {
+        if (toolbar.isShowDiffEnabled()) {
+            fieldRows.forEach(row -> row.showDiff(new ShowDiffConfig(toolbar.getDiffView(), toolbar.getDiffHighlightingMethod())));
+        } else {
+            fieldRows.forEach(FieldRowView::hideDiff);
+        }
+    }
+
+    private void initializeHeaderView() {
+        headerView.getColumnConstraints().addAll(fieldNameColumnConstraints,
+                                                 leftEntryColumnConstraints,
+                                                 rightEntryColumnConstraints,
+                                                 mergedEntryColumnConstraints);
+    }
+
+    private void initializeScrollPane() {
+        scrollPane.setFitToWidth(true);
+        scrollPane.setHbarPolicy(ScrollPane.ScrollBarPolicy.NEVER);
+        scrollPane.setContent(mergeGridPane);
+    }
+
+    private void initializeColumnConstraints() {
+        fieldNameColumnConstraints.setHgrow(Priority.NEVER);
+        leftEntryColumnConstraints.setHgrow(Priority.ALWAYS);
+        rightEntryColumnConstraints.setHgrow(Priority.ALWAYS);
+        mergedEntryColumnConstraints.setHgrow(Priority.ALWAYS);
+    }
+
+    private void initializeMergeGridPane() {
+        mergeGridPane.getColumnConstraints().addAll(fieldNameColumnConstraints, leftEntryColumnConstraints, rightEntryColumnConstraints, mergedEntryColumnConstraints);
+
+        for (int fieldIndex = 0; fieldIndex < viewModel.allFieldsSize(); fieldIndex++) {
+            addRow(fieldIndex);
+
+            mergeGridPane.getRowConstraints().add(new RowConstraints());
+        }
+    }
+
+    private Field getFieldAtIndex(int index) {
+        return viewModel.allFields().get(index);
+    }
+
+    private void addRow(int fieldIndex) {
+        Field field = getFieldAtIndex(fieldIndex);
+
+        FieldRowView fieldRow;
+        if (field.getProperties().contains(FieldProperty.PERSON_NAMES)) {
+            fieldRow = new PersonsNameFieldRowView(field, getLeftEntry(), getRightEntry(), getMergedEntry(), fieldMergerFactory, fieldIndex);
+        } else {
+            fieldRow = new FieldRowView(field, getLeftEntry(), getRightEntry(), getMergedEntry(), fieldMergerFactory, fieldIndex);
+        }
+
+        fieldRows.add(fieldIndex, fieldRow);
+
+        mergeGridPane.add(fieldRow.getFieldNameCell(), 0, fieldIndex);
+        mergeGridPane.add(fieldRow.getLeftValueCell(), 1, fieldIndex);
+        mergeGridPane.add(fieldRow.getRightValueCell(), 2, fieldIndex);
+        mergeGridPane.add(fieldRow.getMergedValueCell(), 3, fieldIndex);
+    }
+
+    public BibEntry getMergedEntry() {
+        return viewModel.getMergedEntry();
+    }
+
+    public void setLeftHeader(String leftHeader) {
+        headerView.setLeftHeader(leftHeader);
+    }
+
+    public void setRightHeader(String rightHeader) {
+        headerView.setRightHeader(rightHeader);
+    }
+
+    public void selectLeftEntryValues() {
+        fieldRows.forEach(FieldRowView::selectLeftValue);
+    }
+
+    public void selectRightEntryValues() {
+        fieldRows.forEach(FieldRowView::selectRightValue);
+    }
+
+    public void showDiff(ShowDiffConfig diffConfig) {
+        toolbar.setDiffView(diffConfig.diffView());
+        toolbar.setDiffHighlightingMethod(diffConfig.diffHighlightingMethod());
+        toolbar.setShowDiff(true);
+    }
+
+    public BibEntry getLeftEntry() {
+        return viewModel.getLeftEntry();
+    }
+
+    public BibEntry getRightEntry() {
+        return viewModel.getRightEntry();
+    }
+}
diff --git a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/ThreeWayMergeViewModel.java b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/ThreeWayMergeViewModel.java
new file mode 100644
index 00000000000..5314a725875
--- /dev/null
+++ b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/ThreeWayMergeViewModel.java
@@ -0,0 +1,115 @@
+package org.jabref.gui.mergeentries.newmergedialog;
+
+import java.util.Comparator;
+import java.util.HashSet;
+import java.util.Objects;
+import java.util.Set;
+
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+
+import org.jabref.gui.AbstractViewModel;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.field.Field;
+import org.jabref.model.entry.field.FieldFactory;
+import org.jabref.model.entry.field.InternalField;
+
+class ThreeWayMergeViewModel extends AbstractViewModel {
+
+    private final ObjectProperty<BibEntry> leftEntry = new SimpleObjectProperty<>();
+    private final ObjectProperty<BibEntry> rightEntry = new SimpleObjectProperty<>();
+    private final ObjectProperty<BibEntry> mergedEntry = new SimpleObjectProperty<>();
+    private final StringProperty leftHeader = new SimpleStringProperty();
+    private final StringProperty rightHeader = new SimpleStringProperty();
+
+    private final ObservableList<Field> allFields = FXCollections.observableArrayList();
+
+    public ThreeWayMergeViewModel(BibEntry leftEntry, BibEntry rightEntry, String leftHeader, String rightHeader) {
+        Objects.requireNonNull(leftEntry, "Left entry is required");
+        Objects.requireNonNull(rightEntry, "Right entry is required");
+        Objects.requireNonNull(leftHeader, "Left header entry is required");
+        Objects.requireNonNull(rightHeader, "Right header is required");
+
+        setLeftEntry(leftEntry);
+        setRightEntry(rightEntry);
+        setLeftHeader(leftHeader);
+        setRightHeader(rightHeader);
+
+        mergedEntry.set(new BibEntry());
+
+        Set<Field> leftAndRightFieldsUnion = new HashSet<>(leftEntry.getFields());
+        leftAndRightFieldsUnion.addAll(rightEntry.getFields());
+        setAllFields(leftAndRightFieldsUnion);
+    }
+
+    public StringProperty leftHeaderProperty() {
+        return leftHeader;
+    }
+
+    public String getLeftHeader() {
+        return leftHeader.get();
+    }
+
+    public void setLeftHeader(String leftHeader) {
+        leftHeaderProperty().set(leftHeader);
+    }
+
+    public StringProperty rightHeaderProperty() {
+        return rightHeader;
+    }
+
+    public String getRightHeader() {
+        return rightHeaderProperty().get();
+    }
+
+    public void setRightHeader(String rightHeader) {
+        rightHeaderProperty().set(rightHeader);
+    }
+
+    public BibEntry getLeftEntry() {
+        return leftEntry.get();
+    }
+
+    private void setLeftEntry(BibEntry bibEntry) {
+        leftEntry.set(bibEntry);
+    }
+
+    public BibEntry getRightEntry() {
+        return rightEntry.get();
+    }
+
+    private void setRightEntry(BibEntry bibEntry) {
+        rightEntry.set(bibEntry);
+    }
+
+    public BibEntry getMergedEntry() {
+        return mergedEntry.get();
+    }
+
+    public ObservableList<Field> allFields() {
+        return allFields;
+    }
+
+    /**
+     * Convince method to determine the total number of fields in the union of the left and right fields.
+     */
+    public int allFieldsSize() {
+        return allFields.size();
+    }
+
+    private void setAllFields(Set<Field> fields) {
+        allFields.clear();
+        allFields.addAll(fields);
+        // Don't show internal fields. See org.jabref.model.entry.field.InternalField
+        allFields.removeIf(FieldFactory::isInternalField);
+
+        allFields.sort(Comparator.comparing(Field::getName));
+
+        // Add the entry type field as the first field to display
+        allFields.add(0, InternalField.TYPE_HEADER);
+    }
+}
diff --git a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/cell/AbstractCell.java b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/cell/AbstractCell.java
new file mode 100644
index 00000000000..ffb1f536986
--- /dev/null
+++ b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/cell/AbstractCell.java
@@ -0,0 +1,82 @@
+package org.jabref.gui.mergeentries.newmergedialog.cell;
+
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.BooleanPropertyBase;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+import javafx.css.PseudoClass;
+import javafx.geometry.Insets;
+import javafx.scene.layout.HBox;
+
+/**
+ *
+ */
+public abstract class AbstractCell extends HBox {
+    public static final String ODD_PSEUDO_CLASS = "odd";
+    public static final String EVEN_PSEUDO_CLASS = "even";
+    public static final int NO_ROW_NUMBER = -1;
+    private static final String DEFAULT_STYLE_CLASS = "field-cell";
+    private final StringProperty text = new SimpleStringProperty();
+    private final BooleanProperty odd = new BooleanPropertyBase() {
+        @Override
+        public Object getBean() {
+            return AbstractCell.this;
+        }
+
+        @Override
+        public String getName() {
+            return "odd";
+        }
+
+        @Override
+        protected void invalidated() {
+            pseudoClassStateChanged(PseudoClass.getPseudoClass(ODD_PSEUDO_CLASS), get());
+            pseudoClassStateChanged(PseudoClass.getPseudoClass(EVEN_PSEUDO_CLASS), !get());
+        }
+    };
+
+    private final BooleanProperty even = new BooleanPropertyBase() {
+        @Override
+        public Object getBean() {
+            return AbstractCell.this;
+        }
+
+        @Override
+        public String getName() {
+            return "even";
+        }
+
+        @Override
+        protected void invalidated() {
+            pseudoClassStateChanged(PseudoClass.getPseudoClass(EVEN_PSEUDO_CLASS), get());
+            pseudoClassStateChanged(PseudoClass.getPseudoClass(ODD_PSEUDO_CLASS), !get());
+        }
+    };
+
+    public AbstractCell(String text, int rowIndex) {
+        getStyleClass().add(DEFAULT_STYLE_CLASS);
+        if (rowIndex != NO_ROW_NUMBER) {
+            if (rowIndex % 2 == 1) {
+                odd.setValue(true);
+            } else {
+                even.setValue(true);
+            }
+        }
+
+        setPadding(new Insets(8));
+
+        setText(text);
+    }
+
+    public String getText() {
+        return textProperty().get();
+    }
+
+    public StringProperty textProperty() {
+        return text;
+    }
+
+    public void setText(String text) {
+        textProperty().set(text);
+    }
+}
diff --git a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/cell/CopyFieldValueCommand.java b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/cell/CopyFieldValueCommand.java
new file mode 100644
index 00000000000..e18a831933b
--- /dev/null
+++ b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/cell/CopyFieldValueCommand.java
@@ -0,0 +1,23 @@
+package org.jabref.gui.mergeentries.newmergedialog.cell;
+
+import java.util.Objects;
+
+import org.jabref.gui.ClipBoardManager;
+import org.jabref.gui.actions.SimpleCommand;
+import org.jabref.preferences.PreferencesService;
+
+public class CopyFieldValueCommand extends SimpleCommand {
+    private final String fieldValue;
+    private final ClipBoardManager clipBoardManager;
+
+    public CopyFieldValueCommand(PreferencesService preferencesService, final String fieldValue) {
+        Objects.requireNonNull(fieldValue, "Field value cannot be null");
+        this.fieldValue = fieldValue;
+        this.clipBoardManager = new ClipBoardManager(preferencesService);
+    }
+
+    @Override
+    public void execute() {
+        clipBoardManager.setContent(fieldValue);
+    }
+}
diff --git a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/cell/FieldNameCell.java b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/cell/FieldNameCell.java
new file mode 100644
index 00000000000..a435f623187
--- /dev/null
+++ b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/cell/FieldNameCell.java
@@ -0,0 +1,39 @@
+package org.jabref.gui.mergeentries.newmergedialog.cell;
+
+import javafx.scene.control.Button;
+import javafx.scene.control.Label;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.Priority;
+
+/**
+ * A readonly cell used to display the name of some field.
+ */
+public class FieldNameCell extends ThreeWayMergeCell {
+    public static final String DEFAULT_STYLE_CLASS = "field-name";
+    protected final HBox actionLayout = new HBox();
+    private final Label label = new Label();
+
+    private final HBox labelBox = new HBox(label);
+
+    public FieldNameCell(String text, int rowIndex) {
+        super(text, rowIndex);
+        initialize();
+    }
+
+    private void initialize() {
+        getStyleClass().add(DEFAULT_STYLE_CLASS);
+        initializeLabel();
+        getChildren().addAll(labelBox, actionLayout);
+    }
+
+    private void initializeLabel() {
+        label.textProperty().bind(textProperty());
+        HBox.setHgrow(labelBox, Priority.ALWAYS);
+    }
+
+    public void addSideButton(Button sideButton) {
+        // TODO: Allow adding more than one side button
+        actionLayout.getChildren().clear();
+        actionLayout.getChildren().setAll(sideButton);
+    }
+}
diff --git a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/cell/FieldValueCell.java b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/cell/FieldValueCell.java
new file mode 100644
index 00000000000..04fda36975d
--- /dev/null
+++ b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/cell/FieldValueCell.java
@@ -0,0 +1,224 @@
+package org.jabref.gui.mergeentries.newmergedialog.cell;
+
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.BooleanPropertyBase;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.css.PseudoClass;
+import javafx.geometry.Insets;
+import javafx.geometry.Pos;
+import javafx.scene.Cursor;
+import javafx.scene.Node;
+import javafx.scene.control.Button;
+import javafx.scene.control.ContentDisplay;
+import javafx.scene.control.ScrollPane;
+import javafx.scene.control.Toggle;
+import javafx.scene.control.ToggleGroup;
+import javafx.scene.input.MouseEvent;
+import javafx.scene.input.ScrollEvent;
+import javafx.scene.layout.Background;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.Priority;
+import javafx.scene.paint.Color;
+
+import org.jabref.gui.Globals;
+import org.jabref.gui.actions.ActionFactory;
+import org.jabref.gui.fieldeditors.URLUtil;
+import org.jabref.gui.icon.IconTheme;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.model.entry.identifier.DOI;
+import org.jabref.model.strings.StringUtil;
+
+import com.tobiasdiez.easybind.EasyBind;
+import org.fxmisc.flowless.VirtualizedScrollPane;
+import org.fxmisc.richtext.StyleClassedTextArea;
+import org.kordamp.ikonli.javafx.FontIcon;
+import org.kordamp.ikonli.materialdesign2.MaterialDesignC;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * A readonly, selectable field cell that contains the value of some field
+ */
+public class FieldValueCell extends ThreeWayMergeCell implements Toggle {
+    public static final Logger LOGGER = LoggerFactory.getLogger(FieldValueCell.class);
+
+    public static final String DEFAULT_STYLE_CLASS = "merge-field-value";
+    public static final String SELECTION_BOX_STYLE_CLASS = "selection-box";
+
+    private static final PseudoClass SELECTED_PSEUDO_CLASS = PseudoClass.getPseudoClass("selected");
+    private final ObjectProperty<ToggleGroup> toggleGroup = new SimpleObjectProperty<>();
+    private final StyleClassedTextArea label = new StyleClassedTextArea();
+
+    private final ActionFactory factory = new ActionFactory(Globals.getKeyPrefs());
+
+    private final VirtualizedScrollPane<StyleClassedTextArea> scrollPane = new VirtualizedScrollPane<>(label);
+    HBox labelBox = new HBox(scrollPane);
+    private final BooleanProperty selected = new BooleanPropertyBase() {
+        @Override
+        public Object getBean() {
+            return FieldValueCell.class;
+        }
+
+        @Override
+        public String getName() {
+            return "selected";
+        }
+
+        @Override
+        protected void invalidated() {
+            pseudoClassStateChanged(SELECTED_PSEUDO_CLASS, get());
+
+            getToggleGroup().selectToggle(FieldValueCell.this);
+        }
+    };
+    private final HBox selectionBox = new HBox();
+    private final HBox actionsContainer = new HBox();
+
+    public FieldValueCell(String text, int rowIndex) {
+        super(text, rowIndex);
+        initialize();
+    }
+
+    private void initialize() {
+        getStyleClass().add(DEFAULT_STYLE_CLASS);
+        initializeScrollPane();
+        initializeLabel();
+        initializeSelectionBox();
+        initializeActions();
+        textProperty().addListener(invalidated -> setUserData(getText()));
+        setOnMouseClicked(e -> {
+            if (!isDisabled()) {
+                setSelected(true);
+            }
+        });
+
+        selectionBox.getChildren().addAll(labelBox, actionsContainer);
+        getChildren().setAll(selectionBox);
+    }
+
+    private void initializeLabel() {
+        label.setEditable(false);
+        label.setBackground(Background.fill(Color.TRANSPARENT));
+        EasyBind.subscribe(textProperty(), label::replaceText);
+        label.setAutoHeight(true);
+        label.setWrapText(true);
+        label.setStyle("-fx-cursor: hand");
+
+        // Workarounds
+        preventTextSelectionViaMouseEvents();
+
+        label.prefHeightProperty().bind(label.totalHeightEstimateProperty().orElseConst(-1d));
+
+        // Fix text area consuming scroll events before they reach the outer scrollable
+        label.addEventFilter(ScrollEvent.SCROLL, e -> {
+            e.consume();
+            FieldValueCell.this.fireEvent(e.copyFor(e.getSource(), FieldValueCell.this));
+        });
+    }
+
+    private void initializeActions() {
+        actionsContainer.getChildren().setAll(createOpenLinkButton(), createCopyButton());
+        actionsContainer.setAlignment(Pos.TOP_CENTER);
+        actionsContainer.setPrefWidth(28);
+    }
+
+    private void initializeSelectionBox() {
+        selectionBox.getStyleClass().add(SELECTION_BOX_STYLE_CLASS);
+        HBox.setHgrow(selectionBox, Priority.ALWAYS);
+
+        HBox.setHgrow(labelBox, Priority.ALWAYS);
+        labelBox.setPadding(new Insets(8));
+        labelBox.setCursor(Cursor.HAND);
+    }
+
+    private Button createCopyButton() {
+        FontIcon copyIcon = FontIcon.of(MaterialDesignC.CONTENT_COPY);
+        copyIcon.getStyleClass().add("action-icon");
+
+        Button copyButton = factory.createIconButton(() -> Localization.lang("Copy"), new CopyFieldValueCommand(Globals.prefs, getText()));
+        copyButton.setGraphic(copyIcon);
+        copyButton.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
+        copyButton.setMaxHeight(Double.MAX_VALUE);
+        copyButton.visibleProperty().bind(textProperty().isEmpty().not());
+
+        return copyButton;
+    }
+
+    public Button createOpenLinkButton() {
+        Node openLinkIcon = IconTheme.JabRefIcons.OPEN_LINK.getGraphicNode();
+        openLinkIcon.getStyleClass().add("action-icon");
+
+        Button openLinkButton = factory.createIconButton(() -> Localization.lang("Open Link"), new OpenExternalLinkAction(getText()));
+        openLinkButton.setGraphic(openLinkIcon);
+        openLinkButton.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
+        openLinkButton.setMaxHeight(Double.MAX_VALUE);
+
+        openLinkButton.visibleProperty().bind(EasyBind.map(textProperty(), input -> StringUtil.isNotBlank(input) && (URLUtil.isURL(input) || DOI.isValid(input))));
+
+        return openLinkButton;
+    }
+
+    private void initializeScrollPane() {
+        HBox.setHgrow(scrollPane, Priority.ALWAYS);
+        scrollPane.setVbarPolicy(ScrollPane.ScrollBarPolicy.NEVER);
+    }
+
+    private void preventTextSelectionViaMouseEvents() {
+        label.addEventFilter(MouseEvent.ANY, e -> {
+            if (e.getEventType() == MouseEvent.MOUSE_DRAGGED ||
+                    e.getEventType() == MouseEvent.DRAG_DETECTED ||
+                    e.getEventType() == MouseEvent.MOUSE_ENTERED) {
+                e.consume();
+            } else if (e.getEventType() == MouseEvent.MOUSE_PRESSED) {
+                if (e.getClickCount() > 1) {
+                    e.consume();
+                }
+            }
+        });
+    }
+
+    @Override
+    public ToggleGroup getToggleGroup() {
+        return toggleGroupProperty().get();
+    }
+
+    @Override
+    public void setToggleGroup(ToggleGroup toggleGroup) {
+        toggleGroupProperty().set(toggleGroup);
+    }
+
+    @Override
+    public ObjectProperty<ToggleGroup> toggleGroupProperty() {
+        return toggleGroup;
+    }
+
+    @Override
+    public boolean isSelected() {
+        return selectedProperty().get();
+    }
+
+    @Override
+    public void setSelected(boolean selected) {
+        selectedProperty().set(selected);
+    }
+
+    @Override
+    public BooleanProperty selectedProperty() {
+        return selected;
+    }
+
+    @Override
+    public void setUserData(Object value) {
+        super.setText((String) value);
+    }
+
+    @Override
+    public Object getUserData() {
+        return super.getText();
+    }
+
+    public StyleClassedTextArea getStyleClassedLabel() {
+        return label;
+    }
+}
diff --git a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/cell/HeaderCell.java b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/cell/HeaderCell.java
new file mode 100644
index 00000000000..76d3fceff0a
--- /dev/null
+++ b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/cell/HeaderCell.java
@@ -0,0 +1,28 @@
+package org.jabref.gui.mergeentries.newmergedialog.cell;
+
+import javafx.geometry.Insets;
+import javafx.scene.control.Label;
+
+/**
+ * A readonly cell used to display the header of the ThreeWayMerge UI at the top of the layout.
+ * */
+public class HeaderCell extends ThreeWayMergeCell {
+    public static final String DEFAULT_STYLE_CLASS = "merge-header-cell";
+    private final Label label = new Label();
+
+    public HeaderCell(String text) {
+        super(text, ThreeWayMergeCell.NO_ROW_NUMBER);
+        initialize();
+    }
+
+    private void initialize() {
+        getStyleClass().add(DEFAULT_STYLE_CLASS);
+        initializeLabel();
+        getChildren().add(label);
+    }
+
+    private void initializeLabel() {
+        label.textProperty().bind(textProperty());
+        label.setPadding(new Insets(getPadding().getTop(), getPadding().getRight(), getPadding().getBottom(), 16));
+    }
+}
diff --git a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/cell/MergedFieldCell.java b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/cell/MergedFieldCell.java
new file mode 100644
index 00000000000..89c591ee0ac
--- /dev/null
+++ b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/cell/MergedFieldCell.java
@@ -0,0 +1,46 @@
+package org.jabref.gui.mergeentries.newmergedialog.cell;
+
+import javafx.geometry.Insets;
+import javafx.geometry.Pos;
+import javafx.scene.input.ScrollEvent;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.Priority;
+
+import org.jabref.gui.util.BindingsHelper;
+
+import org.fxmisc.richtext.StyleClassedTextArea;
+
+public class MergedFieldCell extends ThreeWayMergeCell {
+    private static final String DEFAULT_STYLE_CLASS = "merged-field";
+
+    private final StyleClassedTextArea textArea = new StyleClassedTextArea();
+
+    public MergedFieldCell(String text, int rowIndex) {
+        super(text, rowIndex);
+        initialize();
+    }
+
+    private void initialize() {
+        getStyleClass().add(DEFAULT_STYLE_CLASS);
+        initializeTextArea();
+        getChildren().add(textArea);
+    }
+
+    private void initializeTextArea() {
+        BindingsHelper.bindBidirectional(textArea.textProperty(),
+                                         textProperty(),
+                                         textArea::replaceText,
+                                         textProperty()::setValue);
+
+        setAlignment(Pos.CENTER);
+        textArea.setWrapText(true);
+        textArea.setAutoHeight(true);
+        textArea.setPadding(new Insets(8));
+        HBox.setHgrow(textArea, Priority.ALWAYS);
+
+        textArea.addEventFilter(ScrollEvent.SCROLL, e -> {
+            e.consume();
+            MergedFieldCell.this.fireEvent(e.copyFor(e.getSource(), MergedFieldCell.this));
+        });
+    }
+}
diff --git a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/cell/OpenExternalLinkAction.java b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/cell/OpenExternalLinkAction.java
new file mode 100644
index 00000000000..1b5087b413a
--- /dev/null
+++ b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/cell/OpenExternalLinkAction.java
@@ -0,0 +1,41 @@
+package org.jabref.gui.mergeentries.newmergedialog.cell;
+
+import java.io.IOException;
+import java.net.URI;
+
+import org.jabref.gui.actions.SimpleCommand;
+import org.jabref.gui.desktop.JabRefDesktop;
+import org.jabref.model.entry.identifier.DOI;
+import org.jabref.model.strings.StringUtil;
+
+/**
+ * A command for opening DOIs and URLs. This was created primarily for simplifying {@link FieldValueCell}.
+ * */
+public class OpenExternalLinkAction extends SimpleCommand {
+    private final String urlOrDoi;
+
+    public OpenExternalLinkAction(String urlOrDoi) {
+        this.urlOrDoi = urlOrDoi;
+    }
+
+    @Override
+    public void execute() {
+        if (StringUtil.isBlank(urlOrDoi)) {
+            return;
+        }
+
+        try {
+            String url;
+            if (DOI.isValid(urlOrDoi)) {
+                url = DOI.parse(urlOrDoi).flatMap(DOI::getExternalURI).map(URI::toString).orElse("");
+            } else {
+                url = urlOrDoi;
+            }
+
+            JabRefDesktop.openBrowser(url);
+        } catch (
+                IOException ex) {
+            // TODO: Do something
+        }
+    }
+}
diff --git a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/cell/ThreeWayMergeCell.java b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/cell/ThreeWayMergeCell.java
new file mode 100644
index 00000000000..c3496fcecb6
--- /dev/null
+++ b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/cell/ThreeWayMergeCell.java
@@ -0,0 +1,82 @@
+package org.jabref.gui.mergeentries.newmergedialog.cell;
+
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.BooleanPropertyBase;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+import javafx.css.PseudoClass;
+import javafx.geometry.Insets;
+import javafx.scene.layout.HBox;
+
+/**
+ *
+ */
+public abstract class ThreeWayMergeCell extends HBox {
+    public static final String ODD_PSEUDO_CLASS = "odd";
+    public static final String EVEN_PSEUDO_CLASS = "even";
+    public static final int NO_ROW_NUMBER = -1;
+    private static final String DEFAULT_STYLE_CLASS = "field-cell";
+    private final StringProperty text = new SimpleStringProperty();
+    private final BooleanProperty odd = new BooleanPropertyBase() {
+        @Override
+        public Object getBean() {
+            return ThreeWayMergeCell.this;
+        }
+
+        @Override
+        public String getName() {
+            return "odd";
+        }
+
+        @Override
+        protected void invalidated() {
+            pseudoClassStateChanged(PseudoClass.getPseudoClass(ODD_PSEUDO_CLASS), get());
+            pseudoClassStateChanged(PseudoClass.getPseudoClass(EVEN_PSEUDO_CLASS), !get());
+        }
+    };
+
+    private final BooleanProperty even = new BooleanPropertyBase() {
+        @Override
+        public Object getBean() {
+            return ThreeWayMergeCell.this;
+        }
+
+        @Override
+        public String getName() {
+            return "even";
+        }
+
+        @Override
+        protected void invalidated() {
+            pseudoClassStateChanged(PseudoClass.getPseudoClass(EVEN_PSEUDO_CLASS), get());
+            pseudoClassStateChanged(PseudoClass.getPseudoClass(ODD_PSEUDO_CLASS), !get());
+        }
+    };
+
+    public ThreeWayMergeCell(String text, int rowIndex) {
+        getStyleClass().add(DEFAULT_STYLE_CLASS);
+        if (rowIndex != NO_ROW_NUMBER) {
+            if (rowIndex % 2 == 1) {
+                odd.setValue(true);
+            } else {
+                even.setValue(true);
+            }
+        }
+
+        setPadding(new Insets(8));
+
+        setText(text);
+    }
+
+    public String getText() {
+        return textProperty().get();
+    }
+
+    public StringProperty textProperty() {
+        return text;
+    }
+
+    public void setText(String text) {
+        textProperty().set(text);
+    }
+}
diff --git a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/cell/sidebuttons/InfoButton.java b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/cell/sidebuttons/InfoButton.java
new file mode 100644
index 00000000000..da37e2267ce
--- /dev/null
+++ b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/cell/sidebuttons/InfoButton.java
@@ -0,0 +1,51 @@
+package org.jabref.gui.mergeentries.newmergedialog.cell.sidebuttons;
+
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+import javafx.scene.control.Button;
+
+import org.jabref.gui.Globals;
+import org.jabref.gui.actions.Action;
+import org.jabref.gui.actions.ActionFactory;
+import org.jabref.gui.actions.SimpleCommand;
+import org.jabref.gui.icon.IconTheme;
+
+import com.tobiasdiez.easybind.EasyBind;
+
+public class InfoButton extends Button {
+    private final StringProperty infoMessage = new SimpleStringProperty();
+    private final ActionFactory actionFactory = new ActionFactory(Globals.getKeyPrefs());
+
+    public InfoButton(String infoMessage) {
+        setInfoMessage(infoMessage);
+        configureButton();
+        EasyBind.subscribe(infoMessageProperty(), newWarningMessage -> {
+            configureButton();
+        });
+    }
+
+    private void configureButton() {
+        setMaxHeight(Double.MAX_VALUE);
+        setFocusTraversable(false);
+        Action mergeAction = new Action.Builder(getInfoMessage()).setIcon(IconTheme.JabRefIcons.INTEGRITY_INFO);
+
+        actionFactory.configureIconButton(mergeAction, new SimpleCommand() {
+            @Override
+            public void execute() {
+                // The info button is not meant to be clickable that's why this is empty
+            }
+        }, this);
+    }
+
+    private void setInfoMessage(String infoMessage) {
+        infoMessageProperty().set(infoMessage);
+    }
+
+    public StringProperty infoMessageProperty() {
+        return infoMessage;
+    }
+
+    public String getInfoMessage() {
+        return infoMessage.get();
+    }
+}
diff --git a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/cell/sidebuttons/ToggleMergeUnmergeButton.java b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/cell/sidebuttons/ToggleMergeUnmergeButton.java
new file mode 100644
index 00000000000..de958837778
--- /dev/null
+++ b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/cell/sidebuttons/ToggleMergeUnmergeButton.java
@@ -0,0 +1,91 @@
+package org.jabref.gui.mergeentries.newmergedialog.cell.sidebuttons;
+
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.scene.control.Button;
+
+import org.jabref.gui.Globals;
+import org.jabref.gui.actions.Action;
+import org.jabref.gui.actions.ActionFactory;
+import org.jabref.gui.actions.SimpleCommand;
+import org.jabref.gui.icon.IconTheme;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.model.entry.field.Field;
+
+public class ToggleMergeUnmergeButton extends Button {
+    private final ObjectProperty<FieldState> fieldState = new SimpleObjectProperty<>(FieldState.UNMERGED);
+    private final BooleanProperty canMerge = new SimpleBooleanProperty(Boolean.TRUE);
+
+    private final ActionFactory actionFactory = new ActionFactory(Globals.getKeyPrefs());
+
+    private final Field field;
+
+    public ToggleMergeUnmergeButton(Field field) {
+        this.field = field;
+        setMaxHeight(Double.MAX_VALUE);
+        setFocusTraversable(false);
+
+        configureMergeButton();
+        this.disableProperty().bind(canMergeProperty().not());
+    }
+
+    private void configureMergeButton() {
+        Action mergeAction = new Action.Builder(Localization.lang("Merge %0", field.getDisplayName()))
+                .setIcon(IconTheme.JabRefIcons.MERGE_GROUPS);
+
+        actionFactory.configureIconButton(mergeAction, new ToggleMergeUnmergeAction(), this);
+    }
+
+    private void configureUnmergeButton() {
+        Action unmergeAction = new Action.Builder(Localization.lang("Unmerge %0", field.getDisplayName()))
+                .setIcon(IconTheme.JabRefIcons.UNDO);
+        actionFactory.configureIconButton(unmergeAction, new ToggleMergeUnmergeAction(), this);
+    }
+
+    public ObjectProperty<FieldState> fieldStateProperty() {
+        return fieldState;
+    }
+
+    private void setFieldState(FieldState fieldState) {
+        fieldStateProperty().set(fieldState);
+    }
+
+    public FieldState getFieldState() {
+        return fieldState.get();
+    }
+
+    public BooleanProperty canMergeProperty() {
+        return canMerge;
+    }
+
+    public boolean canMerge() {
+        return canMerge.get();
+    }
+
+    /**
+     * Setting {@code canMerge} to {@code false} will disable the merge/unmerge button
+     * */
+    public void setCanMerge(boolean value) {
+        canMergeProperty().set(value);
+    }
+
+    private class ToggleMergeUnmergeAction extends SimpleCommand {
+
+        @Override
+        public void execute() {
+            if (fieldStateProperty().get() == FieldState.MERGED) {
+                setFieldState(FieldState.UNMERGED);
+                configureMergeButton();
+            } else {
+                setFieldState(FieldState.MERGED);
+                configureUnmergeButton();
+            }
+        }
+    }
+
+    public enum FieldState {
+        MERGED, UNMERGED
+    }
+}
diff --git a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/diffhighlighter/DiffHighlighter.java b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/diffhighlighter/DiffHighlighter.java
new file mode 100644
index 00000000000..17149e368d6
--- /dev/null
+++ b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/diffhighlighter/DiffHighlighter.java
@@ -0,0 +1,69 @@
+package org.jabref.gui.mergeentries.newmergedialog.diffhighlighter;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+
+import org.fxmisc.richtext.StyleClassedTextArea;
+
+public abstract sealed class DiffHighlighter permits SplitDiffHighlighter, UnifiedDiffHighlighter {
+    protected final StyleClassedTextArea sourceTextview;
+    protected final StyleClassedTextArea targetTextview;
+
+    protected DiffMethod diffMethod;
+
+    public DiffHighlighter(StyleClassedTextArea sourceTextview, StyleClassedTextArea targetTextview, DiffMethod diffMethod) {
+        Objects.requireNonNull(sourceTextview, "source text view MUST NOT be null.");
+        Objects.requireNonNull(targetTextview, "target text view MUST NOT be null.");
+
+        this.sourceTextview = sourceTextview;
+        this.targetTextview = targetTextview;
+        this.diffMethod = diffMethod;
+    }
+
+    abstract void highlight();
+
+    protected List<String> splitString(String str) {
+        return Arrays.asList(str.split(diffMethod.separator()));
+    }
+
+    private void setDiffMethod(DiffMethod diffMethod) {
+        this.diffMethod = diffMethod;
+    }
+
+    public DiffMethod getDiffMethod() {
+        return diffMethod;
+    }
+
+    public String getSeparator() {
+        return diffMethod.separator();
+    }
+
+    public enum DiffMethod {
+        WORDS(" "), CHARS("");
+
+        private final String separator;
+
+        DiffMethod(String separator) {
+            this.separator = separator;
+        }
+
+        public String separator() {
+            return separator;
+        }
+    }
+
+    protected String join(List<String> stringList) {
+        return String.join(getSeparator(), stringList);
+    }
+
+    enum ChangeType {
+        ADDITION, DELETION, CHANGE_DELETION
+    }
+
+    record Change(
+            int position,
+            int spanSize,
+            ChangeType type) {
+    }
+}
diff --git a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/diffhighlighter/SplitDiffHighlighter.java b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/diffhighlighter/SplitDiffHighlighter.java
new file mode 100644
index 00000000000..14570f6b2a8
--- /dev/null
+++ b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/diffhighlighter/SplitDiffHighlighter.java
@@ -0,0 +1,74 @@
+package org.jabref.gui.mergeentries.newmergedialog.diffhighlighter;
+
+import java.util.List;
+
+import com.github.difflib.DiffUtils;
+import com.github.difflib.patch.AbstractDelta;
+import org.fxmisc.richtext.StyleClassedTextArea;
+
+/**
+ * A diff highlighter in which changes are split between source and target text view.
+ * They are represented by an addition in the target text view and deletion in the source text view.
+ */
+public final class SplitDiffHighlighter extends DiffHighlighter {
+
+    public SplitDiffHighlighter(StyleClassedTextArea sourceTextview, StyleClassedTextArea targetTextview, DiffMethod diffMethod) {
+        super(sourceTextview, targetTextview, diffMethod);
+    }
+
+    @Override
+    public void highlight() {
+        String sourceContent = sourceTextview.getText();
+        String targetContent = targetTextview.getText();
+        if (sourceContent.equals(targetContent)) {
+            return;
+        }
+
+        List<String> sourceTokens = splitString(sourceContent);
+        List<String> targetTokens = splitString(targetContent);
+
+        List<AbstractDelta<String>> deltaList = DiffUtils.diff(sourceTokens, targetTokens).getDeltas();
+
+        for (AbstractDelta<String> delta : deltaList) {
+            int affectedSourceTokensPosition = delta.getSource().getPosition();
+            int affectedTargetTokensPosition = delta.getTarget().getPosition();
+
+            List<String> affectedTokensInSource = delta.getSource().getLines();
+            List<String> affectedTokensInTarget = delta.getTarget().getLines();
+            int joinedSourceTokensLength = affectedTokensInSource.stream()
+                    .map(String::length)
+                    .reduce(Integer::sum)
+                    .map(value -> value + (getSeparator().length() * (affectedTokensInSource.size() - 1)))
+                    .orElse(0);
+
+            int joinedTargetTokensLength = affectedTokensInTarget.stream()
+                    .map(String::length)
+                    .reduce(Integer::sum)
+                    .map(value -> value + (getSeparator().length() * (affectedTokensInTarget.size() - 1)))
+                    .orElse(0);
+            int affectedSourceTokensPositionInText = getPositionInText(affectedSourceTokensPosition, sourceTokens);
+            int affectedTargetTokensPositionInText = getPositionInText(affectedTargetTokensPosition, targetTokens);
+            switch (delta.getType()) {
+                case CHANGE -> {
+                    sourceTextview.setStyleClass(affectedSourceTokensPositionInText, affectedSourceTokensPositionInText + joinedSourceTokensLength, "deletion");
+                    targetTextview.setStyleClass(affectedTargetTokensPositionInText, affectedTargetTokensPositionInText + joinedTargetTokensLength, "updated");
+                }
+                case DELETE ->
+                        sourceTextview.setStyleClass(affectedSourceTokensPositionInText, affectedSourceTokensPositionInText + joinedSourceTokensLength, "deletion");
+                case INSERT ->
+                        targetTextview.setStyleClass(affectedTargetTokensPositionInText, affectedTargetTokensPositionInText + joinedTargetTokensLength, "addition");
+            }
+        }
+    }
+
+    public int getPositionInText(int positionInTokenList, List<String> tokenList) {
+        if (positionInTokenList == 0) {
+            return 0;
+        } else {
+            return tokenList.stream().limit(positionInTokenList).map(String::length)
+                    .reduce(Integer::sum)
+                    .map(value -> value + (getSeparator().length() * positionInTokenList))
+                    .orElse(0);
+        }
+    }
+}
diff --git a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/diffhighlighter/UnifiedDiffHighlighter.java b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/diffhighlighter/UnifiedDiffHighlighter.java
new file mode 100644
index 00000000000..54824f06d61
--- /dev/null
+++ b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/diffhighlighter/UnifiedDiffHighlighter.java
@@ -0,0 +1,117 @@
+package org.jabref.gui.mergeentries.newmergedialog.diffhighlighter;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+import com.github.difflib.DiffUtils;
+import com.github.difflib.patch.AbstractDelta;
+import com.github.difflib.patch.DeltaType;
+import org.fxmisc.richtext.StyleClassedTextArea;
+
+/**
+ * A diff highlighter in which differences of type {@link DeltaType#CHANGE} are unified and represented by an insertion
+ * and deletion in the target text view. Normal addition and deletion are kept as they are.
+ */
+public final class UnifiedDiffHighlighter extends DiffHighlighter {
+
+    public UnifiedDiffHighlighter(StyleClassedTextArea sourceTextview, StyleClassedTextArea targetTextview, DiffMethod diffMethod) {
+        super(sourceTextview, targetTextview, diffMethod);
+    }
+
+    @Override
+    public void highlight() {
+        String sourceContent = sourceTextview.getText();
+        String targetContent = targetTextview.getText();
+        if (sourceContent.equals(targetContent)) {
+            return;
+        }
+
+        List<String> sourceWords = splitString(sourceContent);
+        List<String> targetWords = splitString(targetContent);
+        List<String> unifiedWords = new ArrayList<>(targetWords);
+
+        List<AbstractDelta<String>> deltaList = DiffUtils.diff(sourceWords, targetWords).getDeltas();
+
+        List<Change> changeList = new ArrayList<>();
+
+        int deletionCount = 0;
+        for (AbstractDelta<String> delta : deltaList) {
+            switch (delta.getType()) {
+                case CHANGE -> {
+                    int changePosition = delta.getTarget().getPosition();
+                    int deletionPoint = changePosition + deletionCount;
+                    int insertionPoint = deletionPoint + 1;
+                    List<String> deltaSourceWords = delta.getSource().getLines();
+                    List<String> deltaTargetWords = delta.getTarget().getLines();
+
+                    unifiedWords.add(deletionPoint, join(deltaSourceWords));
+
+                    changeList.add(new Change(deletionPoint, 1, ChangeType.CHANGE_DELETION));
+                    changeList.add(new Change(insertionPoint, deltaTargetWords.size(), ChangeType.ADDITION));
+                    deletionCount++;
+                }
+                case DELETE -> {
+                    int deletionPoint = delta.getTarget().getPosition() + deletionCount;
+                    unifiedWords.add(deletionPoint, join(delta.getSource().getLines()));
+
+                    changeList.add(new Change(deletionPoint, 1, ChangeType.DELETION));
+                    deletionCount++;
+                }
+                case INSERT -> {
+                    int insertionPoint = delta.getTarget().getPosition() + deletionCount;
+                    changeList.add(new Change(insertionPoint, delta.getTarget().getLines().size(), ChangeType.ADDITION));
+                }
+            }
+        }
+        targetTextview.clear();
+
+        boolean changeInProgress = false;
+        for (int position = 0; position < unifiedWords.size(); position++) {
+            String word = unifiedWords.get(position);
+            Optional<Change> changeAtPosition = findChange(position, changeList);
+            if (changeAtPosition.isEmpty()) {
+                appendToTextArea(targetTextview, getSeparator() + word, "unchanged");
+            } else {
+                Change change = changeAtPosition.get();
+                List<String> changeWords = unifiedWords.subList(change.position(), change.position() + change.spanSize());
+
+                if (change.type() == ChangeType.DELETION) {
+                    appendToTextArea(targetTextview, getSeparator() + join(changeWords), "deletion");
+                } else if (change.type() == ChangeType.ADDITION) {
+                    if (changeInProgress) {
+                        appendToTextArea(targetTextview, join(changeWords), "addition");
+                        changeInProgress = false;
+                    } else {
+                        appendToTextArea(targetTextview, getSeparator() + join(changeWords), "addition");
+                    }
+                } else if (change.type() == ChangeType.CHANGE_DELETION) {
+                    appendToTextArea(targetTextview, getSeparator() + join(changeWords), "deletion");
+                    changeInProgress = true;
+                }
+                position = position + changeWords.size() - 1;
+            }
+        }
+        if (targetTextview.getLength() >= getSeparator().length()) {
+            // There always going to be an extra separator at the start
+            targetTextview.deleteText(0, getSeparator().length());
+        }
+    }
+
+    private void appendToTextArea(StyleClassedTextArea textArea, String text, String styleClass) {
+        if (text.isEmpty()) {
+            return;
+        }
+        // Append separator without styling it
+        if (text.startsWith(getSeparator())) {
+            textArea.append(getSeparator(), "unchanged");
+            textArea.append(text.substring(getSeparator().length()), styleClass);
+        } else {
+            textArea.append(text, styleClass);
+        }
+    }
+
+    private Optional<Change> findChange(int position, List<Change> changeList) {
+        return changeList.stream().filter(change -> change.position() == position).findAny();
+    }
+}
diff --git a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/fieldsmerger/CommentMerger.java b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/fieldsmerger/CommentMerger.java
new file mode 100644
index 00000000000..9beb1819423
--- /dev/null
+++ b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/fieldsmerger/CommentMerger.java
@@ -0,0 +1,14 @@
+package org.jabref.gui.mergeentries.newmergedialog.fieldsmerger;
+
+import org.jabref.logic.util.OS;
+import org.jabref.model.entry.field.StandardField;
+
+/**
+ * A merger for the {@link StandardField#COMMENT} field
+ * */
+public class CommentMerger implements FieldMerger {
+    @Override
+    public String merge(String fieldValueA, String fieldValueB) {
+        return fieldValueA + OS.NEWLINE + fieldValueB;
+    }
+}
diff --git a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/fieldsmerger/FieldMerger.java b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/fieldsmerger/FieldMerger.java
new file mode 100644
index 00000000000..8119a892abb
--- /dev/null
+++ b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/fieldsmerger/FieldMerger.java
@@ -0,0 +1,9 @@
+package org.jabref.gui.mergeentries.newmergedialog.fieldsmerger;
+
+/**
+ * This class is responsible for taking two values for some field and merging them to into one value
+ * */
+@FunctionalInterface
+public interface FieldMerger {
+    String merge(String fieldValueA, String fieldValueB);
+}
diff --git a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/fieldsmerger/FieldMergerFactory.java b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/fieldsmerger/FieldMergerFactory.java
new file mode 100644
index 00000000000..68a68c0359f
--- /dev/null
+++ b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/fieldsmerger/FieldMergerFactory.java
@@ -0,0 +1,31 @@
+package org.jabref.gui.mergeentries.newmergedialog.fieldsmerger;
+
+import org.jabref.model.entry.field.Field;
+import org.jabref.model.entry.field.StandardField;
+import org.jabref.preferences.PreferencesService;
+
+public class FieldMergerFactory {
+    private final PreferencesService preferencesService;
+
+    public FieldMergerFactory(PreferencesService preferencesService) {
+        this.preferencesService = preferencesService;
+    }
+
+    public FieldMerger create(Field field) {
+        if (field == StandardField.GROUPS) {
+            return new GroupMerger();
+        } else if (field == StandardField.KEYWORDS) {
+            return new KeywordMerger(preferencesService);
+        } else if (field == StandardField.COMMENT) {
+            return new CommentMerger();
+        } else if (field == StandardField.FILE) {
+            return new FileMerger();
+        } else {
+            throw new IllegalArgumentException("No implementation found for merging the given field: " + field.getDisplayName());
+        }
+    }
+
+    public static boolean canMerge(Field field) {
+        return field == StandardField.GROUPS || field == StandardField.KEYWORDS || field == StandardField.COMMENT || field == StandardField.FILE;
+    }
+}
diff --git a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/fieldsmerger/FileMerger.java b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/fieldsmerger/FileMerger.java
new file mode 100644
index 00000000000..4b4e2034226
--- /dev/null
+++ b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/fieldsmerger/FileMerger.java
@@ -0,0 +1,34 @@
+package org.jabref.gui.mergeentries.newmergedialog.fieldsmerger;
+
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import org.jabref.logic.bibtex.FileFieldWriter;
+import org.jabref.logic.importer.util.FileFieldParser;
+import org.jabref.model.entry.LinkedFile;
+import org.jabref.model.entry.field.StandardField;
+import org.jabref.model.strings.StringUtil;
+
+/**
+ * A merger for the {@link StandardField#FILE} field
+ * */
+public class FileMerger implements FieldMerger {
+    @Override
+    public String merge(String filesA, String filesB) {
+        if (StringUtil.isBlank(filesA + filesB)) {
+            return "";
+        } else if (StringUtil.isBlank(filesA)) {
+            return filesB;
+        } else if (StringUtil.isBlank(filesB)) {
+            return filesA;
+        } else {
+            List<LinkedFile> linkedFilesA = FileFieldParser.parse(filesA);
+            List<LinkedFile> linkedFilesB = FileFieldParser.parse(filesB);
+            // TODO: If one of the linked files list is empty then the its string value is malformed.
+            return Stream.concat(linkedFilesA.stream(), linkedFilesB.stream())
+                         .map(FileFieldWriter::getStringRepresentation)
+                         .collect(Collectors.joining());
+        }
+    }
+}
diff --git a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/fieldsmerger/GroupMerger.java b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/fieldsmerger/GroupMerger.java
new file mode 100644
index 00000000000..fdbbddbb268
--- /dev/null
+++ b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/fieldsmerger/GroupMerger.java
@@ -0,0 +1,29 @@
+package org.jabref.gui.mergeentries.newmergedialog.fieldsmerger;
+
+import java.util.Arrays;
+import java.util.stream.Collectors;
+
+import org.jabref.model.entry.field.StandardField;
+import org.jabref.model.strings.StringUtil;
+
+/**
+ * A merger for the {@link StandardField#GROUPS} field
+ * */
+public class GroupMerger implements FieldMerger {
+    public static final String GROUPS_SEPARATOR = ", ";
+
+    @Override
+    public String merge(String groupsA, String groupsB) {
+        if (StringUtil.isBlank(groupsA) && StringUtil.isBlank(groupsB)) {
+            return "";
+        } else if (StringUtil.isBlank(groupsA)) {
+            return groupsB;
+        } else if (StringUtil.isBlank(groupsB)) {
+            return groupsA;
+        } else {
+            return Arrays.stream((groupsA + GROUPS_SEPARATOR + groupsB).split(GROUPS_SEPARATOR))
+                         .distinct()
+                         .collect(Collectors.joining(GROUPS_SEPARATOR));
+        }
+    }
+}
diff --git a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/fieldsmerger/KeywordMerger.java b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/fieldsmerger/KeywordMerger.java
new file mode 100644
index 00000000000..3947a185b53
--- /dev/null
+++ b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/fieldsmerger/KeywordMerger.java
@@ -0,0 +1,25 @@
+package org.jabref.gui.mergeentries.newmergedialog.fieldsmerger;
+
+import java.util.Objects;
+
+import org.jabref.model.entry.KeywordList;
+import org.jabref.model.entry.field.StandardField;
+import org.jabref.preferences.PreferencesService;
+
+/**
+ * A merger for the {@link StandardField#KEYWORDS} field
+ * */
+public class KeywordMerger implements FieldMerger {
+    private final PreferencesService preferencesService;
+
+    public KeywordMerger(PreferencesService preferencesService) {
+        Objects.requireNonNull(preferencesService);
+        this.preferencesService = preferencesService;
+    }
+
+    @Override
+    public String merge(String keywordsA, String keywordsB) {
+        Character delimiter = preferencesService.getGroupsPreferences().getKeywordSeparator();
+        return KeywordList.merge(keywordsA, keywordsB, delimiter).getAsString(delimiter);
+    }
+}
diff --git a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/toolbar/ThreeWayMergeToolbar.fxml b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/toolbar/ThreeWayMergeToolbar.fxml
new file mode 100644
index 00000000000..59fde5d824b
--- /dev/null
+++ b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/toolbar/ThreeWayMergeToolbar.fxml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.ComboBox?>
+<?import javafx.scene.control.RadioButton?>
+<?import javafx.scene.control.Separator?>
+<?import javafx.scene.control.ToggleGroup?>
+<?import javafx.scene.control.ToolBar?>
+<?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.HBox?>
+<?import org.jabref.gui.icon.JabRefIconView?>
+
+<fx:root prefWidth="800.0" type="AnchorPane" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.mergeentries.newmergedialog.toolbar.ThreeWayMergeToolbar">
+   <children>
+      <ToolBar maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="60.0" prefWidth="800.0" styleClass="merge-toolbox" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+         <items>
+            <HBox fx:id="naviagetDifferencesContainer" fillHeight="false" maxHeight="-Infinity">
+               <children>
+                  <Button fx:id="selectLeftEntryValuesButton" focusTraversable="false" mnemonicParsing="false" styleClass="icon-button" text="Left">
+                     <graphic>
+                        <JabRefIconView glyph="ACCEPT_LEFT" /><!--glyph="ACCEPT_LEFT"-->
+                     </graphic>
+                  </Button>
+                  <Button fx:id="selectRightEntryValuesButton" focusTraversable="false" mnemonicParsing="false" styleClass="icon-button" text="Right">
+                     <graphic>
+                        <JabRefIconView glyph="ACCEPT_RIGHT"/><!--glyph="ACCEPT_RIGHT"-->
+                     </graphic>
+                  </Button>
+               </children></HBox>
+            <Separator maxHeight="-Infinity" minHeight="-Infinity" orientation="VERTICAL" prefHeight="40.0" />
+            <ComboBox fx:id="plainTextOrDiffComboBox" prefHeight="30.0" prefWidth="150.0" promptText="Plain text" />
+            <ComboBox fx:id="diffViewComboBox" disable="true" prefHeight="30.0" prefWidth="150.0" />
+            <Separator maxHeight="-Infinity" minHeight="-Infinity" orientation="VERTICAL" prefHeight="40.0">
+               <opaqueInsets>
+                  <Insets />
+               </opaqueInsets>
+            </Separator>
+            <RadioButton fx:id="highlightWordsRadioButton" disable="true" mnemonicParsing="false" text="%Highlight words">
+               <toggleGroup>
+                  <ToggleGroup fx:id="diffHighlightingMethodToggleGroup" />
+               </toggleGroup>
+            </RadioButton>
+            <RadioButton fx:id="highlightCharactersRadioButtons" disable="true" mnemonicParsing="false" text="%Highlight characters" toggleGroup="$diffHighlightingMethodToggleGroup" />
+         </items>
+      </ToolBar>
+   </children>
+</fx:root>
diff --git a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/toolbar/ThreeWayMergeToolbar.java b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/toolbar/ThreeWayMergeToolbar.java
new file mode 100644
index 00000000000..08189a7647b
--- /dev/null
+++ b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/toolbar/ThreeWayMergeToolbar.java
@@ -0,0 +1,200 @@
+package org.jabref.gui.mergeentries.newmergedialog.toolbar;
+
+import java.util.Arrays;
+
+import javafx.beans.binding.BooleanExpression;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+import javafx.scene.control.ComboBox;
+import javafx.scene.control.RadioButton;
+import javafx.scene.control.ToggleGroup;
+import javafx.scene.layout.AnchorPane;
+import javafx.util.StringConverter;
+
+import org.jabref.gui.mergeentries.newmergedialog.diffhighlighter.DiffHighlighter;
+import org.jabref.logic.l10n.Localization;
+
+import com.airhacks.afterburner.views.ViewLoader;
+import com.tobiasdiez.easybind.EasyBind;
+import com.tobiasdiez.easybind.EasyBinding;
+
+import static org.jabref.gui.mergeentries.newmergedialog.diffhighlighter.DiffHighlighter.DiffMethod;
+
+public class ThreeWayMergeToolbar extends AnchorPane {
+    @FXML
+    private RadioButton highlightCharactersRadioButtons;
+
+    @FXML
+    private RadioButton highlightWordsRadioButton;
+
+    @FXML
+    private ToggleGroup diffHighlightingMethodToggleGroup;
+
+    @FXML
+    private ComboBox<DiffView> diffViewComboBox;
+
+    @FXML
+    private ComboBox<PlainTextOrDiff> plainTextOrDiffComboBox;
+
+    @FXML
+    private Button selectLeftEntryValuesButton;
+
+    @FXML
+    private Button selectRightEntryValuesButton;
+
+    private final ObjectProperty<DiffHighlighter.DiffMethod> diffHighlightingMethod = new SimpleObjectProperty<>();
+    private EasyBinding<Boolean> showDiff;
+
+    public ThreeWayMergeToolbar() {
+        ViewLoader.view(this)
+                .root(this)
+                .load();
+    }
+
+    @FXML
+    public void initialize() {
+        showDiff = EasyBind.map(plainTextOrDiffComboBox.valueProperty(), plainTextOrDiff -> plainTextOrDiff == PlainTextOrDiff.Diff);
+
+        plainTextOrDiffComboBox.getItems().addAll(PlainTextOrDiff.values());
+        plainTextOrDiffComboBox.getSelectionModel().select(PlainTextOrDiff.PLAIN_TEXT);
+        plainTextOrDiffComboBox.setConverter(new StringConverter<>() {
+            @Override
+            public String toString(PlainTextOrDiff plainTextOrDiff) {
+                return plainTextOrDiff.getValue();
+            }
+
+            @Override
+            public PlainTextOrDiff fromString(String string) {
+                return PlainTextOrDiff.fromString(string);
+            }
+        });
+
+        diffViewComboBox.disableProperty().bind(notShowDiffProperty());
+        diffViewComboBox.getItems().addAll(DiffView.values());
+        diffViewComboBox.getSelectionModel().select(DiffView.UNIFIED);
+        diffViewComboBox.setConverter(new StringConverter<>() {
+            @Override
+            public String toString(DiffView diffView) {
+                return diffView.getValue();
+            }
+
+            @Override
+            public DiffView fromString(String string) {
+                return DiffView.fromString(string);
+            }
+        });
+
+        highlightWordsRadioButton.disableProperty().bind(notShowDiffProperty());
+        highlightCharactersRadioButtons.disableProperty().bind(notShowDiffProperty());
+
+        diffHighlightingMethodToggleGroup.selectedToggleProperty().addListener((observable -> {
+            if (diffHighlightingMethodToggleGroup.getSelectedToggle().equals(highlightCharactersRadioButtons)) {
+                diffHighlightingMethod.set(DiffMethod.CHARS);
+            } else {
+                diffHighlightingMethod.set(DiffMethod.WORDS);
+            }
+        }));
+
+        diffHighlightingMethodToggleGroup.selectToggle(highlightWordsRadioButton);
+    }
+
+    public ObjectProperty<DiffView> diffViewProperty() {
+        return diffViewComboBox.valueProperty();
+    }
+
+    public DiffView getDiffView() {
+        return diffViewProperty().get();
+    }
+
+    public void setDiffView(DiffView diffView) {
+        diffViewProperty().set(diffView);
+    }
+
+    public EasyBinding<Boolean> showDiffProperty() {
+        return showDiff;
+    }
+
+    public void setShowDiff(boolean showDiff) {
+        plainTextOrDiffComboBox.valueProperty().set(showDiff ? PlainTextOrDiff.Diff : PlainTextOrDiff.PLAIN_TEXT);
+    }
+
+    /**
+     * Convenience method used to disable diff related views when diff is not selected.
+     *
+     * <p>
+     * This method is required because {@link EasyBinding} class doesn't have a method to invert a boolean property,
+     * like {@link BooleanExpression#not()}
+     * </p>
+     */
+    public EasyBinding<Boolean> notShowDiffProperty() {
+        return showDiffProperty().map(showDiff -> !showDiff);
+    }
+
+    public Boolean isShowDiffEnabled() {
+        return showDiffProperty().get();
+    }
+
+    public ObjectProperty<DiffMethod> diffHighlightingMethodProperty() {
+        return diffHighlightingMethod;
+    }
+
+    public DiffMethod getDiffHighlightingMethod() {
+        return diffHighlightingMethodProperty().get();
+    }
+
+    public void setDiffHighlightingMethod(DiffMethod diffHighlightingMethod) {
+        diffHighlightingMethodProperty().set(diffHighlightingMethod);
+    }
+
+    public void setOnSelectLeftEntryValuesButtonClicked(Runnable onClick) {
+        selectLeftEntryValuesButton.setOnMouseClicked(e -> onClick.run());
+    }
+
+    public void setOnSelectRightEntryValuesButtonClicked(Runnable onClick) {
+        selectRightEntryValuesButton.setOnMouseClicked(e -> onClick.run());
+    }
+
+    public enum PlainTextOrDiff {
+        PLAIN_TEXT(Localization.lang("Plain Text")), Diff(Localization.lang("Show Diff"));
+
+        private final String value;
+
+        PlainTextOrDiff(String value) {
+            this.value = value;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public static PlainTextOrDiff fromString(String str) {
+            return Arrays.stream(values())
+                    .filter(plainTextOrDiff -> plainTextOrDiff.getValue().equals(str))
+                    .findAny()
+                    .orElseThrow(IllegalArgumentException::new);
+        }
+    }
+
+    public enum DiffView {
+        UNIFIED(Localization.lang("Unified View")),
+        SPLIT(Localization.lang("Split View"));
+        private final String value;
+
+        DiffView(String value) {
+            this.value = value;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public static DiffView fromString(String str) {
+            return Arrays.stream(values())
+                    .filter(diffView -> diffView.getValue().equals(str))
+                    .findAny()
+                    .orElseThrow(IllegalArgumentException::new);
+        }
+    }
+}
diff --git a/src/main/java/org/jabref/gui/openoffice/AdvancedCiteDialogView.java b/src/main/java/org/jabref/gui/openoffice/AdvancedCiteDialogView.java
index f11e8ab90ae..18029ee5f40 100644
--- a/src/main/java/org/jabref/gui/openoffice/AdvancedCiteDialogView.java
+++ b/src/main/java/org/jabref/gui/openoffice/AdvancedCiteDialogView.java
@@ -20,10 +20,10 @@ public class AdvancedCiteDialogView extends BaseDialog<AdvancedCiteDialogViewMod
     private AdvancedCiteDialogViewModel viewModel;
 
     public AdvancedCiteDialogView() {
-
         ViewLoader.view(this)
                   .load()
                   .setAsDialogPane(this);
+
         setResultConverter(btn -> {
             if (btn == ButtonType.OK) {
                 return viewModel;
diff --git a/src/main/java/org/jabref/gui/openoffice/BibEntryNotFoundException.java b/src/main/java/org/jabref/gui/openoffice/BibEntryNotFoundException.java
deleted file mode 100644
index b3db5f8f9e7..00000000000
--- a/src/main/java/org/jabref/gui/openoffice/BibEntryNotFoundException.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.jabref.gui.openoffice;
-
-class BibEntryNotFoundException extends Exception {
-
-    private final String citationKey;
-
-    public BibEntryNotFoundException(String citationKey, String message) {
-        super(message);
-
-        this.citationKey = citationKey;
-    }
-
-    public String getCitationKey() {
-        return citationKey;
-    }
-}
diff --git a/src/main/java/org/jabref/gui/openoffice/Bootstrap.java b/src/main/java/org/jabref/gui/openoffice/Bootstrap.java
index 87e242be781..ff5a4e980c8 100644
--- a/src/main/java/org/jabref/gui/openoffice/Bootstrap.java
+++ b/src/main/java/org/jabref/gui/openoffice/Bootstrap.java
@@ -49,24 +49,24 @@
 import com.sun.star.uno.XComponentContext;
 
 /** Bootstrap offers functionality to obtain a context or simply
-    a service manager.
-    The service manager can create a few basic services, whose implementations  are:
-    <ul>
-    <li>com.sun.star.comp.loader.JavaLoader</li>
-    <li>com.sun.star.comp.urlresolver.UrlResolver</li>
-    <li>com.sun.star.comp.bridgefactory.BridgeFactory</li>
-    <li>com.sun.star.comp.connections.Connector</li>
-    <li>com.sun.star.comp.connections.Acceptor</li>
-    <li>com.sun.star.comp.servicemanager.ServiceManager</li>
-    </ul>
-
-    Other services can be inserted into the service manager by
-    using its XSet interface:
-    <pre>
-        XSet xSet = UnoRuntime.queryInterface( XSet.class, aMultiComponentFactory );
-        // insert the service manager
-        xSet.insert( aSingleComponentFactory );
-    </pre>
+  * a service manager.
+  * The service manager can create a few basic services, whose implementations  are:
+  * <ul>
+  * <li>com.sun.star.comp.loader.JavaLoader</li>
+  * <li>com.sun.star.comp.urlresolver.UrlResolver</li>
+  * <li>com.sun.star.comp.bridgefactory.BridgeFactory</li>
+  * <li>com.sun.star.comp.connections.Connector</li>
+  * <li>com.sun.star.comp.connections.Acceptor</li>
+  * <li>com.sun.star.comp.servicemanager.ServiceManager</li>
+  * </ul>
+  *
+  * Other services can be inserted into the service manager by
+  * using its XSet interface:
+  * <pre>
+  *     XSet xSet = UnoRuntime.queryInterface( XSet.class, aMultiComponentFactory );
+  *     // insert the service manager
+  *     xSet.insert( aSingleComponentFactory );
+  * </pre>
 */
 public class Bootstrap {
 
@@ -334,9 +334,7 @@ public static final XComponentContext bootstrap(String[] argArray, Path path) th
     }
 
     private static void pipe(final InputStream in, final PrintStream out, final String prefix) {
-
         new Thread("Pipe: " + prefix) {
-
             @Override
             public void run() {
                 try {
diff --git a/src/main/java/org/jabref/gui/openoffice/ConnectionLostException.java b/src/main/java/org/jabref/gui/openoffice/ConnectionLostException.java
deleted file mode 100644
index df0264be0de..00000000000
--- a/src/main/java/org/jabref/gui/openoffice/ConnectionLostException.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.jabref.gui.openoffice;
-
-/**
- * This exception is used to indicate that connection to OpenOffice has been lost.
- */
-class ConnectionLostException extends RuntimeException {
-
-    public ConnectionLostException(String msg) {
-        super(msg);
-    }
-}
diff --git a/src/main/java/org/jabref/gui/openoffice/DetectOpenOfficeInstallation.java b/src/main/java/org/jabref/gui/openoffice/DetectOpenOfficeInstallation.java
index 8141d5c7141..d3f92e668fa 100644
--- a/src/main/java/org/jabref/gui/openoffice/DetectOpenOfficeInstallation.java
+++ b/src/main/java/org/jabref/gui/openoffice/DetectOpenOfficeInstallation.java
@@ -21,22 +21,21 @@
  */
 public class DetectOpenOfficeInstallation {
 
-    private final OpenOfficePreferences ooPrefs;
+    private final OpenOfficePreferences openOfficePreferences;
     private final DialogService dialogService;
     private final PreferencesService preferencesService;
 
     public DetectOpenOfficeInstallation(PreferencesService preferencesService, DialogService dialogService) {
         this.preferencesService = preferencesService;
         this.dialogService = dialogService;
-        this.ooPrefs = preferencesService.getOpenOfficePreferences();
+        this.openOfficePreferences = preferencesService.getOpenOfficePreferences();
     }
 
     public boolean isExecutablePathDefined() {
-        return checkAutoDetectedPaths(ooPrefs);
+        return checkAutoDetectedPaths(openOfficePreferences);
     }
 
     public Optional<Path> selectInstallationPath() {
-
         final NativeDesktop nativeDesktop = JabRefDesktop.getNativeDesktop();
 
         dialogService.showInformationDialogAndWait(Localization.lang("Could not find OpenOffice/LibreOffice installation"),
@@ -71,8 +70,8 @@ public boolean setOpenOfficePreferences(Path installDir) {
         }
 
         if (execPath.isPresent()) {
-            ooPrefs.setExecutablePath(execPath.get().toString());
-            preferencesService.setOpenOfficePreferences(ooPrefs);
+            openOfficePreferences.setExecutablePath(execPath.get().toString());
+            preferencesService.setOpenOfficePreferences(openOfficePreferences);
             return true;
         }
 
@@ -88,12 +87,11 @@ public Optional<Path> chooseAmongInstallations(List<Path> installDirs) {
             return Optional.of(installDirs.get(0).toAbsolutePath());
         }
 
-        String content = Localization.lang("Found more than one OpenOffice/LibreOffice executable.")
-                + "\n" + Localization.lang("Please choose which one to connect to:");
-
-        Optional<Path> selectedPath = dialogService.showChoiceDialogAndWait(Localization.lang("Choose OpenOffice/LibreOffice executable"),
-                content, Localization.lang("Use selected instance"), installDirs);
-
-        return selectedPath;
+        return dialogService.showChoiceDialogAndWait(
+                Localization.lang("Choose OpenOffice/LibreOffice executable"),
+                Localization.lang("Found more than one OpenOffice/LibreOffice executable.") + "\n"
+                        + Localization.lang("Please choose which one to connect to:"),
+                Localization.lang("Use selected instance"),
+                installDirs);
     }
 }
diff --git a/src/main/java/org/jabref/gui/openoffice/ManageCitationsDialogView.java b/src/main/java/org/jabref/gui/openoffice/ManageCitationsDialogView.java
index a312a4ef375..f0453231015 100644
--- a/src/main/java/org/jabref/gui/openoffice/ManageCitationsDialogView.java
+++ b/src/main/java/org/jabref/gui/openoffice/ManageCitationsDialogView.java
@@ -19,9 +19,6 @@
 import org.jabref.model.strings.StringUtil;
 
 import com.airhacks.afterburner.views.ViewLoader;
-import com.sun.star.beans.UnknownPropertyException;
-import com.sun.star.container.NoSuchElementException;
-import com.sun.star.lang.WrappedTargetException;
 
 public class ManageCitationsDialogView extends BaseDialog<Void> {
 
@@ -56,8 +53,7 @@ public ManageCitationsDialogView(OOBibBase ooBase) {
     }
 
     @FXML
-    private void initialize() throws NoSuchElementException, WrappedTargetException, UnknownPropertyException {
-
+    private void initialize() {
         viewModel = new ManageCitationsDialogViewModel(ooBase, dialogService);
 
         citation.setCellValueFactory(cellData -> cellData.getValue().citationProperty());
@@ -70,14 +66,12 @@ private void initialize() throws NoSuchElementException, WrappedTargetException,
 
         citationsTableView.itemsProperty().bindBidirectional(viewModel.citationsProperty());
 
-        extraInfo.setOnEditCommit((CellEditEvent<CitationEntryViewModel, String> cell) -> {
-            cell.getRowValue().setExtraInfo(cell.getNewValue());
-        });
+        extraInfo.setOnEditCommit((CellEditEvent<CitationEntryViewModel, String> cell) ->
+                cell.getRowValue().setExtraInfo(cell.getNewValue()));
         extraInfo.setCellFactory(TextFieldTableCell.forTableColumn());
     }
 
     private Node getText(String citationContext) {
-
         String inBetween = StringUtil.substringBetween(citationContext, HTML_BOLD_START_TAG, HTML_BOLD_END_TAG);
         String start = citationContext.substring(0, citationContext.indexOf(HTML_BOLD_START_TAG));
         String end = citationContext.substring(citationContext.lastIndexOf(HTML_BOLD_END_TAG) + HTML_BOLD_END_TAG.length());
@@ -87,7 +81,13 @@ private Node getText(String citationContext) {
         inBetweenText.setStyle("-fx-font-weight: bold");
         Text endText = new Text(end);
 
-        FlowPane flow = new FlowPane(startText, inBetweenText, endText);
-        return flow;
+        return new FlowPane(startText, inBetweenText, endText);
+    }
+
+    public boolean isOkToShowThisDialog() {
+        if (viewModel == null || viewModel.failedToGetCitationEntries) {
+            return false;
+        }
+        return true;
     }
 }
diff --git a/src/main/java/org/jabref/gui/openoffice/ManageCitationsDialogViewModel.java b/src/main/java/org/jabref/gui/openoffice/ManageCitationsDialogViewModel.java
index 40cee65036f..697212fde54 100644
--- a/src/main/java/org/jabref/gui/openoffice/ManageCitationsDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/openoffice/ManageCitationsDialogViewModel.java
@@ -9,59 +9,34 @@
 import javafx.collections.FXCollections;
 
 import org.jabref.gui.DialogService;
-import org.jabref.logic.l10n.Localization;
 import org.jabref.model.openoffice.CitationEntry;
 
-import com.sun.star.beans.IllegalTypeException;
-import com.sun.star.beans.NotRemoveableException;
-import com.sun.star.beans.PropertyExistException;
-import com.sun.star.beans.UnknownPropertyException;
-import com.sun.star.container.NoSuchElementException;
-import com.sun.star.container.XNameAccess;
-import com.sun.star.lang.IllegalArgumentException;
-import com.sun.star.lang.WrappedTargetException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 public class ManageCitationsDialogViewModel {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(ManageCitationsDialogViewModel.class);
-
+    public final boolean failedToGetCitationEntries;
     private final ListProperty<CitationEntryViewModel> citations = new SimpleListProperty<>(FXCollections.observableArrayList());
     private final OOBibBase ooBase;
     private final DialogService dialogService;
 
-    public ManageCitationsDialogViewModel(OOBibBase ooBase, DialogService dialogService) throws NoSuchElementException, WrappedTargetException, UnknownPropertyException {
+    public ManageCitationsDialogViewModel(OOBibBase ooBase, DialogService dialogService) {
         this.ooBase = ooBase;
         this.dialogService = dialogService;
 
-        XNameAccess nameAccess = ooBase.getReferenceMarks();
-        List<String> names = ooBase.getJabRefReferenceMarks(nameAccess);
-        for (String name : names) {
-
-            CitationEntry entry = new CitationEntry(name,
-                    ooBase.getCitationContext(nameAccess, name, 30, 30, true),
-                    ooBase.getCustomProperty(name));
+        Optional<List<CitationEntry>> citationEntries = ooBase.guiActionGetCitationEntries();
+        this.failedToGetCitationEntries = citationEntries.isEmpty();
+        if (citationEntries.isEmpty()) {
+            return;
+        }
 
+        for (CitationEntry entry : citationEntries.get()) {
             CitationEntryViewModel itemViewModelEntry = new CitationEntryViewModel(entry);
             citations.add(itemViewModelEntry);
         }
     }
 
     public void storeSettings() {
-        List<CitationEntry> ciationEntries = citations.stream().map(CitationEntryViewModel::toCitationEntry).collect(Collectors.toList());
-        try {
-            for (CitationEntry entry : ciationEntries) {
-                Optional<String> pageInfo = entry.getPageInfo();
-                if (pageInfo.isPresent()) {
-                    ooBase.setCustomProperty(entry.getRefMarkName(), pageInfo.get());
-                }
-            }
-        } catch (UnknownPropertyException | NotRemoveableException | PropertyExistException | IllegalTypeException |
-                IllegalArgumentException ex) {
-            LOGGER.warn("Problem modifying citation", ex);
-            dialogService.showErrorDialogAndWait(Localization.lang("Problem modifying citation"), ex);
-        }
+        List<CitationEntry> citationEntries = citations.stream().map(CitationEntryViewModel::toCitationEntry).collect(Collectors.toList());
+        ooBase.guiActionApplyCitationEntries(citationEntries);
     }
 
     public ListProperty<CitationEntryViewModel> citationsProperty() {
diff --git a/src/main/java/org/jabref/gui/openoffice/OOBibBase.java b/src/main/java/org/jabref/gui/openoffice/OOBibBase.java
index 540c5f9216b..20254bc0bd8 100644
--- a/src/main/java/org/jabref/gui/openoffice/OOBibBase.java
+++ b/src/main/java/org/jabref/gui/openoffice/OOBibBase.java
@@ -1,1424 +1,853 @@
 package org.jabref.gui.openoffice;
 
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
-import java.util.Set;
-import java.util.SortedMap;
-import java.util.TreeMap;
-import java.util.TreeSet;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
+import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
-import org.jabref.architecture.AllowedToUseAwt;
 import org.jabref.gui.DialogService;
-import org.jabref.logic.bibtex.comparator.FieldComparator;
-import org.jabref.logic.bibtex.comparator.FieldComparatorStack;
+import org.jabref.logic.JabRefException;
 import org.jabref.logic.l10n.Localization;
-import org.jabref.logic.layout.Layout;
-import org.jabref.logic.openoffice.OOUtil;
-import org.jabref.logic.openoffice.UndefinedBibtexEntry;
-import org.jabref.logic.openoffice.UndefinedParagraphFormatException;
+import org.jabref.logic.openoffice.NoDocumentFoundException;
+import org.jabref.logic.openoffice.action.EditInsert;
+import org.jabref.logic.openoffice.action.EditMerge;
+import org.jabref.logic.openoffice.action.EditSeparate;
+import org.jabref.logic.openoffice.action.ExportCited;
+import org.jabref.logic.openoffice.action.ManageCitations;
+import org.jabref.logic.openoffice.action.Update;
+import org.jabref.logic.openoffice.frontend.OOFrontend;
+import org.jabref.logic.openoffice.frontend.RangeForOverlapCheck;
 import org.jabref.logic.openoffice.style.OOBibStyle;
-import org.jabref.logic.openoffice.style.OOPreFormatter;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibEntry;
-import org.jabref.model.entry.field.StandardField;
+import org.jabref.model.openoffice.CitationEntry;
+import org.jabref.model.openoffice.rangesort.FunctionalTextViewCursor;
+import org.jabref.model.openoffice.style.CitationGroupId;
+import org.jabref.model.openoffice.style.CitationType;
 import org.jabref.model.openoffice.uno.CreationException;
 import org.jabref.model.openoffice.uno.NoDocumentException;
+import org.jabref.model.openoffice.uno.UnoCrossRef;
+import org.jabref.model.openoffice.uno.UnoCursor;
+import org.jabref.model.openoffice.uno.UnoRedlines;
+import org.jabref.model.openoffice.uno.UnoStyle;
+import org.jabref.model.openoffice.uno.UnoUndo;
+import org.jabref.model.openoffice.util.OOResult;
+import org.jabref.model.openoffice.util.OOVoidResult;
 
-import com.sun.star.awt.Point;
 import com.sun.star.beans.IllegalTypeException;
 import com.sun.star.beans.NotRemoveableException;
-import com.sun.star.beans.PropertyExistException;
 import com.sun.star.beans.PropertyVetoException;
-import com.sun.star.beans.UnknownPropertyException;
-import com.sun.star.beans.XPropertyContainer;
-import com.sun.star.beans.XPropertySet;
 import com.sun.star.comp.helper.BootstrapException;
 import com.sun.star.container.NoSuchElementException;
-import com.sun.star.container.XEnumeration;
-import com.sun.star.container.XEnumerationAccess;
-import com.sun.star.container.XNameAccess;
-import com.sun.star.container.XNamed;
-import com.sun.star.document.XDocumentPropertiesSupplier;
-import com.sun.star.frame.XComponentLoader;
-import com.sun.star.frame.XController;
-import com.sun.star.frame.XDesktop;
-import com.sun.star.frame.XModel;
 import com.sun.star.lang.DisposedException;
-import com.sun.star.lang.IllegalArgumentException;
-import com.sun.star.lang.Locale;
 import com.sun.star.lang.WrappedTargetException;
-import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiComponentFactory;
-import com.sun.star.lang.XMultiServiceFactory;
-import com.sun.star.text.XBookmarksSupplier;
-import com.sun.star.text.XDocumentIndexesSupplier;
-import com.sun.star.text.XFootnote;
-import com.sun.star.text.XReferenceMarksSupplier;
-import com.sun.star.text.XText;
-import com.sun.star.text.XTextContent;
 import com.sun.star.text.XTextCursor;
 import com.sun.star.text.XTextDocument;
-import com.sun.star.text.XTextRange;
-import com.sun.star.text.XTextRangeCompare;
-import com.sun.star.text.XTextSection;
-import com.sun.star.text.XTextSectionsSupplier;
-import com.sun.star.text.XTextViewCursor;
-import com.sun.star.text.XTextViewCursorSupplier;
-import com.sun.star.uno.Any;
-import com.sun.star.uno.Type;
-import com.sun.star.uno.UnoRuntime;
-import com.sun.star.uno.XComponentContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * Class for manipulating the Bibliography of the currently start document in OpenOffice.
+ * Class for manipulating the Bibliography of the currently started document in OpenOffice.
  */
-@AllowedToUseAwt("Requires AWT for italics and bold")
 class OOBibBase {
 
-    private static final OOPreFormatter POSTFORMATTER = new OOPreFormatter();
+    private static final Logger LOGGER = LoggerFactory.getLogger(OOBibBase.class);
 
-    private static final String BIB_SECTION_NAME = "JR_bib";
-    private static final String BIB_SECTION_END_NAME = "JR_bib_end";
-    private static final String BIB_CITATION = "JR_cite";
-    private static final Pattern CITE_PATTERN = Pattern.compile(OOBibBase.BIB_CITATION + "\\d*_(\\d*)_(.*)");
+    private final DialogService dialogService;
 
-    private static final String CHAR_STYLE_NAME = "CharStyleName";
+    // After inserting a citation, if ooPrefs.getSyncWhenCiting() returns true, shall we also update the bibliography?
+    private final boolean refreshBibliographyDuringSyncWhenCiting;
 
-    private static final int AUTHORYEAR_PAR = 1;
-    private static final int AUTHORYEAR_INTEXT = 2;
-    private static final int INVISIBLE_CIT = 3;
+    // Shall we add "Cited on pages: ..." to resolved bibliography entries?
+    private final boolean alwaysAddCitedOnPages;
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(OOBibBase.class);
-    private XMultiServiceFactory mxDocFactory;
-    private XTextDocument mxDoc;
-    private XText text;
-    private final XDesktop xDesktop;
-    private XTextViewCursorSupplier xViewCursorSupplier;
-    private XComponent xCurrentComponent;
-    private XPropertySet propertySet;
-
-    private XPropertyContainer userProperties;
-    private final boolean atEnd;
-    private final Comparator<BibEntry> entryComparator;
-    private final Comparator<BibEntry> yearAuthorTitleComparator;
-    private final FieldComparator authComp = new FieldComparator(StandardField.AUTHOR);
-    private final FieldComparator yearComp = new FieldComparator(StandardField.YEAR);
-
-    private final FieldComparator titleComp = new FieldComparator(StandardField.TITLE);
-    private final List<Comparator<BibEntry>> authorYearTitleList = new ArrayList<>(3);
-
-    private final List<Comparator<BibEntry>> yearAuthorTitleList = new ArrayList<>(3);
-    private final Map<String, String> uniquefiers = new HashMap<>();
-    private List<String> sortedReferenceMarks;
-
-    private final DialogService dialogService;
+    private final OOBibBaseConnect connection;
 
-    public OOBibBase(Path loPath, boolean atEnd, DialogService dialogService) throws IllegalAccessException, InvocationTargetException, BootstrapException, CreationException, IOException, ClassNotFoundException {
+    public OOBibBase(Path loPath, DialogService dialogService)
+            throws
+            BootstrapException,
+            CreationException {
 
         this.dialogService = dialogService;
+        this.connection = new OOBibBaseConnect(loPath, dialogService);
 
-        authorYearTitleList.add(authComp);
-        authorYearTitleList.add(yearComp);
-        authorYearTitleList.add(titleComp);
+        this.refreshBibliographyDuringSyncWhenCiting = false;
+        this.alwaysAddCitedOnPages = false;
+    }
 
-        yearAuthorTitleList.add(yearComp);
-        yearAuthorTitleList.add(authComp);
-        yearAuthorTitleList.add(titleComp);
+    public void guiActionSelectDocument(boolean autoSelectForSingle) {
+        final String errorTitle = Localization.lang("Problem connecting");
 
-        entryComparator = new FieldComparatorStack<>(authorYearTitleList);
-        yearAuthorTitleComparator = new FieldComparatorStack<>(yearAuthorTitleList);
+        try {
 
-        this.atEnd = atEnd;
+            this.connection.selectDocument(autoSelectForSingle);
+        } catch (NoDocumentFoundException ex) {
+            OOError.from(ex).showErrorDialog(dialogService);
+        } catch (DisposedException ex) {
+            OOError.from(ex).setTitle(errorTitle).showErrorDialog(dialogService);
+        } catch (WrappedTargetException
+                | IndexOutOfBoundsException
+                | NoSuchElementException ex) {
+            LOGGER.warn("Problem connecting", ex);
+            OOError.fromMisc(ex).setTitle(errorTitle).showErrorDialog(dialogService);
+        }
 
-        xDesktop = simpleBootstrap(loPath);
+        if (this.isConnectedToDocument()) {
+            dialogService.notify(Localization.lang("Connected to document") + ": "
+                    + this.getCurrentDocumentTitle().orElse(""));
+        }
     }
 
+    /**
+     * A simple test for document availability.
+     * <p>
+     * See also `isDocumentConnectionMissing` for a test actually attempting to use the connection.
+     */
     public boolean isConnectedToDocument() {
-        return xCurrentComponent != null;
+        return this.connection.isConnectedToDocument();
     }
 
-    public XTextDocument selectComponent(List<XTextDocument> list) {
-        List<DocumentTitleViewModel> viewModel = list.stream().map(DocumentTitleViewModel::new).collect(Collectors.toList());
-        // this whole method is part of a background task when auto-detecting instances, so we need to show dialog in FX thread
-        Optional<DocumentTitleViewModel> selectedDocument = dialogService.showChoiceDialogAndWait(Localization.lang("Select document"), Localization.lang("Found documents:"), Localization.lang("Use selected document"), viewModel);
-        return selectedDocument.map(DocumentTitleViewModel::getXtextDocument).orElse(null);
+    /**
+     * @return true if we are connected to a document
+     */
+    public boolean isDocumentConnectionMissing() {
+        return this.connection.isDocumentConnectionMissing();
     }
 
-    public Optional<String> getCurrentDocumentTitle() {
-        return getDocumentTitle(mxDoc);
+    /**
+     * Either return an XTextDocument or return JabRefException.
+     */
+    public OOResult<XTextDocument, OOError> getXTextDocument() {
+        return this.connection.getXTextDocument();
     }
 
-    private Optional<String> getDocumentTitle(XTextDocument doc) {
-        if (doc == null) {
-            return Optional.empty();
-        } else {
-            try {
-                return Optional.of(String.valueOf(OOUtil.getProperty(doc.getCurrentController().getFrame(), "Title")));
-            } catch (UnknownPropertyException | WrappedTargetException e) {
-                LOGGER.warn("Could not get document title", e);
-                return Optional.empty();
-            }
-        }
+    /**
+     * The title of the current document, or Optional.empty()
+     */
+    public Optional<String> getCurrentDocumentTitle() {
+        return this.connection.getCurrentDocumentTitle();
     }
 
-    public void selectDocument() throws NoDocumentException, NoSuchElementException, WrappedTargetException {
-        List<XTextDocument> textDocumentList = getTextDocuments();
-        XTextDocument selected;
-        if (textDocumentList.isEmpty()) {
-            // No text documents found.
-            throw new NoDocumentException("No Writer documents found");
-        } else if (textDocumentList.size() == 1) {
-            // Get the only one
-            selected = textDocumentList.get(0);
-        } else {
-            // Bring up a dialog
-            selected = selectComponent(textDocumentList);
-        }
-
-        if (selected == null) {
-            return;
-        }
-        xCurrentComponent = UnoRuntime.queryInterface(XComponent.class, selected);
-        mxDoc = selected;
-
-        UnoRuntime.queryInterface(XDocumentIndexesSupplier.class, xCurrentComponent);
+    /* ******************************************************
+     *
+     *  Tools to collect and show precondition test results
+     *
+     * ******************************************************/
 
-        XModel xModel = UnoRuntime.queryInterface(XModel.class, xCurrentComponent);
-        XController xController = xModel.getCurrentController();
-        xViewCursorSupplier = UnoRuntime.queryInterface(XTextViewCursorSupplier.class, xController);
+    void showDialog(OOError err) {
+        err.showErrorDialog(dialogService);
+    }
 
-        // get a reference to the body text of the document
-        text = mxDoc.getText();
+    void showDialog(String errorTitle, OOError err) {
+        err.setTitle(errorTitle).showErrorDialog(dialogService);
+    }
 
-        // Access the text document's multi service factory:
-        mxDocFactory = UnoRuntime.queryInterface(XMultiServiceFactory.class, mxDoc);
+    OOVoidResult<OOError> collectResults(String errorTitle, List<OOVoidResult<OOError>> results) {
+        String msg = (results.stream()
+                             .filter(OOVoidResult::isError)
+                             .map(e -> e.getError().getLocalizedMessage())
+                             .collect(Collectors.joining("\n\n")));
+        if (msg.isEmpty()) {
+            return OOVoidResult.ok();
+        } else {
+            return OOVoidResult.error(new OOError(errorTitle, msg));
+        }
+    }
 
-        XDocumentPropertiesSupplier supp = UnoRuntime.queryInterface(XDocumentPropertiesSupplier.class, mxDoc);
-        userProperties = supp.getDocumentProperties().getUserDefinedProperties();
-        propertySet = UnoRuntime.queryInterface(XPropertySet.class, userProperties);
+    boolean testDialog(OOVoidResult<OOError> res) {
+        return res.ifError(ex -> ex.showErrorDialog(dialogService)).isError();
     }
 
-    private List<XTextDocument> getTextDocuments() throws NoSuchElementException, WrappedTargetException {
-        List<XTextDocument> result = new ArrayList<>();
-        XEnumerationAccess enumAccess = xDesktop.getComponents();
-        XEnumeration componentEnumeration = enumAccess.createEnumeration();
+    boolean testDialog(String errorTitle, OOVoidResult<OOError> res) {
+        return res.ifError(e -> showDialog(e.setTitle(errorTitle))).isError();
+    }
 
-        // TODO: http://api.openoffice.org/docs/DevelopersGuide/OfficeDev/OfficeDev.xhtml#1_1_3_2_1_2_Frame_Hierarchies
+    boolean testDialog(String errorTitle, List<OOVoidResult<OOError>> results) {
+        return testDialog(errorTitle, collectResults(errorTitle, results));
+    }
 
-        while (componentEnumeration.hasMoreElements()) {
-            Object nextElement = componentEnumeration.nextElement();
-            XComponent component = UnoRuntime.queryInterface(XComponent.class, nextElement);
-            XTextDocument document = UnoRuntime.queryInterface(XTextDocument.class, component);
-            if (document != null) {
-                result.add(document);
-            }
-        }
-        return result;
+    @SafeVarargs
+    final boolean testDialog(String errorTitle, OOVoidResult<OOError>... results) {
+        List<OOVoidResult<OOError>> resultList = Arrays.asList(results);
+        return testDialog(collectResults(errorTitle, resultList));
     }
 
-    private XDesktop simpleBootstrap(Path loPath)
-            throws CreationException, BootstrapException {
+    /**
+     * Get the cursor positioned by the user for inserting text.
+     */
+    OOResult<XTextCursor, OOError> getUserCursorForTextInsertion(XTextDocument doc, String errorTitle) {
+        // Get the cursor positioned by the user.
+        XTextCursor cursor = UnoCursor.getViewCursor(doc).orElse(null);
 
-        // Get the office component context:
-        XComponentContext xContext = org.jabref.gui.openoffice.Bootstrap.bootstrap(loPath);
-        // Get the office service manager:
-        XMultiComponentFactory xServiceManager = xContext.getServiceManager();
-        // Create the desktop, which is the root frame of the
-        // hierarchy of frames that contain viewable components:
-        Object desktop;
+        // Check for crippled XTextViewCursor
+        Objects.requireNonNull(cursor);
         try {
-            desktop = xServiceManager.createInstanceWithContext("com.sun.star.frame.Desktop", xContext);
-        } catch (Exception e) {
-            throw new CreationException(e.getMessage());
+            cursor.getStart();
+        } catch (com.sun.star.uno.RuntimeException ex) {
+            String msg =
+                    Localization.lang("Please move the cursor"
+                            + " to the location for the new citation.") + "\n"
+                            + Localization.lang("I cannot insert to the cursors current location.");
+            return OOResult.error(new OOError(errorTitle, msg, ex));
         }
-        XDesktop resultDesktop = UnoRuntime.queryInterface(XDesktop.class, desktop);
-
-        UnoRuntime.queryInterface(XComponentLoader.class, desktop);
-
-        return resultDesktop;
+        return OOResult.ok(cursor);
     }
 
-    public Optional<String> getCustomProperty(String property) throws UnknownPropertyException, WrappedTargetException {
-        if (propertySet.getPropertySetInfo().hasPropertyByName(property)) {
-            return Optional.ofNullable(propertySet.getPropertyValue(property).toString());
+    /**
+     * This may move the view cursor.
+     */
+    OOResult<FunctionalTextViewCursor, OOError> getFunctionalTextViewCursor(XTextDocument doc, String errorTitle) {
+        String messageOnFailureToObtain =
+                Localization.lang("Please move the cursor into the document text.")
+                        + "\n"
+                        + Localization.lang("To get the visual positions of your citations"
+                        + " I need to move the cursor around,"
+                        + " but could not get it.");
+        OOResult<FunctionalTextViewCursor, String> result = FunctionalTextViewCursor.get(doc);
+        if (result.isError()) {
+            LOGGER.warn(result.getError());
+        }
+        return result.mapError(detail -> new OOError(errorTitle, messageOnFailureToObtain));
+    }
+
+    private static OOVoidResult<OOError> checkRangeOverlaps(XTextDocument doc, OOFrontend frontend) {
+        final String errorTitle = "Overlapping ranges";
+        boolean requireSeparation = false;
+        int maxReportedOverlaps = 10;
+        try {
+            return (frontend.checkRangeOverlaps(doc,
+                                    new ArrayList<>(),
+                                    requireSeparation,
+                                    maxReportedOverlaps)
+                            .mapError(OOError::from));
+        } catch (NoDocumentException ex) {
+            return OOVoidResult.error(OOError.from(ex).setTitle(errorTitle));
+        } catch (WrappedTargetException ex) {
+            return OOVoidResult.error(OOError.fromMisc(ex).setTitle(errorTitle));
         }
-        return Optional.empty();
     }
 
-    public void updateSortedReferenceMarks() throws WrappedTargetException, NoSuchElementException {
-        sortedReferenceMarks = getSortedReferenceMarks(getReferenceMarks());
-    }
+    private static OOVoidResult<OOError> checkRangeOverlapsWithCursor(XTextDocument doc, OOFrontend frontend) {
+        final String errorTitle = "Ranges overlapping with cursor";
 
-    public void setCustomProperty(String property, String value) throws UnknownPropertyException,
-            NotRemoveableException, PropertyExistException, IllegalTypeException, IllegalArgumentException {
-        if (propertySet.getPropertySetInfo().hasPropertyByName(property)) {
-            userProperties.removeProperty(property);
+        List<RangeForOverlapCheck<CitationGroupId>> userRanges;
+        userRanges = frontend.viewCursorRanges(doc);
+
+        boolean requireSeparation = false;
+        OOVoidResult<JabRefException> res;
+        try {
+            res = frontend.checkRangeOverlapsWithCursor(doc,
+                    userRanges,
+                    requireSeparation);
+        } catch (NoDocumentException ex) {
+            return OOVoidResult.error(OOError.from(ex).setTitle(errorTitle));
+        } catch (WrappedTargetException ex) {
+            return OOVoidResult.error(OOError.fromMisc(ex).setTitle(errorTitle));
         }
-        if (value != null) {
-            userProperties.addProperty(property, com.sun.star.beans.PropertyAttribute.REMOVEABLE,
-                    new Any(Type.STRING, value));
+
+        if (res.isError()) {
+            final String xtitle = Localization.lang("The cursor is in a protected area.");
+            return OOVoidResult.error(
+                    new OOError(xtitle, xtitle + "\n" + res.getError().getLocalizedMessage() + "\n"));
         }
+        return res.mapError(OOError::from);
     }
 
-    /**
-     * This method inserts a cite marker in the text for the given BibEntry, and may refresh the bibliography.
+    /* ******************************************************
      *
-     * @param entries       The entries to cite.
-     * @param database      The database the entry belongs to.
-     * @param style         The bibliography style we are using.
-     * @param inParenthesis Indicates whether it is an in-text citation or a citation in parenthesis. This is not relevant if numbered citations are used.
-     * @param withText      Indicates whether this should be a normal citation (true) or an empty (invisible) citation (false).
-     * @param sync          Indicates whether the reference list should be refreshed.
-     * @throws IllegalTypeException
-     * @throws PropertyExistException
-     * @throws NotRemoveableException
-     * @throws UnknownPropertyException
-     * @throws UndefinedCharacterFormatException
-     * @throws NoSuchElementException
-     * @throws WrappedTargetException
-     * @throws IOException
-     * @throws PropertyVetoException
-     * @throws CreationException
-     * @throws BibEntryNotFoundException
-     * @throws UndefinedParagraphFormatException
-     */
-    public void insertEntry(List<BibEntry> entries, BibDatabase database,
-                            List<BibDatabase> allBases, OOBibStyle style,
-                            boolean inParenthesis, boolean withText, String pageInfo, boolean sync)
-            throws IllegalArgumentException,
-            UnknownPropertyException, NotRemoveableException, PropertyExistException, IllegalTypeException,
-            UndefinedCharacterFormatException, WrappedTargetException, NoSuchElementException, PropertyVetoException,
-            IOException, CreationException, BibEntryNotFoundException, UndefinedParagraphFormatException {
+     * Tests for preconditions.
+     *
+     * ******************************************************/
 
+    private static OOVoidResult<OOError> checkIfOpenOfficeIsRecordingChanges(XTextDocument doc) {
+        String errorTitle = Localization.lang("Recording and/or Recorded changes");
         try {
-
-            XTextViewCursor xViewCursor = xViewCursorSupplier.getViewCursor();
-
-            if (entries.size() > 1) {
-                if (style.getBooleanCitProperty(OOBibStyle.MULTI_CITE_CHRONOLOGICAL)) {
-                    entries.sort(yearAuthorTitleComparator);
-                } else {
-                    entries.sort(entryComparator);
+            boolean recordingChanges = UnoRedlines.getRecordChanges(doc);
+            int nRedlines = UnoRedlines.countRedlines(doc);
+            if (recordingChanges || (nRedlines > 0)) {
+                String msg = "";
+                if (recordingChanges) {
+                    msg += Localization.lang("Cannot work with"
+                            + " [Edit]/[Track Changes]/[Record] turned on.");
                 }
-            }
-
-            String keyString = String.join(",",
-                    entries.stream().map(entry -> entry.getCitationKey().orElse("")).collect(Collectors.toList()));
-            // Insert bookmark:
-            String bName = getUniqueReferenceMarkName(keyString,
-                    withText ? inParenthesis ? OOBibBase.AUTHORYEAR_PAR : OOBibBase.AUTHORYEAR_INTEXT : OOBibBase.INVISIBLE_CIT);
-
-            // If we should store metadata for page info, do that now:
-            if (pageInfo != null) {
-                LOGGER.info("Storing page info: " + pageInfo);
-                setCustomProperty(bName, pageInfo);
-            }
-
-            xViewCursor.getText().insertString(xViewCursor, " ", false);
-            if (style.isFormatCitations()) {
-                XPropertySet xCursorProps = UnoRuntime.queryInterface(XPropertySet.class, xViewCursor);
-                String charStyle = style.getCitationCharacterFormat();
-                try {
-                    xCursorProps.setPropertyValue(CHAR_STYLE_NAME, charStyle);
-                } catch (UnknownPropertyException | PropertyVetoException | IllegalArgumentException |
-                        WrappedTargetException ex) {
-                    // Setting the character format failed, so we throw an exception that
-                    // will result in an error message for the user. Before that,
-                    // delete the space we inserted:
-                    xViewCursor.goLeft((short) 1, true);
-                    xViewCursor.setString("");
-                    throw new UndefinedCharacterFormatException(charStyle);
+                if (nRedlines > 0) {
+                    if (recordingChanges) {
+                        msg += "\n";
+                    }
+                    msg += Localization.lang("Changes by JabRef"
+                            + " could result in unexpected interactions with"
+                            + " recorded changes.");
+                    msg += "\n";
+                    msg += Localization.lang("Use [Edit]/[Track Changes]/[Manage] to resolve them first.");
                 }
+                return OOVoidResult.error(new OOError(errorTitle, msg));
             }
-            xViewCursor.goLeft((short) 1, false);
-            Map<BibEntry, BibDatabase> databaseMap = new HashMap<>();
-            for (BibEntry entry : entries) {
-                databaseMap.put(entry, database);
-            }
-            String citeText = style.isNumberEntries() ? "-" : style.getCitationMarker(entries, databaseMap,
-                    inParenthesis, null, null);
-            insertReferenceMark(bName, citeText, xViewCursor, withText, style);
-
-            xViewCursor.collapseToEnd();
-            xViewCursor.goRight((short) 1, false);
-
-            XTextRange position = xViewCursor.getEnd();
-
-            if (sync) {
-                // To account for numbering and for uniqiefiers, we must refresh the cite markers:
-                updateSortedReferenceMarks();
-                refreshCiteMarkers(allBases, style);
-
-                // Insert it at the current position:
-                rebuildBibTextSection(allBases, style);
-            }
-
-            // Go back to the relevant position:
-            xViewCursor.gotoRange(position, false);
-        } catch (DisposedException ex) {
-            // We need to catch this one here because the OpenOfficePanel class is
-            // loaded before connection, and therefore cannot directly reference
-            // or catch a DisposedException (which is in a OO JAR file).
-            throw new ConnectionLostException(ex.getMessage());
+        } catch (WrappedTargetException ex) {
+            String msg = Localization.lang("Error while checking if Writer"
+                    + " is recording changes or has recorded changes.");
+            return OOVoidResult.error(new OOError(errorTitle, msg, ex));
         }
+        return OOVoidResult.ok();
     }
 
-    public List<String> getJabRefReferenceMarks(XNameAccess nameAccess) {
-        String[] names = nameAccess.getElementNames();
-        // Remove all reference marks that don't look like JabRef citations:
-        List<String> result = new ArrayList<>();
-        if (names != null) {
-            for (String name : names) {
-                if (CITE_PATTERN.matcher(name).find()) {
-                    result.add(name);
-                }
-            }
+    OOVoidResult<OOError> styleIsRequired(OOBibStyle style) {
+        if (style == null) {
+            return OOVoidResult.error(OOError.noValidStyleSelected());
+        } else {
+            return OOVoidResult.ok();
         }
-        return result;
     }
 
-    /**
-     * Refresh all cite markers in the document.
-     *
-     * @param databases The databases to get entries from.
-     * @param style     The bibliography style to use.
-     * @return A list of those referenced citation keys that could not be resolved.
-     * @throws UndefinedCharacterFormatException
-     * @throws NoSuchElementException
-     * @throws IllegalArgumentException
-     * @throws WrappedTargetException
-     * @throws BibEntryNotFoundException
-     * @throws CreationException
-     * @throws IOException
-     * @throws PropertyVetoException
-     * @throws UnknownPropertyException
-     */
-    public List<String> refreshCiteMarkers(List<BibDatabase> databases, OOBibStyle style)
-            throws WrappedTargetException, IllegalArgumentException, NoSuchElementException,
-            UndefinedCharacterFormatException, UnknownPropertyException, PropertyVetoException, IOException,
-            CreationException, BibEntryNotFoundException {
+    OOResult<OOFrontend, OOError> getFrontend(XTextDocument doc) {
+        final String errorTitle = "Unable to get frontend";
         try {
-            return refreshCiteMarkersInternal(databases, style);
-        } catch (DisposedException ex) {
-            // We need to catch this one here because the OpenOfficePanel class is
-            // loaded before connection, and therefore cannot directly reference
-            // or catch a DisposedException (which is in a OO JAR file).
-            throw new ConnectionLostException(ex.getMessage());
+            return OOResult.ok(new OOFrontend(doc));
+        } catch (NoDocumentException ex) {
+            return OOResult.error(OOError.from(ex).setTitle(errorTitle));
+        } catch (WrappedTargetException
+                | RuntimeException ex) {
+            return OOResult.error(OOError.fromMisc(ex).setTitle(errorTitle));
         }
     }
 
-    private List<String> refreshCiteMarkersInternal(List<BibDatabase> databases, OOBibStyle style)
-            throws WrappedTargetException, IllegalArgumentException, NoSuchElementException,
-            UndefinedCharacterFormatException, UnknownPropertyException, PropertyVetoException,
-            CreationException, BibEntryNotFoundException {
-
-        List<String> cited = findCitedKeys();
-        Map<String, BibDatabase> linkSourceBase = new HashMap<>();
-        Map<BibEntry, BibDatabase> entries = findCitedEntries(databases, cited, linkSourceBase);
-
-        XNameAccess xReferenceMarks = getReferenceMarks();
-
-        List<String> names;
-        if (style.isSortByPosition()) {
-            // We need to sort the reference marks according to their order of appearance:
-            names = sortedReferenceMarks;
-        } else if (style.isNumberEntries()) {
-            // We need to sort the reference marks according to the sorting of the bibliographic
-            // entries:
-            SortedMap<BibEntry, BibDatabase> newMap = new TreeMap<>(entryComparator);
-            for (Map.Entry<BibEntry, BibDatabase> bibtexEntryBibtexDatabaseEntry : entries.entrySet()) {
-                newMap.put(bibtexEntryBibtexDatabaseEntry.getKey(), bibtexEntryBibtexDatabaseEntry.getValue());
-            }
-            entries = newMap;
-            // Rebuild the list of cited keys according to the sort order:
-            cited.clear();
-            for (BibEntry entry : entries.keySet()) {
-                cited.add(entry.getCitationKey().orElse(null));
-            }
-            names = Arrays.asList(xReferenceMarks.getElementNames());
+    OOVoidResult<OOError> databaseIsRequired(List<BibDatabase> databases,
+                                             Supplier<OOError> fun) {
+        if (databases == null || databases.isEmpty()) {
+            return OOVoidResult.error(fun.get());
         } else {
-            names = sortedReferenceMarks;
+            return OOVoidResult.ok();
         }
+    }
 
-        // Remove all reference marks that don't look like JabRef citations:
-        List<String> tmp = new ArrayList<>();
-        for (String name : names) {
-            if (CITE_PATTERN.matcher(name).find()) {
-                tmp.add(name);
-            }
-        }
-        names = tmp;
-
-        Map<String, Integer> numbers = new HashMap<>();
-        int lastNum = 0;
-        // First compute citation markers for all citations:
-        String[] citMarkers = new String[names.size()];
-        String[][] normCitMarkers = new String[names.size()][];
-        String[][] bibtexKeys = new String[names.size()][];
-
-        int minGroupingCount = style.getIntCitProperty(OOBibStyle.MINIMUM_GROUPING_COUNT);
-
-        int[] types = new int[names.size()];
-        for (int i = 0; i < names.size(); i++) {
-            Matcher citeMatcher = CITE_PATTERN.matcher(names.get(i));
-            if (citeMatcher.find()) {
-                String typeStr = citeMatcher.group(1);
-                int type = Integer.parseInt(typeStr);
-                types[i] = type; // Remember the type in case we need to uniquefy.
-                String[] keys = citeMatcher.group(2).split(",");
-                bibtexKeys[i] = keys;
-                BibEntry[] cEntries = new BibEntry[keys.length];
-                for (int j = 0; j < cEntries.length; j++) {
-                    BibDatabase database = linkSourceBase.get(keys[j]);
-                    Optional<BibEntry> tmpEntry = Optional.empty();
-                    if (database != null) {
-                        tmpEntry = database.getEntryByCitationKey(keys[j]);
-                    }
-                    if (tmpEntry.isPresent()) {
-                        cEntries[j] = tmpEntry.get();
-                    } else {
-                        LOGGER.info("Citation key not found: '" + keys[j] + '\'');
-                        LOGGER.info("Problem with reference mark: '" + names.get(i) + '\'');
-                        throw new BibEntryNotFoundException(names.get(i), Localization
-                                .lang("Could not resolve BibTeX entry for citation marker '%0'.", names.get(i)));
-                    }
-                }
-
-                String[] normCitMarker = new String[keys.length];
-                String citationMarker;
-                if (style.isCitationKeyCiteMarkers()) {
-                    StringBuilder sb = new StringBuilder();
-                    normCitMarkers[i] = new String[keys.length];
-                    for (int j = 0; j < keys.length; j++) {
-                        normCitMarkers[i][j] = cEntries[j].getCitationKey().orElse(null);
-                        sb.append(cEntries[j].getCitationKey().orElse(""));
-                        if (j < (keys.length - 1)) {
-                            sb.append(',');
-                        }
-                    }
-                    citationMarker = sb.toString();
-                } else if (style.isNumberEntries()) {
-                    if (style.isSortByPosition()) {
-                        // We have sorted the citation markers according to their order of appearance,
-                        // so we simply count up for each marker referring to a new entry:
-                        List<Integer> num = new ArrayList<>(keys.length);
-                        for (int j = 0; j < keys.length; j++) {
-                            if (cEntries[j] instanceof UndefinedBibtexEntry) {
-                                num.add(j, -1);
-                            } else {
-                                num.add(j, lastNum + 1);
-                                if (numbers.containsKey(keys[j])) {
-                                    num.set(j, numbers.get(keys[j]));
-                                } else {
-                                    numbers.put(keys[j], num.get(j));
-                                    lastNum = num.get(j);
-                                }
-                            }
-                        }
-                        citationMarker = style.getNumCitationMarker(num, minGroupingCount, false);
-                        for (int j = 0; j < keys.length; j++) {
-                            normCitMarker[j] = style.getNumCitationMarker(Collections.singletonList(num.get(j)),
-                                    minGroupingCount, false);
-                        }
-                    } else {
-                        // We need to find the number of the cited entry in the bibliography,
-                        // and use that number for the cite marker:
-                        List<Integer> num = findCitedEntryIndex(names.get(i), cited);
-
-                        if (num.isEmpty()) {
-                            throw new BibEntryNotFoundException(names.get(i), Localization
-                                    .lang("Could not resolve BibTeX entry for citation marker '%0'.", names.get(i)));
-                        } else {
-                            citationMarker = style.getNumCitationMarker(num, minGroupingCount, false);
-                        }
-
-                        for (int j = 0; j < keys.length; j++) {
-                            List<Integer> list = new ArrayList<>(1);
-                            list.add(num.get(j));
-                            normCitMarker[j] = style.getNumCitationMarker(list, minGroupingCount, false);
-                        }
-                    }
-                } else {
-
-                    if (cEntries.length > 1) {
-                        if (style.getBooleanCitProperty(OOBibStyle.MULTI_CITE_CHRONOLOGICAL)) {
-                            Arrays.sort(cEntries, yearAuthorTitleComparator);
-                        } else {
-                            Arrays.sort(cEntries, entryComparator);
-                        }
-                        // Update key list to match the new sorting:
-                        for (int j = 0; j < cEntries.length; j++) {
-                            bibtexKeys[i][j] = cEntries[j].getCitationKey().orElse(null);
-                        }
-                    }
-
-                    citationMarker = style.getCitationMarker(Arrays.asList(cEntries), entries,
-                            type == OOBibBase.AUTHORYEAR_PAR, null, null);
-                    // We need "normalized" (in parenthesis) markers for uniqueness checking purposes:
-                    for (int j = 0; j < cEntries.length; j++) {
-                        normCitMarker[j] = style.getCitationMarker(Collections.singletonList(cEntries[j]), entries,
-                                true, null, new int[] {-1});
-                    }
-                }
-                citMarkers[i] = citationMarker;
-                normCitMarkers[i] = normCitMarker;
-            }
+    OOVoidResult<OOError> selectedBibEntryIsRequired(List<BibEntry> entries,
+                                                     Supplier<OOError> fun) {
+        if (entries == null || entries.isEmpty()) {
+            return OOVoidResult.error(fun.get());
+        } else {
+            return OOVoidResult.ok();
         }
+    }
 
-        uniquefiers.clear();
-        if (!style.isCitationKeyCiteMarkers() && !style.isNumberEntries()) {
-            // See if there are duplicate citations marks referring to different entries. If so, we need to
-            // use uniquefiers:
-            Map<String, List<String>> refKeys = new HashMap<>();
-            Map<String, List<Integer>> refNums = new HashMap<>();
-            for (int i = 0; i < citMarkers.length; i++) {
-                String[] markers = normCitMarkers[i]; // compare normalized markers, since the actual markers can be different
-                for (int j = 0; j < markers.length; j++) {
-                    String marker = markers[j];
-                    String currentKey = bibtexKeys[i][j];
-                    if (refKeys.containsKey(marker)) {
-                        // Ok, we have seen this exact marker before.
-                        if (!refKeys.get(marker).contains(currentKey)) {
-                            // ... but not for this entry.
-                            refKeys.get(marker).add(currentKey);
-                            refNums.get(marker).add(i);
-                        }
-                    } else {
-                        List<String> l = new ArrayList<>(1);
-                        l.add(currentKey);
-                        refKeys.put(marker, l);
-                        List<Integer> l2 = new ArrayList<>(1);
-                        l2.add(i);
-                        refNums.put(marker, l2);
-                    }
-                }
-            }
-            // Go through the collected lists and see where we need to uniquefy:
-            for (Map.Entry<String, List<String>> stringListEntry : refKeys.entrySet()) {
-                List<String> keys = stringListEntry.getValue();
-                if (keys.size() > 1) {
-                    // This marker appears for more than one unique entry:
-                    int uniq = 'a';
-                    for (String key : keys) {
-                        // Update the map of uniquefiers for the benefit of both the following generation of new
-                        // citation markers, and for the method that builds the bibliography:
-                        uniquefiers.put(key, String.valueOf((char) uniq));
-                        uniq++;
-                    }
-                }
-            }
-
-            // Finally, go through all citation markers, and update those referring to entries in our current list:
-            int maxAuthorsFirst = style.getIntCitProperty(OOBibStyle.MAX_AUTHORS_FIRST);
-            Set<String> seenBefore = new HashSet<>();
-            for (int j = 0; j < bibtexKeys.length; j++) {
-                boolean needsChange = false;
-                int[] firstLimAuthors = new int[bibtexKeys[j].length];
-                String[] uniquif = new String[bibtexKeys[j].length];
-                BibEntry[] cEntries = new BibEntry[bibtexKeys[j].length];
-                for (int k = 0; k < bibtexKeys[j].length; k++) {
-                    String currentKey = bibtexKeys[j][k];
-                    firstLimAuthors[k] = -1;
-                    if (maxAuthorsFirst > 0) {
-                        if (!seenBefore.contains(currentKey)) {
-                            firstLimAuthors[k] = maxAuthorsFirst;
-                        }
-                        seenBefore.add(currentKey);
-                    }
-                    String uniq = uniquefiers.get(currentKey);
-                    Optional<BibEntry> tmpEntry = Optional.empty();
-                    if (uniq == null) {
-                        if (firstLimAuthors[k] > 0) {
-                            needsChange = true;
-                            BibDatabase database = linkSourceBase.get(currentKey);
-                            if (database != null) {
-                                tmpEntry = database.getEntryByCitationKey(currentKey);
-                            }
-                        } else {
-                            BibDatabase database = linkSourceBase.get(currentKey);
-                            if (database != null) {
-                                tmpEntry = database.getEntryByCitationKey(currentKey);
-                            }
-                        }
-                        uniquif[k] = "";
-                    } else {
-                        needsChange = true;
-                        BibDatabase database = linkSourceBase.get(currentKey);
-                        if (database != null) {
-                            tmpEntry = database.getEntryByCitationKey(currentKey);
-                        }
-                        uniquif[k] = uniq;
+    /*
+     * Checks existence and also checks if it is not an internal name.
+     */
+    private OOVoidResult<OOError> checkStyleExistsInTheDocument(String familyName,
+                                                                String styleName,
+                                                                XTextDocument doc,
+                                                                String labelInJstyleFile,
+                                                                String pathToStyleFile)
+            throws
+            WrappedTargetException {
+
+        Optional<String> internalName = UnoStyle.getInternalNameOfStyle(doc, familyName, styleName);
+
+        if (internalName.isEmpty()) {
+            String msg =
+                    switch (familyName) {
+                        case UnoStyle.PARAGRAPH_STYLES -> Localization.lang("The %0 paragraph style '%1' is missing from the document",
+                                labelInJstyleFile,
+                                styleName);
+                        case UnoStyle.CHARACTER_STYLES -> Localization.lang("The %0 character style '%1' is missing from the document",
+                                labelInJstyleFile,
+                                styleName);
+                        default -> throw new IllegalArgumentException("Expected " + UnoStyle.CHARACTER_STYLES
+                                + " or " + UnoStyle.PARAGRAPH_STYLES
+                                + " for familyName");
                     }
-                    if (tmpEntry.isPresent()) {
-                        cEntries[k] = tmpEntry.get();
+                            + "\n"
+                            + Localization.lang("Please create it in the document or change in the file:")
+                            + "\n"
+                            + pathToStyleFile;
+            return OOVoidResult.error(new OOError("StyleIsNotKnown", msg));
+        }
+
+        if (!internalName.get().equals(styleName)) {
+            String msg =
+                    switch (familyName) {
+                        case UnoStyle.PARAGRAPH_STYLES -> Localization.lang("The %0 paragraph style '%1' is a display name for '%2'.",
+                                labelInJstyleFile,
+                                styleName,
+                                internalName.get());
+                        case UnoStyle.CHARACTER_STYLES -> Localization.lang("The %0 character style '%1' is a display name for '%2'.",
+                                labelInJstyleFile,
+                                styleName,
+                                internalName.get());
+                        default -> throw new IllegalArgumentException("Expected " + UnoStyle.CHARACTER_STYLES
+                                + " or " + UnoStyle.PARAGRAPH_STYLES
+                                + " for familyName");
                     }
-                }
-                if (needsChange) {
-                    citMarkers[j] = style.getCitationMarker(Arrays.asList(cEntries), entries,
-                            types[j] == OOBibBase.AUTHORYEAR_PAR, uniquif, firstLimAuthors);
-                }
-            }
+                            + "\n"
+                            + Localization.lang("Please use the latter in the style file below"
+                            + " to avoid localization problems.")
+                            + "\n"
+                            + pathToStyleFile;
+            return OOVoidResult.error(new OOError("StyleNameIsNotInternal", msg));
         }
+        return OOVoidResult.ok();
+    }
 
-        // Refresh all reference marks with the citation markers we computed:
-        boolean hadBibSection = getBookmarkRange(OOBibBase.BIB_SECTION_NAME) != null;
-        // Check if we are supposed to set a character format for citations:
-        boolean mustTestCharFormat = style.isFormatCitations();
-        for (int i = 0; i < names.size(); i++) {
-            Object referenceMark = xReferenceMarks.getByName(names.get(i));
-            XTextContent bookmark = UnoRuntime.queryInterface(XTextContent.class, referenceMark);
-
-            XTextCursor cursor = bookmark.getAnchor().getText().createTextCursorByRange(bookmark.getAnchor());
-
-            if (mustTestCharFormat) {
-                // If we are supposed to set character format for citations, must run a test before we
-                // delete old citation markers. Otherwise, if the specified character format doesn't
-                // exist, we end up deleting the markers before the process crashes due to a the missing
-                // format, with catastrophic consequences for the user.
-                mustTestCharFormat = false; // need to do this only once
-                XPropertySet xCursorProps = UnoRuntime.queryInterface(XPropertySet.class, cursor);
-                String charStyle = style.getCitationCharacterFormat();
-                try {
-                    xCursorProps.setPropertyValue(CHAR_STYLE_NAME, charStyle);
-                } catch (UnknownPropertyException | PropertyVetoException | IllegalArgumentException |
-                        WrappedTargetException ex) {
-                    throw new UndefinedCharacterFormatException(charStyle);
-                }
-            }
-
-            text.removeTextContent(bookmark);
+    public OOVoidResult<OOError> checkStylesExistInTheDocument(OOBibStyle style, XTextDocument doc) {
+        String pathToStyleFile = style.getPath();
 
-            insertReferenceMark(names.get(i), citMarkers[i], cursor, types[i] != OOBibBase.INVISIBLE_CIT, style);
-            if (hadBibSection && (getBookmarkRange(OOBibBase.BIB_SECTION_NAME) == null)) {
-                // We have overwritten the marker for the start of the reference list.
-                // We need to add it again.
-                cursor.collapseToEnd();
-                OOUtil.insertParagraphBreak(text, cursor);
-                insertBookMark(OOBibBase.BIB_SECTION_NAME, cursor);
+        List<OOVoidResult<OOError>> results = new ArrayList<>();
+        try {
+            results.add(checkStyleExistsInTheDocument(UnoStyle.PARAGRAPH_STYLES,
+                    style.getReferenceHeaderParagraphFormat(),
+                    doc,
+                    "ReferenceHeaderParagraphFormat",
+                    pathToStyleFile));
+            results.add(checkStyleExistsInTheDocument(UnoStyle.PARAGRAPH_STYLES,
+                    style.getReferenceParagraphFormat(),
+                    doc,
+                    "ReferenceParagraphFormat",
+                    pathToStyleFile));
+            if (style.isFormatCitations()) {
+                results.add(checkStyleExistsInTheDocument(UnoStyle.CHARACTER_STYLES,
+                        style.getCitationCharacterFormat(),
+                        doc,
+                        "CitationCharacterFormat",
+                        pathToStyleFile));
             }
+        } catch (WrappedTargetException ex) {
+            results.add(OOVoidResult.error(new OOError("Other error in checkStyleExistsInTheDocument",
+                    ex.getMessage(),
+                    ex)));
         }
 
-        List<String> unresolvedKeys = new ArrayList<>();
-        for (BibEntry entry : entries.keySet()) {
-            if (entry instanceof UndefinedBibtexEntry) {
-                String key = ((UndefinedBibtexEntry) entry).getKey();
-                if (!unresolvedKeys.contains(key)) {
-                    unresolvedKeys.add(key);
-                }
-            }
-        }
-        return unresolvedKeys;
+        return collectResults("checkStyleExistsInTheDocument failed", results);
     }
 
-    private List<String> getSortedReferenceMarks(final XNameAccess nameAccess)
-            throws WrappedTargetException, NoSuchElementException {
-        XTextViewCursorSupplier cursorSupplier = UnoRuntime.queryInterface(XTextViewCursorSupplier.class,
-                mxDoc.getCurrentController());
-
-        XTextViewCursor viewCursor = cursorSupplier.getViewCursor();
-        XTextRange initialPos = viewCursor.getStart();
-        List<String> names = Arrays.asList(nameAccess.getElementNames());
-        List<Point> positions = new ArrayList<>(names.size());
-        for (String name : names) {
-            XTextContent textContent = UnoRuntime.queryInterface(XTextContent.class, nameAccess.getByName(name));
-            XTextRange range = textContent.getAnchor();
-            // Check if we are inside a footnote:
-            if (UnoRuntime.queryInterface(XFootnote.class, range.getText()) != null) {
-                // Find the linking footnote marker:
-                XFootnote footer = UnoRuntime.queryInterface(XFootnote.class, range.getText());
-                // The footnote's anchor gives the correct position in the text:
-                range = footer.getAnchor();
-            }
+    /* ******************************************************
+     *
+     * ManageCitationsDialogView
+     *
+     * ******************************************************/
+    public Optional<List<CitationEntry>> guiActionGetCitationEntries() {
+        final Optional<List<CitationEntry>> FAIL = Optional.empty();
+        final String errorTitle = Localization.lang("Problem collecting citations");
 
-            positions.add(findPosition(viewCursor, range));
-        }
-        Set<ComparableMark> set = new TreeSet<>();
-        for (int i = 0; i < positions.size(); i++) {
-            set.add(new ComparableMark(names.get(i), positions.get(i)));
+        OOResult<XTextDocument, OOError> odoc = getXTextDocument();
+        if (testDialog(errorTitle, odoc.asVoidResult())) {
+            return FAIL;
         }
+        XTextDocument doc = odoc.get();
 
-        List<String> result = new ArrayList<>(set.size());
-        for (ComparableMark mark : set) {
-            result.add(mark.getName());
+        if (testDialog(errorTitle, checkIfOpenOfficeIsRecordingChanges(doc))) {
+            LOGGER.warn(errorTitle);
+            return FAIL;
         }
-        viewCursor.gotoRange(initialPos, false);
 
-        return result;
-    }
-
-    public XNameAccess getReferenceMarks() {
-        XReferenceMarksSupplier supplier = UnoRuntime.queryInterface(XReferenceMarksSupplier.class, xCurrentComponent);
-        return supplier.getReferenceMarks();
-    }
+        try {
 
-    private String getUniqueReferenceMarkName(String bibtexKey, int type) {
-        XNameAccess xNamedRefMarks = getReferenceMarks();
-        int i = 0;
-        String name = OOBibBase.BIB_CITATION + '_' + type + '_' + bibtexKey;
-        while (xNamedRefMarks.hasByName(name)) {
-            name = OOBibBase.BIB_CITATION + i + '_' + type + '_' + bibtexKey;
-            i++;
+            return Optional.of(ManageCitations.getCitationEntries(doc));
+        } catch (NoDocumentException ex) {
+            OOError.from(ex).setTitle(errorTitle).showErrorDialog(dialogService);
+            return FAIL;
+        } catch (DisposedException ex) {
+            OOError.from(ex).setTitle(errorTitle).showErrorDialog(dialogService);
+            return FAIL;
+        } catch (WrappedTargetException ex) {
+            LOGGER.warn(errorTitle, ex);
+            OOError.fromMisc(ex).setTitle(errorTitle).showErrorDialog(dialogService);
+            return FAIL;
         }
-        return name;
     }
 
-    public void rebuildBibTextSection(List<BibDatabase> databases, OOBibStyle style)
-            throws NoSuchElementException, WrappedTargetException, IllegalArgumentException,
-            CreationException, PropertyVetoException, UnknownPropertyException, UndefinedParagraphFormatException {
-        List<String> cited = findCitedKeys();
-        Map<String, BibDatabase> linkSourceBase = new HashMap<>();
-        Map<BibEntry, BibDatabase> entries = findCitedEntries(databases, cited, linkSourceBase); // Although entries are redefined without use, this also updates linkSourceBase
-
-        List<String> names = sortedReferenceMarks;
-
-        if (style.isSortByPosition()) {
-            // We need to sort the entries according to their order of appearance:
-            entries = getSortedEntriesFromSortedRefMarks(names, linkSourceBase);
-        } else {
-            SortedMap<BibEntry, BibDatabase> newMap = new TreeMap<>(entryComparator);
-            for (Map.Entry<BibEntry, BibDatabase> bibtexEntryBibtexDatabaseEntry : findCitedEntries(databases, cited,
-                    linkSourceBase).entrySet()) {
-                newMap.put(bibtexEntryBibtexDatabaseEntry.getKey(), bibtexEntryBibtexDatabaseEntry.getValue());
-            }
-            entries = newMap;
-        }
-        clearBibTextSectionContent2();
-        populateBibTextSection(entries, style);
-    }
+    /**
+     * Apply editable parts of citationEntries to the document: store pageInfo.
+     * <p>
+     * Does not change presentation.
+     * <p>
+     * Note: we use no undo context here, because only DocumentConnection.setUserDefinedStringPropertyValue() is called, and Undo in LO will not undo that.
+     * <p>
+     * GUI: "Manage citations" dialog "OK" button. Called from: ManageCitationsDialogViewModel.storeSettings
+     *
+     * <p>
+     * Currently the only editable part is pageInfo.
+     * <p>
+     * Since the only call to applyCitationEntries() only changes pageInfo w.r.t those returned by getCitationEntries(), we can do with the following restrictions:
+     * <ul>
+     * <li> Missing pageInfo means no action.</li>
+     * <li> Missing CitationEntry means no action (no attempt to remove
+     *      citation from the text).</li>
+     * </ul>
+     */
+    public void guiActionApplyCitationEntries(List<CitationEntry> citationEntries) {
+        final String errorTitle = Localization.lang("Problem modifying citation");
 
-    private List<String> findCitedKeys() throws NoSuchElementException, WrappedTargetException {
-        XNameAccess xNamedMarks = getReferenceMarks();
-        String[] names = xNamedMarks.getElementNames();
-        List<String> keys = new ArrayList<>();
-        for (String name1 : names) {
-            Object bookmark = xNamedMarks.getByName(name1);
-            UnoRuntime.queryInterface(XTextContent.class, bookmark);
-
-            List<String> newKeys = parseRefMarkName(name1);
-            for (String key : newKeys) {
-                if (!keys.contains(key)) {
-                    keys.add(key);
-                }
-            }
+        OOResult<XTextDocument, OOError> odoc = getXTextDocument();
+        if (testDialog(errorTitle, odoc.asVoidResult())) {
+            return;
         }
+        XTextDocument doc = odoc.get();
 
-        return keys;
-    }
-
-    private Map<BibEntry, BibDatabase> findCitedEntries(List<BibDatabase> databases, List<String> keys,
-                                                        Map<String, BibDatabase> linkSourceBase) {
-        Map<BibEntry, BibDatabase> entries = new LinkedHashMap<>();
-        for (String key : keys) {
-            boolean found = false;
-            for (BibDatabase database : databases) {
-                Optional<BibEntry> entry = database.getEntryByCitationKey(key);
-                if (entry.isPresent()) {
-                    entries.put(entry.get(), database);
-                    linkSourceBase.put(key, database);
-                    found = true;
-                    break;
-                }
-            }
+        try {
 
-            if (!found) {
-                entries.put(new UndefinedBibtexEntry(key), null);
-            }
+            ManageCitations.applyCitationEntries(doc, citationEntries);
+        } catch (NoDocumentException ex) {
+            OOError.from(ex).setTitle(errorTitle).showErrorDialog(dialogService);
+        } catch (DisposedException ex) {
+            OOError.from(ex).setTitle(errorTitle).showErrorDialog(dialogService);
+        } catch (PropertyVetoException
+                | IllegalTypeException
+                | WrappedTargetException
+                | com.sun.star.lang.IllegalArgumentException ex) {
+            LOGGER.warn(errorTitle, ex);
+            OOError.fromMisc(ex).setTitle(errorTitle).showErrorDialog(dialogService);
         }
-        return entries;
-    }
-
-    private Point findPosition(XTextViewCursor cursor, XTextRange range) {
-        cursor.gotoRange(range, false);
-        return cursor.getPosition();
     }
 
     /**
-     * Extract the list of citation keys from a reference mark name.
+     * Creates a citation group from {@code entries} at the cursor.
+     * <p>
+     * Uses LO undo context "Insert citation".
+     * <p>
+     * Note: Undo does not remove or reestablish custom properties.
      *
-     * @param name The reference mark name.
-     * @return The list of citation keys encoded in the name.
+     * @param entries      The entries to cite.
+     * @param database     The database the entries belong to (all of them). Used when creating the citation mark.
+     *                     <p>
+     *                     Consistency: for each entry in {@code entries}: looking it up in {@code syncOptions.get().databases} (if present) should yield {@code database}.
+     * @param style        The bibliography style we are using.
+     * @param citationType Indicates whether it is an in-text citation, a citation in parenthesis or an invisible citation.
+     * @param pageInfo     A single page-info for these entries. Attributed to the last entry.
+     * @param syncOptions  Indicates whether in-text citations should be refreshed in the document. Optional.empty() indicates no refresh. Otherwise provides options for refreshing the reference list.
      */
-    public List<String> parseRefMarkName(String name) {
-        List<String> keys = new ArrayList<>();
-        Matcher citeMatcher = CITE_PATTERN.matcher(name);
-        if (citeMatcher.find()) {
-            String[] keystring = citeMatcher.group(2).split(",");
-            for (String aKeystring : keystring) {
-                if (!keys.contains(aKeystring)) {
-                    keys.add(aKeystring);
-                }
-            }
+    public void guiActionInsertEntry(List<BibEntry> entries,
+                                     BibDatabase database,
+                                     OOBibStyle style,
+                                     CitationType citationType,
+                                     String pageInfo,
+                                     Optional<Update.SyncOptions> syncOptions) {
+
+        final String errorTitle = "Could not insert citation";
+
+        OOResult<XTextDocument, OOError> odoc = getXTextDocument();
+        if (testDialog(errorTitle,
+                odoc.asVoidResult(),
+                styleIsRequired(style),
+                selectedBibEntryIsRequired(entries, OOError::noEntriesSelectedForCitation))) {
+            return;
         }
-        return keys;
-    }
+        XTextDocument doc = odoc.get();
 
-    /**
-     * Resolve the citation key from a citation reference marker name, and look up the index of the key in a list of keys.
-     *
-     * @param citRefName The name of the ReferenceMark representing the citation.
-     * @param keys       A List of citation keys representing the entries in the bibliography.
-     * @return the indices of the cited keys, -1 if a key is not found. Returns null if the ref name could not be resolved as a citation.
-     */
-    private List<Integer> findCitedEntryIndex(String citRefName, List<String> keys) {
-        Matcher citeMatcher = CITE_PATTERN.matcher(citRefName);
-        if (citeMatcher.find()) {
-            List<String> keyStrings = Arrays.asList(citeMatcher.group(2).split(","));
-            List<Integer> result = new ArrayList<>(keyStrings.size());
-            for (String key : keyStrings) {
-                int ind = keys.indexOf(key);
-                result.add(ind == -1 ? -1 : 1 + ind);
-            }
-            return result;
-        } else {
-            return Collections.emptyList();
+        OOResult<OOFrontend, OOError> frontend = getFrontend(doc);
+        if (testDialog(errorTitle, frontend.asVoidResult())) {
+            return;
         }
-    }
 
-    private Map<BibEntry, BibDatabase> getSortedEntriesFromSortedRefMarks(List<String> names,
-                                                                          Map<String, BibDatabase> linkSourceBase) {
-
-        Map<BibEntry, BibDatabase> newList = new LinkedHashMap<>();
-        for (String name : names) {
-            Matcher citeMatcher = CITE_PATTERN.matcher(name);
-            if (citeMatcher.find()) {
-                String[] keys = citeMatcher.group(2).split(",");
-                for (String key : keys) {
-                    BibDatabase database = linkSourceBase.get(key);
-                    Optional<BibEntry> origEntry = Optional.empty();
-                    if (database != null) {
-                        origEntry = database.getEntryByCitationKey(key);
-                    }
-                    if (origEntry.isPresent()) {
-                        if (!newList.containsKey(origEntry.get())) {
-                            newList.put(origEntry.get(), database);
-                        }
-                    } else {
-                        LOGGER.info("Citation key not found: '" + key + "'");
-                        LOGGER.info("Problem with reference mark: '" + name + "'");
-                        newList.put(new UndefinedBibtexEntry(key), null);
-                    }
-                }
-            }
+        OOResult<XTextCursor, OOError> cursor = getUserCursorForTextInsertion(doc, errorTitle);
+        if (testDialog(errorTitle, cursor.asVoidResult())) {
+            return;
         }
 
-        return newList;
-    }
-
-    public String getCitationContext(XNameAccess nameAccess, String refMarkName, int charBefore, int charAfter,
-                                     boolean htmlMarkup)
-            throws NoSuchElementException, WrappedTargetException {
-        Object referenceMark = nameAccess.getByName(refMarkName);
-        XTextContent bookmark = UnoRuntime.queryInterface(XTextContent.class, referenceMark);
-
-        XTextCursor cursor = bookmark.getAnchor().getText().createTextCursorByRange(bookmark.getAnchor());
-        String citPart = cursor.getString();
-        int flex = 8;
-        for (int i = 0; i < charBefore; i++) {
-            try {
-                cursor.goLeft((short) 1, true);
-                if ((i >= (charBefore - flex)) && Character.isWhitespace(cursor.getString().charAt(0))) {
-                    break;
-                }
-            } catch (IndexOutOfBoundsException ex) {
-                LOGGER.warn("Problem going left", ex);
-            }
-        }
-        int length = cursor.getString().length();
-        int added = length - citPart.length();
-        cursor.collapseToStart();
-        for (int i = 0; i < (charAfter + length); i++) {
-            try {
-                cursor.goRight((short) 1, true);
-                if (i >= ((charAfter + length) - flex)) {
-                    String strNow = cursor.getString();
-                    if (Character.isWhitespace(strNow.charAt(strNow.length() - 1))) {
-                        break;
-                    }
-                }
-            } catch (IndexOutOfBoundsException ex) {
-                LOGGER.warn("Problem going right", ex);
-            }
+        if (testDialog(errorTitle, checkRangeOverlapsWithCursor(doc, frontend.get()))) {
+            return;
         }
 
-        String result = cursor.getString();
-        if (htmlMarkup) {
-            result = result.substring(0, added) + "<b>" + citPart + "</b>" + result.substring(length);
+        if (testDialog(errorTitle,
+                checkStylesExistInTheDocument(style, doc),
+                checkIfOpenOfficeIsRecordingChanges(doc))) {
+            return;
         }
-        return result.trim();
-    }
 
-    private void insertFullReferenceAtCursor(XTextCursor cursor, Map<BibEntry, BibDatabase> entries, OOBibStyle style,
-                                             String parFormat)
-            throws UndefinedParagraphFormatException, IllegalArgumentException,
-            UnknownPropertyException, PropertyVetoException, WrappedTargetException {
-        Map<BibEntry, BibDatabase> correctEntries;
-        // If we don't have numbered entries, we need to sort the entries before adding them:
-        if (style.isSortByPosition()) {
-            // Use the received map directly
-            correctEntries = entries;
-        } else {
-            // Sort map
-            Map<BibEntry, BibDatabase> newMap = new TreeMap<>(entryComparator);
-            newMap.putAll(entries);
-            correctEntries = newMap;
-        }
-        int number = 1;
-        for (Map.Entry<BibEntry, BibDatabase> entry : correctEntries.entrySet()) {
-            if (entry.getKey() instanceof UndefinedBibtexEntry) {
-                continue;
-            }
-            OOUtil.insertParagraphBreak(text, cursor);
-            if (style.isNumberEntries()) {
-                int minGroupingCount = style.getIntCitProperty(OOBibStyle.MINIMUM_GROUPING_COUNT);
-                OOUtil.insertTextAtCurrentLocation(text, cursor,
-                        style.getNumCitationMarker(Collections.singletonList(number++), minGroupingCount, true), Collections.emptyList());
+        /*
+         * For sync we need a FunctionalTextViewCursor.
+         */
+        OOResult<FunctionalTextViewCursor, OOError> fcursor = null;
+        if (syncOptions.isPresent()) {
+            fcursor = getFunctionalTextViewCursor(doc, errorTitle);
+            if (testDialog(errorTitle, fcursor.asVoidResult())) {
+                return;
             }
-            Layout layout = style.getReferenceFormat(entry.getKey().getType());
-            layout.setPostFormatter(POSTFORMATTER);
-            OOUtil.insertFullReferenceAtCurrentLocation(text, cursor, layout, parFormat, entry.getKey(),
-                    entry.getValue(), uniquefiers.get(entry.getKey().getCitationKey().orElse(null)));
         }
-    }
 
-    private void createBibTextSection2(boolean end)
-            throws IllegalArgumentException, CreationException {
+        syncOptions
+                .map(e -> e.setUpdateBibliography(this.refreshBibliographyDuringSyncWhenCiting))
+                .map(e -> e.setAlwaysAddCitedOnPages(this.alwaysAddCitedOnPages));
 
-        XTextCursor mxDocCursor = text.createTextCursor();
-        if (end) {
-            mxDocCursor.gotoEnd(false);
+        if (syncOptions.isPresent()) {
+            if (testDialog(databaseIsRequired(syncOptions.get().databases,
+                    OOError::noDataBaseIsOpenForSyncingAfterCitation))) {
+                return;
+            }
         }
-        OOUtil.insertParagraphBreak(text, mxDocCursor);
-        // Create a new TextSection from the document factory and access it's XNamed interface
-        XNamed xChildNamed;
+
         try {
-            xChildNamed = UnoRuntime.queryInterface(XNamed.class,
-                    mxDocFactory.createInstance("com.sun.star.text.TextSection"));
-        } catch (Exception e) {
-            throw new CreationException(e.getMessage());
+            UnoUndo.enterUndoContext(doc, "Insert citation");
+
+            EditInsert.insertCitationGroup(doc,
+                    frontend.get(),
+                    cursor.get(),
+                    entries,
+                    database,
+                    style,
+                    citationType,
+                    pageInfo);
+
+            if (syncOptions.isPresent()) {
+                Update.resyncDocument(doc, style, fcursor.get(), syncOptions.get());
+            }
+        } catch (NoDocumentException ex) {
+            OOError.from(ex).setTitle(errorTitle).showErrorDialog(dialogService);
+        } catch (DisposedException ex) {
+            OOError.from(ex).setTitle(errorTitle).showErrorDialog(dialogService);
+        } catch (CreationException
+                | IllegalTypeException
+                | NotRemoveableException
+                | PropertyVetoException
+                | WrappedTargetException ex) {
+            LOGGER.warn("Could not insert entry", ex);
+            OOError.fromMisc(ex).setTitle(errorTitle).showErrorDialog(dialogService);
+        } finally {
+            UnoUndo.leaveUndoContext(doc);
         }
-        // Set the new sections name to 'Child_Section'
-        xChildNamed.setName(OOBibBase.BIB_SECTION_NAME);
-        // Access the Child_Section's XTextContent interface and insert it into the document
-        XTextContent xChildSection = UnoRuntime.queryInterface(XTextContent.class, xChildNamed);
-        text.insertTextContent(mxDocCursor, xChildSection, false);
     }
 
-    private void clearBibTextSectionContent2()
-            throws NoSuchElementException, WrappedTargetException, IllegalArgumentException, CreationException {
-
-        // Check if the section exists:
-        XTextSectionsSupplier supplier = UnoRuntime.queryInterface(XTextSectionsSupplier.class, mxDoc);
-        if (supplier.getTextSections().hasByName(OOBibBase.BIB_SECTION_NAME)) {
-            XTextSection section = (XTextSection) ((Any) supplier.getTextSections().getByName(OOBibBase.BIB_SECTION_NAME))
-                    .getObject();
-            // Clear it:
-            XTextCursor cursor = text.createTextCursorByRange(section.getAnchor());
-            cursor.gotoRange(section.getAnchor(), false);
-            cursor.setString("");
-        } else {
-            createBibTextSection2(atEnd);
+    /**
+     * GUI action "Merge citations"
+     */
+    public void guiActionMergeCitationGroups(List<BibDatabase> databases, OOBibStyle style) {
+        final String errorTitle = Localization.lang("Problem combining cite markers");
+
+        OOResult<XTextDocument, OOError> odoc = getXTextDocument();
+        if (testDialog(errorTitle,
+                odoc.asVoidResult(),
+                styleIsRequired(style),
+                databaseIsRequired(databases, OOError::noDataBaseIsOpen))) {
+            return;
         }
-    }
-
-    private void populateBibTextSection(Map<BibEntry, BibDatabase> entries, OOBibStyle style)
-            throws NoSuchElementException, WrappedTargetException, PropertyVetoException,
-            UnknownPropertyException, UndefinedParagraphFormatException, IllegalArgumentException, CreationException {
-        XTextSectionsSupplier supplier = UnoRuntime.queryInterface(XTextSectionsSupplier.class, mxDoc);
-        XTextSection section = (XTextSection) ((Any) supplier.getTextSections().getByName(OOBibBase.BIB_SECTION_NAME))
-                .getObject();
-        XTextCursor cursor = text.createTextCursorByRange(section.getAnchor());
-        OOUtil.insertTextAtCurrentLocation(text, cursor, (String) style.getProperty(OOBibStyle.TITLE),
-                (String) style.getProperty(OOBibStyle.REFERENCE_HEADER_PARAGRAPH_FORMAT));
-        insertFullReferenceAtCursor(cursor, entries, style,
-                (String) style.getProperty(OOBibStyle.REFERENCE_PARAGRAPH_FORMAT));
-        insertBookMark(OOBibBase.BIB_SECTION_END_NAME, cursor);
-    }
+        XTextDocument doc = odoc.get();
 
-    private XTextContent insertBookMark(String name, XTextCursor position)
-            throws IllegalArgumentException, CreationException {
-        Object bookmark;
-        try {
-            bookmark = mxDocFactory.createInstance("com.sun.star.text.Bookmark");
-        } catch (Exception e) {
-            throw new CreationException(e.getMessage());
-        }
-        // name the bookmark
-        XNamed xNamed = UnoRuntime.queryInterface(XNamed.class, bookmark);
-        xNamed.setName(name);
-        // get XTextContent interface
-        XTextContent xTextContent = UnoRuntime.queryInterface(XTextContent.class, bookmark);
-        // insert bookmark at the end of the document
-        // instead of mxDocText.getEnd you could use a text cursor's XTextRange interface or any XTextRange
-        text.insertTextContent(position, xTextContent, true);
-        position.collapseToEnd();
-        return xTextContent;
-    }
+        OOResult<FunctionalTextViewCursor, OOError> fcursor = getFunctionalTextViewCursor(doc, errorTitle);
 
-    private void insertReferenceMark(String name, String citationText, XTextCursor position, boolean withText,
-                                     OOBibStyle style)
-            throws UnknownPropertyException, WrappedTargetException,
-            PropertyVetoException, IllegalArgumentException, UndefinedCharacterFormatException, CreationException {
-
-        // Check if there is "page info" stored for this citation. If so, insert it into
-        // the citation text before inserting the citation:
-        Optional<String> pageInfo = getCustomProperty(name);
-        String citText;
-        if ((pageInfo.isPresent()) && !pageInfo.get().isEmpty()) {
-            citText = style.insertPageInfo(citationText, pageInfo.get());
-        } else {
-            citText = citationText;
+        if (testDialog(errorTitle,
+                fcursor.asVoidResult(),
+                checkStylesExistInTheDocument(style, doc),
+                checkIfOpenOfficeIsRecordingChanges(doc))) {
+            return;
         }
 
-        Object bookmark;
         try {
-            bookmark = mxDocFactory.createInstance("com.sun.star.text.ReferenceMark");
-        } catch (Exception e) {
-            throw new CreationException(e.getMessage());
-        }
-        // Name the reference
-        XNamed xNamed = UnoRuntime.queryInterface(XNamed.class, bookmark);
-        xNamed.setName(name);
-
-        if (withText) {
-            position.setString(citText);
-            XPropertySet xCursorProps = UnoRuntime.queryInterface(XPropertySet.class, position);
+            UnoUndo.enterUndoContext(doc, "Merge citations");
 
-            // Set language to [None]:
-            xCursorProps.setPropertyValue("CharLocale", new Locale("zxx", "", ""));
-            if (style.isFormatCitations()) {
-                String charStyle = style.getCitationCharacterFormat();
-                try {
-                    xCursorProps.setPropertyValue(CHAR_STYLE_NAME, charStyle);
-                } catch (UnknownPropertyException | PropertyVetoException | IllegalArgumentException |
-                        WrappedTargetException ex) {
-                    throw new UndefinedCharacterFormatException(charStyle);
-                }
+            OOFrontend frontend = new OOFrontend(doc);
+            boolean madeModifications = EditMerge.mergeCitationGroups(doc, frontend, style);
+            if (madeModifications) {
+                UnoCrossRef.refresh(doc);
+                Update.SyncOptions syncOptions = new Update.SyncOptions(databases);
+                Update.resyncDocument(doc, style, fcursor.get(), syncOptions);
             }
-        } else {
-            position.setString("");
-        }
+        } catch (NoDocumentException ex) {
+            OOError.from(ex).setTitle(errorTitle).showErrorDialog(dialogService);
+        } catch (DisposedException ex) {
+            OOError.from(ex).setTitle(errorTitle).showErrorDialog(dialogService);
+        } catch (CreationException
+                | IllegalTypeException
+                | NotRemoveableException
+                | PropertyVetoException
+                | WrappedTargetException
+                | com.sun.star.lang.IllegalArgumentException ex) {
+            LOGGER.warn("Problem combining cite markers", ex);
+            OOError.fromMisc(ex).setTitle(errorTitle).showErrorDialog(dialogService);
+        } finally {
+            UnoUndo.leaveUndoContext(doc);
+            fcursor.get().restore(doc);
+        }
+    } // MergeCitationGroups
 
-        // get XTextContent interface
-        XTextContent xTextContent = UnoRuntime.queryInterface(XTextContent.class, bookmark);
+    /**
+     * GUI action "Separate citations".
+     * <p>
+     * Do the opposite of MergeCitationGroups. Combined markers are split, with a space inserted between.
+     */
+    public void guiActionSeparateCitations(List<BibDatabase> databases, OOBibStyle style) {
+        final String errorTitle = Localization.lang("Problem during separating cite markers");
+
+        OOResult<XTextDocument, OOError> odoc = getXTextDocument();
+        if (testDialog(errorTitle,
+                odoc.asVoidResult(),
+                styleIsRequired(style),
+                databaseIsRequired(databases, OOError::noDataBaseIsOpen))) {
+            return;
+        }
 
-        position.getText().insertTextContent(position, xTextContent, true);
+        XTextDocument doc = odoc.get();
+        OOResult<FunctionalTextViewCursor, OOError> fcursor = getFunctionalTextViewCursor(doc, errorTitle);
 
-        // Check if we should italicize the "et al." string in citations:
-        boolean italicize = style.getBooleanCitProperty(OOBibStyle.ITALIC_ET_AL);
-        if (italicize) {
-            String etAlString = style.getStringCitProperty(OOBibStyle.ET_AL_STRING);
-            int index = citText.indexOf(etAlString);
-            if (index >= 0) {
-                italicizeOrBold(position, true, index, index + etAlString.length());
-            }
+        if (testDialog(errorTitle,
+                fcursor.asVoidResult(),
+                checkStylesExistInTheDocument(style, doc),
+                checkIfOpenOfficeIsRecordingChanges(doc))) {
+            return;
         }
 
-        position.collapseToEnd();
-    }
+        try {
+            UnoUndo.enterUndoContext(doc, "Separate citations");
 
-    private void removeReferenceMark(String name) throws NoSuchElementException, WrappedTargetException {
-        XNameAccess xReferenceMarks = getReferenceMarks();
-        if (xReferenceMarks.hasByName(name)) {
-            Object referenceMark = xReferenceMarks.getByName(name);
-            XTextContent bookmark = UnoRuntime.queryInterface(XTextContent.class, referenceMark);
-            text.removeTextContent(bookmark);
+            OOFrontend frontend = new OOFrontend(doc);
+            boolean madeModifications = EditSeparate.separateCitations(doc, frontend, databases, style);
+            if (madeModifications) {
+                UnoCrossRef.refresh(doc);
+                Update.SyncOptions syncOptions = new Update.SyncOptions(databases);
+                Update.resyncDocument(doc, style, fcursor.get(), syncOptions);
+            }
+        } catch (NoDocumentException ex) {
+            OOError.from(ex).setTitle(errorTitle).showErrorDialog(dialogService);
+        } catch (DisposedException ex) {
+            OOError.from(ex).setTitle(errorTitle).showErrorDialog(dialogService);
+        } catch (CreationException
+                | IllegalTypeException
+                | NotRemoveableException
+                | PropertyVetoException
+                | WrappedTargetException
+                | com.sun.star.lang.IllegalArgumentException ex) {
+            LOGGER.warn("Problem during separating cite markers", ex);
+            OOError.fromMisc(ex).setTitle(errorTitle).showErrorDialog(dialogService);
+        } finally {
+            UnoUndo.leaveUndoContext(doc);
+            fcursor.get().restore(doc);
         }
     }
 
     /**
-     * Get the XTextRange corresponding to the named bookmark.
+     * GUI action for "Export cited"
+     * <p>
+     * Does not refresh the bibliography.
      *
-     * @param name The name of the bookmark to find.
-     * @return The XTextRange for the bookmark.
-     * @throws WrappedTargetException
-     * @throws NoSuchElementException
+     * @param returnPartialResult If there are some unresolved keys, shall we return an otherwise nonempty result, or Optional.empty()?
      */
-    private XTextRange getBookmarkRange(String name) throws NoSuchElementException, WrappedTargetException {
-        XNameAccess xNamedBookmarks = getBookmarks();
+    public Optional<BibDatabase> exportCitedHelper(List<BibDatabase> databases, boolean returnPartialResult) {
+        final Optional<BibDatabase> FAIL = Optional.empty();
+        final String errorTitle = Localization.lang("Unable to generate new library");
 
-        // retrieve bookmark by name
-        if (!xNamedBookmarks.hasByName(name)) {
-            return null;
+        OOResult<XTextDocument, OOError> odoc = getXTextDocument();
+        if (testDialog(errorTitle,
+                odoc.asVoidResult(),
+                databaseIsRequired(databases, OOError::noDataBaseIsOpenForExport))) {
+            return FAIL;
         }
-        Object foundBookmark = xNamedBookmarks.getByName(name);
-        XTextContent xFoundBookmark = UnoRuntime.queryInterface(XTextContent.class, foundBookmark);
-        return xFoundBookmark.getAnchor();
-    }
-
-    private XNameAccess getBookmarks() {
-        // query XBookmarksSupplier from document model and get bookmarks collection
-        XBookmarksSupplier xBookmarksSupplier = UnoRuntime.queryInterface(XBookmarksSupplier.class, xCurrentComponent);
-        XNameAccess xNamedBookmarks = xBookmarksSupplier.getBookmarks();
-        return xNamedBookmarks;
-    }
-
-    private void italicizeOrBold(XTextCursor position, boolean italicize, int start, int end)
-            throws UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException {
-        XTextRange range = position.getStart();
-        XTextCursor cursor = position.getText().createTextCursorByRange(range);
-        cursor.goRight((short) start, false);
-        cursor.goRight((short) (end - start), true);
-        XPropertySet xcp = UnoRuntime.queryInterface(XPropertySet.class, cursor);
-        if (italicize) {
-            xcp.setPropertyValue("CharPosture", com.sun.star.awt.FontSlant.ITALIC);
-        } else {
-            xcp.setPropertyValue("CharWeight", com.sun.star.awt.FontWeight.BOLD);
-        }
-    }
+        XTextDocument doc = odoc.get();
 
-    public void combineCiteMarkers(List<BibDatabase> databases, OOBibStyle style)
-            throws IOException, WrappedTargetException, NoSuchElementException, IllegalArgumentException,
-            UndefinedCharacterFormatException, UnknownPropertyException, PropertyVetoException, CreationException,
-            BibEntryNotFoundException {
-        XNameAccess nameAccess = getReferenceMarks();
-        // TODO: doesn't work for citations in footnotes/tables
-        List<String> names = getSortedReferenceMarks(nameAccess);
-
-        final XTextRangeCompare compare = UnoRuntime.queryInterface(XTextRangeCompare.class, text);
-
-        int piv = 0;
-        boolean madeModifications = false;
-        while (piv < (names.size() - 1)) {
-            XTextRange range1 = UnoRuntime.queryInterface(XTextContent.class, nameAccess.getByName(names.get(piv)))
-                                          .getAnchor().getEnd();
-            XTextRange range2 = UnoRuntime.queryInterface(XTextContent.class, nameAccess.getByName(names.get(piv + 1)))
-                                          .getAnchor().getStart();
-            if (range1.getText() != range2.getText()) {
-                piv++;
-                continue;
-            }
-            XTextCursor mxDocCursor = range1.getText().createTextCursorByRange(range1);
-            mxDocCursor.goRight((short) 1, true);
-            boolean couldExpand = true;
-            while (couldExpand && (compare.compareRegionEnds(mxDocCursor, range2) > 0)) {
-                couldExpand = mxDocCursor.goRight((short) 1, true);
-            }
-            String cursorText = mxDocCursor.getString();
-            // Check if the string contains no line breaks and only whitespace:
-            if ((cursorText.indexOf('\n') == -1) && cursorText.trim().isEmpty()) {
-
-                // If we are supposed to set character format for citations, test this before
-                // making any changes. This way we can throw an exception before any reference
-                // marks are removed, preventing damage to the user's document:
-                if (style.isFormatCitations()) {
-                    XPropertySet xCursorProps = UnoRuntime.queryInterface(XPropertySet.class, mxDocCursor);
-                    String charStyle = style.getCitationCharacterFormat();
-                    try {
-                        xCursorProps.setPropertyValue(CHAR_STYLE_NAME, charStyle);
-                    } catch (UnknownPropertyException | PropertyVetoException | IllegalArgumentException |
-                            WrappedTargetException ex) {
-                        // Setting the character format failed, so we throw an exception that
-                        // will result in an error message for the user:
-                        throw new UndefinedCharacterFormatException(charStyle);
-                    }
-                }
+        try {
 
-                List<String> keys = parseRefMarkName(names.get(piv));
-                keys.addAll(parseRefMarkName(names.get(piv + 1)));
-                removeReferenceMark(names.get(piv));
-                removeReferenceMark(names.get(piv + 1));
-                List<BibEntry> entries = new ArrayList<>();
-                for (String key : keys) {
-                    for (BibDatabase database : databases) {
-                        Optional<BibEntry> entry = database.getEntryByCitationKey(key);
-                        if (entry.isPresent()) {
-                            entries.add(entry.get());
-                            break;
-                        }
-                    }
+            ExportCited.GenerateDatabaseResult result;
+            try {
+                UnoUndo.enterUndoContext(doc, "Changes during \"Export cited\"");
+                result = ExportCited.generateDatabase(doc, databases);
+            } finally {
+                // There should be no changes, thus no Undo entry should appear
+                // in LibreOffice.
+                UnoUndo.leaveUndoContext(doc);
+            }
+
+            if (!result.newDatabase.hasEntries()) {
+                dialogService.showErrorDialogAndWait(
+                        Localization.lang("Unable to generate new library"),
+                        Localization.lang("Your OpenOffice/LibreOffice document references"
+                                + " no citation keys"
+                                + " which could also be found in your current library."));
+                return FAIL;
+            }
+
+            List<String> unresolvedKeys = result.unresolvedKeys;
+            if (!unresolvedKeys.isEmpty()) {
+                dialogService.showErrorDialogAndWait(
+                        Localization.lang("Unable to generate new library"),
+                        Localization.lang("Your OpenOffice/LibreOffice document references"
+                                        + " at least %0 citation keys"
+                                        + " which could not be found in your current library."
+                                        + " Some of these are %1.",
+                                String.valueOf(unresolvedKeys.size()),
+                                String.join(", ", unresolvedKeys)));
+                if (returnPartialResult) {
+                    return Optional.of(result.newDatabase);
+                } else {
+                    return FAIL;
                 }
-                Collections.sort(entries, new FieldComparator(StandardField.YEAR));
-                String keyString = String.join(",", entries.stream().map(entry -> entry.getCitationKey().orElse(""))
-                                                           .collect(Collectors.toList()));
-                // Insert bookmark:
-                String bName = getUniqueReferenceMarkName(keyString, OOBibBase.AUTHORYEAR_PAR);
-                insertReferenceMark(bName, "tmp", mxDocCursor, true, style);
-                names.set(piv + 1, bName);
-                madeModifications = true;
             }
-            piv++;
-        }
-        if (madeModifications) {
-            updateSortedReferenceMarks();
-            refreshCiteMarkers(databases, style);
+            return Optional.of(result.newDatabase);
+        } catch (NoDocumentException ex) {
+            OOError.from(ex).showErrorDialog(dialogService);
+        } catch (DisposedException ex) {
+            OOError.from(ex).setTitle(errorTitle).showErrorDialog(dialogService);
+        } catch (WrappedTargetException
+                | com.sun.star.lang.IllegalArgumentException ex) {
+            LOGGER.warn("Problem generating new database.", ex);
+            OOError.fromMisc(ex).setTitle(errorTitle).showErrorDialog(dialogService);
         }
+        return FAIL;
     }
 
     /**
-     * Do the opposite of combineCiteMarkers.
-     * Combined markers are split, with a space inserted between.
+     * GUI action, refreshes citation markers and bibliography.
+     *
+     * @param databases Must have at least one.
+     * @param style     Style.
      */
-    public void unCombineCiteMarkers(List<BibDatabase> databases, OOBibStyle style)
-            throws IOException, WrappedTargetException, NoSuchElementException, IllegalArgumentException,
-            UndefinedCharacterFormatException, UnknownPropertyException, PropertyVetoException, CreationException,
-            BibEntryNotFoundException {
-        XNameAccess nameAccess = getReferenceMarks();
-        List<String> names = getSortedReferenceMarks(nameAccess);
-
-        final XTextRangeCompare compare = UnoRuntime.queryInterface(XTextRangeCompare.class, text);
-
-        int pivot = 0;
-        boolean madeModifications = false;
-        while (pivot < (names.size())) {
-            XTextRange range1 = UnoRuntime.queryInterface(XTextContent.class, nameAccess.getByName(names.get(pivot)))
-                .getAnchor();
-
-            XTextCursor textCursor = range1.getText().createTextCursorByRange(range1);
-
-            // If we are supposed to set character format for citations, test this before
-            // making any changes. This way we can throw an exception before any reference
-            // marks are removed, preventing damage to the user's document:
-            if (style.isFormatCitations()) {
-                XPropertySet xCursorProps = UnoRuntime.queryInterface(XPropertySet.class, textCursor);
-                String charStyle = style.getCitationCharacterFormat();
-                try {
-                    xCursorProps.setPropertyValue(CHAR_STYLE_NAME, charStyle);
-                } catch (UnknownPropertyException | PropertyVetoException | IllegalArgumentException |
-                         WrappedTargetException ex) {
-                    // Setting the character format failed, so we throw an exception that
-                    // will result in an error message for the user:
-                        throw new UndefinedCharacterFormatException(charStyle);
-                }
-            }
+    public void guiActionUpdateDocument(List<BibDatabase> databases, OOBibStyle style) {
+        final String errorTitle = Localization.lang("Unable to synchronize bibliography");
 
-            List<String> keys = parseRefMarkName(names.get(pivot));
-            if (keys.size() > 1) {
-                removeReferenceMark(names.get(pivot));
-
-                // Insert bookmark for each key
-                int last = keys.size() - 1;
-                int i = 0;
-                for (String key : keys) {
-                    String newName = getUniqueReferenceMarkName(key, OOBibBase.AUTHORYEAR_PAR);
-                    insertReferenceMark(newName, "tmp", textCursor, true, style);
-                    textCursor.collapseToEnd();
-                    if (i != last) {
-                        textCursor.setString(" ");
-                        textCursor.collapseToEnd();
-                    }
-                    i++;
-                }
-                madeModifications = true;
-            }
-            pivot++;
-        }
-        if (madeModifications) {
-            updateSortedReferenceMarks();
-            refreshCiteMarkers(databases, style);
-        }
-    }
+        try {
 
-    public BibDatabase generateDatabase(List<BibDatabase> databases)
-            throws NoSuchElementException, WrappedTargetException {
-        BibDatabase resultDatabase = new BibDatabase();
-        List<String> cited = findCitedKeys();
-        List<BibEntry> entriesToInsert = new ArrayList<>();
-
-        // For each cited key
-        for (String key : cited) {
-            // Loop through the available databases
-            for (BibDatabase loopDatabase : databases) {
-                Optional<BibEntry> entry = loopDatabase.getEntryByCitationKey(key);
-                // If entry found
-                if (entry.isPresent()) {
-                    BibEntry clonedEntry = (BibEntry) entry.get().clone();
-                    // Insert a copy of the entry
-                    entriesToInsert.add(clonedEntry);
-                    // Check if the cloned entry has a crossref field
-                    clonedEntry.getField(StandardField.CROSSREF).ifPresent(crossref -> {
-                        // If the crossref entry is not already in the database
-                        if (!resultDatabase.getEntryByCitationKey(crossref).isPresent()) {
-                            // Add it if it is in the current library
-                            loopDatabase.getEntryByCitationKey(crossref).ifPresent(entriesToInsert::add);
-                        }
-                    });
-
-                    // Be happy with the first found BibEntry and move on to next key
-                    break;
-                }
+            OOResult<XTextDocument, OOError> odoc = getXTextDocument();
+            if (testDialog(errorTitle,
+                    odoc.asVoidResult(),
+                    styleIsRequired(style))) {
+                return;
             }
-        }
-        resultDatabase.insertEntries(entriesToInsert);
-        return resultDatabase;
-    }
 
-    private static class ComparableMark implements Comparable<ComparableMark> {
+            XTextDocument doc = odoc.get();
 
-        private final String name;
-        private final Point position;
-
-        public ComparableMark(String name, Point position) {
-            this.name = name;
-            this.position = position;
-        }
+            OOResult<FunctionalTextViewCursor, OOError> fcursor = getFunctionalTextViewCursor(doc, errorTitle);
 
-        @Override
-        public int compareTo(ComparableMark other) {
-            if (position.Y == other.position.Y) {
-                return position.X - other.position.X;
-            } else {
-                return position.Y - other.position.Y;
-            }
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) {
-                return true;
+            if (testDialog(errorTitle,
+                    fcursor.asVoidResult(),
+                    checkStylesExistInTheDocument(style, doc),
+                    checkIfOpenOfficeIsRecordingChanges(doc))) {
+                return;
             }
 
-            if (o instanceof ComparableMark) {
-                ComparableMark other = (ComparableMark) o;
-                return (this.position.X == other.position.X) && (this.position.Y == other.position.Y)
-                        && Objects.equals(this.name, other.name);
+            OOFrontend frontend = new OOFrontend(doc);
+            if (testDialog(errorTitle, checkRangeOverlaps(doc, frontend))) {
+                return;
             }
-            return false;
-        }
-
-        public String getName() {
-            return name;
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hash(position, name);
-        }
-    }
-
-    private class DocumentTitleViewModel {
 
-        private final XTextDocument xTextDocument;
-        private final String description;
+            List<String> unresolvedKeys;
+            try {
+                UnoUndo.enterUndoContext(doc, "Refresh bibliography");
 
-        public DocumentTitleViewModel(XTextDocument xTextDocument) {
-            this.xTextDocument = xTextDocument;
-            this.description = getDocumentTitle(xTextDocument).orElse("");
-        }
+                Update.SyncOptions syncOptions = new Update.SyncOptions(databases);
+                syncOptions
+                        .setUpdateBibliography(true)
+                        .setAlwaysAddCitedOnPages(this.alwaysAddCitedOnPages);
 
-        public XTextDocument getXtextDocument() {
-            return xTextDocument;
-        }
+                unresolvedKeys = Update.synchronizeDocument(doc, frontend, style, fcursor.get(), syncOptions);
+            } finally {
+                UnoUndo.leaveUndoContext(doc);
+                fcursor.get().restore(doc);
+            }
 
-        @Override
-        public String toString() {
-            return description;
+            if (!unresolvedKeys.isEmpty()) {
+                String msg = Localization.lang(
+                        "Your OpenOffice/LibreOffice document references the citation key '%0',"
+                                + " which could not be found in your current library.",
+                        unresolvedKeys.get(0));
+                dialogService.showErrorDialogAndWait(errorTitle, msg);
+            }
+        } catch (NoDocumentException ex) {
+            OOError.from(ex).setTitle(errorTitle).showErrorDialog(dialogService);
+        } catch (DisposedException ex) {
+            OOError.from(ex).setTitle(errorTitle).showErrorDialog(dialogService);
+        } catch (CreationException
+                | WrappedTargetException
+                | com.sun.star.lang.IllegalArgumentException ex) {
+            LOGGER.warn("Could not update bibliography", ex);
+            OOError.fromMisc(ex).setTitle(errorTitle).showErrorDialog(dialogService);
         }
     }
 }
diff --git a/src/main/java/org/jabref/gui/openoffice/OOBibBaseConnect.java b/src/main/java/org/jabref/gui/openoffice/OOBibBaseConnect.java
new file mode 100644
index 00000000000..8a12722a17b
--- /dev/null
+++ b/src/main/java/org/jabref/gui/openoffice/OOBibBaseConnect.java
@@ -0,0 +1,265 @@
+package org.jabref.gui.openoffice;
+
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import org.jabref.gui.DialogService;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.logic.openoffice.NoDocumentFoundException;
+import org.jabref.model.openoffice.uno.CreationException;
+import org.jabref.model.openoffice.uno.NoDocumentException;
+import org.jabref.model.openoffice.uno.UnoCast;
+import org.jabref.model.openoffice.uno.UnoTextDocument;
+import org.jabref.model.openoffice.util.OOResult;
+
+import com.sun.star.bridge.XBridge;
+import com.sun.star.bridge.XBridgeFactory;
+import com.sun.star.comp.helper.BootstrapException;
+import com.sun.star.container.NoSuchElementException;
+import com.sun.star.container.XEnumeration;
+import com.sun.star.container.XEnumerationAccess;
+import com.sun.star.frame.XDesktop;
+import com.sun.star.lang.WrappedTargetException;
+import com.sun.star.lang.XComponent;
+import com.sun.star.lang.XMultiComponentFactory;
+import com.sun.star.text.XTextDocument;
+import com.sun.star.uno.XComponentContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static com.sun.star.uno.UnoRuntime.queryInterface;
+
+/**
+ * Establish connection to a document opened in OpenOffice or LibreOffice.
+ */
+public class OOBibBaseConnect {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(OOBibBaseConnect.class);
+
+    private final DialogService dialogService;
+    private final XDesktop xDesktop;
+
+    /**
+     * Created when connected to a document.
+     * <p>
+     * Cleared (to null) when we discover we lost the connection.
+     */
+    private XTextDocument xTextDocument;
+
+    public OOBibBaseConnect(Path loPath, DialogService dialogService)
+            throws
+            BootstrapException,
+            CreationException {
+
+        this.dialogService = dialogService;
+        this.xDesktop = simpleBootstrap(loPath);
+    }
+
+    private XDesktop simpleBootstrap(Path loPath)
+            throws
+            CreationException,
+            BootstrapException {
+
+        // Get the office component context:
+        XComponentContext context = org.jabref.gui.openoffice.Bootstrap.bootstrap(loPath);
+        XMultiComponentFactory sem = context.getServiceManager();
+
+        // Create the desktop, which is the root frame of the
+        // hierarchy of frames that contain viewable components:
+        Object desktop;
+        try {
+            desktop = sem.createInstanceWithContext("com.sun.star.frame.Desktop", context);
+        } catch (com.sun.star.uno.Exception e) {
+            throw new CreationException(e.getMessage());
+        }
+        return UnoCast.cast(XDesktop.class, desktop).get();
+    }
+
+    /**
+     * Close any open office connection, if none exists does nothing
+     */
+    public static void closeOfficeConnection() {
+        try {
+            // get the bridge factory from the local service manager
+            XBridgeFactory bridgeFactory = queryInterface(XBridgeFactory.class,
+                                                          org.jabref.gui.openoffice.Bootstrap.createSimpleServiceManager()
+                    .createInstance("com.sun.star.bridge.BridgeFactory"));
+
+            if (bridgeFactory != null) {
+                for (XBridge bridge : bridgeFactory.getExistingBridges()) {
+                    // dispose of this bridge after closing its connection
+                    queryInterface(XComponent.class, bridge).dispose();
+                }
+            }
+        } catch (Exception ex) {
+            LOGGER.error("Exception disposing office process connection bridge", ex);
+        }
+    }
+
+    private static List<XTextDocument> getTextDocuments(XDesktop desktop)
+            throws
+            NoSuchElementException,
+            WrappedTargetException {
+
+        List<XTextDocument> result = new ArrayList<>();
+
+        XEnumerationAccess enumAccess = desktop.getComponents();
+        XEnumeration compEnum = enumAccess.createEnumeration();
+
+        while (compEnum.hasMoreElements()) {
+            Object next = compEnum.nextElement();
+            XComponent comp = UnoCast.cast(XComponent.class, next).get();
+            Optional<XTextDocument> doc = UnoCast.cast(XTextDocument.class, comp);
+            doc.ifPresent(result::add);
+        }
+        return result;
+    }
+
+    /**
+     * Run a dialog allowing the user to choose among the documents in `list`.
+     *
+     * @return Null if no document was selected. Otherwise the document selected.
+     */
+    private static XTextDocument selectDocumentDialog(List<XTextDocument> list,
+                                                      DialogService dialogService) {
+
+        class DocumentTitleViewModel {
+
+            private final XTextDocument xTextDocument;
+            private final String description;
+
+            public DocumentTitleViewModel(XTextDocument xTextDocument) {
+                this.xTextDocument = xTextDocument;
+                this.description = UnoTextDocument.getFrameTitle(xTextDocument).orElse("");
+            }
+
+            public XTextDocument getXtextDocument() {
+                return xTextDocument;
+            }
+
+            @Override
+            public String toString() {
+                return description;
+            }
+        }
+
+        List<DocumentTitleViewModel> viewModel = (list.stream()
+                                                      .map(DocumentTitleViewModel::new)
+                                                      .collect(Collectors.toList()));
+
+        // This whole method is part of a background task when
+        // auto-detecting instances, so we need to show dialog in FX
+        // thread
+        Optional<DocumentTitleViewModel> selectedDocument =
+                dialogService
+                        .showChoiceDialogAndWait(Localization.lang("Select document"),
+                                Localization.lang("Found documents:"),
+                                Localization.lang("Use selected document"),
+                                viewModel);
+
+        return selectedDocument
+                .map(DocumentTitleViewModel::getXtextDocument)
+                .orElse(null);
+    }
+
+    /**
+     * Choose a document to work with.
+     * <p>
+     * Assumes we have already connected to LibreOffice or OpenOffice.
+     * <p>
+     * If there is a single document to choose from, selects that. If there are more than one, shows selection dialog. If there are none, throws NoDocumentFoundException
+     * <p>
+     * After successful selection connects to the selected document and extracts some frequently used parts (starting points for managing its content).
+     * <p>
+     * Finally initializes this.xTextDocument with the selected document and parts extracted.
+     */
+    public void selectDocument(boolean autoSelectForSingle)
+            throws
+            NoDocumentFoundException,
+            NoSuchElementException,
+            WrappedTargetException {
+
+        XTextDocument selected;
+        List<XTextDocument> textDocumentList = getTextDocuments(this.xDesktop);
+        if (textDocumentList.isEmpty()) {
+            throw new NoDocumentFoundException("No Writer documents found");
+        } else if ((textDocumentList.size() == 1) && autoSelectForSingle) {
+            selected = textDocumentList.get(0); // Get the only one
+        } else { // Bring up a dialog
+            selected = OOBibBaseConnect.selectDocumentDialog(textDocumentList,
+                    this.dialogService);
+        }
+
+        if (selected == null) {
+            return;
+        }
+
+        this.xTextDocument = selected;
+    }
+
+    /**
+     * Mark the current document as missing.
+     */
+    private void forgetDocument() {
+        this.xTextDocument = null;
+    }
+
+    /**
+     * A simple test for document availability.
+     * <p>
+     * See also `isDocumentConnectionMissing` for a test actually attempting to use teh connection.
+     */
+    public boolean isConnectedToDocument() {
+        return this.xTextDocument != null;
+    }
+
+    /**
+     * @return true if we are connected to a document
+     */
+    public boolean isDocumentConnectionMissing() {
+        XTextDocument doc = this.xTextDocument;
+
+        if (doc == null) {
+            return true;
+        }
+
+        if (UnoTextDocument.isDocumentConnectionMissing(doc)) {
+            forgetDocument();
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Either return a valid XTextDocument or throw NoDocumentException.
+     */
+    public XTextDocument getXTextDocumentOrThrow()
+            throws
+            NoDocumentException {
+        if (isDocumentConnectionMissing()) {
+            throw new NoDocumentException("Not connected to document");
+        }
+        return this.xTextDocument;
+    }
+
+    public OOResult<XTextDocument, OOError> getXTextDocument() {
+        if (isDocumentConnectionMissing()) {
+            return OOResult.error(OOError.from(new NoDocumentException()));
+        }
+        return OOResult.ok(this.xTextDocument);
+    }
+
+    /**
+     * The title of the current document, or Optional.empty()
+     */
+    public Optional<String> getCurrentDocumentTitle() {
+        if (isDocumentConnectionMissing()) {
+            return Optional.empty();
+        } else {
+            return UnoTextDocument.getFrameTitle(this.xTextDocument);
+        }
+    }
+}
diff --git a/src/main/java/org/jabref/gui/openoffice/OOError.java b/src/main/java/org/jabref/gui/openoffice/OOError.java
new file mode 100644
index 00000000000..c8ad7ef53aa
--- /dev/null
+++ b/src/main/java/org/jabref/gui/openoffice/OOError.java
@@ -0,0 +1,141 @@
+package org.jabref.gui.openoffice;
+
+import org.jabref.gui.DialogService;
+import org.jabref.logic.JabRefException;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.logic.openoffice.NoDocumentFoundException;
+import org.jabref.model.openoffice.uno.NoDocumentException;
+
+import com.sun.star.lang.DisposedException;
+
+class OOError extends JabRefException {
+
+    private String localizedTitle;
+
+    public OOError(String title, String localizedMessage) {
+        super(localizedMessage, localizedMessage);
+        this.localizedTitle = title;
+    }
+
+    public OOError(String title, String localizedMessage, Throwable cause) {
+        super(localizedMessage, localizedMessage, cause);
+        this.localizedTitle = title;
+    }
+
+    public String getTitle() {
+        return localizedTitle;
+    }
+
+    public OOError setTitle(String title) {
+        localizedTitle = title;
+        return this;
+    }
+
+    public void showErrorDialog(DialogService dialogService) {
+        dialogService.showErrorDialogAndWait(getTitle(), getLocalizedMessage());
+    }
+
+    /*
+     * Conversions from exception caught
+     */
+
+    public static OOError from(JabRefException err) {
+        return new OOError(
+                Localization.lang("JabRefException"),
+                err.getLocalizedMessage(),
+                err);
+    }
+
+    // For DisposedException
+    public static OOError from(DisposedException err) {
+        return new OOError(
+                Localization.lang("Connection lost"),
+                Localization.lang("Connection to OpenOffice/LibreOffice has been lost."
+                        + " Please make sure OpenOffice/LibreOffice is running,"
+                        + " and try to reconnect."),
+                err);
+    }
+
+    // For NoDocumentException
+    public static OOError from(NoDocumentException err) {
+        return new OOError(
+                Localization.lang("Not connected to document"),
+                Localization.lang("Not connected to any Writer document."
+                        + " Please make sure a document is open,"
+                        + " and use the 'Select Writer document' button"
+                        + " to connect to it."),
+                err);
+    }
+
+    // For NoDocumentFoundException
+    public static OOError from(NoDocumentFoundException err) {
+        return new OOError(
+                Localization.lang("No Writer documents found"),
+                Localization.lang("Could not connect to any Writer document."
+                        + " Please make sure a document is open"
+                        + " before using the 'Select Writer document' button"
+                        + " to connect to it."),
+                err);
+    }
+
+    public static OOError fromMisc(Exception err) {
+        return new OOError(
+                "Exception",
+                err.getMessage(),
+                err);
+    }
+
+    /*
+     * Messages for error dialog. These are not thrown.
+     */
+
+    // noDataBaseIsOpenForCiting
+    public static OOError noDataBaseIsOpenForCiting() {
+        return new OOError(
+                Localization.lang("No database"),
+                Localization.lang("No bibliography database is open for citation.")
+                        + "\n"
+                        + Localization.lang("Open one before citing."));
+    }
+
+    public static OOError noDataBaseIsOpenForSyncingAfterCitation() {
+        return new OOError(
+                Localization.lang("No database"),
+                Localization.lang("No database is open for updating citation markers after citing.")
+                        + "\n"
+                        + Localization.lang("Open one before citing."));
+    }
+
+    // noDataBaseIsOpenForExport
+    public static OOError noDataBaseIsOpenForExport() {
+        return new OOError(
+                Localization.lang("No database is open"),
+                Localization.lang("We need a database to export from. Open one."));
+    }
+
+    // noDataBaseIsOpenForExport
+    public static OOError noDataBaseIsOpen() {
+        return new OOError(
+                Localization.lang("No database is open"),
+                Localization.lang("This operation requires a bibliography database."));
+    }
+
+    // noValidStyleSelected
+    public static OOError noValidStyleSelected() {
+        return new OOError(Localization.lang("No valid style file defined"),
+                Localization.lang("No bibliography style is selected for citation.")
+                        + "\n"
+                        + Localization.lang("Select one before citing.")
+                        + "\n"
+                        + Localization.lang("You must select either a valid style file,"
+                        + " or use one of the default styles."));
+    }
+
+    // noEntriesSelectedForCitation
+    public static OOError noEntriesSelectedForCitation() {
+        return new OOError(Localization.lang("No entries selected for citation"),
+                Localization.lang("No bibliography entries are selected for citation.")
+                        + "\n"
+                        + Localization.lang("Select some before citing."));
+    }
+}
diff --git a/src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java b/src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java
index 681e16ad424..298c0149309 100644
--- a/src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java
+++ b/src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java
@@ -1,8 +1,6 @@
 package org.jabref.gui.openoffice;
 
-import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
@@ -48,24 +46,17 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.openoffice.OpenOfficeFileSearch;
 import org.jabref.logic.openoffice.OpenOfficePreferences;
-import org.jabref.logic.openoffice.UndefinedParagraphFormatException;
+import org.jabref.logic.openoffice.action.Update;
 import org.jabref.logic.openoffice.style.OOBibStyle;
 import org.jabref.logic.openoffice.style.StyleLoader;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
+import org.jabref.model.openoffice.style.CitationType;
 import org.jabref.model.openoffice.uno.CreationException;
-import org.jabref.model.openoffice.uno.NoDocumentException;
 import org.jabref.preferences.PreferencesService;
 
-import com.sun.star.beans.IllegalTypeException;
-import com.sun.star.beans.NotRemoveableException;
-import com.sun.star.beans.PropertyExistException;
-import com.sun.star.beans.PropertyVetoException;
-import com.sun.star.beans.UnknownPropertyException;
 import com.sun.star.comp.helper.BootstrapException;
-import com.sun.star.container.NoSuchElementException;
-import com.sun.star.lang.WrappedTargetException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -99,19 +90,19 @@ public class OpenOfficePanel {
     private final UndoManager undoManager;
     private final TaskExecutor taskExecutor;
     private final StyleLoader loader;
-    private OpenOfficePreferences ooPrefs;
+    private OpenOfficePreferences openOfficePreferences;
     private OOBibBase ooBase;
     private OOBibStyle style;
 
     public OpenOfficePanel(PreferencesService preferencesService,
-                           OpenOfficePreferences ooPrefs,
+                           OpenOfficePreferences openOfficePreferences,
                            KeyBindingRepository keyBindingRepository,
                            TaskExecutor taskExecutor,
                            DialogService dialogService,
                            StateManager stateManager,
                            UndoManager undoManager) {
         ActionFactory factory = new ActionFactory(keyBindingRepository);
-        this.ooPrefs = ooPrefs;
+        this.openOfficePreferences = openOfficePreferences;
         this.preferencesService = preferencesService;
         this.taskExecutor = taskExecutor;
         this.dialogService = dialogService;
@@ -128,7 +119,7 @@ public OpenOfficePanel(PreferencesService preferencesService,
         manualConnect.setTooltip(new Tooltip(Localization.lang("Manual connect")));
         manualConnect.setMaxWidth(Double.MAX_VALUE);
 
-        help = factory.createIconButton(StandardActions.HELP, new HelpAction(HelpFile.OPENOFFICE_LIBREOFFICE));
+        help = factory.createIconButton(StandardActions.HELP, new HelpAction(HelpFile.OPENOFFICE_LIBREOFFICE, dialogService));
         help.setMaxWidth(Double.MAX_VALUE);
 
         selectDocument = new Button();
@@ -141,9 +132,8 @@ public OpenOfficePanel(PreferencesService preferencesService,
         update.setTooltip(new Tooltip(Localization.lang("Sync OpenOffice/LibreOffice bibliography")));
         update.setMaxWidth(Double.MAX_VALUE);
 
-        loader = new StyleLoader(ooPrefs,
-                preferencesService.getLayoutFormatterPreferences(Globals.journalAbbreviationRepository),
-                preferencesService.getGeneralPreferences().getDefaultEncoding());
+        loader = new StyleLoader(openOfficePreferences,
+                preferencesService.getLayoutFormatterPreferences(Globals.journalAbbreviationRepository));
 
         initPanel();
     }
@@ -152,24 +142,37 @@ public Node getContent() {
         return vbox;
     }
 
-    private void initPanel() {
+    /* Note: the style may still be null on return.
+     *
+     * Return true if failed. In this case the dialog is already shown.
+     */
+    private boolean getOrUpdateTheStyle(String title) {
+        final boolean FAIL = true;
+        final boolean PASS = false;
+
+        if (style == null) {
+            style = loader.getUsedStyle();
+        } else {
+            try {
+                style.ensureUpToDate();
+            } catch (IOException ex) {
+                LOGGER.warn("Unable to reload style file '" + style.getPath() + "'", ex);
+                String msg = (Localization.lang("Unable to reload style file")
+                        + "'" + style.getPath() + "'"
+                        + "\n" + ex.getMessage());
+                new OOError(title, msg, ex).showErrorDialog(dialogService);
+                return FAIL;
+            }
+        }
+        return PASS;
+    }
 
+    private void initPanel() {
         connect.setOnAction(e -> connectAutomatically());
         manualConnect.setOnAction(e -> connectManually());
 
         selectDocument.setTooltip(new Tooltip(Localization.lang("Select which open Writer document to work on")));
-        selectDocument.setOnAction(e -> {
-
-            try {
-                ooBase.selectDocument();
-                dialogService.notify(Localization.lang("Connected to document") + ": "
-                                     + ooBase.getCurrentDocumentTitle().orElse(""));
-            } catch (WrappedTargetException | IndexOutOfBoundsException |
-                     NoSuchElementException | NoDocumentException ex) {
-                LOGGER.warn("Problem connecting", ex);
-                dialogService.showErrorDialogAndWait(ex);
-            }
-        });
+        selectDocument.setOnAction(e -> ooBase.guiActionSelectDocument(false));
 
         setStyleFile.setMaxWidth(Double.MAX_VALUE);
         setStyleFile.setOnAction(event ->
@@ -185,107 +188,53 @@ private void initPanel() {
                              }));
 
         pushEntries.setTooltip(new Tooltip(Localization.lang("Cite selected entries between parenthesis")));
-        pushEntries.setOnAction(e -> pushEntries(true, true, false));
+        pushEntries.setOnAction(e -> pushEntries(CitationType.AUTHORYEAR_PAR, false));
         pushEntries.setMaxWidth(Double.MAX_VALUE);
         pushEntriesInt.setTooltip(new Tooltip(Localization.lang("Cite selected entries with in-text citation")));
-        pushEntriesInt.setOnAction(e -> pushEntries(false, true, false));
+        pushEntriesInt.setOnAction(e -> pushEntries(CitationType.AUTHORYEAR_INTEXT, false));
         pushEntriesInt.setMaxWidth(Double.MAX_VALUE);
         pushEntriesEmpty.setTooltip(new Tooltip(Localization.lang("Insert a citation without text (the entry will appear in the reference list)")));
-        pushEntriesEmpty.setOnAction(e -> pushEntries(false, false, false));
+        pushEntriesEmpty.setOnAction(e -> pushEntries(CitationType.INVISIBLE_CIT, false));
         pushEntriesEmpty.setMaxWidth(Double.MAX_VALUE);
         pushEntriesAdvanced.setTooltip(new Tooltip(Localization.lang("Cite selected entries with extra information")));
-        pushEntriesAdvanced.setOnAction(e -> pushEntries(false, true, true));
+        pushEntriesAdvanced.setOnAction(e -> pushEntries(CitationType.AUTHORYEAR_INTEXT, true));
         pushEntriesAdvanced.setMaxWidth(Double.MAX_VALUE);
 
         update.setTooltip(new Tooltip(Localization.lang("Ensure that the bibliography is up-to-date")));
 
         update.setOnAction(event -> {
-            try {
-                if (style == null) {
-                    style = loader.getUsedStyle();
-                } else {
-                    style.ensureUpToDate();
-                }
-
-                ooBase.updateSortedReferenceMarks();
-
-                List<BibDatabase> databases = getBaseList();
-                List<String> unresolvedKeys = ooBase.refreshCiteMarkers(databases, style);
-                ooBase.rebuildBibTextSection(databases, style);
-                if (!unresolvedKeys.isEmpty()) {
-                    dialogService.showErrorDialogAndWait(Localization.lang("Unable to synchronize bibliography"),
-                                                         Localization.lang("Your OpenOffice/LibreOffice document references the citation key '%0', which could not be found in your current library.",
-                                                                           unresolvedKeys.get(0)));
-                }
-            } catch (UndefinedCharacterFormatException ex) {
-                reportUndefinedCharacterFormat(ex);
-            } catch (UndefinedParagraphFormatException ex) {
-                reportUndefinedParagraphFormat(ex);
-            } catch (ConnectionLostException ex) {
-                showConnectionLostErrorMessage();
-            } catch (IOException ex) {
-                LOGGER.warn("Problem with style file", ex);
-                dialogService.showErrorDialogAndWait(Localization.lang("No valid style file defined"),
-                                                     Localization.lang("You must select either a valid style file, or use one of the default styles."));
-            } catch (BibEntryNotFoundException ex) {
-                LOGGER.debug("BibEntry not found", ex);
-                dialogService.showErrorDialogAndWait(Localization.lang("Unable to synchronize bibliography"), Localization.lang(
-                                                                                                                                "Your OpenOffice/LibreOffice document references the citation key '%0', which could not be found in your current library.",
-                                                                                                                                ex.getCitationKey()));
-            } catch (com.sun.star.lang.IllegalArgumentException | PropertyVetoException | UnknownPropertyException | WrappedTargetException | NoSuchElementException |
-                     CreationException ex) {
-                LOGGER.warn("Could not update bibliography", ex);
+            String title = Localization.lang("Could not update bibliography");
+            if (getOrUpdateTheStyle(title)) {
+                return;
             }
+            List<BibDatabase> databases = getBaseList();
+            ooBase.guiActionUpdateDocument(databases, style);
         });
 
         merge.setMaxWidth(Double.MAX_VALUE);
         merge.setTooltip(new Tooltip(Localization.lang("Combine pairs of citations that are separated by spaces only")));
-        merge.setOnAction(e -> {
-            try {
-                ooBase.combineCiteMarkers(getBaseList(), style);
-            } catch (UndefinedCharacterFormatException ex) {
-                reportUndefinedCharacterFormat(ex);
-            } catch (com.sun.star.lang.IllegalArgumentException | UnknownPropertyException | PropertyVetoException |
-                     CreationException | NoSuchElementException | WrappedTargetException | IOException |
-                     BibEntryNotFoundException ex) {
-                LOGGER.warn("Problem combining cite markers", ex);
-            }
-        });
+        merge.setOnAction(e -> ooBase.guiActionMergeCitationGroups(getBaseList(), style));
 
         unmerge.setMaxWidth(Double.MAX_VALUE);
         unmerge.setTooltip(new Tooltip(Localization.lang("Separate merged citations")));
-        unmerge.setOnAction(e -> {
-            try {
-                ooBase.unCombineCiteMarkers(getBaseList(), style);
-            } catch (UndefinedCharacterFormatException ex) {
-                reportUndefinedCharacterFormat(ex);
-            } catch (com.sun.star.lang.IllegalArgumentException | UnknownPropertyException | PropertyVetoException |
-                     CreationException | NoSuchElementException | WrappedTargetException | IOException |
-                     BibEntryNotFoundException ex) {
-                LOGGER.warn("Problem uncombining cite markers", ex);
-            }
-        });
+        unmerge.setOnAction(e -> ooBase.guiActionSeparateCitations(getBaseList(), style));
 
         ContextMenu settingsMenu = createSettingsPopup();
         settingsB.setMaxWidth(Double.MAX_VALUE);
         settingsB.setContextMenu(settingsMenu);
         settingsB.setOnAction(e -> settingsMenu.show(settingsB, Side.BOTTOM, 0, 0));
         manageCitations.setMaxWidth(Double.MAX_VALUE);
-        manageCitations.setOnAction(e -> dialogService.showCustomDialogAndWait(new ManageCitationsDialogView(ooBase)));
+        manageCitations.setOnAction(e -> {
+            ManageCitationsDialogView dialog = new ManageCitationsDialogView(ooBase);
+            if (dialog.isOkToShowThisDialog()) {
+                dialogService.showCustomDialogAndWait(dialog);
+            }
+        });
 
         exportCitations.setMaxWidth(Double.MAX_VALUE);
         exportCitations.setOnAction(event -> exportEntries());
 
-        selectDocument.setDisable(true);
-        pushEntries.setDisable(true);
-        pushEntriesInt.setDisable(true);
-        pushEntriesEmpty.setDisable(true);
-        pushEntriesAdvanced.setDisable(true);
-        update.setDisable(true);
-        merge.setDisable(true);
-        unmerge.setDisable(true);
-        manageCitations.setDisable(true);
-        exportCitations.setDisable(true);
+        updateButtonAvailability();
 
         HBox hbox = new HBox();
         hbox.getChildren().addAll(connect, manualConnect, selectDocument, update, help);
@@ -305,42 +254,18 @@ private void initPanel() {
     }
 
     private void exportEntries() {
-        try {
-            if (style == null) {
-                style = loader.getUsedStyle();
-            } else {
-                style.ensureUpToDate();
-            }
-
-            ooBase.updateSortedReferenceMarks();
-
-            List<BibDatabase> databases = getBaseList();
-            List<String> unresolvedKeys = ooBase.refreshCiteMarkers(databases, style);
-            BibDatabase newDatabase = ooBase.generateDatabase(databases);
-            if (!unresolvedKeys.isEmpty()) {
-                dialogService.showErrorDialogAndWait(Localization.lang("Unable to generate new library"),
-                                                     Localization.lang("Your OpenOffice/LibreOffice document references the citation key '%0', which could not be found in your current library.",
-                                                                       unresolvedKeys.get(0)));
-            }
-
-            BibDatabaseContext databaseContext = new BibDatabaseContext(newDatabase);
-
+        List<BibDatabase> databases = getBaseList();
+        boolean returnPartialResult = false;
+        Optional<BibDatabase> newDatabase = ooBase.exportCitedHelper(databases, returnPartialResult);
+        if (newDatabase.isPresent()) {
+            BibDatabaseContext databaseContext = new BibDatabaseContext(newDatabase.get());
             JabRefGUI.getMainFrame().addTab(databaseContext, true);
-        } catch (BibEntryNotFoundException ex) {
-            LOGGER.debug("BibEntry not found", ex);
-            dialogService.showErrorDialogAndWait(Localization.lang("Unable to synchronize bibliography"),
-                                                 Localization.lang("Your OpenOffice/LibreOffice document references the citation key '%0', which could not be found in your current library.",
-                                                                   ex.getCitationKey()));
-        } catch (com.sun.star.lang.IllegalArgumentException | UnknownPropertyException | PropertyVetoException |
-                 UndefinedCharacterFormatException | NoSuchElementException | WrappedTargetException | IOException |
-                 CreationException e) {
-            LOGGER.warn("Problem generating new database.", e);
         }
     }
 
     private List<BibDatabase> getBaseList() {
         List<BibDatabase> databases = new ArrayList<>();
-        if (ooPrefs.getUseAllDatabases()) {
+        if (openOfficePreferences.getUseAllDatabases()) {
             for (BibDatabaseContext database : stateManager.getOpenDatabases()) {
                 databases.add(database.getDatabase());
             }
@@ -359,9 +284,7 @@ private void connectAutomatically() {
         if (officeInstallation.isExecutablePathDefined()) {
             connect();
         } else {
-
             Task<List<Path>> taskConnectIfInstalled = new Task<>() {
-
                 @Override
                 protected List<Path> call() {
                     return OpenOfficeFileSearch.detectInstallations();
@@ -393,7 +316,6 @@ private void connectManually() {
         DetectOpenOfficeInstallation officeInstallation = new DetectOpenOfficeInstallation(preferencesService, dialogService);
 
         if (selectedPath.isPresent()) {
-
             BackgroundTask.wrap(() -> officeInstallation.setOpenOfficePreferences(selectedPath.get()))
                           .withInitialMessage("Searching for executable")
                           .onFailure(dialogService::showErrorDialogAndWait).onSuccess(value -> {
@@ -401,7 +323,6 @@ private void connectManually() {
                                   connect();
                               } else {
                                   dialogService.showErrorDialogAndWait(Localization.lang("Could not connect to running OpenOffice/LibreOffice."), Localization.lang("If connecting manually, please verify program and library paths."));
-
                               }
                           })
                           .executeWith(taskExecutor);
@@ -410,16 +331,41 @@ private void connectManually() {
         }
     }
 
+    private void updateButtonAvailability() {
+        boolean isConnected = (ooBase != null);
+        boolean isConnectedToDocument = isConnected && !ooBase.isDocumentConnectionMissing();
+
+        // For these, we need to watch something
+        boolean hasStyle = true; // (style != null);
+        boolean hasDatabase = true; // !getBaseList().isEmpty();
+        boolean hasSelectedBibEntry = true;
+
+        selectDocument.setDisable(!(isConnected));
+        pushEntries.setDisable(!(isConnectedToDocument && hasStyle && hasDatabase));
+
+        boolean canCite = isConnectedToDocument && hasStyle && hasSelectedBibEntry;
+        pushEntriesInt.setDisable(!canCite);
+        pushEntriesEmpty.setDisable(!canCite);
+        pushEntriesAdvanced.setDisable(!canCite);
+
+        boolean canRefreshDocument = isConnectedToDocument && hasStyle;
+        update.setDisable(!canRefreshDocument);
+        merge.setDisable(!canRefreshDocument);
+        unmerge.setDisable(!canRefreshDocument);
+        manageCitations.setDisable(!canRefreshDocument);
+
+        exportCitations.setDisable(!(isConnectedToDocument && hasDatabase));
+    }
+
     private void connect() {
-        ooPrefs = preferencesService.getOpenOfficePreferences();
+        openOfficePreferences = preferencesService.getOpenOfficePreferences();
 
         Task<OOBibBase> connectTask = new Task<>() {
-
             @Override
             protected OOBibBase call() throws Exception {
                 updateProgress(ProgressBar.INDETERMINATE_PROGRESS, ProgressBar.INDETERMINATE_PROGRESS);
 
-                var path = Path.of(ooPrefs.getExecutablePath());
+                var path = Path.of(openOfficePreferences.getExecutablePath());
                 return createBibBase(path);
             }
         };
@@ -427,45 +373,32 @@ protected OOBibBase call() throws Exception {
         connectTask.setOnSucceeded(value -> {
             ooBase = connectTask.getValue();
 
-            try {
-                ooBase.selectDocument();
-            } catch (NoSuchElementException | WrappedTargetException | NoDocumentException ex) {
-                dialogService.showErrorDialogAndWait(Localization.lang("Error connecting to Writer document"), Localization.lang("You need to open Writer with a document before connecting"), ex);
-                LOGGER.error("Error connecting to writer document", ex);
-            }
-
-            if (ooBase.isConnectedToDocument()) {
-                dialogService.notify(Localization.lang("Connected to document") + ": " + ooBase.getCurrentDocumentTitle().orElse(""));
-            }
+            ooBase.guiActionSelectDocument(true);
 
             // Enable actions that depend on Connect:
-            selectDocument.setDisable(false);
-            pushEntries.setDisable(false);
-            pushEntriesInt.setDisable(false);
-            pushEntriesEmpty.setDisable(false);
-            pushEntriesAdvanced.setDisable(false);
-            update.setDisable(false);
-            merge.setDisable(false);
-            unmerge.setDisable(false);
-            manageCitations.setDisable(false);
-            exportCitations.setDisable(false);
+            updateButtonAvailability();
         });
+
         connectTask.setOnFailed(value -> {
             Throwable ex = connectTask.getException();
+            LOGGER.error("autodetect failed", ex);
             if (ex instanceof UnsatisfiedLinkError) {
                 LOGGER.warn("Could not connect to running OpenOffice/LibreOffice", ex);
 
                 dialogService.showErrorDialogAndWait(Localization.lang("Unable to connect. One possible reason is that JabRef "
-                                                                       + "and OpenOffice/LibreOffice are not both running in either 32 bit mode or 64 bit mode."));
+                        + "and OpenOffice/LibreOffice are not both running in either 32 bit mode or 64 bit mode."));
             } else if (ex instanceof IOException) {
                 LOGGER.warn("Could not connect to running OpenOffice/LibreOffice", ex);
 
                 dialogService.showErrorDialogAndWait(Localization.lang("Could not connect to running OpenOffice/LibreOffice."),
-                                                     Localization.lang("Could not connect to running OpenOffice/LibreOffice.")
-                                                                                                                                + "\n"
-                                                                                                                                + Localization.lang("Make sure you have installed OpenOffice/LibreOffice with Java support.") + "\n"
-                                                                                                                                + Localization.lang("If connecting manually, please verify program and library paths.") + "\n" + "\n" + Localization.lang("Error message:"),
-                                                     ex);
+                        Localization.lang("Could not connect to running OpenOffice/LibreOffice.")
+                                + "\n"
+                                + Localization.lang("Make sure you have installed OpenOffice/LibreOffice with Java support.") + "\n"
+                                + Localization.lang("If connecting manually, please verify program and library paths.") + "\n" + "\n" + Localization.lang("Error message:"),
+                        ex);
+            } else if (ex instanceof BootstrapException bootstrapEx) {
+               LOGGER.error("Exception boostrap cause", bootstrapEx.getTargetException());
+               dialogService.showErrorDialogAndWait("Bootstrap error", bootstrapEx.getTargetException());
             } else {
                 dialogService.showErrorDialogAndWait(Localization.lang("Autodetection failed"), Localization.lang("Autodetection failed"), ex);
             }
@@ -475,65 +408,89 @@ protected OOBibBase call() throws Exception {
         taskExecutor.execute(connectTask);
     }
 
-    private OOBibBase createBibBase(Path loPath) throws IOException, InvocationTargetException, IllegalAccessException,
-        BootstrapException, CreationException, ClassNotFoundException {
-        return new OOBibBase(loPath, true, dialogService);
+    private OOBibBase createBibBase(Path loPath) throws BootstrapException, CreationException {
+        return new OOBibBase(loPath, dialogService);
     }
 
-    private void pushEntries(boolean inParenthesisIn, boolean withText, boolean addPageInfo) {
-        if (!ooBase.isConnectedToDocument()) {
-            dialogService.showErrorDialogAndWait(Localization.lang("Error pushing entries"), Localization.lang("Not connected to any Writer document. Please" + " make sure a document is open, and use the 'Select Writer document' button to connect to it."));
+    /**
+     * Given the withText and inParenthesis options, return the corresponding citationType.
+     *
+     * @param withText      False means invisible citation (no text).
+     * @param inParenthesis True means "(Au and Thor 2000)". False means "Au and Thor (2000)".
+     */
+    private static CitationType citationTypeFromOptions(boolean withText, boolean inParenthesis) {
+        if (!withText) {
+            return CitationType.INVISIBLE_CIT;
+        }
+        return (inParenthesis
+                ? CitationType.AUTHORYEAR_PAR
+                : CitationType.AUTHORYEAR_INTEXT);
+    }
+
+    private void pushEntries(CitationType citationType, boolean addPageInfo) {
+        final String errorDialogTitle = Localization.lang("Error pushing entries");
+
+        if (stateManager.getActiveDatabase().isEmpty()
+                || (stateManager.getActiveDatabase().get().getDatabase() == null)) {
+            OOError.noDataBaseIsOpenForCiting()
+                   .setTitle(errorDialogTitle)
+                   .showErrorDialog(dialogService);
+            return;
+        }
+
+        final BibDatabase database = stateManager.getActiveDatabase().get().getDatabase();
+        if (database == null) {
+            OOError.noDataBaseIsOpenForCiting()
+                   .setTitle(errorDialogTitle)
+                   .showErrorDialog(dialogService);
+            return;
+        }
+
+        List<BibEntry> entries = stateManager.getSelectedEntries();
+        if (entries.isEmpty()) {
+            OOError.noEntriesSelectedForCitation()
+                   .setTitle(errorDialogTitle)
+                   .showErrorDialog(dialogService);
+            return;
+        }
+
+        if (getOrUpdateTheStyle(errorDialogTitle)) {
             return;
         }
 
-        Boolean inParenthesis = inParenthesisIn;
         String pageInfo = null;
         if (addPageInfo) {
+            boolean withText = citationType.withText();
 
             Optional<AdvancedCiteDialogViewModel> citeDialogViewModel = dialogService.showCustomDialogAndWait(new AdvancedCiteDialogView());
             if (citeDialogViewModel.isPresent()) {
-
                 AdvancedCiteDialogViewModel model = citeDialogViewModel.get();
                 if (!model.pageInfoProperty().getValue().isEmpty()) {
                     pageInfo = model.pageInfoProperty().getValue();
                 }
-                inParenthesis = model.citeInParProperty().getValue();
+                citationType = citationTypeFromOptions(withText, model.citeInParProperty().getValue());
+            } else {
+                // user canceled
+                return;
             }
         }
 
-        Optional<BibDatabaseContext> databaseContext = stateManager.getActiveDatabase();
-        if (databaseContext.isPresent()) {
-            final BibDatabase database = databaseContext.get().getDatabase();
-            final List<BibEntry> entries = stateManager.getSelectedEntries();
-            if (!entries.isEmpty() && checkThatEntriesHaveKeys(entries)) {
-
-                try {
-                    if (style == null) {
-                        style = loader.getUsedStyle();
-                    }
-                    ooBase.insertEntry(entries, database, getBaseList(), style, inParenthesis, withText, pageInfo,
-                                       ooPrefs.getSyncWhenCiting());
-                } catch (FileNotFoundException ex) {
-
-                    dialogService.showErrorDialogAndWait(
-                                                         Localization.lang("No valid style file defined"),
-                                                         Localization.lang("You must select either a valid style file, or use one of the default styles."));
-
-                    LOGGER.warn("Problem with style file", ex);
-                } catch (ConnectionLostException ex) {
-                    showConnectionLostErrorMessage();
-                } catch (UndefinedCharacterFormatException ex) {
-                    reportUndefinedCharacterFormat(ex);
-                } catch (UndefinedParagraphFormatException ex) {
-                    reportUndefinedParagraphFormat(ex);
-                } catch (com.sun.star.lang.IllegalArgumentException | UnknownPropertyException | PropertyVetoException |
-                         CreationException | NoSuchElementException | WrappedTargetException | IOException |
-                         BibEntryNotFoundException | IllegalTypeException | PropertyExistException |
-                         NotRemoveableException ex) {
-                    LOGGER.warn("Could not insert entry", ex);
-                }
-            }
+        if (!checkThatEntriesHaveKeys(entries)) {
+            // Not all entries have keys and key generation was declined.
+            return;
         }
+
+        Optional<Update.SyncOptions> syncOptions =
+                (openOfficePreferences.getSyncWhenCiting()
+                        ? Optional.of(new Update.SyncOptions(getBaseList()))
+                        : Optional.empty());
+
+        ooBase.guiActionInsertEntry(entries,
+                database,
+                style,
+                citationType,
+                pageInfo,
+                syncOptions);
     }
 
     /**
@@ -588,33 +545,11 @@ private boolean checkThatEntriesHaveKeys(List<BibEntry> entries) {
         }
     }
 
-    private void showConnectionLostErrorMessage() {
-        dialogService.showErrorDialogAndWait(Localization.lang("Connection lost"),
-                                             Localization.lang("Connection to OpenOffice/LibreOffice has been lost. " + "Please make sure OpenOffice/LibreOffice is running, and try to reconnect."));
-    }
-
-    private void reportUndefinedParagraphFormat(UndefinedParagraphFormatException ex) {
-        dialogService.showErrorDialogAndWait(Localization.lang("Undefined paragraph format"),
-                                             Localization.lang("Your style file specifies the paragraph format '%0', "
-                                                               + "which is undefined in your current OpenOffice/LibreOffice document.",
-                                                               ex.getFormatName()) + "\n" + Localization.lang("The paragraph format is controlled by the property 'ReferenceParagraphFormat' or 'ReferenceHeaderParagraphFormat' in the style file."));
-    }
-
-    private void reportUndefinedCharacterFormat(UndefinedCharacterFormatException ex) {
-        dialogService.showErrorDialogAndWait(Localization.lang("Undefined character format"),
-                                             Localization.lang("Your style file specifies the character format '%0', "
-                                                               + "which is undefined in your current OpenOffice/LibreOffice document.",
-                                                               ex.getFormatName()) + "\n" + Localization.lang("The character format is controlled by the citation property 'CitationCharacterFormat' in the style file.")
-
-        );
-    }
-
     private ContextMenu createSettingsPopup() {
-
         ContextMenu contextMenu = new ContextMenu();
 
         CheckMenuItem autoSync = new CheckMenuItem(Localization.lang("Automatically sync bibliography when inserting citations"));
-        autoSync.selectedProperty().set(ooPrefs.getSyncWhenCiting());
+        autoSync.selectedProperty().set(openOfficePreferences.getSyncWhenCiting());
 
         ToggleGroup toggleGroup = new ToggleGroup();
         RadioMenuItem useActiveBase = new RadioMenuItem(Localization.lang("Look up BibTeX entries in the active tab only"));
@@ -624,31 +559,37 @@ private ContextMenu createSettingsPopup() {
 
         MenuItem clearConnectionSettings = new MenuItem(Localization.lang("Clear connection settings"));
 
-        if (ooPrefs.getUseAllDatabases()) {
+        if (openOfficePreferences.getUseAllDatabases()) {
             useAllBases.setSelected(true);
         } else {
             useActiveBase.setSelected(true);
         }
 
         autoSync.setOnAction(e -> {
-            ooPrefs.setSyncWhenCiting(autoSync.isSelected());
-            preferencesService.setOpenOfficePreferences(ooPrefs);
+            openOfficePreferences.setSyncWhenCiting(autoSync.isSelected());
+            preferencesService.setOpenOfficePreferences(openOfficePreferences);
         });
         useAllBases.setOnAction(e -> {
-            ooPrefs.setUseAllDatabases(useAllBases.isSelected());
-            preferencesService.setOpenOfficePreferences(ooPrefs);
+            openOfficePreferences.setUseAllDatabases(useAllBases.isSelected());
+            preferencesService.setOpenOfficePreferences(openOfficePreferences);
         });
         useActiveBase.setOnAction(e -> {
-            ooPrefs.setUseAllDatabases(!useActiveBase.isSelected());
-            preferencesService.setOpenOfficePreferences(ooPrefs);
+            openOfficePreferences.setUseAllDatabases(!useActiveBase.isSelected());
+            preferencesService.setOpenOfficePreferences(openOfficePreferences);
         });
         clearConnectionSettings.setOnAction(e -> {
-            ooPrefs.clearConnectionSettings();
+            openOfficePreferences.clearConnectionSettings();
             dialogService.notify(Localization.lang("Cleared connection settings"));
-            preferencesService.setOpenOfficePreferences(ooPrefs);
+            preferencesService.setOpenOfficePreferences(openOfficePreferences);
         });
 
-        contextMenu.getItems().addAll(autoSync, new SeparatorMenuItem(), useActiveBase, useAllBases, new SeparatorMenuItem(), clearConnectionSettings);
+        contextMenu.getItems().addAll(
+                autoSync,
+                new SeparatorMenuItem(),
+                useActiveBase,
+                useAllBases,
+                new SeparatorMenuItem(),
+                clearConnectionSettings);
 
         return contextMenu;
     }
diff --git a/src/main/java/org/jabref/gui/openoffice/StyleSelectDialogView.java b/src/main/java/org/jabref/gui/openoffice/StyleSelectDialogView.java
index 6792d2fbb8e..2b66e0f6013 100644
--- a/src/main/java/org/jabref/gui/openoffice/StyleSelectDialogView.java
+++ b/src/main/java/org/jabref/gui/openoffice/StyleSelectDialogView.java
@@ -36,6 +36,7 @@ public class StyleSelectDialogView extends BaseDialog<OOBibStyle> {
     private final MenuItem edit = new MenuItem(Localization.lang("Edit"));
     private final MenuItem reload = new MenuItem(Localization.lang("Reload"));
     private final StyleLoader loader;
+
     @FXML private TableColumn<StyleSelectItemViewModel, String> colName;
     @FXML private TableView<StyleSelectItemViewModel> tvStyles;
     @FXML private TableColumn<StyleSelectItemViewModel, String> colJournals;
@@ -54,7 +55,6 @@ public class StyleSelectDialogView extends BaseDialog<OOBibStyle> {
     private PreviewViewer previewBook;
 
     public StyleSelectDialogView(StyleLoader loader) {
-
         this.loader = loader;
 
         ViewLoader.view(this)
diff --git a/src/main/java/org/jabref/gui/openoffice/StyleSelectDialogViewModel.java b/src/main/java/org/jabref/gui/openoffice/StyleSelectDialogViewModel.java
index 2fccfd5a332..b78e69aeba9 100644
--- a/src/main/java/org/jabref/gui/openoffice/StyleSelectDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/openoffice/StyleSelectDialogViewModel.java
@@ -85,7 +85,6 @@ public ListProperty<StyleSelectItemViewModel> stylesProperty() {
     }
 
     public void deleteStyle() {
-
         OOBibStyle style = selectedItem.getValue().getStyle();
         if (loader.removeStyle(style)) {
             styles.remove(selectedItem.get());
@@ -94,7 +93,7 @@ public void deleteStyle() {
 
     public void editStyle() {
         OOBibStyle style = selectedItem.getValue().getStyle();
-        Optional<ExternalFileType> type = ExternalFileTypes.getInstance().getExternalFileTypeByExt("jstyle");
+        Optional<ExternalFileType> type = ExternalFileTypes.getExternalFileTypeByExt("jstyle", preferencesService.getFilePreferences());
         try {
             JabRefDesktop.openExternalFileAnyFormat(new BibDatabaseContext(), preferencesService, style.getPath(), type);
         } catch (IOException e) {
diff --git a/src/main/java/org/jabref/gui/openoffice/UndefinedCharacterFormatException.java b/src/main/java/org/jabref/gui/openoffice/UndefinedCharacterFormatException.java
deleted file mode 100644
index 4ab29ca2fa5..00000000000
--- a/src/main/java/org/jabref/gui/openoffice/UndefinedCharacterFormatException.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.jabref.gui.openoffice;
-
-/**
- * Exception used to indicate that the plugin attempted to set a character format that is
- * not defined in the current OpenOffice document.
- */
-class UndefinedCharacterFormatException extends Exception {
-
-    private final String formatName;
-
-    public UndefinedCharacterFormatException(String formatName) {
-        super();
-        this.formatName = formatName;
-    }
-
-    public String getFormatName() {
-        return formatName;
-    }
-}
diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesDialogViewModel.java b/src/main/java/org/jabref/gui/preferences/PreferencesDialogViewModel.java
index fb1c888f01f..0b58c0fdfff 100644
--- a/src/main/java/org/jabref/gui/preferences/PreferencesDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/PreferencesDialogViewModel.java
@@ -227,7 +227,7 @@ public void storeAllSettings() {
     }
 
     /**
-     * Inserts the preference values into the the Properties of the ViewModel
+     * Inserts the preference values into the Properties of the ViewModel
      */
     public void setValues() {
         for (PreferencesTab preferencesTab : preferenceTabs) {
diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesSearchHandler.java b/src/main/java/org/jabref/gui/preferences/PreferencesSearchHandler.java
index e09ba7f4815..96cbfe053d6 100644
--- a/src/main/java/org/jabref/gui/preferences/PreferencesSearchHandler.java
+++ b/src/main/java/org/jabref/gui/preferences/PreferencesSearchHandler.java
@@ -79,7 +79,6 @@ private ArrayListMultimap<PreferencesTab, Labeled> getPrefsTabLabelMap() {
             if (builder instanceof Parent) {
                 Parent parentBuilder = (Parent) builder;
                 scanLabeledControls(parentBuilder, prefsTabLabelMap, preferencesTab);
-
             }
         }
         return prefsTabLabelMap;
@@ -92,10 +91,8 @@ protected ListProperty<PreferencesTab> filteredPreferenceTabsProperty() {
     private static void scanLabeledControls(Parent parent, ArrayListMultimap<PreferencesTab, Labeled> prefsTabLabelMap, PreferencesTab preferencesTab) {
         for (Node child : parent.getChildrenUnmodifiable()) {
             if (!(child instanceof Labeled)) {
-
                 scanLabeledControls((Parent) child, prefsTabLabelMap, preferencesTab);
             } else {
-
                 Labeled labeled = (Labeled) child;
                 if (!labeled.getText().isEmpty()) {
                     prefsTabLabelMap.put(preferencesTab, labeled);
diff --git a/src/main/java/org/jabref/gui/preferences/citationkeypattern/CitationKeyPatternTab.java b/src/main/java/org/jabref/gui/preferences/citationkeypattern/CitationKeyPatternTab.java
index 325493c520f..1b1f2838949 100644
--- a/src/main/java/org/jabref/gui/preferences/citationkeypattern/CitationKeyPatternTab.java
+++ b/src/main/java/org/jabref/gui/preferences/citationkeypattern/CitationKeyPatternTab.java
@@ -60,7 +60,7 @@ public void initialize() {
         bibtexKeyPatternTable.defaultKeyPatternProperty().bindBidirectional(viewModel.defaultKeyPatternProperty());
 
         ActionFactory actionFactory = new ActionFactory(Globals.getKeyPrefs());
-        actionFactory.configureIconButton(StandardActions.HELP_KEY_PATTERNS, new HelpAction(HelpFile.CITATION_KEY_PATTERN), keyPatternHelp);
+        actionFactory.configureIconButton(StandardActions.HELP_KEY_PATTERNS, new HelpAction(HelpFile.CITATION_KEY_PATTERN, dialogService), keyPatternHelp);
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/preferences/customimporter/CustomImporterTabViewModel.java b/src/main/java/org/jabref/gui/preferences/customimporter/CustomImporterTabViewModel.java
index 218c76d940a..2f8065d5615 100644
--- a/src/main/java/org/jabref/gui/preferences/customimporter/CustomImporterTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/customimporter/CustomImporterTabViewModel.java
@@ -42,7 +42,7 @@ public CustomImporterTabViewModel(PreferencesService preferences, DialogService
 
     @Override
     public void setValues() {
-        Set<CustomImporter> importersLogic = preferences.getCustomImportFormats();
+        Set<CustomImporter> importersLogic = preferences.getImporterPreferences().getCustomImportList();
         for (CustomImporter importer : importersLogic) {
             importers.add(new ImporterViewModel(importer));
         }
@@ -50,14 +50,13 @@ public void setValues() {
 
     @Override
     public void storeSettings() {
-        preferences.storeCustomImportFormats(importers.stream()
-                                                      .map(ImporterViewModel::getLogic)
-                                                      .collect(Collectors.toSet()));
+        preferences.getImporterPreferences().getCustomImportList().clear();
+        preferences.getImporterPreferences().getCustomImportList().addAll(importers.stream()
+                                                                                   .map(ImporterViewModel::getLogic)
+                                                                                   .collect(Collectors.toSet()));
         Globals.IMPORT_FORMAT_READER.resetImportFormats(
                 preferences.getImporterPreferences(),
-                preferences.getGeneralPreferences(),
                 preferences.getImportFormatPreferences(),
-                preferences.getXmpPreferences(),
                 Globals.getFileUpdateMonitor());
     }
 
diff --git a/src/main/java/org/jabref/gui/preferences/entryeditortabs/CustomEditorFieldsTab.java b/src/main/java/org/jabref/gui/preferences/entryeditortabs/CustomEditorFieldsTab.java
index f00fbe24ee8..319f4e83f02 100644
--- a/src/main/java/org/jabref/gui/preferences/entryeditortabs/CustomEditorFieldsTab.java
+++ b/src/main/java/org/jabref/gui/preferences/entryeditortabs/CustomEditorFieldsTab.java
@@ -37,7 +37,7 @@ public void initialize() {
         fieldsTextArea.textProperty().bindBidirectional(viewModel.fieldsProperty());
 
         ActionFactory actionFactory = new ActionFactory(Globals.getKeyPrefs());
-        actionFactory.configureIconButton(StandardActions.HELP, new HelpAction(HelpFile.GENERAL_FIELDS), generalFieldsHelp);
+        actionFactory.configureIconButton(StandardActions.HELP, new HelpAction(HelpFile.GENERAL_FIELDS, dialogService), generalFieldsHelp);
     }
 
     @FXML
diff --git a/src/main/java/org/jabref/gui/externalfiletype/EditExternalFileTypeEntryDialog.fxml b/src/main/java/org/jabref/gui/preferences/externalfiletypes/EditExternalFileTypeEntryDialog.fxml
similarity index 51%
rename from src/main/java/org/jabref/gui/externalfiletype/EditExternalFileTypeEntryDialog.fxml
rename to src/main/java/org/jabref/gui/preferences/externalfiletypes/EditExternalFileTypeEntryDialog.fxml
index 2e885d60011..d197a829648 100644
--- a/src/main/java/org/jabref/gui/externalfiletype/EditExternalFileTypeEntryDialog.fxml
+++ b/src/main/java/org/jabref/gui/preferences/externalfiletypes/EditExternalFileTypeEntryDialog.fxml
@@ -10,7 +10,7 @@
 <?import javafx.scene.layout.ColumnConstraints?>
 <?import javafx.scene.layout.GridPane?>
 <?import javafx.scene.layout.RowConstraints?>
-<DialogPane minHeight="-Infinity" prefHeight="302.0" prefWidth="508.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.externalfiletype.EditExternalFileTypeEntryDialog">
+<DialogPane minHeight="-Infinity" prefHeight="302.0" prefWidth="508.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.preferences.externalfiletypes.EditExternalFileTypeEntryDialog">
     <content>
         <GridPane>
             <columnConstraints>
@@ -27,25 +27,23 @@
                 <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
                 <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
             </rowConstraints>
-            <children>
-                <Label text="%Icon"/>
-                <Label text="%Name" GridPane.rowIndex="1"/>
-                <Label text="%Extension" GridPane.rowIndex="2"/>
-                <Label text="%MIME type" GridPane.rowIndex="3"/>
-                <Label text="%Application" GridPane.rowIndex="4"/>
-                <RadioButton fx:id="defaultApplication" mnemonicParsing="false" selected="true" text="%Default" GridPane.columnIndex="1" GridPane.rowIndex="4">
-                    <toggleGroup>
-                        <ToggleGroup fx:id="applicationToggleGroup"/>
-                    </toggleGroup>
-                </RadioButton>
-                <TextField fx:id="name" GridPane.columnIndex="1" GridPane.columnSpan="2" GridPane.rowIndex="1"/>
-                <TextField fx:id="extension" GridPane.columnIndex="1" GridPane.columnSpan="2" GridPane.rowIndex="2"/>
-                <TextField fx:id="mimeType" GridPane.columnIndex="1" GridPane.columnSpan="2" GridPane.rowIndex="3"/>
-                <RadioButton fx:id="customApplication" mnemonicParsing="false" text="Custom" toggleGroup="$applicationToggleGroup" GridPane.columnIndex="1" GridPane.rowIndex="5"/>
-                <TextField fx:id="selectedApplication" prefWidth="152.0" GridPane.columnIndex="2" GridPane.rowIndex="5"/>
-                <Button fx:id="btnBrowse" mnemonicParsing="false" onAction="#openFileChooser" text="%Browse" GridPane.columnIndex="3" GridPane.rowIndex="5"/>
-                <Label fx:id="icon" GridPane.columnIndex="1"/>
-            </children>
+            <Label text="%Icon"/>
+            <Label text="%Name" GridPane.rowIndex="1"/>
+            <Label text="%Extension" GridPane.rowIndex="2"/>
+            <Label text="%MIME type" GridPane.rowIndex="3"/>
+            <Label text="%Application" GridPane.rowIndex="4"/>
+            <RadioButton fx:id="defaultApplication" mnemonicParsing="false" selected="true" text="%Default" GridPane.columnIndex="1" GridPane.rowIndex="4">
+                <toggleGroup>
+                    <ToggleGroup fx:id="applicationToggleGroup"/>
+                </toggleGroup>
+            </RadioButton>
+            <TextField fx:id="name" GridPane.columnIndex="1" GridPane.columnSpan="2" GridPane.rowIndex="1"/>
+            <TextField fx:id="extension" GridPane.columnIndex="1" GridPane.columnSpan="2" GridPane.rowIndex="2"/>
+            <TextField fx:id="mimeType" GridPane.columnIndex="1" GridPane.columnSpan="2" GridPane.rowIndex="3"/>
+            <RadioButton fx:id="customApplication" mnemonicParsing="false" text="Custom" toggleGroup="$applicationToggleGroup" GridPane.columnIndex="1" GridPane.rowIndex="5"/>
+            <TextField fx:id="selectedApplication" prefWidth="152.0" GridPane.columnIndex="2" GridPane.rowIndex="5"/>
+            <Button fx:id="btnBrowse" mnemonicParsing="false" onAction="#openFileChooser" text="%Browse" GridPane.columnIndex="3" GridPane.rowIndex="5"/>
+            <Label fx:id="icon" GridPane.columnIndex="1"/>
         </GridPane>
     </content>
     <ButtonType fx:constant="OK"/>
diff --git a/src/main/java/org/jabref/gui/externalfiletype/EditExternalFileTypeEntryDialog.java b/src/main/java/org/jabref/gui/preferences/externalfiletypes/EditExternalFileTypeEntryDialog.java
similarity index 90%
rename from src/main/java/org/jabref/gui/externalfiletype/EditExternalFileTypeEntryDialog.java
rename to src/main/java/org/jabref/gui/preferences/externalfiletypes/EditExternalFileTypeEntryDialog.java
index 622ab07fb97..377291e96e4 100644
--- a/src/main/java/org/jabref/gui/externalfiletype/EditExternalFileTypeEntryDialog.java
+++ b/src/main/java/org/jabref/gui/preferences/externalfiletypes/EditExternalFileTypeEntryDialog.java
@@ -1,4 +1,4 @@
-package org.jabref.gui.externalfiletype;
+package org.jabref.gui.preferences.externalfiletypes;
 
 import javax.inject.Inject;
 
@@ -35,11 +35,12 @@ public class EditExternalFileTypeEntryDialog extends BaseDialog<Void> {
     private final NativeDesktop nativeDesktop = JabRefDesktop.getNativeDesktop();
     private final FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder().withInitialDirectory(nativeDesktop.getApplicationDirectory()).build();
 
+    private final ExternalFileTypeItemViewModel item;
+
     private EditExternalFileTypeViewModel viewModel;
-    private CustomExternalFileType entry;
 
-    public EditExternalFileTypeEntryDialog(CustomExternalFileType entry, String dialogTitle) {
-        this.entry = entry;
+    public EditExternalFileTypeEntryDialog(ExternalFileTypeItemViewModel item, String dialogTitle) {
+        this.item = item;
 
         this.setTitle(dialogTitle);
 
@@ -57,7 +58,7 @@ public EditExternalFileTypeEntryDialog(CustomExternalFileType entry, String dial
 
     @FXML
     public void initialize() {
-        viewModel = new EditExternalFileTypeViewModel(entry);
+        viewModel = new EditExternalFileTypeViewModel(item);
 
         icon.setGraphic(viewModel.getIcon());
 
diff --git a/src/main/java/org/jabref/gui/externalfiletype/EditExternalFileTypeViewModel.java b/src/main/java/org/jabref/gui/preferences/externalfiletypes/EditExternalFileTypeViewModel.java
similarity index 65%
rename from src/main/java/org/jabref/gui/externalfiletype/EditExternalFileTypeViewModel.java
rename to src/main/java/org/jabref/gui/preferences/externalfiletypes/EditExternalFileTypeViewModel.java
index 3af300d2585..693f6eab412 100644
--- a/src/main/java/org/jabref/gui/externalfiletype/EditExternalFileTypeViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/externalfiletypes/EditExternalFileTypeViewModel.java
@@ -1,4 +1,4 @@
-package org.jabref.gui.externalfiletype;
+package org.jabref.gui.preferences.externalfiletypes;
 
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
@@ -7,39 +7,41 @@
 import javafx.scene.Node;
 
 public class EditExternalFileTypeViewModel {
+    private final ExternalFileTypeItemViewModel fileTypeViewModel;
 
-    private final StringProperty extensionProperty = new SimpleStringProperty("");
     private final StringProperty nameProperty = new SimpleStringProperty("");
     private final StringProperty mimeTypeProperty = new SimpleStringProperty("");
+    private final StringProperty extensionProperty = new SimpleStringProperty("");
     private final StringProperty selectedApplicationProperty = new SimpleStringProperty("");
     private final BooleanProperty defaultApplicationSelectedProperty = new SimpleBooleanProperty(false);
     private final BooleanProperty customApplicationSelectedProperty = new SimpleBooleanProperty(false);
-    private final Node icon;
-    private final CustomExternalFileType fileType;
-
-    public EditExternalFileTypeViewModel(CustomExternalFileType fileType) {
-        this.fileType = fileType;
-        extensionProperty.setValue(fileType.getExtension());
-        nameProperty.setValue(fileType.getName());
-        mimeTypeProperty.setValue(fileType.getMimeType());
-        selectedApplicationProperty.setValue(fileType.getOpenWithApplication());
-        icon = fileType.getIcon().getGraphicNode();
-
-        if (fileType.getOpenWithApplication().isEmpty()) {
+
+    public EditExternalFileTypeViewModel(ExternalFileTypeItemViewModel fileTypeViewModel) {
+        this.fileTypeViewModel = fileTypeViewModel;
+
+        extensionProperty.setValue(fileTypeViewModel.extensionProperty().getValue());
+        nameProperty.setValue(fileTypeViewModel.nameProperty().getValue());
+        mimeTypeProperty.setValue(fileTypeViewModel.mimetypeProperty().getValue());
+
+        if (fileTypeViewModel.applicationProperty().getValue().isEmpty()) {
             defaultApplicationSelectedProperty.setValue(true);
         } else {
             customApplicationSelectedProperty.setValue(true);
         }
     }
 
-    public StringProperty extensionProperty() {
-        return extensionProperty;
+    public Node getIcon() {
+        return fileTypeViewModel.iconProperty().getValue().getGraphicNode();
     }
 
     public StringProperty nameProperty() {
         return nameProperty;
     }
 
+    public StringProperty extensionProperty() {
+        return extensionProperty;
+    }
+
     public StringProperty mimeTypeProperty() {
         return mimeTypeProperty;
     }
@@ -56,30 +58,25 @@ public BooleanProperty customApplicationSelectedProperty() {
         return customApplicationSelectedProperty;
     }
 
-    public Node getIcon() {
-        return icon;
-    }
-
     public void storeSettings() {
-
-        fileType.setName(nameProperty.getValue().trim());
-        fileType.setMimeType(mimeTypeProperty.getValue().trim());
+        fileTypeViewModel.nameProperty().setValue(nameProperty.getValue().trim());
+        fileTypeViewModel.mimetypeProperty().setValue(mimeTypeProperty.getValue().trim());
 
         String ext = extensionProperty.getValue().trim();
         if (!ext.isEmpty() && (ext.charAt(0) == '.')) {
-            fileType.setExtension(ext.substring(1));
+            fileTypeViewModel.extensionProperty().setValue(ext.substring(1));
         } else {
-            fileType.setExtension(ext);
+            fileTypeViewModel.extensionProperty().setValue(ext);
         }
 
         String application = selectedApplicationProperty.getValue().trim();
 
         // store application as empty if the "Default" option is selected, or if the application name is empty:
         if (defaultApplicationSelectedProperty.getValue() || application.isEmpty()) {
-            fileType.setOpenWith("");
+            fileTypeViewModel.applicationProperty().setValue("");
             selectedApplicationProperty.setValue("");
         } else {
-            fileType.setOpenWith(application);
+            fileTypeViewModel.applicationProperty().setValue(application);
         }
     }
 }
diff --git a/src/main/java/org/jabref/gui/preferences/externalfiletypes/ExternalFileTypeItemViewModel.java b/src/main/java/org/jabref/gui/preferences/externalfiletypes/ExternalFileTypeItemViewModel.java
new file mode 100644
index 00000000000..da149d6e516
--- /dev/null
+++ b/src/main/java/org/jabref/gui/preferences/externalfiletypes/ExternalFileTypeItemViewModel.java
@@ -0,0 +1,68 @@
+package org.jabref.gui.preferences.externalfiletypes;
+
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+
+import org.jabref.gui.externalfiletype.CustomExternalFileType;
+import org.jabref.gui.externalfiletype.ExternalFileType;
+import org.jabref.gui.icon.IconTheme;
+import org.jabref.gui.icon.JabRefIcon;
+
+public class ExternalFileTypeItemViewModel {
+    private final ObjectProperty<JabRefIcon> icon = new SimpleObjectProperty<>();
+    private final StringProperty name = new SimpleStringProperty();
+    private final StringProperty extension = new SimpleStringProperty();
+    private final StringProperty mimetype = new SimpleStringProperty();
+    private final StringProperty application = new SimpleStringProperty();
+
+    public ExternalFileTypeItemViewModel(ExternalFileType fileType) {
+        this.icon.setValue(fileType.getIcon());
+        this.name.setValue(fileType.getName());
+        this.extension.setValue(fileType.getExtension());
+        this.mimetype.setValue(fileType.getMimeType());
+        this.application.setValue(fileType.getOpenWithApplication());
+    }
+
+    public ExternalFileTypeItemViewModel() {
+        this(new CustomExternalFileType("", "", "", "", "new", IconTheme.JabRefIcons.FILE));
+    }
+
+    public ObjectProperty<JabRefIcon> iconProperty() {
+        return icon;
+    }
+
+    /**
+     * Used for sorting in the table
+     */
+    public String getName() {
+        return name.get();
+    }
+
+    public StringProperty nameProperty() {
+        return name;
+    }
+
+    public StringProperty extensionProperty() {
+        return extension;
+    }
+
+    public StringProperty mimetypeProperty() {
+        return mimetype;
+    }
+
+    public StringProperty applicationProperty() {
+        return application;
+    }
+
+    public ExternalFileType toExternalFileType() {
+        return new CustomExternalFileType(
+                this.name.get(),
+                this.extension.get(),
+                this.mimetype.get(),
+                this.application.get(),
+                this.icon.get().name(),
+                this.icon.get());
+    }
+}
diff --git a/src/main/java/org/jabref/gui/preferences/externalfiletypes/ExternalFileTypesTab.fxml b/src/main/java/org/jabref/gui/preferences/externalfiletypes/ExternalFileTypesTab.fxml
index 5d8b4556c70..040bb446dc7 100644
--- a/src/main/java/org/jabref/gui/preferences/externalfiletypes/ExternalFileTypesTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/externalfiletypes/ExternalFileTypesTab.fxml
@@ -16,7 +16,7 @@
             <TableColumn fx:id="fileTypesTableIconColumn" minWidth="40.0" maxWidth="40.0"/>
             <TableColumn fx:id="fileTypesTableNameColumn" text="%Name"/>
             <TableColumn fx:id="fileTypesTableExtensionColumn" text="%Extension" prefWidth="120"/>
-            <TableColumn fx:id="fileTypesTableTypeColumn" text="%MIME type" prefWidth="150"/>
+            <TableColumn fx:id="fileTypesTableMimeTypeColumn" text="%MIME type" prefWidth="150"/>
             <TableColumn fx:id="fileTypesTableApplicationColumn" text="%Application" prefWidth="100"/>
             <TableColumn fx:id="fileTypesTableEditColumn" minWidth="40.0" maxWidth="40.0"/>
             <TableColumn fx:id="fileTypesTableDeleteColumn" minWidth="40.0" maxWidth="40.0"/>
diff --git a/src/main/java/org/jabref/gui/preferences/externalfiletypes/ExternalFileTypesTab.java b/src/main/java/org/jabref/gui/preferences/externalfiletypes/ExternalFileTypesTab.java
index 41998975660..b131484ddc3 100644
--- a/src/main/java/org/jabref/gui/preferences/externalfiletypes/ExternalFileTypesTab.java
+++ b/src/main/java/org/jabref/gui/preferences/externalfiletypes/ExternalFileTypesTab.java
@@ -4,8 +4,6 @@
 import javafx.scene.control.TableColumn;
 import javafx.scene.control.TableView;
 
-import org.jabref.gui.externalfiletype.ExternalFileType;
-import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.icon.JabRefIcon;
 import org.jabref.gui.preferences.AbstractPreferenceTabView;
@@ -21,14 +19,14 @@
  */
 public class ExternalFileTypesTab extends AbstractPreferenceTabView<ExternalFileTypesTabViewModel> implements PreferencesTab {
 
-    @FXML private TableColumn<ExternalFileType, JabRefIcon> fileTypesTableIconColumn;
-    @FXML private TableColumn<ExternalFileType, String> fileTypesTableNameColumn;
-    @FXML private TableColumn<ExternalFileType, String> fileTypesTableExtensionColumn;
-    @FXML private TableColumn<ExternalFileType, String> fileTypesTableTypeColumn;
-    @FXML private TableColumn<ExternalFileType, String> fileTypesTableApplicationColumn;
-    @FXML private TableColumn<ExternalFileType, Boolean> fileTypesTableEditColumn;
-    @FXML private TableColumn<ExternalFileType, Boolean> fileTypesTableDeleteColumn;
-    @FXML private TableView<ExternalFileType> fileTypesTable;
+    @FXML private TableColumn<ExternalFileTypeItemViewModel, JabRefIcon> fileTypesTableIconColumn;
+    @FXML private TableColumn<ExternalFileTypeItemViewModel, String> fileTypesTableNameColumn;
+    @FXML private TableColumn<ExternalFileTypeItemViewModel, String> fileTypesTableExtensionColumn;
+    @FXML private TableColumn<ExternalFileTypeItemViewModel, String> fileTypesTableMimeTypeColumn;
+    @FXML private TableColumn<ExternalFileTypeItemViewModel, String> fileTypesTableApplicationColumn;
+    @FXML private TableColumn<ExternalFileTypeItemViewModel, Boolean> fileTypesTableEditColumn;
+    @FXML private TableColumn<ExternalFileTypeItemViewModel, Boolean> fileTypesTableDeleteColumn;
+    @FXML private TableView<ExternalFileTypeItemViewModel> fileTypesTable;
 
     public ExternalFileTypesTab() {
         ViewLoader.view(this)
@@ -43,26 +41,46 @@ public String getTabName() {
 
     @FXML
     public void initialize() {
-        viewModel = new ExternalFileTypesTabViewModel(ExternalFileTypes.getInstance());
+        viewModel = new ExternalFileTypesTabViewModel(preferencesService.getFilePreferences(), dialogService);
 
         fileTypesTable.setItems(viewModel.getFileTypes());
 
-        fileTypesTableIconColumn.setCellValueFactory(data -> BindingsHelper.constantOf(data.getValue().getIcon()));
-        fileTypesTableNameColumn.setCellValueFactory(data -> BindingsHelper.constantOf(data.getValue().getName()));
-        fileTypesTableExtensionColumn.setCellValueFactory(data -> BindingsHelper.constantOf(data.getValue().getExtension()));
-        fileTypesTableTypeColumn.setCellValueFactory(data -> BindingsHelper.constantOf(data.getValue().getMimeType()));
-        fileTypesTableApplicationColumn.setCellValueFactory(data -> BindingsHelper.constantOf(data.getValue().getOpenWithApplication()));
+        fileTypesTableIconColumn.setCellValueFactory(cellData -> cellData.getValue().iconProperty());
+        new ValueTableCellFactory<ExternalFileTypeItemViewModel, JabRefIcon>()
+                .withGraphic(JabRefIcon::getGraphicNode)
+                .install(fileTypesTableIconColumn);
+
+        fileTypesTableNameColumn.setCellValueFactory(cellData -> cellData.getValue().nameProperty());
+        new ValueTableCellFactory<ExternalFileTypeItemViewModel, String>()
+                .withText(name -> name)
+                .install(fileTypesTableNameColumn);
+
+        fileTypesTableExtensionColumn.setCellValueFactory(cellData -> cellData.getValue().extensionProperty());
+        new ValueTableCellFactory<ExternalFileTypeItemViewModel, String>()
+                .withText(extension -> extension)
+                .install(fileTypesTableExtensionColumn);
+
+        fileTypesTableMimeTypeColumn.setCellValueFactory(cellData -> cellData.getValue().mimetypeProperty());
+        new ValueTableCellFactory<ExternalFileTypeItemViewModel, String>()
+                .withText(mimetype -> mimetype)
+                .install(fileTypesTableMimeTypeColumn);
+
+        fileTypesTableApplicationColumn.setCellValueFactory(cellData -> cellData.getValue().applicationProperty());
+        new ValueTableCellFactory<ExternalFileTypeItemViewModel, String>()
+                .withText(extension -> extension)
+                .install(fileTypesTableApplicationColumn);
+
         fileTypesTableEditColumn.setCellValueFactory(data -> BindingsHelper.constantOf(true));
         fileTypesTableDeleteColumn.setCellValueFactory(data -> BindingsHelper.constantOf(true));
 
-        new ValueTableCellFactory<ExternalFileType, JabRefIcon>()
+        new ValueTableCellFactory<ExternalFileTypeItemViewModel, JabRefIcon>()
                 .withGraphic(JabRefIcon::getGraphicNode)
                 .install(fileTypesTableIconColumn);
-        new ValueTableCellFactory<ExternalFileType, Boolean>()
+        new ValueTableCellFactory<ExternalFileTypeItemViewModel, Boolean>()
                 .withGraphic(none -> IconTheme.JabRefIcons.EDIT.getGraphicNode())
                 .withOnMouseClickedEvent((type, none) -> event -> viewModel.edit(type))
                 .install(fileTypesTableEditColumn);
-        new ValueTableCellFactory<ExternalFileType, Boolean>()
+        new ValueTableCellFactory<ExternalFileTypeItemViewModel, Boolean>()
                 .withGraphic(none -> IconTheme.JabRefIcons.DELETE_ENTRY.getGraphicNode())
                 .withOnMouseClickedEvent((type, none) -> event -> viewModel.remove(type))
                 .install(fileTypesTableDeleteColumn);
diff --git a/src/main/java/org/jabref/gui/preferences/externalfiletypes/ExternalFileTypesTabViewModel.java b/src/main/java/org/jabref/gui/preferences/externalfiletypes/ExternalFileTypesTabViewModel.java
index ee669177d6d..8a1faf6f8f4 100644
--- a/src/main/java/org/jabref/gui/preferences/externalfiletypes/ExternalFileTypesTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/externalfiletypes/ExternalFileTypesTabViewModel.java
@@ -1,75 +1,77 @@
 package org.jabref.gui.preferences.externalfiletypes;
 
 import java.util.Comparator;
-import java.util.List;
+import java.util.HashSet;
+import java.util.Set;
 
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 
 import org.jabref.gui.DialogService;
-import org.jabref.gui.externalfiletype.CustomExternalFileType;
-import org.jabref.gui.externalfiletype.EditExternalFileTypeEntryDialog;
 import org.jabref.gui.externalfiletype.ExternalFileType;
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
-import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.preferences.PreferenceTabViewModel;
 import org.jabref.logic.l10n.Localization;
-
-import com.airhacks.afterburner.injection.Injector;
+import org.jabref.preferences.FilePreferences;
 
 public class ExternalFileTypesTabViewModel implements PreferenceTabViewModel {
 
-    private final ExternalFileTypes externalFileTypes;
-    private final ObservableList<ExternalFileType> fileTypes = FXCollections.observableArrayList();
+    private final ObservableList<ExternalFileTypeItemViewModel> fileTypes = FXCollections.observableArrayList();
+
+    private final FilePreferences filePreferences;
+    private final DialogService dialogService;
 
-    public ExternalFileTypesTabViewModel(ExternalFileTypes externalFileTypes) {
-        this.externalFileTypes = externalFileTypes;
+    public ExternalFileTypesTabViewModel(FilePreferences filePreferences, DialogService dialogService) {
+        this.filePreferences = filePreferences;
+        this.dialogService = dialogService;
     }
 
     @Override
     public void setValues() {
-        fileTypes.setAll(externalFileTypes.getExternalFileTypeSelection());
-        fileTypes.sort(Comparator.comparing(ExternalFileType::getName));
+        fileTypes.addAll(filePreferences.getExternalFileTypes().stream()
+                       .map(ExternalFileTypeItemViewModel::new)
+                       .toList());
+        fileTypes.sort(Comparator.comparing(ExternalFileTypeItemViewModel::getName));
     }
 
     public void storeSettings() {
-        externalFileTypes.setExternalFileTypes(fileTypes);
+        Set<ExternalFileType> saveList = new HashSet<>();
+
+        fileTypes.stream().map(ExternalFileTypeItemViewModel::toExternalFileType)
+                 .forEach(type -> ExternalFileTypes.getDefaultExternalFileTypes().stream()
+                                                   .filter(type::equals).findAny()
+                                                   .ifPresentOrElse(saveList::add, () -> saveList.add(type)));
+
+        filePreferences.getExternalFileTypes().clear();
+        filePreferences.getExternalFileTypes().addAll(saveList);
     }
 
     public void resetToDefaults() {
-        List<ExternalFileType> list = ExternalFileTypes.getDefaultExternalFileTypes();
-        fileTypes.setAll(list);
-        fileTypes.sort(Comparator.comparing(ExternalFileType::getName));
+        fileTypes.setAll(ExternalFileTypes.getDefaultExternalFileTypes().stream()
+                                          .map(ExternalFileTypeItemViewModel::new)
+                                          .toList());
+        fileTypes.sort(Comparator.comparing(ExternalFileTypeItemViewModel::getName));
     }
 
     public void addNewType() {
-        CustomExternalFileType type = new CustomExternalFileType("", "", "", "", "new", IconTheme.JabRefIcons.FILE);
-        fileTypes.add(type);
-        showEditDialog(type, Localization.lang("Add new file type"));
+        ExternalFileTypeItemViewModel item = new ExternalFileTypeItemViewModel();
+        fileTypes.add(item);
+        showEditDialog(item, Localization.lang("Add new file type"));
     }
 
-    public ObservableList<ExternalFileType> getFileTypes() {
+    public ObservableList<ExternalFileTypeItemViewModel> getFileTypes() {
         return fileTypes;
     }
 
-    private void showEditDialog(ExternalFileType type, String dialogTitle) {
-        CustomExternalFileType typeForEdit;
-        if (type instanceof CustomExternalFileType) {
-            typeForEdit = (CustomExternalFileType) type;
-        } else {
-            typeForEdit = new CustomExternalFileType(type);
-            fileTypes.add(fileTypes.indexOf(type), typeForEdit);
-            fileTypes.remove(type);
-        }
-        DialogService dialogService = Injector.instantiateModelOrService(DialogService.class);
-        dialogService.showCustomDialogAndWait(new EditExternalFileTypeEntryDialog(typeForEdit, dialogTitle));
+    private void showEditDialog(ExternalFileTypeItemViewModel item, String dialogTitle) {
+        dialogService.showCustomDialogAndWait(new EditExternalFileTypeEntryDialog(item, dialogTitle));
     }
 
-    public void edit(ExternalFileType type) {
+    public void edit(ExternalFileTypeItemViewModel type) {
         showEditDialog(type, Localization.lang("Edit file type"));
     }
 
-    public void remove(ExternalFileType type) {
+    public void remove(ExternalFileTypeItemViewModel type) {
         fileTypes.remove(type);
     }
 }
diff --git a/src/main/java/org/jabref/gui/preferences/file/FileTab.fxml b/src/main/java/org/jabref/gui/preferences/file/FileTab.fxml
index 8666dfd973f..59b1d7f0e90 100644
--- a/src/main/java/org/jabref/gui/preferences/file/FileTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/file/FileTab.fxml
@@ -42,5 +42,4 @@
     </HBox>
 
     <CheckBox fx:id="alwaysReformatBib" text="%Always reformat BIB file on save and export"/>
-    <CheckBox fx:id="warnAboutDuplicatesOnImport" text="%Warn about duplicates on import"/>
 </fx:root>
diff --git a/src/main/java/org/jabref/gui/preferences/file/FileTab.java b/src/main/java/org/jabref/gui/preferences/file/FileTab.java
index 0fd6bc201e7..88c3768df07 100644
--- a/src/main/java/org/jabref/gui/preferences/file/FileTab.java
+++ b/src/main/java/org/jabref/gui/preferences/file/FileTab.java
@@ -25,7 +25,6 @@ public class FileTab extends AbstractPreferenceTabView<FileTabViewModel> impleme
     @FXML private RadioButton resolveStrings;
     @FXML private TextField resolveStringsForFields;
     @FXML private CheckBox alwaysReformatBib;
-    @FXML private CheckBox warnAboutDuplicatesOnImport;
 
     @FXML private CheckBox autosaveLocalLibraries;
     @FXML private Button autosaveLocalLibrariesHelp;
@@ -48,11 +47,10 @@ public void initialize() {
         resolveStringsForFields.disableProperty().bind(doNotResolveStrings.selectedProperty());
 
         alwaysReformatBib.selectedProperty().bindBidirectional(viewModel.alwaysReformatBibProperty());
-        warnAboutDuplicatesOnImport.selectedProperty().bindBidirectional(viewModel.warnAboutDuplicatesOnImportProperty());
         autosaveLocalLibraries.selectedProperty().bindBidirectional(viewModel.autosaveLocalLibrariesProperty());
 
         ActionFactory actionFactory = new ActionFactory(Globals.getKeyPrefs());
-        actionFactory.configureIconButton(StandardActions.HELP, new HelpAction(HelpFile.AUTOSAVE), autosaveLocalLibrariesHelp);
+        actionFactory.configureIconButton(StandardActions.HELP, new HelpAction(HelpFile.AUTOSAVE, dialogService), autosaveLocalLibrariesHelp);
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/preferences/file/FileTabViewModel.java b/src/main/java/org/jabref/gui/preferences/file/FileTabViewModel.java
index abcefcd1150..3981f4d2c82 100644
--- a/src/main/java/org/jabref/gui/preferences/file/FileTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/file/FileTabViewModel.java
@@ -16,7 +16,6 @@ public class FileTabViewModel implements PreferenceTabViewModel {
     private final BooleanProperty resolveStringsProperty = new SimpleBooleanProperty();
     private final StringProperty resolveStringsForFieldsProperty = new SimpleStringProperty("");
     private final BooleanProperty alwaysReformatBibProperty = new SimpleBooleanProperty();
-    private final BooleanProperty warnAboutDuplicatesOnImportProperty = new SimpleBooleanProperty();
     private final BooleanProperty autosaveLocalLibraries = new SimpleBooleanProperty();
 
     private final ImportExportPreferences importExportPreferences;
@@ -34,7 +33,6 @@ public void setValues() {
         resolveStringsProperty.setValue(importExportPreferences.resolveStrings());
         resolveStringsForFieldsProperty.setValue(importExportPreferences.getResolvableFields());
         alwaysReformatBibProperty.setValue(importExportPreferences.shouldAlwaysReformatOnSave());
-        warnAboutDuplicatesOnImportProperty.setValue(importExportPreferences.shouldWarnAboutDuplicatesOnImport());
         autosaveLocalLibraries.setValue(importExportPreferences.shouldAutoSave());
     }
 
@@ -45,7 +43,6 @@ public void storeSettings() {
         importExportPreferences.setNonWrappableFields(noWrapFilesProperty.getValue().trim());
         importExportPreferences.setResolvableFields(resolveStringsForFieldsProperty.getValue().trim());
         importExportPreferences.setAlwaysReformatOnSave(alwaysReformatBibProperty.getValue());
-        importExportPreferences.setWarnAboutDuplicatesOnImport(warnAboutDuplicatesOnImportProperty.getValue());
         importExportPreferences.setAutoSave(autosaveLocalLibraries.getValue());
     }
 
@@ -77,10 +74,6 @@ public BooleanProperty alwaysReformatBibProperty() {
         return alwaysReformatBibProperty;
     }
 
-    public BooleanProperty warnAboutDuplicatesOnImportProperty() {
-        return warnAboutDuplicatesOnImportProperty;
-    }
-
     // Autosave
     public BooleanProperty autosaveLocalLibrariesProperty() {
         return autosaveLocalLibraries;
diff --git a/src/main/java/org/jabref/gui/preferences/general/GeneralTab.fxml b/src/main/java/org/jabref/gui/preferences/general/GeneralTab.fxml
index 0fe621f75c2..73a010b459a 100644
--- a/src/main/java/org/jabref/gui/preferences/general/GeneralTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/general/GeneralTab.fxml
@@ -27,8 +27,6 @@
         </rowConstraints>
         <Label text="%Language"/>
         <ComboBox fx:id="language" prefWidth="200.0" GridPane.columnIndex="1"/>
-        <Label text="%Default encoding" GridPane.rowIndex="1"/>
-        <ComboBox fx:id="defaultEncoding" prefWidth="200.0" GridPane.columnIndex="1" GridPane.rowIndex="1"/>
         <Label text="%Default library mode" GridPane.rowIndex="2"/>
         <ComboBox fx:id="biblatexMode" prefWidth="200.0" GridPane.columnIndex="1" GridPane.rowIndex="2"/>
     </GridPane>
diff --git a/src/main/java/org/jabref/gui/preferences/general/GeneralTab.java b/src/main/java/org/jabref/gui/preferences/general/GeneralTab.java
index fc164a5ec4b..4f561b8f2a1 100644
--- a/src/main/java/org/jabref/gui/preferences/general/GeneralTab.java
+++ b/src/main/java/org/jabref/gui/preferences/general/GeneralTab.java
@@ -1,7 +1,5 @@
 package org.jabref.gui.preferences.general;
 
-import java.nio.charset.Charset;
-
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
 import javafx.scene.control.CheckBox;
@@ -28,7 +26,6 @@ public class GeneralTab extends AbstractPreferenceTabView<GeneralTabViewModel> i
 
     private final ControlsFxVisualizer validationVisualizer = new ControlsFxVisualizer();
     @FXML private ComboBox<Language> language;
-    @FXML private ComboBox<Charset> defaultEncoding;
     @FXML private ComboBox<BibDatabaseMode> biblatexMode;
     @FXML private CheckBox inspectionWarningDuplicate;
     @FXML private CheckBox confirmDelete;
@@ -62,12 +59,6 @@ public void initialize() {
         language.itemsProperty().bind(viewModel.languagesListProperty());
         language.valueProperty().bindBidirectional(viewModel.selectedLanguageProperty());
 
-        new ViewModelListCellFactory<Charset>()
-                .withText(Charset::displayName)
-                .install(defaultEncoding);
-        defaultEncoding.itemsProperty().bind(viewModel.encodingsListProperty());
-        defaultEncoding.valueProperty().bindBidirectional(viewModel.selectedEncodingProperty());
-
         new ViewModelListCellFactory<BibDatabaseMode>()
                 .withText(BibDatabaseMode::getFormattedName)
                 .install(biblatexMode);
@@ -90,7 +81,7 @@ public void initialize() {
         addModificationDate.selectedProperty().bindBidirectional(viewModel.addModificationDateProperty());
 
         ActionFactory actionFactory = new ActionFactory(Globals.getKeyPrefs());
-        actionFactory.configureIconButton(StandardActions.HELP, new HelpAction(HelpFile.OWNER), markOwnerHelp);
+        actionFactory.configureIconButton(StandardActions.HELP, new HelpAction(HelpFile.OWNER, dialogService), markOwnerHelp);
 
         validationVisualizer.setDecoration(new IconValidationDecorator());
     }
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 4f4c8d9469e..68ea3b24c7a 100644
--- a/src/main/java/org/jabref/gui/preferences/general/GeneralTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/general/GeneralTabViewModel.java
@@ -71,7 +71,6 @@ public void setValues() {
         selectedLanguageProperty.setValue(preferencesService.getLanguage());
 
         encodingsListProperty.setValue(FXCollections.observableArrayList(Encodings.getCharsets()));
-        selectedEncodingProperty.setValue(generalPreferences.getDefaultEncoding());
 
         bibliographyModeListProperty.setValue(FXCollections.observableArrayList(BibDatabaseMode.values()));
         selectedBiblatexModeProperty.setValue(generalPreferences.getDefaultBibDatabaseMode());
@@ -104,7 +103,6 @@ public void storeSettings() {
                             + " rename or remove the jabref.xml file in the same folder as JabRef."));
         }
 
-        generalPreferences.setDefaultEncoding(selectedEncodingProperty.getValue());
         generalPreferences.setDefaultBibDatabaseMode(selectedBiblatexModeProperty.getValue());
         generalPreferences.setWarnAboutDuplicatesInInspection(inspectionWarningDuplicateProperty.getValue());
         generalPreferences.setConfirmDelete(confirmDeleteProperty.getValue());
diff --git a/src/main/java/org/jabref/gui/preferences/importexport/ImportExportTab.fxml b/src/main/java/org/jabref/gui/preferences/importexport/ImportExportTab.fxml
index 10cc58d0d5c..a1fc3bbb64d 100644
--- a/src/main/java/org/jabref/gui/preferences/importexport/ImportExportTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/importexport/ImportExportTab.fxml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import javafx.scene.control.Button?>
 <?import javafx.scene.control.CheckBox?>
+<?import javafx.scene.control.ComboBox?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.GridPane?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
 <?import org.jabref.gui.commonfxcontrols.SaveOrderConfigPanel?>
-
 <fx:root spacing="10.0" type="VBox"
          xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml"
          fx:controller="org.jabref.gui.preferences.importexport.ImportExportTab">
@@ -14,6 +16,7 @@
 
     <Label styleClass="sectionHeader" text="%General"/>
     <CheckBox fx:id="generateNewKeyOnImport" text="%Generate a new key for imported entries (overwriting their default)"/>
+    <CheckBox fx:id="warnAboutDuplicatesOnImport" text="%Warn about duplicates on import"/>
 
     <Label styleClass="sectionHeader" text="%Custom DOI URI"/>
     <HBox alignment="CENTER_LEFT" spacing="10.0">
@@ -30,4 +33,16 @@
         <Label text="%Grobid URL" />
         <TextField fx:id="grobidURL" HBox.hgrow="ALWAYS"/>
     </HBox>
+
+    <Label styleClass="sectionHeader" text="%Custom API key"/>
+    <HBox alignment="CENTER_LEFT" spacing="10.0">
+        <ComboBox fx:id="apiKeySelector" prefWidth="200.0" GridPane.columnIndex="1"/>
+        <TextField fx:id="customApiKey" HBox.hgrow="ALWAYS"/>
+        <CheckBox fx:id="useCustomApiKey" text="%Custom">
+        </CheckBox>
+    </HBox>
+    <HBox alignment="CENTER_LEFT" >
+        <Button fx:id="testCustomApiKey" text="%Check connection" onAction="#checkCustomApiKey"
+                prefWidth="200.0" GridPane.columnIndex="1" GridPane.rowIndex="6"/>
+    </HBox>
 </fx:root>
diff --git a/src/main/java/org/jabref/gui/preferences/importexport/ImportExportTab.java b/src/main/java/org/jabref/gui/preferences/importexport/ImportExportTab.java
index 42cffc479b7..49c7fd20563 100644
--- a/src/main/java/org/jabref/gui/preferences/importexport/ImportExportTab.java
+++ b/src/main/java/org/jabref/gui/preferences/importexport/ImportExportTab.java
@@ -1,13 +1,18 @@
 package org.jabref.gui.preferences.importexport;
 
+import javafx.beans.InvalidationListener;
 import javafx.fxml.FXML;
+import javafx.scene.control.Button;
 import javafx.scene.control.CheckBox;
+import javafx.scene.control.ComboBox;
 import javafx.scene.control.TextField;
 
 import org.jabref.gui.commonfxcontrols.SaveOrderConfigPanel;
 import org.jabref.gui.preferences.AbstractPreferenceTabView;
 import org.jabref.gui.preferences.PreferencesTab;
+import org.jabref.gui.util.ViewModelListCellFactory;
 import org.jabref.logic.l10n.Localization;
+import org.jabref.logic.preferences.FetcherApiKey;
 
 import com.airhacks.afterburner.views.ViewLoader;
 
@@ -19,9 +24,16 @@ public class ImportExportTab extends AbstractPreferenceTabView<ImportExportTabVi
 
     @FXML private SaveOrderConfigPanel exportOrderPanel;
 
+    @FXML private ComboBox<FetcherApiKey> apiKeySelector;
+    @FXML private TextField customApiKey;
+    @FXML private CheckBox useCustomApiKey;
+    @FXML private Button testCustomApiKey;
+
     @FXML private CheckBox grobidEnabled;
     @FXML private TextField grobidURL;
 
+    @FXML private CheckBox warnAboutDuplicatesOnImport;
+
     public ImportExportTab() {
         ViewLoader.view(this)
                   .root(this)
@@ -34,7 +46,7 @@ public String getTabName() {
     }
 
     public void initialize() {
-        this.viewModel = new ImportExportTabViewModel(preferencesService, preferencesService.getDOIPreferences());
+        this.viewModel = new ImportExportTabViewModel(preferencesService, dialogService);
 
         useCustomDOI.selectedProperty().bindBidirectional(viewModel.useCustomDOIProperty());
         useCustomDOIName.textProperty().bindBidirectional(viewModel.useCustomDOINameProperty());
@@ -52,5 +64,42 @@ public void initialize() {
         grobidEnabled.selectedProperty().bindBidirectional(viewModel.grobidEnabledProperty());
         grobidURL.textProperty().bindBidirectional(viewModel.grobidURLProperty());
         grobidURL.disableProperty().bind(grobidEnabled.selectedProperty().not());
+
+        new ViewModelListCellFactory<FetcherApiKey>()
+                .withText(FetcherApiKey::getName)
+                .install(apiKeySelector);
+        apiKeySelector.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, newValue) -> {
+            if (oldValue != null) {
+                updateFetcherApiKey(oldValue);
+            }
+            if (newValue != null) {
+                useCustomApiKey.setSelected(newValue.shouldUse());
+                customApiKey.setText(newValue.getKey());
+            }
+        });
+        customApiKey.textProperty().addListener(listener -> updateFetcherApiKey(apiKeySelector.valueProperty().get()));
+
+        customApiKey.disableProperty().bind(useCustomApiKey.selectedProperty().not());
+        testCustomApiKey.disableProperty().bind(useCustomApiKey.selectedProperty().not());
+
+        apiKeySelector.setItems(viewModel.fetcherApiKeys());
+        viewModel.selectedApiKeyProperty().bind(apiKeySelector.valueProperty());
+
+        // Content is set later
+        viewModel.fetcherApiKeys().addListener((InvalidationListener) change -> apiKeySelector.getSelectionModel().selectFirst());
+
+        warnAboutDuplicatesOnImport.selectedProperty().bindBidirectional(viewModel.warnAboutDuplicatesOnImportProperty());
+    }
+
+    private void updateFetcherApiKey(FetcherApiKey apiKey) {
+        if (apiKey != null) {
+            apiKey.setUse(useCustomApiKey.isSelected());
+            apiKey.setKey(customApiKey.getText().trim());
+        }
+    }
+
+    @FXML
+    void checkCustomApiKey() {
+        viewModel.checkCustomApiKey();
     }
 }
diff --git a/src/main/java/org/jabref/gui/preferences/importexport/ImportExportTabViewModel.java b/src/main/java/org/jabref/gui/preferences/importexport/ImportExportTabViewModel.java
index 6182fb9e342..c3e1edef304 100644
--- a/src/main/java/org/jabref/gui/preferences/importexport/ImportExportTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/importexport/ImportExportTabViewModel.java
@@ -1,29 +1,48 @@
 package org.jabref.gui.preferences.importexport;
 
+import java.io.IOException;
+import java.net.HttpURLConnection;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
-import java.util.stream.Collectors;
+import java.util.Optional;
+
+import javax.net.ssl.HostnameVerifier;
+import javax.net.ssl.HttpsURLConnection;
+import javax.net.ssl.SSLSocketFactory;
 
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ListProperty;
+import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleListProperty;
+import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import javafx.collections.FXCollections;
 
+import org.jabref.gui.DialogService;
 import org.jabref.gui.commonfxcontrols.SortCriterionViewModel;
 import org.jabref.gui.preferences.PreferenceTabViewModel;
 import org.jabref.logic.importer.ImporterPreferences;
+import org.jabref.logic.importer.WebFetchers;
+import org.jabref.logic.importer.fetcher.CustomizableKeyFetcher;
+import org.jabref.logic.importer.fetcher.GrobidPreferences;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.logic.net.URLDownload;
 import org.jabref.logic.preferences.DOIPreferences;
+import org.jabref.logic.preferences.FetcherApiKey;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.FieldFactory;
 import org.jabref.model.metadata.SaveOrderConfig;
+import org.jabref.preferences.ImportExportPreferences;
 import org.jabref.preferences.PreferencesService;
 
 public class ImportExportTabViewModel implements PreferenceTabViewModel {
 
+    private final ListProperty<FetcherApiKey> apiKeys = new SimpleListProperty<>();
+    private final ObjectProperty<FetcherApiKey> selectedApiKeyProperty = new SimpleObjectProperty<>();
+
     private final BooleanProperty generateKeyOnImportProperty = new SimpleBooleanProperty();
 
     private final BooleanProperty useCustomDOIProperty = new SimpleBooleanProperty();
@@ -38,17 +57,24 @@ public class ImportExportTabViewModel implements PreferenceTabViewModel {
 
     private final BooleanProperty grobidEnabledProperty = new SimpleBooleanProperty();
     private final StringProperty grobidURLProperty = new SimpleStringProperty("");
+    private final BooleanProperty warnAboutDuplicatesOnImportProperty = new SimpleBooleanProperty();
 
+    private final DialogService dialogService;
     private final PreferencesService preferencesService;
     private final DOIPreferences doiPreferences;
+    private final GrobidPreferences grobidPreferences;
     private final ImporterPreferences importerPreferences;
     private final SaveOrderConfig initialExportOrder;
+    private final ImportExportPreferences importExportPreferences;
 
-    public ImportExportTabViewModel(PreferencesService preferencesService, DOIPreferences doiPreferences) {
+    public ImportExportTabViewModel(PreferencesService preferencesService, DialogService dialogService) {
+        this.dialogService = dialogService;
         this.preferencesService = preferencesService;
         this.importerPreferences = preferencesService.getImporterPreferences();
-        this.doiPreferences = doiPreferences;
+        this.grobidPreferences = preferencesService.getGrobidPreferences();
+        this.doiPreferences = preferencesService.getDOIPreferences();
         this.initialExportOrder = preferencesService.getExportSaveOrder();
+        this.importExportPreferences = preferencesService.getImportExportPreferences();
     }
 
     @Override
@@ -56,6 +82,7 @@ public void setValues() {
         generateKeyOnImportProperty.setValue(importerPreferences.isGenerateNewKeyOnImport());
         useCustomDOIProperty.setValue(doiPreferences.isUseCustom());
         useCustomDOINameProperty.setValue(doiPreferences.getDefaultBaseURI());
+        warnAboutDuplicatesOnImportProperty.setValue(importExportPreferences.shouldWarnAboutDuplicatesOnImport());
 
         switch (initialExportOrder.getOrderType()) {
             case SPECIFIED -> exportInSpecifiedOrderProperty.setValue(true);
@@ -69,18 +96,20 @@ public void setValues() {
         sortableFieldsProperty.addAll(fieldNames);
         sortCriteriaProperty.addAll(initialExportOrder.getSortCriteria().stream()
                                                       .map(SortCriterionViewModel::new)
-                                                      .collect(Collectors.toList()));
+                                                      .toList());
+
+        grobidEnabledProperty.setValue(grobidPreferences.isGrobidEnabled());
+        grobidURLProperty.setValue(grobidPreferences.getGrobidURL());
 
-        grobidEnabledProperty.setValue(importerPreferences.isGrobidEnabled());
-        grobidURLProperty.setValue(importerPreferences.getGrobidURL());
+        apiKeys.setValue(FXCollections.observableArrayList(preferencesService.getImporterPreferences().getApiKeys()));
     }
 
     @Override
     public void storeSettings() {
         importerPreferences.setGenerateNewKeyOnImport(generateKeyOnImportProperty.getValue());
-        importerPreferences.setGrobidEnabled(grobidEnabledProperty.getValue());
-        importerPreferences.setGrobidOptOut(importerPreferences.isGrobidOptOut());
-        importerPreferences.setGrobidURL(grobidURLProperty.getValue());
+        grobidPreferences.setGrobidEnabled(grobidEnabledProperty.getValue());
+        grobidPreferences.setGrobidOptOut(grobidPreferences.isGrobidOptOut());
+        grobidPreferences.setGrobidURL(grobidURLProperty.getValue());
 
         doiPreferences.setUseCustom(useCustomDOIProperty.get());
         doiPreferences.setDefaultBaseURI(useCustomDOINameProperty.getValue().trim());
@@ -89,6 +118,12 @@ public void storeSettings() {
                 SaveOrderConfig.OrderType.fromBooleans(exportInSpecifiedOrderProperty.getValue(), exportInTableOrderProperty.getValue()),
                 sortCriteriaProperty.stream().map(SortCriterionViewModel::getCriterion).toList());
         preferencesService.storeExportSaveOrder(newSaveOrderConfig);
+
+        importExportPreferences.setWarnAboutDuplicatesOnImport(warnAboutDuplicatesOnImportProperty.getValue());
+
+        // API keys
+        preferencesService.getImporterPreferences().getApiKeys().clear();
+        preferencesService.getImporterPreferences().getApiKeys().addAll(apiKeys);
     }
 
     public BooleanProperty generateKeyOnImportProperty() {
@@ -132,4 +167,71 @@ public BooleanProperty grobidEnabledProperty() {
     public StringProperty grobidURLProperty() {
         return grobidURLProperty;
     }
+
+    public ListProperty<FetcherApiKey> fetcherApiKeys() {
+        return apiKeys;
+    }
+
+    public ObjectProperty<FetcherApiKey> selectedApiKeyProperty() {
+        return selectedApiKeyProperty;
+    }
+
+    public BooleanProperty warnAboutDuplicatesOnImportProperty() {
+        return warnAboutDuplicatesOnImportProperty;
+    }
+
+    public void checkCustomApiKey() {
+        final String apiKeyName = selectedApiKeyProperty.get().getName();
+
+        final Optional<CustomizableKeyFetcher> fetcherOpt =
+                WebFetchers.getCustomizableKeyFetchers(
+                                   preferencesService.getImportFormatPreferences(),
+                                   preferencesService.getImporterPreferences())
+                           .stream()
+                           .filter(fetcher -> fetcher.getName().equals(apiKeyName))
+                           .findFirst();
+
+        if (fetcherOpt.isEmpty()) {
+            dialogService.showErrorDialogAndWait(
+                    Localization.lang("Check %0 API Key Setting", apiKeyName),
+                    Localization.lang("Fetcher unknown!"));
+            return;
+        }
+
+        final String testUrlWithoutApiKey = fetcherOpt.get().getTestUrl();
+        if (testUrlWithoutApiKey == null) {
+            dialogService.showWarningDialogAndWait(
+                    Localization.lang("Check %0 API Key Setting", apiKeyName),
+                    Localization.lang("Fetcher cannot be tested!"));
+            return;
+        }
+
+        final String apiKey = selectedApiKeyProperty.get().getKey();
+
+        boolean keyValid;
+        if (!apiKey.isEmpty()) {
+            URLDownload urlDownload;
+            try {
+                SSLSocketFactory defaultSslSocketFactory = HttpsURLConnection.getDefaultSSLSocketFactory();
+                HostnameVerifier defaultHostnameVerifier = HttpsURLConnection.getDefaultHostnameVerifier();
+
+                urlDownload = new URLDownload(testUrlWithoutApiKey + apiKey);
+                // The HEAD request cannot be used because its response is not 200 (maybe 404 or 596...).
+                int statusCode = ((HttpURLConnection) urlDownload.getSource().openConnection()).getResponseCode();
+                keyValid = statusCode >= 200 && statusCode < 300;
+
+                URLDownload.setSSLVerification(defaultSslSocketFactory, defaultHostnameVerifier);
+            } catch (IOException | kong.unirest.UnirestException e) {
+                keyValid = false;
+            }
+        } else {
+            keyValid = false;
+        }
+
+        if (keyValid) {
+            dialogService.showInformationDialogAndWait(Localization.lang("Check %0 API Key Setting", apiKeyName), Localization.lang("Connection successful!"));
+        } else {
+            dialogService.showErrorDialogAndWait(Localization.lang("Check %0 API Key Setting", apiKeyName), Localization.lang("Connection failed!"));
+        }
+    }
 }
diff --git a/src/main/java/org/jabref/gui/preferences/linkedfiles/LinkedFilesTab.java b/src/main/java/org/jabref/gui/preferences/linkedfiles/LinkedFilesTab.java
index 6c4adbbdfa9..558ac2db289 100644
--- a/src/main/java/org/jabref/gui/preferences/linkedfiles/LinkedFilesTab.java
+++ b/src/main/java/org/jabref/gui/preferences/linkedfiles/LinkedFilesTab.java
@@ -71,7 +71,7 @@ public void initialize() {
         fileDirectoryPattern.textProperty().bindBidirectional(viewModel.fileDirectoryPatternProperty());
 
         ActionFactory actionFactory = new ActionFactory(Globals.getKeyPrefs());
-        actionFactory.configureIconButton(StandardActions.HELP_REGEX_SEARCH, new HelpAction(HelpFile.REGEX_SEARCH), autolinkRegexHelp);
+        actionFactory.configureIconButton(StandardActions.HELP_REGEX_SEARCH, new HelpAction(HelpFile.REGEX_SEARCH, dialogService), autolinkRegexHelp);
 
         validationVisualizer.setDecoration(new IconValidationDecorator());
         Platform.runLater(() -> validationVisualizer.initVisualization(viewModel.mainFileDirValidationStatus(), mainFileDirectory));
diff --git a/src/main/java/org/jabref/gui/preferences/nameformatter/NameFormatterTab.java b/src/main/java/org/jabref/gui/preferences/nameformatter/NameFormatterTab.java
index 03038872af2..84ccc80d80d 100644
--- a/src/main/java/org/jabref/gui/preferences/nameformatter/NameFormatterTab.java
+++ b/src/main/java/org/jabref/gui/preferences/nameformatter/NameFormatterTab.java
@@ -103,7 +103,7 @@ public void initialize() {
         });
 
         ActionFactory actionFactory = new ActionFactory(Globals.getKeyPrefs());
-        actionFactory.configureIconButton(StandardActions.HELP_NAME_FORMATTER, new HelpAction(HelpFile.CUSTOM_EXPORTS_NAME_FORMATTER), formatterHelp);
+        actionFactory.configureIconButton(StandardActions.HELP_NAME_FORMATTER, new HelpAction(HelpFile.CUSTOM_EXPORTS_NAME_FORMATTER, dialogService), formatterHelp);
     }
 
     public void addFormatter() {
diff --git a/src/main/java/org/jabref/gui/preferences/nameformatter/NameFormatterTabViewModel.java b/src/main/java/org/jabref/gui/preferences/nameformatter/NameFormatterTabViewModel.java
index 3bcfb75cc5f..4efae9eea8e 100644
--- a/src/main/java/org/jabref/gui/preferences/nameformatter/NameFormatterTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/nameformatter/NameFormatterTabViewModel.java
@@ -58,7 +58,6 @@ public void storeSettings() {
     public void addFormatter() {
         if (!StringUtil.isNullOrEmpty(addFormatterNameProperty.getValue()) &&
                 !StringUtil.isNullOrEmpty(addFormatterStringProperty.getValue())) {
-
             formatterListProperty.add(new NameFormatterItemModel(
                     addFormatterNameProperty.getValue(), addFormatterStringProperty.getValue()));
 
diff --git a/src/main/java/org/jabref/gui/preferences/network/CustomCertificateViewModel.java b/src/main/java/org/jabref/gui/preferences/network/CustomCertificateViewModel.java
new file mode 100644
index 00000000000..48844b9056f
--- /dev/null
+++ b/src/main/java/org/jabref/gui/preferences/network/CustomCertificateViewModel.java
@@ -0,0 +1,115 @@
+package org.jabref.gui.preferences.network;
+
+import java.time.LocalDate;
+import java.util.Optional;
+
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.ReadOnlyObjectProperty;
+import javafx.beans.property.ReadOnlyStringProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+
+import org.jabref.gui.AbstractViewModel;
+import org.jabref.logic.net.ssl.SSLCertificate;
+
+public class CustomCertificateViewModel extends AbstractViewModel {
+    private final StringProperty serialNumberProperty = new SimpleStringProperty("");
+    private final StringProperty issuerProperty = new SimpleStringProperty("");
+    private final ObjectProperty<LocalDate> validFromProperty = new SimpleObjectProperty<>();
+    private final ObjectProperty<LocalDate> validToProperty = new SimpleObjectProperty<>();
+    private final StringProperty signatureAlgorithmProperty = new SimpleStringProperty("");
+    private final StringProperty versionProperty = new SimpleStringProperty("");
+    private final StringProperty thumbprintProperty = new SimpleStringProperty("");
+    private final StringProperty pathProperty = new SimpleStringProperty("");
+
+    public CustomCertificateViewModel(String thumbprint, String serialNumber, String issuer, LocalDate validFrom, LocalDate validTo, String sigAlgorithm, String version) {
+        serialNumberProperty.setValue(serialNumber);
+        issuerProperty.setValue(issuer);
+        validFromProperty.setValue(validFrom);
+        validToProperty.setValue(validTo);
+        signatureAlgorithmProperty.setValue(sigAlgorithm);
+        versionProperty.setValue(version);
+        thumbprintProperty.setValue(thumbprint);
+    }
+
+    public ReadOnlyStringProperty serialNumberProperty() {
+        return serialNumberProperty;
+    }
+
+    public ReadOnlyStringProperty issuerProperty() {
+        return issuerProperty;
+    }
+
+    public ReadOnlyObjectProperty<LocalDate> validFromProperty() {
+        return validFromProperty;
+    }
+
+    public ReadOnlyObjectProperty<LocalDate> validToProperty() {
+        return validToProperty;
+    }
+
+    public ReadOnlyStringProperty signatureAlgorithmProperty() {
+        return signatureAlgorithmProperty;
+    }
+
+    public ReadOnlyStringProperty versionProperty() {
+        return versionProperty;
+    }
+
+    public String getVersion() {
+        return versionProperty.getValue();
+    }
+
+    public String getThumbprint() {
+        return thumbprintProperty.getValue();
+    }
+
+    public LocalDate getValidFrom() {
+        return validFromProperty.getValue();
+    }
+
+    public LocalDate getValidTo() {
+        return validToProperty.getValue();
+    }
+
+    public StringProperty pathPropertyProperty() {
+        return pathProperty;
+    }
+
+    public Optional<String> getPath() {
+        if (pathProperty.getValue() == null || pathProperty.getValue().isEmpty()) {
+            return Optional.empty();
+        } else {
+            return Optional.of(pathProperty.getValue());
+        }
+    }
+
+    public CustomCertificateViewModel setPath(String path) {
+        pathProperty.setValue(path);
+        return this;
+    }
+
+    public String getSerialNumber() {
+        return serialNumberProperty.getValue();
+    }
+
+    public String getIssuer() {
+        return issuerProperty.getValue();
+    }
+
+    public String getSignatureAlgorithm() {
+        return signatureAlgorithmProperty.getValue();
+    }
+
+    public static CustomCertificateViewModel fromSSLCertificate(SSLCertificate sslCertificate) {
+        return new CustomCertificateViewModel(
+                sslCertificate.getSHA256Thumbprint(),
+                sslCertificate.getSerialNumber(),
+                sslCertificate.getIssuer(),
+                sslCertificate.getValidFrom(),
+                sslCertificate.getValidTo(),
+                sslCertificate.getSignatureAlgorithm(),
+                sslCertificate.getVersion().toString());
+    }
+}
diff --git a/src/main/java/org/jabref/gui/preferences/network/NetworkTab.fxml b/src/main/java/org/jabref/gui/preferences/network/NetworkTab.fxml
index 1e22e4a34f5..2c0146e461f 100644
--- a/src/main/java/org/jabref/gui/preferences/network/NetworkTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/network/NetworkTab.fxml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.CheckBox?>
 <?import javafx.scene.control.Label?>
+<?import javafx.scene.control.TableColumn?>
+<?import javafx.scene.control.TableView?>
 <?import javafx.scene.control.TextField?>
 <?import javafx.scene.layout.ColumnConstraints?>
 <?import javafx.scene.layout.GridPane?>
@@ -10,50 +13,145 @@
 <?import javafx.scene.layout.RowConstraints?>
 <?import javafx.scene.layout.VBox?>
 <?import org.controlsfx.control.textfield.CustomPasswordField?>
-<fx:root spacing="10.0" type="VBox"
-         xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml"
-         fx:controller="org.jabref.gui.preferences.network.NetworkTab">
-    <Label styleClass="titleHeader" text="%Network"/>
-    <Label styleClass="sectionHeader" text="%Remote operation"/>
-    <Label fx:id="remoteLabel"
-           text="%This feature lets new files be opened or imported into an already running instance of JabRef instead of opening a new instance. For instance, this is useful when you open a file in JabRef from your web browser. Note that this will prevent you from running more than one instance of JabRef at a time."
-           textOverrun="CLIP" wrapText="true"/>
+
+<?import org.jabref.gui.icon.JabRefIconView?>
+<fx:root spacing="10.0" type="VBox" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.preferences.network.NetworkTab">
+    <Label styleClass="titleHeader" text="%Network" />
+    <Label styleClass="sectionHeader" text="%Remote operation" />
+    <Label fx:id="remoteLabel" text="%This feature lets new files be opened or imported into an already running instance of JabRef instead of opening a new instance. For instance, this is useful when you open a file in JabRef from your web browser. Note that this will prevent you from running more than one instance of JabRef at a time." textOverrun="CLIP" wrapText="true" />
     <HBox alignment="CENTER_LEFT" spacing="10.0">
-        <CheckBox fx:id="remoteServer" text="%Listen for remote operation on port"/>
-        <TextField fx:id="remotePort" maxWidth="100.0" HBox.hgrow="ALWAYS"/>
-        <Button fx:id="remoteHelp" prefWidth="20.0"/>
+        <CheckBox fx:id="remoteServer" text="%Listen for remote operation on port" />
+        <TextField fx:id="remotePort" maxWidth="100.0" HBox.hgrow="ALWAYS" />
+        <Button fx:id="remoteHelp" prefWidth="20.0" />
     </HBox>
 
-    <Label styleClass="sectionHeader" text="%Proxy configuration"/>
+    <Label styleClass="sectionHeader" text="%Proxy configuration" />
     <GridPane hgap="10.0" vgap="10.0">
         <columnConstraints>
-            <ColumnConstraints hgrow="SOMETIMES"/>
-            <ColumnConstraints hgrow="SOMETIMES"/>
-            <ColumnConstraints hgrow="SOMETIMES"/>
+            <ColumnConstraints hgrow="SOMETIMES" />
+            <ColumnConstraints hgrow="SOMETIMES" />
+            <ColumnConstraints hgrow="SOMETIMES" />
+        </columnConstraints>
+        <rowConstraints>
+            <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
+            <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
+            <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
+            <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
+            <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
+         <RowConstraints />
+         <RowConstraints />
+        </rowConstraints>
+        <CheckBox fx:id="proxyUse" text="%Use custom proxy configuration" GridPane.columnSpan="3" GridPane.rowIndex="0" />
+        <Label fx:id="proxyHostnameLabel" text="%Hostname" GridPane.rowIndex="1" />
+        <TextField fx:id="proxyHostname" prefWidth="200.0" GridPane.columnIndex="1" GridPane.rowIndex="1" />
+        <Label fx:id="proxyPortLabel" text="%Port" GridPane.rowIndex="2" />
+        <TextField fx:id="proxyPort" maxWidth="100.0" GridPane.columnIndex="1" GridPane.rowIndex="2" />
+        <CheckBox fx:id="proxyUseAuthentication" text="%Proxy requires authentication" GridPane.columnSpan="3" GridPane.rowIndex="3" />
+        <Label fx:id="proxyUsernameLabel" text="%Username" GridPane.rowIndex="4" />
+        <TextField fx:id="proxyUsername" prefWidth="200.0" GridPane.columnIndex="1" GridPane.rowIndex="4" />
+        <Label fx:id="proxyPasswordLabel" text="%Password" GridPane.rowIndex="5" />
+        <CustomPasswordField fx:id="proxyPassword" prefWidth="200.0" GridPane.columnIndex="1" GridPane.rowIndex="5" />
+        <Label fx:id="proxyAttentionLabel" styleClass="warning-message" text="%Attention: Password is stored in plain text!" GridPane.columnIndex="2" GridPane.rowIndex="5" />
+        <Button fx:id="checkConnectionButton" onAction="#checkConnection" prefWidth="200.0" text="%Check connection" GridPane.columnIndex="1" GridPane.rowIndex="6" />
+    </GridPane>
+   <Label styleClass="sectionHeader" text="%SSL Configuration" />
+    <GridPane
+            hgap="10.0"
+            vgap="10.0">
+        <columnConstraints>
+            <ColumnConstraints
+                    hgrow="SOMETIMES"/>
+            <ColumnConstraints
+                    hgrow="SOMETIMES"/>
+            <ColumnConstraints
+                    hgrow="SOMETIMES"/>
         </columnConstraints>
         <rowConstraints>
-            <RowConstraints minHeight="10.0" vgrow="SOMETIMES"/>
-            <RowConstraints minHeight="10.0" vgrow="SOMETIMES"/>
-            <RowConstraints minHeight="10.0" vgrow="SOMETIMES"/>
-            <RowConstraints minHeight="10.0" vgrow="SOMETIMES"/>
-            <RowConstraints minHeight="10.0" vgrow="SOMETIMES"/>
+            <RowConstraints
+                    minHeight="10.0"
+                    vgrow="SOMETIMES"/>
+            <RowConstraints
+                    minHeight="10.0"
+                    vgrow="SOMETIMES"/>
+            <RowConstraints
+                    minHeight="10.0"
+                    vgrow="SOMETIMES"/>
+            <RowConstraints
+                    minHeight="10.0"
+                    vgrow="SOMETIMES"/>
+            <RowConstraints
+                    minHeight="10.0"
+                    vgrow="SOMETIMES"/>
+            <RowConstraints
+                    minHeight="10.0"
+                    vgrow="SOMETIMES"/>
+            <RowConstraints
+                    minHeight="10.0"
+                    vgrow="SOMETIMES"/>
+            <RowConstraints
+                    minHeight="10.0"
+                    vgrow="SOMETIMES"/>
+            <RowConstraints/>
+            <RowConstraints/>
         </rowConstraints>
-        <CheckBox fx:id="proxyUse" text="%Use custom proxy configuration" GridPane.columnSpan="3"
-                  GridPane.rowIndex="0"/>
-        <Label fx:id="proxyHostnameLabel" text="%Hostname" GridPane.rowIndex="1"/>
-        <TextField fx:id="proxyHostname" prefWidth="200.0" GridPane.columnIndex="1" GridPane.rowIndex="1"/>
-        <Label fx:id="proxyPortLabel" text="%Port" GridPane.rowIndex="2"/>
-        <TextField fx:id="proxyPort" maxWidth="100.0" GridPane.columnIndex="1" GridPane.rowIndex="2"/>
-        <CheckBox fx:id="proxyUseAuthentication" text="%Proxy requires authentication" GridPane.columnSpan="3"
-                  GridPane.rowIndex="3"/>
-        <Label fx:id="proxyUsernameLabel" text="%Username" GridPane.rowIndex="4"/>
-        <TextField fx:id="proxyUsername" prefWidth="200.0" GridPane.columnIndex="1" GridPane.rowIndex="4"/>
-        <Label fx:id="proxyPasswordLabel" text="%Password" GridPane.rowIndex="5"/>
-        <CustomPasswordField fx:id="proxyPassword" prefWidth="200.0" GridPane.columnIndex="1"
-                             GridPane.rowIndex="5"/>
-        <Label fx:id="proxyAttentionLabel" styleClass="warning-message"
-               text="%Attention: Password is stored in plain text!" GridPane.columnIndex="2" GridPane.rowIndex="5"/>
-        <Button fx:id="checkConnectionButton" text="%Check connection" onAction="#checkConnection"
-                prefWidth="200.0" GridPane.columnIndex="1" GridPane.rowIndex="6"/>
+        <TableView
+                fx:id="customCertificatesTable"
+                prefHeight="200.0"
+                GridPane.columnSpan="3"
+                GridPane.rowIndex="0">
+            <GridPane.margin>
+                <Insets right="16.0"/>
+            </GridPane.margin>
+            <columns>
+                <TableColumn
+                        fx:id="certSerialNumber"
+                        prefWidth="75.0"
+                        text="%Serial number"/>
+                <TableColumn
+                        fx:id="certIssuer"
+                        prefWidth="75.0"
+                        text="%Issuer"/>
+                <TableColumn
+                        fx:id="certValidFrom"
+                        prefWidth="50.0"
+                        text="%Valid from"/>
+                <TableColumn
+                        fx:id="certValidTo"
+                        prefWidth="50.0"
+                        text="%Valid to"/>
+                <TableColumn
+                        fx:id="certSignatureAlgorithm"
+                        minWidth="40.0"
+                        prefWidth="100.0"
+                        text="%Signature algorithm"/>
+                <TableColumn
+                        fx:id="certVersion"
+                        prefWidth="136.0"
+                        text="%Version"/>
+                <TableColumn
+                        fx:id="actionsColumn" maxWidth="35.0" minWidth="35.0" prefWidth="35.0"
+                        editable="false" resizable="false" reorderable="false"
+                />
+            </columns>
+           <columnResizePolicy>
+               <TableView
+                       fx:constant="CONSTRAINED_RESIZE_POLICY"/>
+           </columnResizePolicy>
+        </TableView>
+        <Button fx:id="addCertificate"
+                mnemonicParsing="false"
+                onAction="#addCertificateFile"
+                text="%Add certificate"
+                GridPane.columnIndex="2"
+                GridPane.halignment="RIGHT"
+                GridPane.rowIndex="1"
+                GridPane.valignment="TOP">
+           <GridPane.margin>
+               <Insets right="16.0"/>
+           </GridPane.margin>
+            <graphic>
+                <JabRefIconView glyph="OPEN_LIST"/>
+            </graphic>
+        </Button>
     </GridPane>
 </fx:root>
diff --git a/src/main/java/org/jabref/gui/preferences/network/NetworkTab.java b/src/main/java/org/jabref/gui/preferences/network/NetworkTab.java
index 6d2d0d344aa..1002f80b22e 100644
--- a/src/main/java/org/jabref/gui/preferences/network/NetworkTab.java
+++ b/src/main/java/org/jabref/gui/preferences/network/NetworkTab.java
@@ -1,11 +1,17 @@
 package org.jabref.gui.preferences.network;
 
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+
 import javafx.application.Platform;
 import javafx.beans.binding.BooleanBinding;
+import javafx.beans.property.SimpleStringProperty;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
 import javafx.scene.control.CheckBox;
 import javafx.scene.control.Label;
+import javafx.scene.control.TableColumn;
+import javafx.scene.control.TableView;
 import javafx.scene.control.TextField;
 import javafx.scene.input.MouseEvent;
 
@@ -17,10 +23,12 @@
 import org.jabref.gui.preferences.AbstractPreferenceTabView;
 import org.jabref.gui.preferences.PreferencesTab;
 import org.jabref.gui.util.IconValidationDecorator;
+import org.jabref.gui.util.ValueTableCellFactory;
 import org.jabref.logic.help.HelpFile;
 import org.jabref.logic.l10n.Localization;
 
 import com.airhacks.afterburner.views.ViewLoader;
+import com.tobiasdiez.easybind.EasyBind;
 import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
 import org.controlsfx.control.textfield.CustomPasswordField;
 
@@ -43,6 +51,16 @@ public class NetworkTab extends AbstractPreferenceTabView<NetworkTabViewModel> i
     @FXML private Label proxyAttentionLabel;
     @FXML private Button checkConnectionButton;
 
+    @FXML private TableView<CustomCertificateViewModel> customCertificatesTable;
+    @FXML private TableColumn<CustomCertificateViewModel, String> certIssuer;
+    @FXML private TableColumn<CustomCertificateViewModel, String> certSerialNumber;
+    @FXML private TableColumn<CustomCertificateViewModel, String> certSignatureAlgorithm;
+    @FXML private TableColumn<CustomCertificateViewModel, String> certValidFrom;
+    @FXML private TableColumn<CustomCertificateViewModel, String> certValidTo;
+    @FXML private TableColumn<CustomCertificateViewModel, String> certVersion;
+    @FXML private TableColumn<CustomCertificateViewModel, String> actionsColumn;
+
+
     private String proxyPasswordText = "";
     private int proxyPasswordCaretPosition = 0;
 
@@ -92,7 +110,7 @@ public void initialize() {
         proxyPassword.getRight().addEventFilter(MouseEvent.MOUSE_EXITED, this::proxyPasswordMask);
 
         ActionFactory actionFactory = new ActionFactory(Globals.getKeyPrefs());
-        actionFactory.configureIconButton(StandardActions.HELP, new HelpAction(HelpFile.REMOTE), remoteHelp);
+        actionFactory.configureIconButton(StandardActions.HELP, new HelpAction(HelpFile.REMOTE, dialogService), remoteHelp);
 
         validationVisualizer.setDecoration(new IconValidationDecorator());
         Platform.runLater(() -> {
@@ -102,6 +120,31 @@ public void initialize() {
             validationVisualizer.initVisualization(viewModel.proxyUsernameValidationStatus(), proxyUsername);
             validationVisualizer.initVisualization(viewModel.proxyPasswordValidationStatus(), proxyPassword);
         });
+
+        certSerialNumber.setCellValueFactory(data -> data.getValue().serialNumberProperty());
+        certIssuer.setCellValueFactory(data -> data.getValue().issuerProperty());
+        certSignatureAlgorithm.setCellValueFactory(data -> data.getValue().signatureAlgorithmProperty());
+        certVersion.setCellValueFactory(data -> EasyBind.map(data.getValue().versionProperty(), this::formatVersion));
+
+        certValidFrom.setCellValueFactory(data -> EasyBind.map(data.getValue().validFromProperty(), this::formatDate));
+        certValidTo.setCellValueFactory(data -> EasyBind.map(data.getValue().validToProperty(), this::formatDate));
+
+        customCertificatesTable.itemsProperty().set(viewModel.customCertificateListProperty());
+
+        actionsColumn.setCellValueFactory(cellData -> new SimpleStringProperty(cellData.getValue().getThumbprint()));
+        new ValueTableCellFactory<CustomCertificateViewModel, String>()
+                .withGraphic(name -> IconTheme.JabRefIcons.DELETE_ENTRY.getGraphicNode())
+                .withTooltip(name -> Localization.lang("Remove formatter '%0'", name))
+                .withOnMouseClickedEvent(thumbprint -> evt -> viewModel.customCertificateListProperty().removeIf(cert -> cert.getThumbprint().equals(thumbprint)))
+                .install(actionsColumn);
+    }
+
+    private String formatDate(LocalDate localDate) {
+        return localDate.format(DateTimeFormatter.ofPattern("dd-MMM-yyyy"));
+    }
+
+    private String formatVersion(String version) {
+        return String.format("V%s", version);
     }
 
     private void proxyPasswordReveal(MouseEvent event) {
@@ -125,4 +168,9 @@ private void proxyPasswordMask(MouseEvent event) {
     void checkConnection() {
         viewModel.checkConnection();
     }
+
+    @FXML
+    void addCertificateFile() {
+        viewModel.addCertificateFile();
+    }
 }
diff --git a/src/main/java/org/jabref/gui/preferences/network/NetworkTabViewModel.java b/src/main/java/org/jabref/gui/preferences/network/NetworkTabViewModel.java
index fda9c9e9e94..c3962e241e8 100644
--- a/src/main/java/org/jabref/gui/preferences/network/NetworkTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/network/NetworkTabViewModel.java
@@ -1,25 +1,38 @@
 package org.jabref.gui.preferences.network;
 
 import java.net.MalformedURLException;
-import java.util.ArrayList;
+import java.nio.file.Path;
+import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.ListProperty;
 import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.property.SimpleListProperty;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
+import javafx.collections.FXCollections;
+import javafx.collections.ListChangeListener;
+import javafx.stage.FileChooser;
 
 import org.jabref.gui.DialogService;
 import org.jabref.gui.Globals;
 import org.jabref.gui.preferences.PreferenceTabViewModel;
 import org.jabref.gui.remote.JabRefMessageHandler;
+import org.jabref.gui.util.FileDialogConfiguration;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.net.ProxyPreferences;
 import org.jabref.logic.net.ProxyRegisterer;
 import org.jabref.logic.net.URLDownload;
+import org.jabref.logic.net.ssl.SSLCertificate;
+import org.jabref.logic.net.ssl.SSLPreferences;
+import org.jabref.logic.net.ssl.TrustStoreManager;
 import org.jabref.logic.remote.RemotePreferences;
 import org.jabref.logic.remote.RemoteUtil;
+import org.jabref.logic.util.StandardFileType;
 import org.jabref.model.strings.StringUtil;
 import org.jabref.preferences.PreferencesService;
 
@@ -29,8 +42,12 @@
 import de.saxsys.mvvmfx.utils.validation.ValidationStatus;
 import de.saxsys.mvvmfx.utils.validation.Validator;
 import kong.unirest.UnirestException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class NetworkTabViewModel implements PreferenceTabViewModel {
+    private static final Logger LOGGER = LoggerFactory.getLogger(NetworkTabViewModel.class);
+
     private final BooleanProperty remoteServerProperty = new SimpleBooleanProperty();
     private final StringProperty remotePortProperty = new SimpleStringProperty("");
     private final BooleanProperty proxyUseProperty = new SimpleBooleanProperty();
@@ -39,6 +56,7 @@ public class NetworkTabViewModel implements PreferenceTabViewModel {
     private final BooleanProperty proxyUseAuthenticationProperty = new SimpleBooleanProperty();
     private final StringProperty proxyUsernameProperty = new SimpleStringProperty("");
     private final StringProperty proxyPasswordProperty = new SimpleStringProperty("");
+    private final ListProperty<CustomCertificateViewModel> customCertificateListProperty = new SimpleListProperty<>(FXCollections.observableArrayList());
 
     private final Validator remotePortValidator;
     private final Validator proxyHostnameValidator;
@@ -51,14 +69,18 @@ public class NetworkTabViewModel implements PreferenceTabViewModel {
     private final RemotePreferences remotePreferences;
     private final ProxyPreferences proxyPreferences;
     private final ProxyPreferences backupProxyPreferences;
+    private final SSLPreferences sslPreferences;
+
+    private final TrustStoreManager trustStoreManager;
 
-    private final List<String> restartWarning = new ArrayList<>();
+    private AtomicBoolean sslCertificatesChanged = new AtomicBoolean(false);
 
     public NetworkTabViewModel(DialogService dialogService, PreferencesService preferences) {
         this.dialogService = dialogService;
         this.preferences = preferences;
         this.remotePreferences = preferences.getRemotePreferences();
         this.proxyPreferences = preferences.getProxyPreferences();
+        this.sslPreferences = preferences.getSSLPreferences();
 
         backupProxyPreferences = new ProxyPreferences(
                 proxyPreferences.shouldUseProxy(),
@@ -114,6 +136,7 @@ public NetworkTabViewModel(DialogService dialogService, PreferencesService prefe
                         Localization.lang("Network"),
                         Localization.lang("Proxy configuration"),
                         Localization.lang("Please specify a password"))));
+        this.trustStoreManager = new TrustStoreManager(Path.of(sslPreferences.getTruststorePath()));
     }
 
     public void setValues() {
@@ -121,6 +144,7 @@ public void setValues() {
         remotePortProperty.setValue(String.valueOf(remotePreferences.getPort()));
 
         setProxyValues();
+        setSSLValues();
     }
 
     private void setProxyValues() {
@@ -132,9 +156,26 @@ private void setProxyValues() {
         proxyPasswordProperty.setValue(proxyPreferences.getPassword());
     }
 
+    private void setSSLValues() {
+        customCertificateListProperty.clear();
+        trustStoreManager.getCustomCertificates().forEach(cert -> customCertificateListProperty.add(CustomCertificateViewModel.fromSSLCertificate(cert)));
+        customCertificateListProperty.addListener((ListChangeListener<CustomCertificateViewModel>) c -> {
+            sslCertificatesChanged.set(true);
+            while (c.next()) {
+                if (c.wasAdded()) {
+                    CustomCertificateViewModel certificate = c.getAddedSubList().get(0);
+                    certificate.getPath().ifPresent(path -> trustStoreManager
+                            .addCertificate(formatCustomAlias(certificate.getThumbprint()), Path.of(path)));
+                } else if (c.wasRemoved()) {
+                    CustomCertificateViewModel certificate = c.getRemoved().get(0);
+                    trustStoreManager.deleteCertificate(formatCustomAlias(certificate.getThumbprint()));
+                }
+            }
+        });
+    }
+
     public void storeSettings() {
         storeRemoteSettings();
-
         storeProxySettings(new ProxyPreferences(
                 proxyUseProperty.getValue(),
                 proxyHostnameProperty.getValue().trim(),
@@ -143,6 +184,7 @@ public void storeSettings() {
                 proxyUsernameProperty.getValue().trim(),
                 proxyPasswordProperty.getValue()
         ));
+        storeSSLSettings();
     }
 
     private void storeRemoteSettings() {
@@ -167,10 +209,13 @@ private void storeRemoteSettings() {
     }
 
     private void storeProxySettings(ProxyPreferences newProxyPreferences) {
-        if (!newProxyPreferences.equals(proxyPreferences)) {
-            ProxyRegisterer.register(newProxyPreferences);
+        if (Objects.equals(newProxyPreferences, proxyPreferences)) {
+            // nothing changed; thus, nothing to store
+            return;
         }
 
+        ProxyRegisterer.register(newProxyPreferences);
+
         proxyPreferences.setUseProxy(newProxyPreferences.shouldUseProxy());
         proxyPreferences.setHostname(newProxyPreferences.getHostname());
         proxyPreferences.setPort(newProxyPreferences.getPort());
@@ -179,6 +224,10 @@ private void storeProxySettings(ProxyPreferences newProxyPreferences) {
         proxyPreferences.setPassword(newProxyPreferences.getPassword());
     }
 
+    public void storeSSLSettings() {
+        trustStoreManager.flush();
+    }
+
     private Optional<Integer> getPortAsInt(String value) {
         try {
             return Optional.of(Integer.parseInt(value));
@@ -234,9 +283,7 @@ public boolean validateSettings() {
     }
 
     /**
-     * Check the connection by using the given url. Used for validating the http proxy.
-     * The checking result will be appear when request finished.
-     * The checking result could be either success or fail, if fail, the cause will be displayed.
+     * Check the connection by using the given url. Used for validating the http proxy. The checking result will be appear when request finished. The checking result could be either success or fail, if fail, the cause will be displayed.
      */
     public void checkConnection() {
         final String connectionSuccessText = Localization.lang("Connection successful!");
@@ -275,7 +322,11 @@ public void checkConnection() {
 
     @Override
     public List<String> getRestartWarnings() {
-        return restartWarning;
+        if (sslCertificatesChanged.get()) {
+            return List.of(Localization.lang("SSL configuration changed"));
+        } else {
+            return Collections.emptyList();
+        }
     }
 
     public BooleanProperty remoteServerProperty() {
@@ -309,4 +360,29 @@ public StringProperty proxyUsernameProperty() {
     public StringProperty proxyPasswordProperty() {
         return proxyPasswordProperty;
     }
+
+    public ListProperty<CustomCertificateViewModel> customCertificateListProperty() {
+        return customCertificateListProperty;
+    }
+
+    public void addCertificateFile() {
+        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
+                .addExtensionFilter(new FileChooser.ExtensionFilter(Localization.lang("SSL certificate file"), "*.crt", "*.cer"))
+                .withDefaultExtension(Localization.lang("SSL certificate file"), StandardFileType.CER)
+                .withInitialDirectory(preferences.getFilePreferences().getWorkingDirectory())
+                .build();
+
+        dialogService.showFileOpenDialog(fileDialogConfiguration).ifPresent(certPath -> SSLCertificate.fromPath(certPath).ifPresent(sslCertificate -> {
+            if (!trustStoreManager.isCertificateExist(formatCustomAlias(sslCertificate.getSHA256Thumbprint()))) {
+                customCertificateListProperty.add(CustomCertificateViewModel.fromSSLCertificate(sslCertificate)
+                                                                            .setPath(certPath.toAbsolutePath().toString()));
+            } else {
+                dialogService.showWarningDialogAndWait(Localization.lang("Duplicate Certificates"), Localization.lang("You already added this certificate"));
+            }
+        }));
+    }
+
+    private String formatCustomAlias(String thumbprint) {
+        return String.format("%s[custom]", thumbprint);
+    }
 }
diff --git a/src/main/java/org/jabref/gui/preferences/preview/PreviewTabViewModel.java b/src/main/java/org/jabref/gui/preferences/preview/PreviewTabViewModel.java
index 256bb7ebd52..397e7687c58 100644
--- a/src/main/java/org/jabref/gui/preferences/preview/PreviewTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/preview/PreviewTabViewModel.java
@@ -54,6 +54,7 @@
  * <p>
  *     {@link PreviewTab} is the controller of Entry Preview tab
  * </p>
+ *
  * @see PreviewTab
  * */
 public class PreviewTabViewModel implements PreferenceTabViewModel {
@@ -293,7 +294,6 @@ public void resetDefaultLayout() {
      * @return highlighted span for codeArea
      */
     public StyleSpans<Collection<String>> computeHighlighting(String text) {
-
         final Pattern XML_TAG = Pattern.compile("(?<ELEMENT>(</?\\h*)(\\w+)([^<>]*)(\\h*/?>))"
                 + "|(?<COMMENT><!--[^<>]+-->)");
         final Pattern ATTRIBUTES = Pattern.compile("(\\w+\\h*)(=)(\\h*\"[^\"]+\")");
@@ -310,7 +310,6 @@ public StyleSpans<Collection<String>> computeHighlighting(String text) {
         int lastKeywordEnd = 0;
         StyleSpansBuilder<Collection<String>> spansBuilder = new StyleSpansBuilder<>();
         while (matcher.find()) {
-
             spansBuilder.add(Collections.emptyList(), matcher.start() - lastKeywordEnd);
             if (matcher.group("COMMENT") != null) {
                 spansBuilder.add(Collections.singleton("comment"), matcher.end() - matcher.start());
@@ -322,7 +321,6 @@ public StyleSpans<Collection<String>> computeHighlighting(String text) {
                     spansBuilder.add(Collections.singleton("anytag"), matcher.end(GROUP_ELEMENT_NAME) - matcher.end(GROUP_OPEN_BRACKET));
 
                     if (!attributesText.isEmpty()) {
-
                         lastKeywordEnd = 0;
 
                         Matcher attributesMatcher = ATTRIBUTES.matcher(attributesText);
diff --git a/src/main/java/org/jabref/gui/preferences/protectedterms/ProtectedTermsTabViewModel.java b/src/main/java/org/jabref/gui/preferences/protectedterms/ProtectedTermsTabViewModel.java
index 2382ea04263..62c09375df6 100644
--- a/src/main/java/org/jabref/gui/preferences/protectedterms/ProtectedTermsTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/protectedterms/ProtectedTermsTabViewModel.java
@@ -112,7 +112,6 @@ public void removeList(ProtectedTermsListItemModel itemModel) {
                 Localization.lang("Are you sure you want to remove the protected terms file?"),
                 Localization.lang("Remove protected terms file"),
                 Localization.lang("Cancel"))) {
-
             itemModel.enabledProperty().setValue(false);
             if (!termsFilesProperty.remove(itemModel)) {
                 LOGGER.info("Problem removing protected terms file");
@@ -126,8 +125,8 @@ public void createNewFile() {
 
     public void edit(ProtectedTermsListItemModel file) {
         Optional<ExternalFileType> termsFileType = OptionalUtil.<ExternalFileType>orElse(
-                ExternalFileTypes.getInstance().getExternalFileTypeByExt("terms"),
-                ExternalFileTypes.getInstance().getExternalFileTypeByExt("txt")
+                ExternalFileTypes.getExternalFileTypeByExt("terms", preferences.getFilePreferences()),
+                ExternalFileTypes.getExternalFileTypeByExt("txt", preferences.getFilePreferences())
         );
 
         String fileName = file.getTermsList().getLocation();
diff --git a/src/main/java/org/jabref/gui/preferences/table/TableTab.java b/src/main/java/org/jabref/gui/preferences/table/TableTab.java
index 6014d21ae90..e3ab7004598 100644
--- a/src/main/java/org/jabref/gui/preferences/table/TableTab.java
+++ b/src/main/java/org/jabref/gui/preferences/table/TableTab.java
@@ -66,7 +66,7 @@ public void initialize() {
         setupBindings();
 
         ActionFactory actionFactory = new ActionFactory(preferencesService.getKeyBindingRepository());
-        actionFactory.configureIconButton(StandardActions.HELP_SPECIAL_FIELDS, new HelpAction(HelpFile.SPECIAL_FIELDS), specialFieldsHelp);
+        actionFactory.configureIconButton(StandardActions.HELP_SPECIAL_FIELDS, new HelpAction(HelpFile.SPECIAL_FIELDS, dialogService), specialFieldsHelp);
     }
 
     private void setupTable() {
diff --git a/src/main/java/org/jabref/gui/preferences/table/TableTabViewModel.java b/src/main/java/org/jabref/gui/preferences/table/TableTabViewModel.java
index 2184469c933..ecae4a7d091 100644
--- a/src/main/java/org/jabref/gui/preferences/table/TableTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/table/TableTabViewModel.java
@@ -14,7 +14,6 @@
 
 import org.jabref.gui.DialogService;
 import org.jabref.gui.externalfiletype.ExternalFileType;
-import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.maintable.ColumnPreferences;
 import org.jabref.gui.maintable.MainTableColumnModel;
 import org.jabref.gui.maintable.MainTableNameFormatPreferences;
@@ -180,10 +179,10 @@ private void removeSpecialFieldColumns() {
     }
 
     private void insertExtraFileColumns() {
-        ExternalFileTypes.getInstance().getExternalFileTypeSelection().stream()
-                         .map(ExternalFileType::getName)
-                         .map(name -> new MainTableColumnModel(MainTableColumnModel.Type.EXTRAFILE, name))
-                         .forEach(item -> availableColumnsProperty.getValue().add(item));
+        preferences.getFilePreferences().getExternalFileTypes().stream()
+                   .map(ExternalFileType::getName)
+                   .map(name -> new MainTableColumnModel(MainTableColumnModel.Type.EXTRAFILE, name))
+                   .forEach(item -> availableColumnsProperty.getValue().add(item));
     }
 
     private void removeExtraFileColumns() {
diff --git a/src/main/java/org/jabref/gui/preview/PreviewPanel.java b/src/main/java/org/jabref/gui/preview/PreviewPanel.java
index f16b27d8b13..94cf57cd1e3 100644
--- a/src/main/java/org/jabref/gui/preview/PreviewPanel.java
+++ b/src/main/java/org/jabref/gui/preview/PreviewPanel.java
@@ -19,7 +19,6 @@
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.externalfiles.ExternalFilesEntryLinker;
-import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.keyboard.KeyBinding;
 import org.jabref.gui.keyboard.KeyBindingRepository;
@@ -50,7 +49,6 @@ public class PreviewPanel extends VBox {
 
     public PreviewPanel(BibDatabaseContext database,
                         DialogService dialogService,
-                        ExternalFileTypes externalFileTypes,
                         KeyBindingRepository keyBindingRepository,
                         PreferencesService preferences,
                         StateManager stateManager,
@@ -61,7 +59,7 @@ public PreviewPanel(BibDatabaseContext database,
         this.stateManager = stateManager;
         this.previewPreferences = preferences.getPreviewPreferences();
         this.indexingTaskManager = indexingTaskManager;
-        this.fileLinker = new ExternalFilesEntryLinker(externalFileTypes, preferences.getFilePreferences(), database);
+        this.fileLinker = new ExternalFilesEntryLinker(preferences.getFilePreferences(), database);
 
         PreviewPreferences previewPreferences = preferences.getPreviewPreferences();
         previewView = new PreviewViewer(database, dialogService, stateManager, themeManager);
diff --git a/src/main/java/org/jabref/gui/preview/PreviewViewer.java b/src/main/java/org/jabref/gui/preview/PreviewViewer.java
index 0c2c1cd2e70..78a7d47d2ee 100644
--- a/src/main/java/org/jabref/gui/preview/PreviewViewer.java
+++ b/src/main/java/org/jabref/gui/preview/PreviewViewer.java
@@ -27,6 +27,7 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.preview.PreviewLayout;
 import org.jabref.logic.search.SearchQuery;
+import org.jabref.logic.util.WebViewStore;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 
@@ -46,57 +47,74 @@ public class PreviewViewer extends ScrollPane implements InvalidationListener {
     private static final Logger LOGGER = LoggerFactory.getLogger(PreviewViewer.class);
 
     // https://stackoverflow.com/questions/5669448/get-selected-texts-html-in-div/5670825#5670825
-    private static final String JS_GET_SELECTION_HTML_SCRIPT = "function getSelectionHtml() {" +
-                                                               "    var html = \"\";" +
-                                                               "    if (typeof window.getSelection != \"undefined\") {" +
-                                                               "        var sel = window.getSelection();" +
-                                                               "        if (sel.rangeCount) {" +
-                                                               "            var container = document.createElement(\"div\");" +
-                                                               "            for (var i = 0, len = sel.rangeCount; i < len; ++i) {" +
-                                                               "                container.appendChild(sel.getRangeAt(i).cloneContents());" +
-                                                               "            }" +
-                                                               "            html = container.innerHTML;" +
-                                                               "        }" +
-                                                               "    } else if (typeof document.selection != \"undefined\") {" +
-                                                               "        if (document.selection.type == \"Text\") {" +
-                                                               "            html = document.selection.createRange().htmlText;" +
-                                                               "        }" +
-                                                               "    }" +
-                                                               "    return html;" +
-                                                               "};" +
-                                                               "getSelectionHtml();";
+    private static final String JS_GET_SELECTION_HTML_SCRIPT = """
+                                                                   function getSelectionHtml() {
+                                                                   var html = "";
+                                                                   if (typeof window.getSelection != "undefined") {
+                                                                       var sel = window.getSelection();
+                                                                       if (sel.rangeCount) {
+                                                                           var container = document.createElement("div");
+                                                                           for (var i = 0, len = sel.rangeCount; i < len; ++i) {
+                                                                               container.appendChild(sel.getRangeAt(i).cloneContents());
+                                                                           }
+                                                                           html = container.innerHTML;
+                                                                       }
+                                                                   } else if (typeof document.selection != "undefined") {
+                                                                       if (document.selection.type == "Text") {
+                                                                           html = document.selection.createRange().htmlText;
+                                                                       }
+                                                                   }
+                                                                   return html;
+                                                                   }
+                                                               getSelectionHtml();
+                                                               """;
     private static final String JS_HIGHLIGHT_FUNCTION =
-            "<head>" +
-                    "   <meta charset=\"UTF-8\">" +
-                    "   <style>" +
-                    "       mark{" +
-                    "           background: orange;" +
-                    "           color: black;" +
-                    "       }" +
-                    "   </style>" +
-                    "   <script type=\"text/javascript\">" +
-                    "/*!***************************************************\n" +
-                    "* mark.js v9.0.0\n" +
-                    "* https://markjs.io/\n" +
-                    "* Copyright (c) 2014–2018, Julian Kühnel\n" +
-                    "* Released under the MIT license https://git.io/vwTVl\n" +
-                    "*****************************************************/\n" +
-                    "!function(e,t){\"object\"==typeof exports&&\"undefined\"!=typeof module?module.exports=t():\"function\"==typeof define&&define.amd?define(t):e.Mark=t()}(this,function(){\"use strict\";function e(t){return(e=\"function\"==typeof Symbol&&\"symbol\"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&\"function\"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?\"symbol\":typeof e})(t)}function t(e,t){if(!(e instanceof t))throw new TypeError(\"Cannot call a class as a function\")}function n(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,\"value\"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}function r(e,t,r){return t&&n(e.prototype,t),r&&n(e,r),e}function o(){return(o=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e}).apply(this,arguments)}var i=\n" +
-                    "/* */\n" +
-                    "function(){function e(n){var r=!(arguments.length>1&&void 0!==arguments[1])||arguments[1],o=arguments.length>2&&void 0!==arguments[2]?arguments[2]:[],i=arguments.length>3&&void 0!==arguments[3]?arguments[3]:5e3;t(this,e),this.ctx=n,this.iframes=r,this.exclude=o,this.iframesTimeout=i}return r(e,[{key:\"getContexts\",value:function(){var e=[];return(void 0!==this.ctx&&this.ctx?NodeList.prototype.isPrototypeOf(this.ctx)?Array.prototype.slice.call(this.ctx):Array.isArray(this.ctx)?this.ctx:\"string\"==typeof this.ctx?Array.prototype.slice.call(document.querySelectorAll(this.ctx)):[this.ctx]:[]).forEach(function(t){var n=e.filter(function(e){return e.contains(t)}).length>0;-1!==e.indexOf(t)||n||e.push(t)}),e}},{key:\"getIframeContents\",value:function(e,t){var n,r=arguments.length>2&&void 0!==arguments[2]?arguments[2]:function(){};try{var o=e.contentWindow;if(n=o.document,!o||!n)throw new Error(\"iframe inaccessible\")}catch(e){r()}n&&t(n)}},{key:\"isIframeBlank\",value:function(e){var t=\"about:blank\",n=e.getAttribute(\"src\").trim();return e.contentWindow.location.href===t&&n!==t&&n}},{key:\"observeIframeLoad\",value:function(e,t,n){var r=this,o=!1,i=null,a=function a(){if(!o){o=!0,clearTimeout(i);try{r.isIframeBlank(e)||(e.removeEventListener(\"load\",a),r.getIframeContents(e,t,n))}catch(e){n()}}};e.addEventListener(\"load\",a),i=setTimeout(a,this.iframesTimeout)}},{key:\"onIframeReady\",value:function(e,t,n){try{\"complete\"===e.contentWindow.document.readyState?this.isIframeBlank(e)?this.observeIframeLoad(e,t,n):this.getIframeContents(e,t,n):this.observeIframeLoad(e,t,n)}catch(e){n()}}},{key:\"waitForIframes\",value:function(e,t){var n=this,r=0;this.forEachIframe(e,function(){return!0},function(e){r++,n.waitForIframes(e.querySelector(\"html\"),function(){--r||t()})},function(e){e||t()})}},{key:\"forEachIframe\",value:function(t,n,r){var o=this,i=arguments.length>3&&void 0!==arguments[3]?arguments[3]:function(){},a=t.querySelectorAll(\"iframe\"),s=a.length,c=0;a=Array.prototype.slice.call(a);var u=function(){--s<=0&&i(c)};s||u(),a.forEach(function(t){e.matches(t,o.exclude)?u():o.onIframeReady(t,function(e){n(t)&&(c++,r(e)),u()},u)})}},{key:\"createIterator\",value:function(e,t,n){return document.createNodeIterator(e,t,n,!1)}},{key:\"createInstanceOnIframe\",value:function(t){return new e(t.querySelector(\"html\"),this.iframes)}},{key:\"compareNodeIframe\",value:function(e,t,n){if(e.compareDocumentPosition(n)&Node.DOCUMENT_POSITION_PRECEDING){if(null===t)return!0;if(t.compareDocumentPosition(n)&Node.DOCUMENT_POSITION_FOLLOWING)return!0}return!1}},{key:\"getIteratorNode\",value:function(e){var t=e.previousNode();return{prevNode:t,node:null===t?e.nextNode():e.nextNode()&&e.nextNode()}}},{key:\"checkIframeFilter\",value:function(e,t,n,r){var o=!1,i=!1;return r.forEach(function(e,t){e.val===n&&(o=t,i=e.handled)}),this.compareNodeIframe(e,t,n)?(!1!==o||i?!1===o||i||(r[o].handled=!0):r.push({val:n,handled:!0}),!0):(!1===o&&r.push({val:n,handled:!1}),!1)}},{key:\"handleOpenIframes\",value:function(e,t,n,r){var o=this;e.forEach(function(e){e.handled||o.getIframeContents(e.val,function(e){o.createInstanceOnIframe(e).forEachNode(t,n,r)})})}},{key:\"iterateThroughNodes\",value:function(e,t,n,r,o){for(var i,a,s,c=this,u=this.createIterator(t,e,r),l=[],h=[];s=void 0,s=c.getIteratorNode(u),a=s.prevNode,i=s.node;)this.iframes&&this.forEachIframe(t,function(e){return c.checkIframeFilter(i,a,e,l)},function(t){c.createInstanceOnIframe(t).forEachNode(e,function(e){return h.push(e)},r)}),h.push(i);h.forEach(function(e){n(e)}),this.iframes&&this.handleOpenIframes(l,e,n,r),o()}},{key:\"forEachNode\",value:function(e,t,n){var r=this,o=arguments.length>3&&void 0!==arguments[3]?arguments[3]:function(){},i=this.getContexts(),a=i.length;a||o(),i.forEach(function(i){var s=function(){r.iterateThroughNodes(e,i,t,n,function(){--a<=0&&o()})};r.iframes?r.waitForIframes(i,s):s()})}}],[{key:\"matches\",value:function(e,t){var n=\"string\"==typeof t?[t]:t,r=e.matches||e.matchesSelector||e.msMatchesSelector||e.mozMatchesSelector||e.oMatchesSelector||e.webkitMatchesSelector;if(r){var o=!1;return n.every(function(t){return!r.call(e,t)||(o=!0,!1)}),o}return!1}}]),e}(),a=\n" +
-                    "/* */\n" +
-                    "function(){function e(n){t(this,e),this.opt=o({},{diacritics:!0,synonyms:{},accuracy:\"partially\",caseSensitive:!1,ignoreJoiners:!1,ignorePunctuation:[],wildcards:\"disabled\"},n)}return r(e,[{key:\"create\",value:function(e){return\"disabled\"!==this.opt.wildcards&&(e=this.setupWildcardsRegExp(e)),e=this.escapeStr(e),Object.keys(this.opt.synonyms).length&&(e=this.createSynonymsRegExp(e)),(this.opt.ignoreJoiners||this.opt.ignorePunctuation.length)&&(e=this.setupIgnoreJoinersRegExp(e)),this.opt.diacritics&&(e=this.createDiacriticsRegExp(e)),e=this.createMergedBlanksRegExp(e),(this.opt.ignoreJoiners||this.opt.ignorePunctuation.length)&&(e=this.createJoinersRegExp(e)),\"disabled\"!==this.opt.wildcards&&(e=this.createWildcardsRegExp(e)),e=this.createAccuracyRegExp(e),new RegExp(e,\"gm\".concat(this.opt.caseSensitive?\"\":\"i\"))}},{key:\"sortByLength\",value:function(e){return e.sort(function(e,t){return e.length===t.length?e>t?1:-1:t.length-e.length})}},{key:\"escapeStr\",value:function(e){return e.replace(/[\\-\\[\\]\\/\\{\\}\\(\\)\\*\\+\\?\\.\\\\\\^\\$\\|]/g,\"\\\\$&\")}},{key:\"createSynonymsRegExp\",value:function(e){var t=this,n=this.opt.synonyms,r=this.opt.caseSensitive?\"\":\"i\",o=this.opt.ignoreJoiners||this.opt.ignorePunctuation.length?\"\\0\":\"\";for(var i in n)if(n.hasOwnProperty(i)){var a=Array.isArray(n[i])?n[i]:[n[i]];a.unshift(i),(a=this.sortByLength(a).map(function(e){return\"disabled\"!==t.opt.wildcards&&(e=t.setupWildcardsRegExp(e)),e=t.escapeStr(e)}).filter(function(e){return\"\"!==e})).length>1&&(e=e.replace(new RegExp(\"(\".concat(a.map(function(e){return t.escapeStr(e)}).join(\"|\"),\")\"),\"gm\".concat(r)),o+\"(\".concat(a.map(function(e){return t.processSynonyms(e)}).join(\"|\"),\")\")+o))}return e}},{key:\"processSynonyms\",value:function(e){return(this.opt.ignoreJoiners||this.opt.ignorePunctuation.length)&&(e=this.setupIgnoreJoinersRegExp(e)),e}},{key:\"setupWildcardsRegExp\",value:function(e){return(e=e.replace(/(?:\\\\)*\\?/g,function(e){return\"\\\\\"===e.charAt(0)?\"?\":\"\u0001\"})).replace(/(?:\\\\)*\\*/g,function(e){return\"\\\\\"===e.charAt(0)?\"*\":\"\u0002\"})}},{key:\"createWildcardsRegExp\",value:function(e){var t=\"withSpaces\"===this.opt.wildcards;return e.replace(/\\u0001/g,t?\"[\\\\S\\\\s]?\":\"\\\\S?\").replace(/\\u0002/g,t?\"[\\\\S\\\\s]*?\":\"\\\\S*\")}},{key:\"setupIgnoreJoinersRegExp\",value:function(e){return e.replace(/[^(|)\\\\]/g,function(e,t,n){var r=n.charAt(t+1);return/[(|)\\\\]/.test(r)||\"\"===r?e:e+\"\\0\"})}},{key:\"createJoinersRegExp\",value:function(e){var t=[],n=this.opt.ignorePunctuation;return Array.isArray(n)&&n.length&&t.push(this.escapeStr(n.join(\"\"))),this.opt.ignoreJoiners&&t.push(\"\\\\u00ad\\\\u200b\\\\u200c\\\\u200d\"),t.length?e.split(/\\u0000+/).join(\"[\".concat(t.join(\"\"),\"]*\")):e}},{key:\"createDiacriticsRegExp\",value:function(e){var t=this.opt.caseSensitive?\"\":\"i\",n=this.opt.caseSensitive?[\"aàáảãạăằắẳẵặâầấẩẫậäåāą\",\"AÀÁẢÃẠĂẰẮẲẴẶÂẦẤẨẪẬÄÅĀĄ\",\"cçćč\",\"CÇĆČ\",\"dđď\",\"DĐĎ\",\"eèéẻẽẹêềếểễệëěēę\",\"EÈÉẺẼẸÊỀẾỂỄỆËĚĒĘ\",\"iìíỉĩịîïī\",\"IÌÍỈĨỊÎÏĪ\",\"lł\",\"LŁ\",\"nñňń\",\"NÑŇŃ\",\"oòóỏõọôồốổỗộơởỡớờợöøō\",\"OÒÓỎÕỌÔỒỐỔỖỘƠỞỠỚỜỢÖØŌ\",\"rř\",\"RŘ\",\"sšśșş\",\"SŠŚȘŞ\",\"tťțţ\",\"TŤȚŢ\",\"uùúủũụưừứửữựûüůū\",\"UÙÚỦŨỤƯỪỨỬỮỰÛÜŮŪ\",\"yýỳỷỹỵÿ\",\"YÝỲỶỸỴŸ\",\"zžżź\",\"ZŽŻŹ\"]:[\"aàáảãạăằắẳẵặâầấẩẫậäåāąAÀÁẢÃẠĂẰẮẲẴẶÂẦẤẨẪẬÄÅĀĄ\",\"cçćčCÇĆČ\",\"dđďDĐĎ\",\"eèéẻẽẹêềếểễệëěēęEÈÉẺẼẸÊỀẾỂỄỆËĚĒĘ\",\"iìíỉĩịîïīIÌÍỈĨỊÎÏĪ\",\"lłLŁ\",\"nñňńNÑŇŃ\",\"oòóỏõọôồốổỗộơởỡớờợöøōOÒÓỎÕỌÔỒỐỔỖỘƠỞỠỚỜỢÖØŌ\",\"rřRŘ\",\"sšśșşSŠŚȘŞ\",\"tťțţTŤȚŢ\",\"uùúủũụưừứửữựûüůūUÙÚỦŨỤƯỪỨỬỮỰÛÜŮŪ\",\"yýỳỷỹỵÿYÝỲỶỸỴŸ\",\"zžżźZŽŻŹ\"],r=[];return e.split(\"\").forEach(function(o){n.every(function(n){if(-1!==n.indexOf(o)){if(r.indexOf(n)>-1)return!1;e=e.replace(new RegExp(\"[\".concat(n,\"]\"),\"gm\".concat(t)),\"[\".concat(n,\"]\")),r.push(n)}return!0})}),e}},{key:\"createMergedBlanksRegExp\",value:function(e){return e.replace(/[\\s]+/gim,\"[\\\\s]+\")}},{key:\"createAccuracyRegExp\",value:function(e){var t=this,n=this.opt.accuracy,r=\"string\"==typeof n?n:n.value,o=\"string\"==typeof n?[]:n.limiters,i=\"\";switch(o.forEach(function(e){i+=\"|\".concat(t.escapeStr(e))}),r){case\"partially\":default:return\"()(\".concat(e,\")\");case\"complementary\":return i=\"\\\\s\"+(i||this.escapeStr(\"!\\\"#$%&'()*+,-./:;<=>?@[\\\\]^_`{|}~¡¿\")),\"()([^\".concat(i,\"]*\").concat(e,\"[^\").concat(i,\"]*)\");case\"exactly\":return\"(^|\\\\s\".concat(i,\")(\").concat(e,\")(?=$|\\\\s\").concat(i,\")\")}}}]),e}(),s=\n" +
-                    "/* */\n" +
-                    "function(){function n(e){t(this,n),this.ctx=e,this.ie=!1;var r=window.navigator.userAgent;(r.indexOf(\"MSIE\")>-1||r.indexOf(\"Trident\")>-1)&&(this.ie=!0)}return r(n,[{key:\"log\",value:function(t){var n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:\"debug\",r=this.opt.log;this.opt.debug&&\"object\"===e(r)&&\"function\"==typeof r[n]&&r[n](\"mark.js: \".concat(t))}},{key:\"getSeparatedKeywords\",value:function(e){var t=this,n=[];return e.forEach(function(e){t.opt.separateWordSearch?e.split(\" \").forEach(function(e){e.trim()&&-1===n.indexOf(e)&&n.push(e)}):e.trim()&&-1===n.indexOf(e)&&n.push(e)}),{keywords:n.sort(function(e,t){return t.length-e.length}),length:n.length}}},{key:\"isNumeric\",value:function(e){return Number(parseFloat(e))==e}},{key:\"checkRanges\",value:function(e){var t=this;if(!Array.isArray(e)||\"[object Object]\"!==Object.prototype.toString.call(e[0]))return this.log(\"markRanges() will only accept an array of objects\"),this.opt.noMatch(e),[];var n=[],r=0;return e.sort(function(e,t){return e.start-t.start}).forEach(function(e){var o=t.callNoMatchOnInvalidRanges(e,r),i=o.start,a=o.end;o.valid&&(e.start=i,e.length=a-i,n.push(e),r=a)}),n}},{key:\"callNoMatchOnInvalidRanges\",value:function(e,t){var n,r,o=!1;return e&&void 0!==e.start?(r=(n=parseInt(e.start,10))+parseInt(e.length,10),this.isNumeric(e.start)&&this.isNumeric(e.length)&&r-t>0&&r-n>0?o=!0:(this.log(\"Ignoring invalid or overlapping range: \"+\"\".concat(JSON.stringify(e))),this.opt.noMatch(e))):(this.log(\"Ignoring invalid range: \".concat(JSON.stringify(e))),this.opt.noMatch(e)),{start:n,end:r,valid:o}}},{key:\"checkWhitespaceRanges\",value:function(e,t,n){var r,o=!0,i=n.length,a=t-i,s=parseInt(e.start,10)-a;return(r=(s=s>i?i:s)+parseInt(e.length,10))>i&&(r=i,this.log(\"End range automatically set to the max value of \".concat(i))),s<0||r-s<0||s>i||r>i?(o=!1,this.log(\"Invalid range: \".concat(JSON.stringify(e))),this.opt.noMatch(e)):\"\"===n.substring(s,r).replace(/\\s+/g,\"\")&&(o=!1,this.log(\"Skipping whitespace only range: \"+JSON.stringify(e)),this.opt.noMatch(e)),{start:s,end:r,valid:o}}},{key:\"getTextNodes\",value:function(e){var t=this,n=\"\",r=[];this.iterator.forEachNode(NodeFilter.SHOW_TEXT,function(e){r.push({start:n.length,end:(n+=e.textContent).length,node:e})},function(e){return t.matchesExclude(e.parentNode)?NodeFilter.FILTER_REJECT:NodeFilter.FILTER_ACCEPT},function(){e({value:n,nodes:r})})}},{key:\"matchesExclude\",value:function(e){return i.matches(e,this.opt.exclude.concat([\"script\",\"style\",\"title\",\"head\",\"html\"]))}},{key:\"wrapRangeInTextNode\",value:function(e,t,n){var r=this.opt.element?this.opt.element:\"mark\",o=e.splitText(t),i=o.splitText(n-t),a=document.createElement(r);return a.setAttribute(\"data-markjs\",\"true\"),this.opt.className&&a.setAttribute(\"class\",this.opt.className),a.textContent=o.textContent,o.parentNode.replaceChild(a,o),i}},{key:\"wrapRangeInMappedTextNode\",value:function(e,t,n,r,o){var i=this;e.nodes.every(function(a,s){var c=e.nodes[s+1];if(void 0===c||c.start>t){if(!r(a.node))return!1;var u=t-a.start,l=(n>a.end?a.end:n)-a.start,h=e.value.substr(0,a.start),f=e.value.substr(l+a.start);if(a.node=i.wrapRangeInTextNode(a.node,u,l),e.value=h+f,e.nodes.forEach(function(t,n){n>=s&&(e.nodes[n].start>0&&n!==s&&(e.nodes[n].start-=l),e.nodes[n].end-=l)}),n-=l,o(a.node.previousSibling,a.start),!(n>a.end))return!1;t=a.end}return!0})}},{key:\"wrapGroups\",value:function(e,t,n,r){return r((e=this.wrapRangeInTextNode(e,t,t+n)).previousSibling),e}},{key:\"separateGroups\",value:function(e,t,n,r,o){for(var i=t.length,a=1;a<i;a++){var s=e.textContent.indexOf(t[a]);t[a]&&s>-1&&r(t[a],e)&&(e=this.wrapGroups(e,s,t[a].length,o))}return e}},{key:\"wrapMatches\",value:function(e,t,n,r,o){var i=this,a=0===t?0:t+1;this.getTextNodes(function(t){t.nodes.forEach(function(t){var o;for(t=t.node;null!==(o=e.exec(t.textContent))&&\"\"!==o[a];){if(i.opt.separateGroups)t=i.separateGroups(t,o,a,n,r);else{if(!n(o[a],t))continue;var s=o.index;if(0!==a)for(var c=1;c<a;c++)s+=o[c].length;t=i.wrapGroups(t,s,o[a].length,r)}e.lastIndex=0}}),o()})}},{key:\"wrapMatchesAcrossElements\",value:function(e,t,n,r,o){var i=this,a=0===t?0:t+1;this.getTextNodes(function(t){for(var s;null!==(s=e.exec(t.value))&&\"\"!==s[a];){var c=s.index;if(0!==a)for(var u=1;u<a;u++)c+=s[u].length;var l=c+s[a].length;i.wrapRangeInMappedTextNode(t,c,l,function(e){return n(s[a],e)},function(t,n){e.lastIndex=n,r(t)})}o()})}},{key:\"wrapRangeFromIndex\",value:function(e,t,n,r){var o=this;this.getTextNodes(function(i){var a=i.value.length;e.forEach(function(e,r){var s=o.checkWhitespaceRanges(e,a,i.value),c=s.start,u=s.end;s.valid&&o.wrapRangeInMappedTextNode(i,c,u,function(n){return t(n,e,i.value.substring(c,u),r)},function(t){n(t,e)})}),r()})}},{key:\"unwrapMatches\",value:function(e){for(var t=e.parentNode,n=document.createDocumentFragment();e.firstChild;)n.appendChild(e.removeChild(e.firstChild));t.replaceChild(n,e),this.ie?this.normalizeTextNode(t):t.normalize()}},{key:\"normalizeTextNode\",value:function(e){if(e){if(3===e.nodeType)for(;e.nextSibling&&3===e.nextSibling.nodeType;)e.nodeValue+=e.nextSibling.nodeValue,e.parentNode.removeChild(e.nextSibling);else this.normalizeTextNode(e.firstChild);this.normalizeTextNode(e.nextSibling)}}},{key:\"markRegExp\",value:function(e,t){var n=this;this.opt=t,this.log('Searching with expression \"'.concat(e,'\"'));var r=0,o=\"wrapMatches\";this.opt.acrossElements&&(o=\"wrapMatchesAcrossElements\"),this[o](e,this.opt.ignoreGroups,function(e,t){return n.opt.filter(t,e,r)},function(e){r++,n.opt.each(e)},function(){0===r&&n.opt.noMatch(e),n.opt.done(r)})}},{key:\"mark\",value:function(e,t){var n=this;this.opt=t;var r=0,o=\"wrapMatches\",i=this.getSeparatedKeywords(\"string\"==typeof e?[e]:e),s=i.keywords,c=i.length;this.opt.acrossElements&&(o=\"wrapMatchesAcrossElements\"),0===c?this.opt.done(r):function e(t){var i=new a(n.opt).create(t),u=0;n.log('Searching with expression \"'.concat(i,'\"')),n[o](i,1,function(e,o){return n.opt.filter(o,t,r,u)},function(e){u++,r++,n.opt.each(e)},function(){0===u&&n.opt.noMatch(t),s[c-1]===t?n.opt.done(r):e(s[s.indexOf(t)+1])})}(s[0])}},{key:\"markRanges\",value:function(e,t){var n=this;this.opt=t;var r=0,o=this.checkRanges(e);o&&o.length?(this.log(\"Starting to mark with the following ranges: \"+JSON.stringify(o)),this.wrapRangeFromIndex(o,function(e,t,r,o){return n.opt.filter(e,t,r,o)},function(e,t){r++,n.opt.each(e,t)},function(){n.opt.done(r)})):this.opt.done(r)}},{key:\"unmark\",value:function(e){var t=this;this.opt=e;var n=this.opt.element?this.opt.element:\"*\";n+=\"[data-markjs]\",this.opt.className&&(n+=\".\".concat(this.opt.className)),this.log('Removal selector \"'.concat(n,'\"')),this.iterator.forEachNode(NodeFilter.SHOW_ELEMENT,function(e){t.unwrapMatches(e)},function(e){var r=i.matches(e,n),o=t.matchesExclude(e);return!r||o?NodeFilter.FILTER_REJECT:NodeFilter.FILTER_ACCEPT},this.opt.done)}},{key:\"opt\",set:function(e){this._opt=o({},{element:\"\",className:\"\",exclude:[],iframes:!1,iframesTimeout:5e3,separateWordSearch:!0,acrossElements:!1,ignoreGroups:0,each:function(){},noMatch:function(){},filter:function(){return!0},done:function(){},debug:!1,log:window.console},e)},get:function(){return this._opt}},{key:\"iterator\",get:function(){return new i(this.ctx,this.opt.iframes,this.opt.exclude,this.opt.iframesTimeout)}}]),n}();return function(e){var t=this,n=new s(e);return this.mark=function(e,r){return n.mark(e,r),t},this.markRegExp=function(e,r){return n.markRegExp(e,r),t},this.markRanges=function(e,r){return n.markRanges(e,r),t},this.unmark=function(e){return n.unmark(e),t},this}});\n" +
-                    "   </script>\n" +
-                    "</head>";
-    private static final String JS_MARK_REG_EXP_CALLBACK = "" +
-            "{done: function(){" +
-            "    markInstance.markRegExp(%s);}" +
-            "}";
-    private static final String JS_UNMARK_WITH_CALLBACK = "" +
-            "var markInstance = new Mark(document.getElementById(\"content\"));" +
-            "markInstance.unmark(%s);";
+            """
+                    <head>
+                       <meta charset="UTF-8">
+                       <style>
+                           mark{
+                               background: orange;
+                               color: black;
+                           }
+                       </style>
+                       <script type="text/javascript">
+                    /*!***************************************************
+                    * mark.js v9.0.0
+                    * https://markjs.io/
+                    * Copyright (c) 2014–2018, Julian Kühnel
+                    * Released under the MIT license https://git.io/vwTVl
+                    *****************************************************/
+
+                    !function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):e.Mark=t()}(this,function(){"use strict";function e(t){return(e="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(t)}function t(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function n(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}function r(e,t,r){return t&&n(e.prototype,t),r&&n(e,r),e}function o(){return(o=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e}).apply(this,arguments)}var i=
+
+                    /* */
+
+                    function(){function e(n){var r=!(arguments.length>1&&void 0!==arguments[1])||arguments[1],o=arguments.length>2&&void 0!==arguments[2]?arguments[2]:[],i=arguments.length>3&&void 0!==arguments[3]?arguments[3]:5e3;t(this,e),this.ctx=n,this.iframes=r,this.exclude=o,this.iframesTimeout=i}return r(e,[{key:"getContexts",value:function(){var e=[];return(void 0!==this.ctx&&this.ctx?NodeList.prototype.isPrototypeOf(this.ctx)?Array.prototype.slice.call(this.ctx):Array.isArray(this.ctx)?this.ctx:"string"==typeof this.ctx?Array.prototype.slice.call(document.querySelectorAll(this.ctx)):[this.ctx]:[]).forEach(function(t){var n=e.filter(function(e){return e.contains(t)}).length>0;-1!==e.indexOf(t)||n||e.push(t)}),e}},{key:"getIframeContents",value:function(e,t){var n,r=arguments.length>2&&void 0!==arguments[2]?arguments[2]:function(){};try{var o=e.contentWindow;if(n=o.document,!o||!n)throw new Error("iframe inaccessible")}catch(e){r()}n&&t(n)}},{key:"isIframeBlank",value:function(e){var t="about:blank",n=e.getAttribute("src").trim();return e.contentWindow.location.href===t&&n!==t&&n}},{key:"observeIframeLoad",value:function(e,t,n){var r=this,o=!1,i=null,a=function a(){if(!o){o=!0,clearTimeout(i);try{r.isIframeBlank(e)||(e.removeEventListener("load",a),r.getIframeContents(e,t,n))}catch(e){n()}}};e.addEventListener("load",a),i=setTimeout(a,this.iframesTimeout)}},{key:"onIframeReady",value:function(e,t,n){try{"complete"===e.contentWindow.document.readyState?this.isIframeBlank(e)?this.observeIframeLoad(e,t,n):this.getIframeContents(e,t,n):this.observeIframeLoad(e,t,n)}catch(e){n()}}},{key:"waitForIframes",value:function(e,t){var n=this,r=0;this.forEachIframe(e,function(){return!0},function(e){r++,n.waitForIframes(e.querySelector("html"),function(){--r||t()})},function(e){e||t()})}},{key:"forEachIframe",value:function(t,n,r){var o=this,i=arguments.length>3&&void 0!==arguments[3]?arguments[3]:function(){},a=t.querySelectorAll("iframe"),s=a.length,c=0;a=Array.prototype.slice.call(a);var u=function(){--s<=0&&i(c)};s||u(),a.forEach(function(t){e.matches(t,o.exclude)?u():o.onIframeReady(t,function(e){n(t)&&(c++,r(e)),u()},u)})}},{key:"createIterator",value:function(e,t,n){return document.createNodeIterator(e,t,n,!1)}},{key:"createInstanceOnIframe",value:function(t){return new e(t.querySelector("html"),this.iframes)}},{key:"compareNodeIframe",value:function(e,t,n){if(e.compareDocumentPosition(n)&Node.DOCUMENT_POSITION_PRECEDING){if(null===t)return!0;if(t.compareDocumentPosition(n)&Node.DOCUMENT_POSITION_FOLLOWING)return!0}return!1}},{key:"getIteratorNode",value:function(e){var t=e.previousNode();return{prevNode:t,node:null===t?e.nextNode():e.nextNode()&&e.nextNode()}}},{key:"checkIframeFilter",value:function(e,t,n,r){var o=!1,i=!1;return r.forEach(function(e,t){e.val===n&&(o=t,i=e.handled)}),this.compareNodeIframe(e,t,n)?(!1!==o||i?!1===o||i||(r[o].handled=!0):r.push({val:n,handled:!0}),!0):(!1===o&&r.push({val:n,handled:!1}),!1)}},{key:"handleOpenIframes",value:function(e,t,n,r){var o=this;e.forEach(function(e){e.handled||o.getIframeContents(e.val,function(e){o.createInstanceOnIframe(e).forEachNode(t,n,r)})})}},{key:"iterateThroughNodes",value:function(e,t,n,r,o){for(var i,a,s,c=this,u=this.createIterator(t,e,r),l=[],h=[];s=void 0,s=c.getIteratorNode(u),a=s.prevNode,i=s.node;)this.iframes&&this.forEachIframe(t,function(e){return c.checkIframeFilter(i,a,e,l)},function(t){c.createInstanceOnIframe(t).forEachNode(e,function(e){return h.push(e)},r)}),h.push(i);h.forEach(function(e){n(e)}),this.iframes&&this.handleOpenIframes(l,e,n,r),o()}},{key:"forEachNode",value:function(e,t,n){var r=this,o=arguments.length>3&&void 0!==arguments[3]?arguments[3]:function(){},i=this.getContexts(),a=i.length;a||o(),i.forEach(function(i){var s=function(){r.iterateThroughNodes(e,i,t,n,function(){--a<=0&&o()})};r.iframes?r.waitForIframes(i,s):s()})}}],[{key:"matches",value:function(e,t){var n="string"==typeof t?[t]:t,r=e.matches||e.matchesSelector||e.msMatchesSelector||e.mozMatchesSelector||e.oMatchesSelector||e.webkitMatchesSelector;if(r){var o=!1;return n.every(function(t){return!r.call(e,t)||(o=!0,!1)}),o}return!1}}]),e}(),a=
+
+                    /* */
+
+                    function(){function e(n){t(this,e),this.opt=o({},{diacritics:!0,synonyms:{},accuracy:"partially",caseSensitive:!1,ignoreJoiners:!1,ignorePunctuation:[],wildcards:"disabled"},n)}return r(e,[{key:"create",value:function(e){return"disabled"!==this.opt.wildcards&&(e=this.setupWildcardsRegExp(e)),e=this.escapeStr(e),Object.keys(this.opt.synonyms).length&&(e=this.createSynonymsRegExp(e)),(this.opt.ignoreJoiners||this.opt.ignorePunctuation.length)&&(e=this.setupIgnoreJoinersRegExp(e)),this.opt.diacritics&&(e=this.createDiacriticsRegExp(e)),e=this.createMergedBlanksRegExp(e),(this.opt.ignoreJoiners||this.opt.ignorePunctuation.length)&&(e=this.createJoinersRegExp(e)),"disabled"!==this.opt.wildcards&&(e=this.createWildcardsRegExp(e)),e=this.createAccuracyRegExp(e),new RegExp(e,"gm".concat(this.opt.caseSensitive?"":"i"))}},{key:"sortByLength",value:function(e){return e.sort(function(e,t){return e.length===t.length?e>t?1:-1:t.length-e.length})}},{key:"escapeStr",value:function(e){return e.replace(/[\\-\\[\\]\\/\\{\\}\\(\\)\\*\\+\\?\\.\\\\\\^\\$\\|]/g,"\\\\$&")}},{key:"createSynonymsRegExp",value:function(e){var t=this,n=this.opt.synonyms,r=this.opt.caseSensitive?"":"i",o=this.opt.ignoreJoiners||this.opt.ignorePunctuation.length?"\\0":"";for(var i in n)if(n.hasOwnProperty(i)){var a=Array.isArray(n[i])?n[i]:[n[i]];a.unshift(i),(a=this.sortByLength(a).map(function(e){return"disabled"!==t.opt.wildcards&&(e=t.setupWildcardsRegExp(e)),e=t.escapeStr(e)}).filter(function(e){return""!==e})).length>1&&(e=e.replace(new RegExp("(".concat(a.map(function(e){return t.escapeStr(e)}).join("|"),")"),"gm".concat(r)),o+"(".concat(a.map(function(e){return t.processSynonyms(e)}).join("|"),")")+o))}return e}},{key:"processSynonyms",value:function(e){return(this.opt.ignoreJoiners||this.opt.ignorePunctuation.length)&&(e=this.setupIgnoreJoinersRegExp(e)),e}},{key:"setupWildcardsRegExp",value:function(e){return(e=e.replace(/(?:\\\\)*\\?/g,function(e){return"\\\\"===e.charAt(0)?"?":"\u0001"})).replace(/(?:\\\\)*\\*/g,function(e){return"\\\\"===e.charAt(0)?"*":"\u0002"})}},{key:"createWildcardsRegExp",value:function(e){var t="withSpaces"===this.opt.wildcards;return e.replace(/\\u0001/g,t?"[\\\\S\\\\s]?":"\\\\S?").replace(/\\u0002/g,t?"[\\\\S\\\\s]*?":"\\\\S*")}},{key:"setupIgnoreJoinersRegExp",value:function(e){return e.replace(/[^(|)\\\\]/g,function(e,t,n){var r=n.charAt(t+1);return/[(|)\\\\]/.test(r)||""===r?e:e+"\\0"})}},{key:"createJoinersRegExp",value:function(e){var t=[],n=this.opt.ignorePunctuation;return Array.isArray(n)&&n.length&&t.push(this.escapeStr(n.join(""))),this.opt.ignoreJoiners&&t.push("\\\\u00ad\\\\u200b\\\\u200c\\\\u200d"),t.length?e.split(/\\u0000+/).join("[".concat(t.join(""),"]*")):e}},{key:"createDiacriticsRegExp",value:function(e){var t=this.opt.caseSensitive?"":"i",n=this.opt.caseSensitive?["aàáảãạăằắẳẵặâầấẩẫậäåāą","AÀÁẢÃẠĂẰẮẲẴẶÂẦẤẨẪẬÄÅĀĄ","cçćč","CÇĆČ","dđď","DĐĎ","eèéẻẽẹêềếểễệëěēę","EÈÉẺẼẸÊỀẾỂỄỆËĚĒĘ","iìíỉĩịîïī","IÌÍỈĨỊÎÏĪ","lł","LŁ","nñňń","NÑŇŃ","oòóỏõọôồốổỗộơởỡớờợöøō","OÒÓỎÕỌÔỒỐỔỖỘƠỞỠỚỜỢÖØŌ","rř","RŘ","sšśșş","SŠŚȘŞ","tťțţ","TŤȚŢ","uùúủũụưừứửữựûüůū","UÙÚỦŨỤƯỪỨỬỮỰÛÜŮŪ","yýỳỷỹỵÿ","YÝỲỶỸỴŸ","zžżź","ZŽŻŹ"]:["aàáảãạăằắẳẵặâầấẩẫậäåāąAÀÁẢÃẠĂẰẮẲẴẶÂẦẤẨẪẬÄÅĀĄ","cçćčCÇĆČ","dđďDĐĎ","eèéẻẽẹêềếểễệëěēęEÈÉẺẼẸÊỀẾỂỄỆËĚĒĘ","iìíỉĩịîïīIÌÍỈĨỊÎÏĪ","lłLŁ","nñňńNÑŇŃ","oòóỏõọôồốổỗộơởỡớờợöøōOÒÓỎÕỌÔỒỐỔỖỘƠỞỠỚỜỢÖØŌ","rřRŘ","sšśșşSŠŚȘŞ","tťțţTŤȚŢ","uùúủũụưừứửữựûüůūUÙÚỦŨỤƯỪỨỬỮỰÛÜŮŪ","yýỳỷỹỵÿYÝỲỶỸỴŸ","zžżźZŽŻŹ"],r=[];return e.split("").forEach(function(o){n.every(function(n){if(-1!==n.indexOf(o)){if(r.indexOf(n)>-1)return!1;e=e.replace(new RegExp("[".concat(n,"]"),"gm".concat(t)),"[".concat(n,"]")),r.push(n)}return!0})}),e}},{key:"createMergedBlanksRegExp",value:function(e){return e.replace(/[\\s]+/gim,"[\\\\s]+")}},{key:"createAccuracyRegExp",value:function(e){var t=this,n=this.opt.accuracy,r="string"==typeof n?n:n.value,o="string"==typeof n?[]:n.limiters,i="";switch(o.forEach(function(e){i+="|".concat(t.escapeStr(e))}),r){case"partially":default:return"()(".concat(e,")");case"complementary":return i="\\\\s"+(i||this.escapeStr("!\\"#$%&'()*+,-./:;<=>?@[\\\\]^_`{|}~¡¿")),"()([^".concat(i,"]*").concat(e,"[^").concat(i,"]*)");case"exactly":return"(^|\\\\s".concat(i,")(").concat(e,")(?=$|\\\\s").concat(i,")")}}}]),e}(),s=
+
+                    /* */
+
+                    function(){function n(e){t(this,n),this.ctx=e,this.ie=!1;var r=window.navigator.userAgent;(r.indexOf("MSIE")>-1||r.indexOf("Trident")>-1)&&(this.ie=!0)}return r(n,[{key:"log",value:function(t){var n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"debug",r=this.opt.log;this.opt.debug&&"object"===e(r)&&"function"==typeof r[n]&&r[n]("mark.js: ".concat(t))}},{key:"getSeparatedKeywords",value:function(e){var t=this,n=[];return e.forEach(function(e){t.opt.separateWordSearch?e.split(" ").forEach(function(e){e.trim()&&-1===n.indexOf(e)&&n.push(e)}):e.trim()&&-1===n.indexOf(e)&&n.push(e)}),{keywords:n.sort(function(e,t){return t.length-e.length}),length:n.length}}},{key:"isNumeric",value:function(e){return Number(parseFloat(e))==e}},{key:"checkRanges",value:function(e){var t=this;if(!Array.isArray(e)||"[object Object]"!==Object.prototype.toString.call(e[0]))return this.log("markRanges() will only accept an array of objects"),this.opt.noMatch(e),[];var n=[],r=0;return e.sort(function(e,t){return e.start-t.start}).forEach(function(e){var o=t.callNoMatchOnInvalidRanges(e,r),i=o.start,a=o.end;o.valid&&(e.start=i,e.length=a-i,n.push(e),r=a)}),n}},{key:"callNoMatchOnInvalidRanges",value:function(e,t){var n,r,o=!1;return e&&void 0!==e.start?(r=(n=parseInt(e.start,10))+parseInt(e.length,10),this.isNumeric(e.start)&&this.isNumeric(e.length)&&r-t>0&&r-n>0?o=!0:(this.log("Ignoring invalid or overlapping range: "+"".concat(JSON.stringify(e))),this.opt.noMatch(e))):(this.log("Ignoring invalid range: ".concat(JSON.stringify(e))),this.opt.noMatch(e)),{start:n,end:r,valid:o}}},{key:"checkWhitespaceRanges",value:function(e,t,n){var r,o=!0,i=n.length,a=t-i,s=parseInt(e.start,10)-a;return(r=(s=s>i?i:s)+parseInt(e.length,10))>i&&(r=i,this.log("End range automatically set to the max value of ".concat(i))),s<0||r-s<0||s>i||r>i?(o=!1,this.log("Invalid range: ".concat(JSON.stringify(e))),this.opt.noMatch(e)):""===n.substring(s,r).replace(/\\s+/g,"")&&(o=!1,this.log("Skipping whitespace only range: "+JSON.stringify(e)),this.opt.noMatch(e)),{start:s,end:r,valid:o}}},{key:"getTextNodes",value:function(e){var t=this,n="",r=[];this.iterator.forEachNode(NodeFilter.SHOW_TEXT,function(e){r.push({start:n.length,end:(n+=e.textContent).length,node:e})},function(e){return t.matchesExclude(e.parentNode)?NodeFilter.FILTER_REJECT:NodeFilter.FILTER_ACCEPT},function(){e({value:n,nodes:r})})}},{key:"matchesExclude",value:function(e){return i.matches(e,this.opt.exclude.concat(["script","style","title","head","html"]))}},{key:"wrapRangeInTextNode",value:function(e,t,n){var r=this.opt.element?this.opt.element:"mark",o=e.splitText(t),i=o.splitText(n-t),a=document.createElement(r);return a.setAttribute("data-markjs","true"),this.opt.className&&a.setAttribute("class",this.opt.className),a.textContent=o.textContent,o.parentNode.replaceChild(a,o),i}},{key:"wrapRangeInMappedTextNode",value:function(e,t,n,r,o){var i=this;e.nodes.every(function(a,s){var c=e.nodes[s+1];if(void 0===c||c.start>t){if(!r(a.node))return!1;var u=t-a.start,l=(n>a.end?a.end:n)-a.start,h=e.value.substr(0,a.start),f=e.value.substr(l+a.start);if(a.node=i.wrapRangeInTextNode(a.node,u,l),e.value=h+f,e.nodes.forEach(function(t,n){n>=s&&(e.nodes[n].start>0&&n!==s&&(e.nodes[n].start-=l),e.nodes[n].end-=l)}),n-=l,o(a.node.previousSibling,a.start),!(n>a.end))return!1;t=a.end}return!0})}},{key:"wrapGroups",value:function(e,t,n,r){return r((e=this.wrapRangeInTextNode(e,t,t+n)).previousSibling),e}},{key:"separateGroups",value:function(e,t,n,r,o){for(var i=t.length,a=1;a<i;a++){var s=e.textContent.indexOf(t[a]);t[a]&&s>-1&&r(t[a],e)&&(e=this.wrapGroups(e,s,t[a].length,o))}return e}},{key:"wrapMatches",value:function(e,t,n,r,o){var i=this,a=0===t?0:t+1;this.getTextNodes(function(t){t.nodes.forEach(function(t){var o;for(t=t.node;null!==(o=e.exec(t.textContent))&&""!==o[a];){if(i.opt.separateGroups)t=i.separateGroups(t,o,a,n,r);else{if(!n(o[a],t))continue;var s=o.index;if(0!==a)for(var c=1;c<a;c++)s+=o[c].length;t=i.wrapGroups(t,s,o[a].length,r)}e.lastIndex=0}}),o()})}},{key:"wrapMatchesAcrossElements",value:function(e,t,n,r,o){var i=this,a=0===t?0:t+1;this.getTextNodes(function(t){for(var s;null!==(s=e.exec(t.value))&&""!==s[a];){var c=s.index;if(0!==a)for(var u=1;u<a;u++)c+=s[u].length;var l=c+s[a].length;i.wrapRangeInMappedTextNode(t,c,l,function(e){return n(s[a],e)},function(t,n){e.lastIndex=n,r(t)})}o()})}},{key:"wrapRangeFromIndex",value:function(e,t,n,r){var o=this;this.getTextNodes(function(i){var a=i.value.length;e.forEach(function(e,r){var s=o.checkWhitespaceRanges(e,a,i.value),c=s.start,u=s.end;s.valid&&o.wrapRangeInMappedTextNode(i,c,u,function(n){return t(n,e,i.value.substring(c,u),r)},function(t){n(t,e)})}),r()})}},{key:"unwrapMatches",value:function(e){for(var t=e.parentNode,n=document.createDocumentFragment();e.firstChild;)n.appendChild(e.removeChild(e.firstChild));t.replaceChild(n,e),this.ie?this.normalizeTextNode(t):t.normalize()}},{key:"normalizeTextNode",value:function(e){if(e){if(3===e.nodeType)for(;e.nextSibling&&3===e.nextSibling.nodeType;)e.nodeValue+=e.nextSibling.nodeValue,e.parentNode.removeChild(e.nextSibling);else this.normalizeTextNode(e.firstChild);this.normalizeTextNode(e.nextSibling)}}},{key:"markRegExp",value:function(e,t){var n=this;this.opt=t,this.log('Searching with expression "'.concat(e,'"'));var r=0,o="wrapMatches";this.opt.acrossElements&&(o="wrapMatchesAcrossElements"),this[o](e,this.opt.ignoreGroups,function(e,t){return n.opt.filter(t,e,r)},function(e){r++,n.opt.each(e)},function(){0===r&&n.opt.noMatch(e),n.opt.done(r)})}},{key:"mark",value:function(e,t){var n=this;this.opt=t;var r=0,o="wrapMatches",i=this.getSeparatedKeywords("string"==typeof e?[e]:e),s=i.keywords,c=i.length;this.opt.acrossElements&&(o="wrapMatchesAcrossElements"),0===c?this.opt.done(r):function e(t){var i=new a(n.opt).create(t),u=0;n.log('Searching with expression "'.concat(i,'"')),n[o](i,1,function(e,o){return n.opt.filter(o,t,r,u)},function(e){u++,r++,n.opt.each(e)},function(){0===u&&n.opt.noMatch(t),s[c-1]===t?n.opt.done(r):e(s[s.indexOf(t)+1])})}(s[0])}},{key:"markRanges",value:function(e,t){var n=this;this.opt=t;var r=0,o=this.checkRanges(e);o&&o.length?(this.log("Starting to mark with the following ranges: "+JSON.stringify(o)),this.wrapRangeFromIndex(o,function(e,t,r,o){return n.opt.filter(e,t,r,o)},function(e,t){r++,n.opt.each(e,t)},function(){n.opt.done(r)})):this.opt.done(r)}},{key:"unmark",value:function(e){var t=this;this.opt=e;var n=this.opt.element?this.opt.element:"*";n+="[data-markjs]",this.opt.className&&(n+=".".concat(this.opt.className)),this.log('Removal selector "'.concat(n,'"')),this.iterator.forEachNode(NodeFilter.SHOW_ELEMENT,function(e){t.unwrapMatches(e)},function(e){var r=i.matches(e,n),o=t.matchesExclude(e);return!r||o?NodeFilter.FILTER_REJECT:NodeFilter.FILTER_ACCEPT},this.opt.done)}},{key:"opt",set:function(e){this._opt=o({},{element:"",className:"",exclude:[],iframes:!1,iframesTimeout:5e3,separateWordSearch:!0,acrossElements:!1,ignoreGroups:0,each:function(){},noMatch:function(){},filter:function(){return!0},done:function(){},debug:!1,log:window.console},e)},get:function(){return this._opt}},{key:"iterator",get:function(){return new i(this.ctx,this.opt.iframes,this.opt.exclude,this.opt.iframesTimeout)}}]),n}();return function(e){var t=this,n=new s(e);return this.mark=function(e,r){return n.mark(e,r),t},this.markRegExp=function(e,r){return n.markRegExp(e,r),t},this.markRanges=function(e,r){return n.markRanges(e,r),t},this.unmark=function(e){return n.unmark(e),t},this}});
+
+                       </script>
+
+                    </head>""";
+    // This is a string format, and it takes a variable name as an argument to pass to the markInstance.markRegExp() Javascript method.
+    private static final String JS_MARK_REG_EXP_CALLBACK =
+            """
+            {done: function(){
+                markInstance.markRegExp(%s);}
+            }""";
+
+    // This is a string format, and it takes a variable name as an argument to pass to the markInstance.unmark() Javascript method.
+    private static final String JS_UNMARK_WITH_CALLBACK =
+            """
+            var markInstance = new Mark(document.getElementById("content"));
+            markInstance.unmark(%s);""";
     private static final Pattern UNESCAPED_FORWARD_SLASH = Pattern.compile("(?<!\\\\)/");
 
     private final ClipBoardManager clipBoardManager;
@@ -133,7 +151,7 @@ public PreviewViewer(BibDatabaseContext database,
 
         setFitToHeight(true);
         setFitToWidth(true);
-        previewView = new WebView();
+        previewView = WebViewStore.get();
         setContent(previewView);
         previewView.setContextMenuEnabled(false);
 
@@ -244,7 +262,14 @@ private void update() {
     }
 
     private void setPreviewText(String text) {
-        String myText = "<html>" + JS_HIGHLIGHT_FUNCTION + "<body id=\"previewBody\"><div id=\"content\">" + text + "</div></body></html>";
+        String myText = String.format("""
+                <html>
+                    %s
+                    <body id="previewBody">
+                        <div id="content"> %s </div>
+                    </body>
+                </html>
+                """, JS_HIGHLIGHT_FUNCTION, text);
         previewView.getEngine().setJavaScriptEnabled(true);
         previewView.getEngine().loadContent(myText);
 
diff --git a/src/main/java/org/jabref/gui/search/GlobalSearchBar.java b/src/main/java/org/jabref/gui/search/GlobalSearchBar.java
index da016e1f219..d42bcd34cb7 100644
--- a/src/main/java/org/jabref/gui/search/GlobalSearchBar.java
+++ b/src/main/java/org/jabref/gui/search/GlobalSearchBar.java
@@ -47,7 +47,6 @@
 import org.jabref.gui.autocompleter.AutoCompletionTextInputBinding;
 import org.jabref.gui.autocompleter.PersonNameStringConverter;
 import org.jabref.gui.autocompleter.SuggestionProvider;
-import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.keyboard.KeyBinding;
 import org.jabref.gui.keyboard.KeyBindingRepository;
@@ -239,7 +238,7 @@ private void initSearchModifierButtons() {
         initSearchModifierButton(openGlobalSearchButton);
         openGlobalSearchButton.setOnAction(evt -> {
             globalSearchActive.setValue(true);
-            globalSearchResultDialog = new GlobalSearchResultDialog(ExternalFileTypes.getInstance(), undoManager);
+            globalSearchResultDialog = new GlobalSearchResultDialog(undoManager);
             performSearch();
             globalSearchResultDialog.showAndWait();
             globalSearchActive.setValue(false);
@@ -268,7 +267,6 @@ public void focus() {
     }
 
     public void performSearch() {
-
         LOGGER.debug("Flags: {}", searchPreferences.getSearchFlags());
         LOGGER.debug("Run search " + searchField.getText());
 
diff --git a/src/main/java/org/jabref/gui/search/GlobalSearchResultDialog.java b/src/main/java/org/jabref/gui/search/GlobalSearchResultDialog.java
index 59843b2e4cb..b23dc8ab2df 100644
--- a/src/main/java/org/jabref/gui/search/GlobalSearchResultDialog.java
+++ b/src/main/java/org/jabref/gui/search/GlobalSearchResultDialog.java
@@ -11,7 +11,6 @@
 
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
-import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.maintable.columns.SpecialFieldColumn;
 import org.jabref.gui.preview.PreviewViewer;
@@ -28,7 +27,6 @@ public class GlobalSearchResultDialog extends BaseDialog<Void> {
     @FXML private SplitPane container;
     @FXML private ToggleButton keepOnTop;
 
-    private final ExternalFileTypes externalFileTypes;
     private final UndoManager undoManager;
 
     @Inject private PreferencesService preferencesService;
@@ -38,9 +36,8 @@ public class GlobalSearchResultDialog extends BaseDialog<Void> {
 
     private GlobalSearchResultDialogViewModel viewModel;
 
-    public GlobalSearchResultDialog(ExternalFileTypes externalFileTypes, UndoManager undoManager) {
+    public GlobalSearchResultDialog(UndoManager undoManager) {
         this.undoManager = undoManager;
-        this.externalFileTypes = externalFileTypes;
 
         setTitle(Localization.lang("Search results from open libraries"));
         ViewLoader.view(this)
@@ -57,7 +54,7 @@ private void initialize() {
         previewViewer.setLayout(preferencesService.getPreviewPreferences().getSelectedPreviewLayout());
 
         SearchResultsTableDataModel model = new SearchResultsTableDataModel(viewModel.getSearchDatabaseContext(), preferencesService, stateManager);
-        SearchResultsTable resultsTable = new SearchResultsTable(model, viewModel.getSearchDatabaseContext(), preferencesService, undoManager, dialogService, stateManager, externalFileTypes);
+        SearchResultsTable resultsTable = new SearchResultsTable(model, viewModel.getSearchDatabaseContext(), preferencesService, undoManager, dialogService, stateManager);
 
         resultsTable.getColumns().removeIf(col -> col instanceof SpecialFieldColumn);
         resultsTable.getSelectionModel().selectFirst();
diff --git a/src/main/java/org/jabref/gui/search/RebuildFulltextSearchIndexAction.java b/src/main/java/org/jabref/gui/search/RebuildFulltextSearchIndexAction.java
index 2de75512b39..90d4fe5f1bd 100644
--- a/src/main/java/org/jabref/gui/search/RebuildFulltextSearchIndexAction.java
+++ b/src/main/java/org/jabref/gui/search/RebuildFulltextSearchIndexAction.java
@@ -69,7 +69,7 @@ private void rebuildIndex() {
         }
         try {
             currentLibraryTab.get().getIndexingTaskManager().createIndex(PdfIndexer.of(databaseContext, filePreferences));
-            currentLibraryTab.get().getIndexingTaskManager().addToIndex(PdfIndexer.of(databaseContext, filePreferences), databaseContext);
+            currentLibraryTab.get().getIndexingTaskManager().updateIndex(PdfIndexer.of(databaseContext, filePreferences), databaseContext);
         } catch (IOException e) {
             dialogService.notify(Localization.lang("Failed to access fulltext search index"));
             LOGGER.error("Failed to access fulltext search index", e);
diff --git a/src/main/java/org/jabref/gui/search/SearchResultsTable.java b/src/main/java/org/jabref/gui/search/SearchResultsTable.java
index 09083921f7a..a0f3ac20ea6 100644
--- a/src/main/java/org/jabref/gui/search/SearchResultsTable.java
+++ b/src/main/java/org/jabref/gui/search/SearchResultsTable.java
@@ -10,7 +10,6 @@
 
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
-import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.maintable.BibEntryTableViewModel;
 import org.jabref.gui.maintable.MainTable;
 import org.jabref.gui.maintable.MainTableColumnFactory;
@@ -28,8 +27,7 @@ public SearchResultsTable(SearchResultsTableDataModel model,
                               PreferencesService preferencesService,
                               UndoManager undoManager,
                               DialogService dialogService,
-                              StateManager stateManager,
-                              ExternalFileTypes externalFileTypes) {
+                              StateManager stateManager) {
         super();
 
         MainTablePreferences mainTablePreferences = preferencesService.getMainTablePreferences();
@@ -38,7 +36,6 @@ public SearchResultsTable(SearchResultsTableDataModel model,
                                    database,
                                    preferencesService,
                                    preferencesService.getSearchDialogColumnPreferences(),
-                                   externalFileTypes,
                                    undoManager,
                                    dialogService,
                                    stateManager).createColumns();
diff --git a/src/main/java/org/jabref/gui/search/rules/describer/SearchDescribers.java b/src/main/java/org/jabref/gui/search/rules/describer/SearchDescribers.java
index 4cc5e2ebd82..de696f03632 100644
--- a/src/main/java/org/jabref/gui/search/rules/describer/SearchDescribers.java
+++ b/src/main/java/org/jabref/gui/search/rules/describer/SearchDescribers.java
@@ -1,7 +1,7 @@
 package org.jabref.gui.search.rules.describer;
 
 import org.jabref.logic.search.SearchQuery;
-import org.jabref.model.search.rules.ContainBasedSearchRule;
+import org.jabref.model.search.rules.ContainsBasedSearchRule;
 import org.jabref.model.search.rules.GrammarBasedSearchRule;
 import org.jabref.model.search.rules.RegexBasedSearchRule;
 
@@ -19,7 +19,7 @@ private SearchDescribers() {
     public static SearchDescriber getSearchDescriberFor(SearchQuery searchQuery) {
         if (searchQuery.getRule() instanceof GrammarBasedSearchRule grammarBasedSearchRule) {
             return new GrammarBasedSearchRuleDescriber(grammarBasedSearchRule.getSearchFlags(), grammarBasedSearchRule.getTree());
-        } else if (searchQuery.getRule() instanceof ContainBasedSearchRule containBasedSearchRule) {
+        } else if (searchQuery.getRule() instanceof ContainsBasedSearchRule containBasedSearchRule) {
             return new ContainsAndRegexBasedSearchRuleDescriber(containBasedSearchRule.getSearchFlags(), searchQuery.getQuery());
         } else if (searchQuery.getRule() instanceof RegexBasedSearchRule regexBasedSearchRule) {
             return new ContainsAndRegexBasedSearchRuleDescriber(regexBasedSearchRule.getSearchFlags(), searchQuery.getQuery());
diff --git a/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogViewModel.java b/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogViewModel.java
index 95a62d6878d..970d36db98e 100644
--- a/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogViewModel.java
@@ -135,7 +135,6 @@ private void setupKeyStore() {
 
     private boolean openSharedDatabase(DBMSConnectionProperties connectionProperties) {
         if (isSharedDatabaseAlreadyPresent(connectionProperties)) {
-
             dialogService.showWarningDialogAndWait(Localization.lang("Shared database connection"),
                     Localization.lang("You are already connected to a database using entered connection details."));
             return true;
@@ -145,7 +144,6 @@ private boolean openSharedDatabase(DBMSConnectionProperties connectionProperties
             Path localFilePath = Path.of(folder.getValue());
 
             if (Files.exists(localFilePath) && !Files.isDirectory(localFilePath)) {
-
                 boolean overwriteFilePressed = dialogService.showConfirmationDialogAndWait(Localization.lang("Existing file"),
                         Localization.lang("'%0' exists. Overwrite file?", localFilePath.getFileName().toString()),
                         Localization.lang("Overwrite file"),
@@ -173,7 +171,6 @@ private boolean openSharedDatabase(DBMSConnectionProperties connectionProperties
 
             return true;
         } catch (SQLException | InvalidDBMSConnectionPropertiesException exception) {
-
             frame.getDialogService().showErrorDialogAndWait(Localization.lang("Connection error"), exception);
         } catch (DatabaseNotSupportedException exception) {
             ButtonType openHelp = new ButtonType("Open Help", ButtonData.OTHER);
@@ -187,7 +184,7 @@ private boolean openSharedDatabase(DBMSConnectionProperties connectionProperties
                             Localization.lang("However, a new database was created alongside the pre-3.6 one."),
                     ButtonType.OK, openHelp);
 
-            result.filter(btn -> btn.equals(openHelp)).ifPresent(btn -> HelpAction.openHelpPage(HelpFile.SQL_DATABASE_MIGRATION));
+            result.filter(btn -> btn.equals(openHelp)).ifPresent(btn -> new HelpAction(HelpFile.SQL_DATABASE_MIGRATION, dialogService).execute());
             result.filter(btn -> btn.equals(ButtonType.OK)).ifPresent(btn -> openSharedDatabase(connectionProperties));
         }
         loading.set(false);
@@ -215,6 +212,9 @@ private void setPreferences() {
         }
 
         sharedDatabasePreferences.setRememberPassword(rememberPassword.get());
+
+        sharedDatabasePreferences.setFolder(folder.getValue());
+        sharedDatabasePreferences.setAutosave(autosave.get());
     }
 
     /**
@@ -228,6 +228,8 @@ private void applyPreferences() {
         Optional<String> sharedDatabaseUser = sharedDatabasePreferences.getUser();
         Optional<String> sharedDatabasePassword = sharedDatabasePreferences.getPassword();
         boolean sharedDatabaseRememberPassword = sharedDatabasePreferences.getRememberPassword();
+        Optional<String> sharedDatabaseFolder = sharedDatabasePreferences.getFolder();
+        boolean sharedDatabaseAutosave = sharedDatabasePreferences.getAutosave();
         Optional<String> sharedDatabaseKeystoreFile = sharedDatabasePreferences.getKeyStoreFile();
 
         if (sharedDatabaseType.isPresent()) {
@@ -251,6 +253,9 @@ private void applyPreferences() {
         }
 
         rememberPassword.set(sharedDatabaseRememberPassword);
+        
+        sharedDatabaseFolder.ifPresent(folder::set);
+        autosave.set(sharedDatabaseAutosave);
     }
 
     private boolean isSharedDatabaseAlreadyPresent(DBMSConnectionProperties connectionProperties) {
diff --git a/src/main/java/org/jabref/gui/shared/SharedDatabaseUIManager.java b/src/main/java/org/jabref/gui/shared/SharedDatabaseUIManager.java
index cbcb0a72393..6bfcc33298d 100644
--- a/src/main/java/org/jabref/gui/shared/SharedDatabaseUIManager.java
+++ b/src/main/java/org/jabref/gui/shared/SharedDatabaseUIManager.java
@@ -15,6 +15,7 @@
 import org.jabref.gui.LibraryTab;
 import org.jabref.gui.entryeditor.EntryEditor;
 import org.jabref.gui.exporter.SaveDatabaseAction;
+import org.jabref.gui.mergeentries.EntriesMergeResult;
 import org.jabref.gui.mergeentries.MergeEntriesDialog;
 import org.jabref.gui.undo.UndoableRemoveEntries;
 import org.jabref.gui.util.DefaultTaskExecutor;
@@ -49,7 +50,6 @@ public SharedDatabaseUIManager(JabRefFrame jabRefFrame) {
 
     @Subscribe
     public void listen(ConnectionLostEvent connectionLostEvent) {
-
         ButtonType reconnect = new ButtonType(Localization.lang("Reconnect"), ButtonData.YES);
         ButtonType workOffline = new ButtonType(Localization.lang("Work offline"), ButtonData.NO);
         ButtonType closeLibrary = new ButtonType(Localization.lang("Close library"), ButtonData.CANCEL_CLOSE);
@@ -77,7 +77,6 @@ public void listen(ConnectionLostEvent connectionLostEvent) {
 
     @Subscribe
     public void listen(UpdateRefusedEvent updateRefusedEvent) {
-
         jabRefFrame.getDialogService().notify(Localization.lang("Update refused."));
 
         BibEntry localBibEntry = updateRefusedEvent.getLocalBibEntry();
@@ -101,9 +100,9 @@ public void listen(UpdateRefusedEvent updateRefusedEvent) {
         Optional<BibEntry> mergedEntryResp = DefaultTaskExecutor.runInJavaFXThread(() -> {
             Optional<ButtonType> response = dialogService.showCustomButtonDialogAndWait(AlertType.CONFIRMATION, Localization.lang("Update refused"), message.toString(), ButtonType.CANCEL, merge);
 
-            if (response.isPresent() && response.get().equals(merge)) {
-                MergeEntriesDialog dialog = new MergeEntriesDialog(localBibEntry, sharedBibEntry);
-                Optional<BibEntry> mergedEntry = dialogService.showCustomDialogAndWait(dialog);
+        if (response.isPresent() && response.get().equals(merge)) {
+            MergeEntriesDialog dialog = new MergeEntriesDialog(localBibEntry, sharedBibEntry);
+            Optional<BibEntry> mergedEntry = dialogService.showCustomDialogAndWait(dialog).map(EntriesMergeResult::mergedEntry);
 
                 return mergedEntry;
             }
diff --git a/src/main/java/org/jabref/gui/sidepane/SidePaneViewModel.java b/src/main/java/org/jabref/gui/sidepane/SidePaneViewModel.java
index 5677c603cbc..03a72d7c073 100644
--- a/src/main/java/org/jabref/gui/sidepane/SidePaneViewModel.java
+++ b/src/main/java/org/jabref/gui/sidepane/SidePaneViewModel.java
@@ -62,7 +62,6 @@ public SidePaneViewModel(PreferencesService preferencesService,
     }
 
     protected SidePaneComponent getSidePaneComponent(SidePaneType pane) {
-
         SidePaneComponent sidePaneComponent = sidePaneComponentLookup.get(pane);
         if (sidePaneComponent == null) {
             sidePaneComponent = switch (pane) {
diff --git a/src/main/java/org/jabref/gui/slr/ExistingStudySearchAction.java b/src/main/java/org/jabref/gui/slr/ExistingStudySearchAction.java
index 4485c2f3fe3..284e8c9a487 100644
--- a/src/main/java/org/jabref/gui/slr/ExistingStudySearchAction.java
+++ b/src/main/java/org/jabref/gui/slr/ExistingStudySearchAction.java
@@ -18,6 +18,7 @@
 import org.jabref.logic.exporter.SavePreferences;
 import org.jabref.logic.git.SlrGitHandler;
 import org.jabref.logic.importer.ImportFormatPreferences;
+import org.jabref.logic.importer.ImporterPreferences;
 import org.jabref.logic.importer.ParseException;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.io.FileUtil;
@@ -46,6 +47,7 @@ public class ExistingStudySearchAction extends SimpleCommand {
     private final ThemeManager themeManager;
     private final GeneralPreferences generalPreferences;
     private final ImportFormatPreferences importFormatPreferences;
+    private final ImporterPreferences importerPreferences;
     private final SavePreferences savePreferences;
     // This can be either populated before crawl is called or is populated in the call using the directory dialog. This is helpful if the directory is selected in a previous dialog/UI element
 
@@ -64,10 +66,13 @@ public ExistingStudySearchAction(JabRefFrame frame,
         this.generalPreferences = preferencesService.getGeneralPreferences();
         this.themeManager = themeManager;
         this.importFormatPreferences = preferencesService.getImportFormatPreferences();
+        this.importerPreferences = preferencesService.getImporterPreferences();
         this.savePreferences = preferencesService.getSavePreferences();
 
         this.workingDirectory = stateManager.getActiveDatabase()
-                                            .map(database -> FileUtil.getInitialDirectory(database, preferencesService.getFilePreferences().getWorkingDirectory()))
+                                            .map(database -> FileUtil.getInitialDirectory(
+                                                    database,
+                                                    preferencesService.getFilePreferences().getWorkingDirectory()))
                                             .orElse(preferencesService.getFilePreferences().getWorkingDirectory());
     }
 
@@ -101,7 +106,15 @@ public void crawl() {
         }
         final Crawler crawler;
         try {
-            crawler = new Crawler(studyDirectory, new SlrGitHandler(studyDirectory), generalPreferences, importFormatPreferences, savePreferences, new BibEntryTypesManager(), fileUpdateMonitor);
+            crawler = new Crawler(
+                    studyDirectory,
+                    new SlrGitHandler(studyDirectory),
+                    generalPreferences,
+                    importFormatPreferences,
+                    importerPreferences,
+                    savePreferences,
+                    new BibEntryTypesManager(),
+                    fileUpdateMonitor);
         } catch (IOException | ParseException e) {
             LOGGER.error("Error during reading of study definition file.", e);
             dialogService.showErrorDialogAndWait(Localization.lang("Error during reading of study definition file."), e);
@@ -117,7 +130,7 @@ public void crawl() {
                           dialogService.showErrorDialogAndWait(Localization.lang("Error during persistence of crawling results."), e);
                       })
                       .onSuccess(unused -> {
-                          new OpenDatabaseAction(frame, preferencesService, dialogService, stateManager, themeManager).openFile(Path.of(studyDirectory.toString(), "studyResult.bib"), true);
+                          new OpenDatabaseAction(frame, preferencesService, dialogService, stateManager, themeManager).openFile(Path.of(studyDirectory.toString(), "studyResult.bib"));
                           // If  finished reset command object for next use
                           studyDirectory = null;
                       })
diff --git a/src/main/java/org/jabref/gui/slr/ManageStudyDefinitionView.java b/src/main/java/org/jabref/gui/slr/ManageStudyDefinitionView.java
index 38467fed367..ce1c5f10e3e 100644
--- a/src/main/java/org/jabref/gui/slr/ManageStudyDefinitionView.java
+++ b/src/main/java/org/jabref/gui/slr/ManageStudyDefinitionView.java
@@ -118,7 +118,11 @@ private void setupSaveButton() {
 
     @FXML
     private void initialize() {
-        viewModel = new ManageStudyDefinitionViewModel(study, workingDirectory, prefs.getImportFormatPreferences());
+        viewModel = new ManageStudyDefinitionViewModel(
+                study,
+                workingDirectory,
+                prefs.getImportFormatPreferences(),
+                prefs.getImporterPreferences());
 
         // Listen whether any databases are removed from selection -> Add back to the database selector
         studyTitle.textProperty().bindBidirectional(viewModel.titleProperty());
diff --git a/src/main/java/org/jabref/gui/slr/ManageStudyDefinitionViewModel.java b/src/main/java/org/jabref/gui/slr/ManageStudyDefinitionViewModel.java
index c7f47a0ca56..01350ab64bb 100644
--- a/src/main/java/org/jabref/gui/slr/ManageStudyDefinitionViewModel.java
+++ b/src/main/java/org/jabref/gui/slr/ManageStudyDefinitionViewModel.java
@@ -14,6 +14,7 @@
 import javafx.collections.ObservableList;
 
 import org.jabref.logic.importer.ImportFormatPreferences;
+import org.jabref.logic.importer.ImporterPreferences;
 import org.jabref.logic.importer.SearchBasedFetcher;
 import org.jabref.logic.importer.WebFetchers;
 import org.jabref.model.study.Study;
@@ -40,33 +41,35 @@ public class ManageStudyDefinitionViewModel {
     private final SimpleStringProperty directory = new SimpleStringProperty();
     private Study study;
 
-    public ManageStudyDefinitionViewModel(Study study, Path studyDirectory, ImportFormatPreferences importFormatPreferences) {
+    public ManageStudyDefinitionViewModel(Study study,
+                                          Path studyDirectory,
+                                          ImportFormatPreferences importFormatPreferences,
+                                          ImporterPreferences importerPreferences) {
         if (Objects.isNull(study)) {
-            computeNonSelectedDatabases(importFormatPreferences);
+            computeNonSelectedDatabases(importFormatPreferences, importerPreferences);
             return;
         }
         this.study = study;
         title.setValue(study.getTitle());
         authors.addAll(study.getAuthors());
         researchQuestions.addAll(study.getResearchQuestions());
-        queries.addAll(study.getQueries().stream().map(StudyQuery::getQuery).collect(Collectors.toList()));
+        queries.addAll(study.getQueries().stream().map(StudyQuery::getQuery).toList());
         databases.addAll(study.getDatabases()
                               .stream()
                               .map(studyDatabase -> new StudyDatabaseItem(studyDatabase.getName(), studyDatabase.isEnabled()))
-                              .collect(Collectors.toList()));
-        computeNonSelectedDatabases(importFormatPreferences);
+                              .toList());
+        computeNonSelectedDatabases(importFormatPreferences, importerPreferences);
         if (!Objects.isNull(studyDirectory)) {
             this.directory.set(studyDirectory.toString());
         }
     }
 
-    private void computeNonSelectedDatabases(ImportFormatPreferences importFormatPreferences) {
-        nonSelectedDatabases.addAll(WebFetchers.getSearchBasedFetchers(importFormatPreferences)
+    private void computeNonSelectedDatabases(ImportFormatPreferences importFormatPreferences, ImporterPreferences importerPreferences) {
+        nonSelectedDatabases.addAll(WebFetchers.getSearchBasedFetchers(importFormatPreferences, importerPreferences)
                                                .stream()
                                                .map(SearchBasedFetcher::getName)
                                                .map(s -> new StudyDatabaseItem(s, true))
-                                               .filter(studyDatabase -> !databases.contains(studyDatabase))
-                                               .collect(Collectors.toList()));
+                                               .filter(studyDatabase -> !databases.contains(studyDatabase)).toList());
     }
 
     public StringProperty getTitle() {
@@ -165,7 +168,7 @@ public void removeDatabase(String database) {
     }
 
     public void setStudyDirectory(Optional<Path> studyRepositoryRoot) {
-        getDirectory().setValue(studyRepositoryRoot.isPresent() ? studyRepositoryRoot.get().toString() : getDirectory().getValueSafe());
+        getDirectory().setValue(studyRepositoryRoot.map(Path::toString).orElseGet(() -> getDirectory().getValueSafe()));
     }
 
     public void deleteAuthor(String item) {
diff --git a/src/main/java/org/jabref/gui/theme/ThemeManager.java b/src/main/java/org/jabref/gui/theme/ThemeManager.java
index f317891282e..de6a9f197fa 100644
--- a/src/main/java/org/jabref/gui/theme/ThemeManager.java
+++ b/src/main/java/org/jabref/gui/theme/ThemeManager.java
@@ -6,6 +6,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.Set;
 import java.util.WeakHashMap;
 import java.util.function.Consumer;
@@ -46,7 +47,7 @@ public class ThemeManager {
     private final StyleSheet baseStyleSheet;
     private Theme theme;
 
-    private final Set<Scene> scenes = Collections.newSetFromMap(new WeakHashMap<>());
+    private Scene mainWindowScene;
     private final Set<WebEngine> webEngines = Collections.newSetFromMap(new WeakHashMap<>());
 
     public ThemeManager(AppearancePreferences appearancePreferences,
@@ -88,8 +89,7 @@ private void updateThemeSettings() {
     }
 
     private void updateFontSettings() {
-        DefaultTaskExecutor.runInJavaFXThread(() ->
-                updateRunner.accept(() -> scenes.forEach(this::updateFontStyle)));
+        DefaultTaskExecutor.runInJavaFXThread(() -> updateRunner.accept(() -> getMainWindowScene().ifPresent(this::updateFontStyle)));
     }
 
     private void removeStylesheetFromWatchList(StyleSheet styleSheet) {
@@ -117,12 +117,10 @@ private void baseCssLiveUpdate() {
         if (baseStyleSheet.getSceneStylesheet() == null) {
             LOGGER.error("Base stylesheet does not exist.");
         } else {
-            LOGGER.debug("Updating base CSS for {} scenes", scenes.size());
+            LOGGER.debug("Updating base CSS for main window scene");
         }
 
-        DefaultTaskExecutor.runInJavaFXThread(() ->
-                updateRunner.accept(() -> scenes.forEach(this::updateBaseCss))
-        );
+        DefaultTaskExecutor.runInJavaFXThread(() -> updateRunner.accept(this::updateBaseCss));
     }
 
     private void additionalCssLiveUpdate() {
@@ -131,11 +129,11 @@ private void additionalCssLiveUpdate() {
             return styleSheet.getWebEngineStylesheet();
         }).orElse("");
 
-        LOGGER.debug("Updating additional CSS for {} scenes and {} web engines", scenes.size(), webEngines.size());
+        LOGGER.debug("Updating additional CSS for main window scene and {} web engines", webEngines.size());
 
         DefaultTaskExecutor.runInJavaFXThread(() ->
                 updateRunner.accept(() -> {
-                    scenes.forEach(this::updateAdditionalCss);
+                    updateAdditionalCss();
 
                     webEngines.forEach(webEngine -> {
                         // force refresh by unloading style sheet, if the location hasn't changed
@@ -148,17 +146,19 @@ private void additionalCssLiveUpdate() {
         );
     }
 
-    private void updateBaseCss(Scene scene) {
-        List<String> stylesheets = scene.getStylesheets();
-        if (!stylesheets.isEmpty()) {
-            stylesheets.remove(0);
-        }
+    private void updateBaseCss() {
+        getMainWindowScene().ifPresent(scene -> {
+            List<String> stylesheets = scene.getStylesheets();
+            if (!stylesheets.isEmpty()) {
+                stylesheets.remove(0);
+            }
 
-        stylesheets.add(0, baseStyleSheet.getSceneStylesheet().toExternalForm());
+            stylesheets.add(0, baseStyleSheet.getSceneStylesheet().toExternalForm());
+        });
     }
 
-    private void updateAdditionalCss(Scene scene) {
-        scene.getStylesheets().setAll(List.of(
+    private void updateAdditionalCss() {
+        getMainWindowScene().ifPresent(scene -> scene.getStylesheets().setAll(List.of(
                 baseStyleSheet.getSceneStylesheet().toExternalForm(),
                 appearancePreferences.getTheme()
                                      .getAdditionalStylesheet().map(styleSheet -> {
@@ -170,21 +170,21 @@ private void updateAdditionalCss(Scene scene) {
                                          }
                                      })
                                      .orElse("")
-        ));
+        )));
     }
 
     /**
      * Installs the base css file as a stylesheet in the given scene. Changes in the css file lead to a redraw of the
      * scene using the new css file.
      *
-     * @param scene the scene to install the css into
+     * @param mainWindowScene the scene to install the css into
      */
-    public void installCss(Scene scene) {
+    public void installCss(Scene mainWindowScene) {
+        Objects.requireNonNull(mainWindowScene, "scene is required");
         updateRunner.accept(() -> {
-            if (this.scenes.add(scene)) {
-                updateBaseCss(scene);
-                updateAdditionalCss(scene);
-            }
+            this.mainWindowScene = mainWindowScene;
+            updateBaseCss();
+            updateAdditionalCss();
         });
     }
 
@@ -223,4 +223,8 @@ public void updateFontStyle(Scene scene) {
     public Theme getActiveTheme() {
         return this.theme;
     }
+
+    public Optional<Scene> getMainWindowScene() {
+        return Optional.ofNullable(mainWindowScene);
+    }
 }
diff --git a/src/main/java/org/jabref/gui/util/BackgroundTask.java b/src/main/java/org/jabref/gui/util/BackgroundTask.java
index 280df1bc0ad..250337bacc7 100644
--- a/src/main/java/org/jabref/gui/util/BackgroundTask.java
+++ b/src/main/java/org/jabref/gui/util/BackgroundTask.java
@@ -47,6 +47,7 @@ public abstract class BackgroundTask<V> {
     private final StringProperty title = new SimpleStringProperty(this.getClass().getSimpleName());
     private final DoubleProperty workDonePercentage = new SimpleDoubleProperty(0);
     private final BooleanProperty showToUser = new SimpleBooleanProperty(false);
+    private final BooleanProperty willBeRecoveredAutomatically = new SimpleBooleanProperty(false);
 
     public BackgroundTask() {
         workDonePercentage.bind(EasyBind.map(progress, BackgroundTask.BackgroundProgress::getWorkDonePercentage));
@@ -130,6 +131,14 @@ public void showToUser(boolean show) {
         showToUser.set(show);
     }
 
+    public boolean willBeRecoveredAutomatically() {
+        return willBeRecoveredAutomatically.get();
+    }
+
+    public void willBeRecoveredAutomatically(boolean willBeRecoveredAutomatically) {
+        this.willBeRecoveredAutomatically.set(willBeRecoveredAutomatically);
+    }
+
     /**
      * Sets the {@link Runnable} that is invoked after the task is started.
      */
diff --git a/src/main/java/org/jabref/gui/util/BaseDialog.java b/src/main/java/org/jabref/gui/util/BaseDialog.java
index 8879f9b7f5c..721fcb377cf 100644
--- a/src/main/java/org/jabref/gui/util/BaseDialog.java
+++ b/src/main/java/org/jabref/gui/util/BaseDialog.java
@@ -2,7 +2,6 @@
 
 import java.util.Optional;
 
-import javafx.scene.Node;
 import javafx.scene.control.Button;
 import javafx.scene.control.ButtonType;
 import javafx.scene.control.Dialog;
@@ -15,8 +14,6 @@
 import org.jabref.gui.keyboard.KeyBinding;
 import org.jabref.gui.keyboard.KeyBindingRepository;
 
-import com.tobiasdiez.easybind.EasyBind;
-
 public class BaseDialog<T> extends Dialog<T> implements org.jabref.gui.Dialog<T> {
 
     protected BaseDialog() {
@@ -39,10 +36,6 @@ protected BaseDialog() {
 
         setDialogIcon(IconTheme.getJabRefImage());
         setResizable(true);
-
-        EasyBind.wrapNullable(dialogPaneProperty())
-                .mapObservable(Node::sceneProperty)
-                .subscribeToValues(scene -> Globals.getThemeManager().installCss(scene));
     }
 
     private Optional<Button> getDefaultButton() {
diff --git a/src/main/java/org/jabref/gui/util/BindingsHelper.java b/src/main/java/org/jabref/gui/util/BindingsHelper.java
index c4f88f1e15b..48cef619852 100644
--- a/src/main/java/org/jabref/gui/util/BindingsHelper.java
+++ b/src/main/java/org/jabref/gui/util/BindingsHelper.java
@@ -43,7 +43,6 @@ public static Subscription includePseudoClassWhen(Node node, PseudoClass pseudoC
 
     public static <T, U> ObservableList<U> map(ObservableValue<T> source, Function<T, List<U>> mapper) {
         PreboundBinding<List<U>> binding = new PreboundBinding<>(source) {
-
             @Override
             protected List<U> computeValue() {
                 return mapper.apply(source.getValue());
@@ -134,7 +133,6 @@ public static <A, V, B> void bindContentBidirectional(ObservableMap<A, V> proper
 
     public static <T> ObservableValue<T> constantOf(T value) {
         return new ObjectBinding<>() {
-
             @Override
             protected T computeValue() {
                 return value;
@@ -144,7 +142,6 @@ protected T computeValue() {
 
     public static ObservableValue<Boolean> constantOf(boolean value) {
         return new BooleanBinding() {
-
             @Override
             protected boolean computeValue() {
                 return value;
@@ -154,7 +151,6 @@ protected boolean computeValue() {
 
     public static ObservableValue<? extends String> emptyString() {
         return new StringBinding() {
-
             @Override
             protected String computeValue() {
                 return "";
diff --git a/src/main/java/org/jabref/gui/util/CustomRatingSkin.java b/src/main/java/org/jabref/gui/util/CustomRatingSkin.java
new file mode 100644
index 00000000000..96e6e8d75d5
--- /dev/null
+++ b/src/main/java/org/jabref/gui/util/CustomRatingSkin.java
@@ -0,0 +1,21 @@
+package org.jabref.gui.util;
+
+import javafx.scene.Node;
+
+import org.jabref.gui.icon.IconTheme;
+
+import impl.org.controlsfx.skin.RatingSkin;
+import org.controlsfx.control.Rating;
+
+public class CustomRatingSkin extends RatingSkin {
+    public CustomRatingSkin(Rating control) {
+        super(control);
+
+        consumeMouseEvents(false);
+    }
+
+    @Override
+    protected Node createButtonNode() {
+        return IconTheme.JabRefIcons.RANKING.getGraphicNode();
+    }
+}
diff --git a/src/main/java/org/jabref/gui/util/DefaultFileUpdateMonitor.java b/src/main/java/org/jabref/gui/util/DefaultFileUpdateMonitor.java
index 4017621cf95..4c00eb13929 100644
--- a/src/main/java/org/jabref/gui/util/DefaultFileUpdateMonitor.java
+++ b/src/main/java/org/jabref/gui/util/DefaultFileUpdateMonitor.java
@@ -26,7 +26,7 @@
  * This class monitors a set of files for changes. Upon detecting a change it notifies the registered {@link
  * FileUpdateListener}s.
  * <p>
- * Implementation based on https://stackoverflow.com/questions/16251273/can-i-watch-for-single-file-change-with-watchservice-not-the-whole-directory
+ * Implementation based on <a href="https://stackoverflow.com/questions/16251273/can-i-watch-for-single-file-change-with-watchservice-not-the-whole-directory">https://stackoverflow.com/questions/16251273/can-i-watch-for-single-file-change-with-watchservice-not-the-whole-directory</a>.
  */
 public class DefaultFileUpdateMonitor implements Runnable, FileUpdateMonitor {
 
@@ -113,6 +113,5 @@ public void shutdown() {
         } catch (IOException e) {
             LOGGER.error("error closing watcher", e);
         }
-
     }
 }
diff --git a/src/main/java/org/jabref/gui/util/DefaultTaskExecutor.java b/src/main/java/org/jabref/gui/util/DefaultTaskExecutor.java
index f1f2ffc6fe7..0e5b9f2c73d 100644
--- a/src/main/java/org/jabref/gui/util/DefaultTaskExecutor.java
+++ b/src/main/java/org/jabref/gui/util/DefaultTaskExecutor.java
@@ -106,7 +106,7 @@ public static void runInJavaFXThread(Runnable runnable) {
     public <V> Future<V> execute(BackgroundTask<V> task) {
         Task<V> javafxTask = getJavaFXTask(task);
         if (task.showToUser()) {
-            stateManager.addBackgroundTask(javafxTask);
+            stateManager.addBackgroundTask(task, javafxTask);
         }
         return execute(javafxTask);
     }
@@ -141,8 +141,7 @@ public DelayTaskThrottler createThrottler(int delay) {
     }
 
     private <V> Task<V> getJavaFXTask(BackgroundTask<V> task) {
-        Task<V> javaTask = new Task<>() {
-
+        Task<V> javaTask = new Task<V>() {
             {
                 this.updateMessage(task.messageProperty().get());
                 this.updateTitle(task.titleProperty().get());
diff --git a/src/main/java/org/jabref/gui/util/DirectoryDialogConfiguration.java b/src/main/java/org/jabref/gui/util/DirectoryDialogConfiguration.java
index 3bb79a16192..39c4741c93e 100644
--- a/src/main/java/org/jabref/gui/util/DirectoryDialogConfiguration.java
+++ b/src/main/java/org/jabref/gui/util/DirectoryDialogConfiguration.java
@@ -25,17 +25,17 @@ public DirectoryDialogConfiguration build() {
         }
 
         public Builder withInitialDirectory(Path directory) {
-
             directory = directory.toAbsolutePath();
+
             // Dir must be a folder, not a file
             if (!Files.isDirectory(directory)) {
                 directory = directory.getParent();
             }
+
             // The lines above work also if the dir does not exist at all!
-            // NULL is accepted by the filechooser as no inital path
+            // NULL is accepted by the filechooser as no initial path
 
             if (!Files.exists(directory)) {
-
                 directory = null;
             }
             initialDirectory = directory;
diff --git a/src/main/java/org/jabref/gui/util/FileFilterConverter.java b/src/main/java/org/jabref/gui/util/FileFilterConverter.java
index 623fcb54cb2..3f51bf534ee 100644
--- a/src/main/java/org/jabref/gui/util/FileFilterConverter.java
+++ b/src/main/java/org/jabref/gui/util/FileFilterConverter.java
@@ -28,11 +28,11 @@ private FileFilterConverter() {
 
     public static FileChooser.ExtensionFilter toExtensionFilter(FileType fileType) {
         String description = Localization.lang("%0 file", fileType.toString());
-        return new FileChooser.ExtensionFilter(description, fileType.getExtensionsWithDot());
+        return new FileChooser.ExtensionFilter(description, fileType.getExtensionsWithAsteriskAndDot());
     }
 
     public static FileChooser.ExtensionFilter toExtensionFilter(String description, FileType fileType) {
-        return new FileChooser.ExtensionFilter(description, fileType.getExtensionsWithDot());
+        return new FileChooser.ExtensionFilter(description, fileType.getExtensionsWithAsteriskAndDot());
     }
 
     public static Optional<Importer> getImporter(FileChooser.ExtensionFilter extensionFilter, Collection<Importer> importers) {
@@ -46,7 +46,7 @@ public static Optional<Exporter> getExporter(FileChooser.ExtensionFilter extensi
     public static FileChooser.ExtensionFilter forAllImporters(SortedSet<Importer> importers) {
         List<FileType> fileTypes = importers.stream().map(Importer::getFileType).collect(Collectors.toList());
         List<String> flatExtensions = fileTypes.stream()
-                                               .flatMap(type -> type.getExtensionsWithDot().stream())
+                                               .flatMap(type -> type.getExtensionsWithAsteriskAndDot().stream())
                                                .collect(Collectors.toList());
 
         return new FileChooser.ExtensionFilter(Localization.lang("Available import formats"), flatExtensions);
diff --git a/src/main/java/org/jabref/gui/util/FileNodeViewModel.java b/src/main/java/org/jabref/gui/util/FileNodeViewModel.java
index 1a6c0382499..2410ad4b67c 100644
--- a/src/main/java/org/jabref/gui/util/FileNodeViewModel.java
+++ b/src/main/java/org/jabref/gui/util/FileNodeViewModel.java
@@ -7,6 +7,7 @@
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
+import java.util.Objects;
 
 import javafx.beans.property.ReadOnlyListWrapper;
 import javafx.collections.FXCollections;
@@ -50,7 +51,6 @@ public void setFileCount(int fileCount) {
      * Return a string of a FileTime in a yyyy-MM-dd HH:mm format.
      */
     public static String formatDateTime(FileTime fileTime) {
-
         LocalDateTime localDateTime = fileTime
                 .toInstant()
                 .atZone(ZoneId.systemDefault())
@@ -95,4 +95,21 @@ public String toString() {
                 this.children,
                 this.fileCount);
     }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(children, fileCount, path);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (!(obj instanceof FileNodeViewModel)) {
+            return false;
+        }
+        FileNodeViewModel other = (FileNodeViewModel) obj;
+        return Objects.equals(children, other.children) && (fileCount == other.fileCount) && Objects.equals(path, other.path);
+    }
 }
diff --git a/src/main/java/org/jabref/gui/util/ValueTableCellFactory.java b/src/main/java/org/jabref/gui/util/ValueTableCellFactory.java
index 3275d57b650..683c70ea9d0 100644
--- a/src/main/java/org/jabref/gui/util/ValueTableCellFactory.java
+++ b/src/main/java/org/jabref/gui/util/ValueTableCellFactory.java
@@ -92,7 +92,6 @@ public ValueTableCellFactory<S, T> withMenu(BiFunction<S, T, ContextMenu> menuFa
     @Override
     public TableCell<S, T> call(TableColumn<S, T> param) {
         return new TableCell<>() {
-
             @Override
             protected void updateItem(T item, boolean empty) {
                 super.updateItem(item, empty);
diff --git a/src/main/java/org/jabref/gui/util/ViewModelListCellFactory.java b/src/main/java/org/jabref/gui/util/ViewModelListCellFactory.java
index 851cddd3c92..41e0727583f 100644
--- a/src/main/java/org/jabref/gui/util/ViewModelListCellFactory.java
+++ b/src/main/java/org/jabref/gui/util/ViewModelListCellFactory.java
@@ -151,9 +151,7 @@ public void install(ListView<T> listView) {
 
     @Override
     public ListCell<T> call(ListView<T> param) {
-
         return new ListCell<>() {
-
             final List<Subscription> subscriptions = new ArrayList<>();
 
             @Override
diff --git a/src/main/java/org/jabref/gui/util/ViewModelTextFieldTableCellVisualizationFactory.java b/src/main/java/org/jabref/gui/util/ViewModelTextFieldTableCellVisualizationFactory.java
index 583d95cc7eb..b7688c3b250 100644
--- a/src/main/java/org/jabref/gui/util/ViewModelTextFieldTableCellVisualizationFactory.java
+++ b/src/main/java/org/jabref/gui/util/ViewModelTextFieldTableCellVisualizationFactory.java
@@ -39,7 +39,6 @@ public void install(TableColumn<S, T> column, StringConverter<T> stringConverter
     @Override
     public TextFieldTableCell<S, T> call(TableColumn<S, T> param) {
         return new TextFieldTableCell<>(stringConverter) {
-
             final List<Subscription> subscriptions = new ArrayList<>();
 
             @Override
diff --git a/src/main/java/org/jabref/gui/util/ViewModelTreeTableCellFactory.java b/src/main/java/org/jabref/gui/util/ViewModelTreeTableCellFactory.java
index 8b89661ac3c..a1e3f81b7bf 100644
--- a/src/main/java/org/jabref/gui/util/ViewModelTreeTableCellFactory.java
+++ b/src/main/java/org/jabref/gui/util/ViewModelTreeTableCellFactory.java
@@ -51,9 +51,7 @@ public ViewModelTreeTableCellFactory<S> withOnMouseClickedEvent(
 
     @Override
     public TreeTableCell<S, S> call(TreeTableColumn<S, S> param) {
-
         return new TreeTableCell<S, S>() {
-
             @Override
             protected void updateItem(S viewModel, boolean empty) {
                 super.updateItem(viewModel, empty);
diff --git a/src/main/java/org/jabref/logic/autosaveandbackup/AutosaveManager.java b/src/main/java/org/jabref/logic/autosaveandbackup/AutosaveManager.java
index 8a14f7fc533..990da5c2db4 100644
--- a/src/main/java/org/jabref/logic/autosaveandbackup/AutosaveManager.java
+++ b/src/main/java/org/jabref/logic/autosaveandbackup/AutosaveManager.java
@@ -3,9 +3,9 @@
 import java.util.HashSet;
 import java.util.Set;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
 
 import org.jabref.logic.util.CoarseChangeFilter;
-import org.jabref.logic.util.DelayTaskThrottler;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.database.event.AutosaveEvent;
 import org.jabref.model.database.event.BibDatabaseContextChangedEvent;
@@ -24,39 +24,47 @@ public class AutosaveManager {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(AutosaveManager.class);
 
+    private static final int DELAY_BETWEEN_AUTOSAVE_ATTEMPTS_IN_SECONDS = 31;
+
     private static Set<AutosaveManager> runningInstances = new HashSet<>();
 
     private final BibDatabaseContext bibDatabaseContext;
 
     private final EventBus eventBus;
     private final CoarseChangeFilter changeFilter;
-    private final DelayTaskThrottler throttler;
+    private final ScheduledThreadPoolExecutor executor;
+    private boolean needsSave = false;
 
     private AutosaveManager(BibDatabaseContext bibDatabaseContext) {
         this.bibDatabaseContext = bibDatabaseContext;
-        this.throttler = new DelayTaskThrottler(2000);
         this.eventBus = new EventBus();
         this.changeFilter = new CoarseChangeFilter(bibDatabaseContext);
         changeFilter.registerListener(this);
+
+        this.executor = new ScheduledThreadPoolExecutor(2);
+        this.executor.scheduleAtFixedRate(
+                () -> {
+                    if (needsSave) {
+                       eventBus.post(new AutosaveEvent());
+                       needsSave = false;
+                    }
+                },
+                DELAY_BETWEEN_AUTOSAVE_ATTEMPTS_IN_SECONDS,
+                DELAY_BETWEEN_AUTOSAVE_ATTEMPTS_IN_SECONDS,
+                TimeUnit.SECONDS);
     }
 
     @Subscribe
-    public synchronized void listen(@SuppressWarnings("unused") BibDatabaseContextChangedEvent event) {
+    public void listen(@SuppressWarnings("unused") BibDatabaseContextChangedEvent event) {
         if (!event.isFilteredOut()) {
-            startAutosaveTask();
+            this.needsSave = true;
         }
     }
 
-    private void startAutosaveTask() {
-        throttler.schedule(() -> {
-            eventBus.post(new AutosaveEvent());
-        });
-    }
-
     private void shutdown() {
         changeFilter.unregisterListener(this);
         changeFilter.shutdown();
-        throttler.shutdown();
+        executor.shutdown();
     }
 
     /**
@@ -65,9 +73,9 @@ private void shutdown() {
      * @param bibDatabaseContext Associated {@link BibDatabaseContext}
      */
     public static AutosaveManager start(BibDatabaseContext bibDatabaseContext) {
-        AutosaveManager autosaver = new AutosaveManager(bibDatabaseContext);
-        runningInstances.add(autosaver);
-        return autosaver;
+        AutosaveManager autosaveManager = new AutosaveManager(bibDatabaseContext);
+        runningInstances.add(autosaveManager);
+        return autosaveManager;
     }
 
     /**
@@ -92,7 +100,7 @@ public void unregisterListener(Object listener) {
             eventBus.unregister(listener);
         } catch (IllegalArgumentException e) {
             // occurs if the event source has not been registered, should not prevent shutdown
-            LOGGER.debug("Proble, unregistering", e);
+            LOGGER.debug("Problem unregistering", e);
         }
     }
 }
diff --git a/src/main/java/org/jabref/logic/autosaveandbackup/BackupManager.java b/src/main/java/org/jabref/logic/autosaveandbackup/BackupManager.java
index 7ec9727a3af..11228558c48 100644
--- a/src/main/java/org/jabref/logic/autosaveandbackup/BackupManager.java
+++ b/src/main/java/org/jabref/logic/autosaveandbackup/BackupManager.java
@@ -3,24 +3,30 @@
 import java.io.IOException;
 import java.io.Writer;
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
+import java.nio.file.attribute.FileTime;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Optional;
+import java.util.Queue;
 import java.util.Set;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.ExecutorService;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
 
 import org.jabref.logic.bibtex.InvalidFieldValueException;
 import org.jabref.logic.exporter.AtomicFileWriter;
 import org.jabref.logic.exporter.BibWriter;
 import org.jabref.logic.exporter.BibtexDatabaseWriter;
 import org.jabref.logic.exporter.SavePreferences;
+import org.jabref.logic.util.BackupFileType;
 import org.jabref.logic.util.CoarseChangeFilter;
-import org.jabref.logic.util.DelayTaskThrottler;
-import org.jabref.logic.util.OS;
-import org.jabref.logic.util.io.FileUtil;
+import org.jabref.logic.util.io.BackupFileUtil;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.database.event.BibDatabaseContextChangedEvent;
 import org.jabref.model.entry.BibEntryTypesManager;
@@ -41,35 +47,55 @@ public class BackupManager {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(BackupManager.class);
 
-    // This differs from org.jabref.logic.exporter.AtomicFileOutputStream.BACKUP_EXTENSION, which is used for copying the .bib away before overwriting on save.
-    private static final String AUTOSAVE_FILE_EXTENSION = ".sav";
+    private static final int MAXIMUM_BACKUP_FILE_COUNT = 10;
+
+    private static final int DELAY_BETWEEN_BACKUP_ATTEMPTS_IN_SECONDS = 19;
 
     private static Set<BackupManager> runningInstances = new HashSet<>();
 
     private final BibDatabaseContext bibDatabaseContext;
     private final PreferencesService preferences;
-    private final DelayTaskThrottler throttler;
+    private final ScheduledThreadPoolExecutor executor;
     private final CoarseChangeFilter changeFilter;
     private final BibEntryTypesManager entryTypesManager;
 
+
+    // Contains a list of all backup paths
+    // During a write, the less recent backup file is deleted
+    private final Queue<Path> backupFilesQueue = new LinkedBlockingQueue<>();
+
+    private boolean needsBackup = true;
+
     private BackupManager(BibDatabaseContext bibDatabaseContext, BibEntryTypesManager entryTypesManager, PreferencesService preferences) {
         this.bibDatabaseContext = bibDatabaseContext;
         this.entryTypesManager = entryTypesManager;
         this.preferences = preferences;
-        this.throttler = new DelayTaskThrottler(15000);
+        this.executor = new ScheduledThreadPoolExecutor(2);
 
         changeFilter = new CoarseChangeFilter(bibDatabaseContext);
         changeFilter.registerListener(this);
     }
 
-    static Path getBackupPath(Path originalPath) {
-        return FileUtil.addExtension(originalPath, AUTOSAVE_FILE_EXTENSION);
+    /**
+     * Determines the most recent backup file name
+     */
+    static Path getBackupPathForNewBackup(Path originalPath) {
+        return BackupFileUtil.getPathForNewBackupFileAndCreateDirectory(originalPath, BackupFileType.BACKUP);
+    }
+
+    /**
+     * Determines the most recent existing backup file name
+     */
+    static Optional<Path> getLatestBackupPath(Path originalPath) {
+        return BackupFileUtil.getPathOfLatestExisingBackupFile(originalPath, BackupFileType.BACKUP);
     }
 
     /**
      * Starts the BackupManager which is associated with the given {@link BibDatabaseContext}. As long as no database
      * file is present in {@link BibDatabaseContext}, the {@link BackupManager} will do nothing.
      *
+     * This method is not thread-safe. The caller has to ensure that this method is not called in parallel.
+     *
      * @param bibDatabaseContext Associated {@link BibDatabaseContext}
      */
     public static BackupManager start(BibDatabaseContext bibDatabaseContext, BibEntryTypesManager entryTypesManager, PreferencesService preferences) {
@@ -92,26 +118,45 @@ public static void shutdown(BibDatabaseContext bibDatabaseContext) {
 
     /**
      * Checks whether a backup file exists for the given database file. If it exists, it is checked whether it is
-     * different from the original.
+     * newer and different from the original.
      *
      * @param originalPath Path to the file a backup should be checked for. Example: jabref.bib.
+     *
      * @return <code>true</code> if backup file exists AND differs from originalPath. <code>false</code> is the
      * "default" return value in the good case. In the case of an exception <code>true</code> is returned to ensure that
      * the user checks the output.
      */
     public static boolean backupFileDiffers(Path originalPath) {
-        Path backupPath = getBackupPath(originalPath);
-        if (!Files.exists(backupPath) || Files.isDirectory(backupPath)) {
-            return false;
-        }
-
-        try {
-            return Files.mismatch(originalPath, backupPath) != -1L;
-        } catch (IOException e) {
-            LOGGER.debug("Could not compare original file and backup file.", e);
-            // User has to investigate in this case
-            return true;
-        }
+        return getLatestBackupPath(originalPath).map(latestBackupPath -> {
+            FileTime latestBackupFileLastModifiedTime;
+            try {
+                 latestBackupFileLastModifiedTime = Files.getLastModifiedTime(latestBackupPath);
+            } catch (IOException e) {
+                LOGGER.debug("Could not get timestamp of backup file {}", latestBackupPath, e);
+                // If we cannot get the timestamp, we do show any warning
+                return false;
+            }
+            FileTime currentFileLastModifiedTime;
+            try {
+                currentFileLastModifiedTime = Files.getLastModifiedTime(originalPath);
+            } catch (IOException e) {
+                LOGGER.debug("Could not get timestamp of current file file {}", originalPath, e);
+                // If we cannot get the timestamp, we do show any warning
+                return false;
+            }
+            if (latestBackupFileLastModifiedTime.compareTo(currentFileLastModifiedTime) <= 0) {
+                // Backup is older than current file
+                // We treat the backup as non-different (even if it could differ)
+                return false;
+            }
+            try {
+                return Files.mismatch(originalPath, latestBackupPath) != -1L;
+            } catch (IOException e) {
+                LOGGER.debug("Could not compare original file and backup file.", e);
+                // User has to investigate in this case
+                return true;
+            }
+        }).orElse(false);
     }
 
     /**
@@ -120,28 +165,62 @@ public static boolean backupFileDiffers(Path originalPath) {
      * @param originalPath Path to the file which should be equalized to the backup file.
      */
     public static void restoreBackup(Path originalPath) {
-        Path backupPath = getBackupPath(originalPath);
+        Optional<Path> backupPath = getLatestBackupPath(originalPath);
+        if (backupPath.isEmpty()) {
+            LOGGER.error("There is no backup file");
+            return;
+        }
         try {
-            Files.copy(backupPath, originalPath, StandardCopyOption.REPLACE_EXISTING);
+            Files.copy(backupPath.get(), originalPath, StandardCopyOption.REPLACE_EXISTING);
         } catch (IOException e) {
             LOGGER.error("Error while restoring the backup file.", e);
         }
     }
 
-    private Optional<Path> determineBackupPath() {
-        return bibDatabaseContext.getDatabasePath().map(BackupManager::getBackupPath);
+    private Optional<Path> determineBackupPathForNewBackup() {
+        return bibDatabaseContext.getDatabasePath().map(BackupManager::getBackupPathForNewBackup);
     }
 
+    /**
+     * This method is called as soon as the scheduler says: "Do the backup"
+     *
+     * <em>SIDE EFFECT: Deletes oldest backup file</em>
+     *
+     * @param backupPath the path where the library should be backed up to
+     */
     private void performBackup(Path backupPath) {
-        try {
-            Charset charset = bibDatabaseContext.getMetaData().getEncoding().orElse(preferences.getGeneralPreferences().getDefaultEncoding());
-            GeneralPreferences generalPreferences = preferences.getGeneralPreferences();
-            SavePreferences savePreferences = preferences.getSavePreferences()
-                                                         .withMakeBackup(false);
-            Writer writer = new AtomicFileWriter(backupPath, charset);
-            BibWriter bibWriter = new BibWriter(writer, OS.NEWLINE);
+        if (!needsBackup) {
+            return;
+        }
+
+        // We opted for "while" to delete backups in case there are more than 10
+        while (backupFilesQueue.size() >= MAXIMUM_BACKUP_FILE_COUNT) {
+            Path lessRecentBackupFile = backupFilesQueue.poll();
+            try {
+                Files.delete(lessRecentBackupFile);
+            } catch (IOException e) {
+                LOGGER.error("Could not delete backup file {}", lessRecentBackupFile, e);
+            }
+        }
+
+        // code similar to org.jabref.gui.exporter.SaveDatabaseAction.saveDatabase
+        GeneralPreferences generalPreferences = preferences.getGeneralPreferences();
+        SavePreferences savePreferences = preferences.getSavePreferences()
+                                                     .withMakeBackup(false);
+        Charset encoding = bibDatabaseContext.getMetaData().getEncoding().orElse(StandardCharsets.UTF_8);
+        // We want to have successful backups only
+        // Thus, we do not use a plain "FileWriter", but the "AtomicFileWriter"
+        // Example: What happens if one hard powers off the machine (or kills the jabref process) during the write of the backup?
+        //          This MUST NOT create a broken backup file that then jabref wants to "restore" from?
+        try (Writer writer = new AtomicFileWriter(backupPath, encoding, false)) {
+            BibWriter bibWriter = new BibWriter(writer, bibDatabaseContext.getDatabase().getNewLineSeparator());
             new BibtexDatabaseWriter(bibWriter, generalPreferences, savePreferences, entryTypesManager)
                     .saveDatabase(bibDatabaseContext);
+            backupFilesQueue.add(backupPath);
+
+            // We wrote the file successfully
+            // Thus, we currently do not need any new backup
+            this.needsBackup = false;
         } catch (IOException e) {
             logIfCritical(backupPath, e);
         }
@@ -156,39 +235,58 @@ private void logIfCritical(Path backupPath, IOException e) {
 
         // do not print errors in field values into the log during autosave
         if (!isErrorInField) {
-            LOGGER.error("Error while saving to file" + backupPath, e);
+            LOGGER.error("Error while saving to file {}", backupPath, e);
         }
     }
 
     @Subscribe
     public synchronized void listen(@SuppressWarnings("unused") BibDatabaseContextChangedEvent event) {
         if (!event.isFilteredOut()) {
-            startBackupTask();
+            this.needsBackup = true;
         }
     }
 
     private void startBackupTask() {
-        throttler.schedule(() -> determineBackupPath().ifPresent(this::performBackup));
+        fillQueue();
+
+        executor.scheduleAtFixedRate(
+                // We need to determine the backup path on each action, because we use the timestamp in the filename
+                () -> determineBackupPathForNewBackup().ifPresent(this::performBackup),
+                DELAY_BETWEEN_BACKUP_ATTEMPTS_IN_SECONDS,
+                DELAY_BETWEEN_BACKUP_ATTEMPTS_IN_SECONDS,
+                TimeUnit.SECONDS);
+    }
+
+    private void fillQueue() {
+        Path backupDir = BackupFileUtil.getAppDataBackupDir();
+        if (!Files.exists(backupDir)) {
+            return;
+        }
+        bibDatabaseContext.getDatabasePath().ifPresent(databasePath -> {
+            // code similar to {@link org.jabref.logic.util.io.BackupFileUtil.getPathOfLatestExisingBackupFile}
+            final String prefix = BackupFileUtil.getUniqueFilePrefix(databasePath) + "--" + databasePath.getFileName();
+            try {
+                List<Path> allSavFiles = Files.list(backupDir)
+                                              // just list the .sav belonging to the given targetFile
+                                              .filter(p -> p.getFileName().toString().startsWith(prefix))
+                                              .sorted().toList();
+                backupFilesQueue.addAll(allSavFiles);
+            } catch (IOException e) {
+                LOGGER.error("Could not determine most recent file", e);
+            }
+        });
     }
 
     /**
-     * Unregisters the BackupManager from the eventBus of {@link BibDatabaseContext} and deletes the backup file. This
-     * method should only be used when closing a database/JabRef legally.
+     * Unregisters the BackupManager from the eventBus of {@link BibDatabaseContext}.
+     * This method should only be used when closing a database/JabRef in a normal way.
      */
     private void shutdown() {
         changeFilter.unregisterListener(this);
         changeFilter.shutdown();
-        throttler.shutdown();
-        determineBackupPath().ifPresent(this::deleteBackupFile);
-    }
+        executor.shutdown();
 
-    private void deleteBackupFile(Path backupPath) {
-        try {
-            if (Files.exists(backupPath) && !Files.isDirectory(backupPath)) {
-                Files.delete(backupPath);
-            }
-        } catch (IOException e) {
-            LOGGER.error("Error while deleting the backup file.", e);
-        }
+        // Ensure that backup is a recent one
+        determineBackupPathForNewBackup().ifPresent(this::performBackup);
     }
 }
diff --git a/src/main/java/org/jabref/logic/auxparser/DefaultAuxParser.java b/src/main/java/org/jabref/logic/auxparser/DefaultAuxParser.java
index 8e391226575..68c80974aa4 100644
--- a/src/main/java/org/jabref/logic/auxparser/DefaultAuxParser.java
+++ b/src/main/java/org/jabref/logic/auxparser/DefaultAuxParser.java
@@ -32,7 +32,7 @@
 public class DefaultAuxParser implements AuxParser {
     private static final Logger LOGGER = LoggerFactory.getLogger(DefaultAuxParser.class);
 
-    private static final Pattern CITE_PATTERN = Pattern.compile("\\\\(citation|abx@aux@cite)\\{(.+)\\}");
+    private static final Pattern CITE_PATTERN = Pattern.compile("\\\\(citation|abx@aux@cite)(\\{\\d+\\})?\\{(?<citationkey>.+)\\}");
     private static final Pattern INPUT_PATTERN = Pattern.compile("\\\\@input\\{(.+)\\}");
 
     private final BibDatabase masterDatabase;
@@ -108,7 +108,7 @@ private void matchCitation(AuxParserResult result, String line) {
         Matcher citeMatch = CITE_PATTERN.matcher(line);
 
         while (citeMatch.find()) {
-            String keyString = citeMatch.group(2);
+            String keyString = citeMatch.group("citationkey");
             String[] keys = keyString.split(",");
 
             for (String key : keys) {
diff --git a/src/main/java/org/jabref/logic/bibtex/FieldContentFormatter.java b/src/main/java/org/jabref/logic/bibtex/FieldContentFormatter.java
index f6b55bfc2d5..c2fdab6b40c 100644
--- a/src/main/java/org/jabref/logic/bibtex/FieldContentFormatter.java
+++ b/src/main/java/org/jabref/logic/bibtex/FieldContentFormatter.java
@@ -5,10 +5,8 @@
 import java.util.Set;
 import java.util.regex.Pattern;
 
-import org.jabref.logic.util.OS;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.StandardField;
-import org.jabref.model.strings.StringUtil;
 
 /**
  * This class provides the reformatting needed when reading BibTeX fields formatted
@@ -43,7 +41,10 @@ public FieldContentFormatter(FieldContentFormatterPreferences preferences) {
      */
     public String format(String fieldContent, Field field) {
         if (multiLineFields.contains(field)) {
-            return StringUtil.unifyLineBreaks(fieldContent, OS.NEWLINE);
+            // Keep the field as is.
+            // Newlines are normalized at org.jabref.logic.exporter.BibWriter
+            // Alternative: StringUtil.unifyLineBreaks(fieldContent, OS.NEWLINE)
+            return fieldContent;
         }
 
         return WHITESPACE.matcher(fieldContent).replaceAll(" ");
diff --git a/src/main/java/org/jabref/logic/bibtex/FieldWriter.java b/src/main/java/org/jabref/logic/bibtex/FieldWriter.java
index a917fd116e9..3654da1f118 100644
--- a/src/main/java/org/jabref/logic/bibtex/FieldWriter.java
+++ b/src/main/java/org/jabref/logic/bibtex/FieldWriter.java
@@ -1,8 +1,6 @@
 package org.jabref.logic.bibtex;
 
-import org.jabref.logic.util.OS;
 import org.jabref.model.entry.field.Field;
-import org.jabref.model.strings.StringUtil;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -204,7 +202,6 @@ private void writeText(StringBuilder stringBuilder, String text, int startPos, i
      */
     private void writeStringLabel(StringBuilder stringBuilder, String text, int startPos, int endPos, boolean isFirst, boolean isLast) {
         String line = (isFirst ? "" : " # ") + text.substring(startPos, endPos) + (isLast ? "" : " # ");
-        String wrappedLine = StringUtil.wrap(line, preferences.getLineLength(), OS.NEWLINE);
-        stringBuilder.append(wrappedLine);
+        stringBuilder.append(line);
     }
 }
diff --git a/src/main/java/org/jabref/logic/bibtex/FieldWriterPreferences.java b/src/main/java/org/jabref/logic/bibtex/FieldWriterPreferences.java
index b153ef1a547..d519a18330b 100644
--- a/src/main/java/org/jabref/logic/bibtex/FieldWriterPreferences.java
+++ b/src/main/java/org/jabref/logic/bibtex/FieldWriterPreferences.java
@@ -8,7 +8,6 @@ public class FieldWriterPreferences {
 
     private final boolean resolveStrings;
     private final List<Field> resolveStringsForFields;
-    private final int lineLength = 65; // Constant
     private final FieldContentFormatterPreferences fieldContentFormatterPreferences;
 
     /**
@@ -29,10 +28,6 @@ public List<Field> getResolveStringsForFields() {
         return resolveStringsForFields;
     }
 
-    public int getLineLength() {
-        return lineLength;
-    }
-
     public FieldContentFormatterPreferences getFieldContentFormatterPreferences() {
         return fieldContentFormatterPreferences;
     }
diff --git a/src/main/java/org/jabref/logic/bibtex/FileFieldWriter.java b/src/main/java/org/jabref/logic/bibtex/FileFieldWriter.java
index 68f59c1e403..237e160dfb9 100644
--- a/src/main/java/org/jabref/logic/bibtex/FileFieldWriter.java
+++ b/src/main/java/org/jabref/logic/bibtex/FileFieldWriter.java
@@ -29,6 +29,7 @@ public static String getStringRepresentation(LinkedFile field) {
     /**
      * Encodes a two-dimensional String array into a single string, using ':' and
      * ';' as separators. The characters ':' and ';' are escaped with '\'.
+     *
      * @param values The String array.
      * @return The encoded String.
      */
@@ -41,6 +42,7 @@ public static String encodeStringArray(String[][] values) {
     /**
      * Encodes a String array into a single string, using ':' as separator.
      * The characters ':' and ';' are escaped with '\'.
+     *
      * @param entry The String array.
      * @return The encoded String.
      */
diff --git a/src/main/java/org/jabref/logic/bibtex/comparator/BibtexStringComparator.java b/src/main/java/org/jabref/logic/bibtex/comparator/BibtexStringComparator.java
index cf2ec28a93c..36df24c09e7 100644
--- a/src/main/java/org/jabref/logic/bibtex/comparator/BibtexStringComparator.java
+++ b/src/main/java/org/jabref/logic/bibtex/comparator/BibtexStringComparator.java
@@ -20,7 +20,6 @@ public BibtexStringComparator(boolean considerRefs) {
 
     @Override
     public int compare(BibtexString s1, BibtexString s2) {
-
         int res;
 
         // First check their names:
@@ -36,7 +35,6 @@ public int compare(BibtexString s1, BibtexString s2) {
         // Then, if we are supposed to, see if the ordering needs
         // to be changed because of one string referring to the other.x
         if (considerRefs) {
-
             // First order them:
             BibtexString pre;
             BibtexString post;
diff --git a/src/main/java/org/jabref/logic/bibtex/comparator/EntryComparator.java b/src/main/java/org/jabref/logic/bibtex/comparator/EntryComparator.java
index 3892d220251..7e11b1d8de0 100644
--- a/src/main/java/org/jabref/logic/bibtex/comparator/EntryComparator.java
+++ b/src/main/java/org/jabref/logic/bibtex/comparator/EntryComparator.java
@@ -66,7 +66,7 @@ public int compare(BibEntry e1, BibEntry e2) {
             }
         }
 
-        // If the field is author or editor, we rearrange names so they are
+        // If the field is author or editor, we rearrange names to achieve that they are
         // sorted according to last name.
         if (sortField.getProperties().contains(FieldProperty.PERSON_NAMES)) {
             if (f1 != null) {
diff --git a/src/main/java/org/jabref/logic/bibtex/comparator/GroupDiff.java b/src/main/java/org/jabref/logic/bibtex/comparator/GroupDiff.java
index 4914ed9642d..35c2e5a1338 100644
--- a/src/main/java/org/jabref/logic/bibtex/comparator/GroupDiff.java
+++ b/src/main/java/org/jabref/logic/bibtex/comparator/GroupDiff.java
@@ -23,7 +23,7 @@ public static Optional<GroupDiff> compare(MetaData originalMetaData, MetaData ne
         final Optional<GroupTreeNode> newGroups = newMetaData.getGroups();
 
         if (!originalGroups.equals(newGroups)) {
-            return Optional.of(new GroupDiff(newGroups.orElse(null), originalGroups.orElse(null)));
+            return Optional.of(new GroupDiff(originalGroups.orElse(null), newGroups.orElse(null)));
         } else {
             return Optional.empty();
         }
diff --git a/src/main/java/org/jabref/logic/bst/BibtexWidth.java b/src/main/java/org/jabref/logic/bst/BibtexWidth.java
deleted file mode 100644
index a1e89430333..00000000000
--- a/src/main/java/org/jabref/logic/bst/BibtexWidth.java
+++ /dev/null
@@ -1,243 +0,0 @@
-package org.jabref.logic.bst;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- *
- * The |built_in| function {\.{purify\$}} pops the top (string) literal, removes
- * nonalphanumeric characters except for |white_space| and |sep_char| characters
- * (these get converted to a |space|) and removes certain alphabetic characters
- * contained in the control sequences associated with a special character, and
- * pushes the resulting string. If the literal isn't a string, it complains and
- * pushes the null string.
- *
- */
-public class BibtexWidth {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(BibtexWidth.class);
-
-    /*
-     * Quoted from Bibtex:
-     *
-     * Now we initialize the system-dependent |char_width| array, for which
-     * |space| is the only |white_space| character given a nonzero printing
-     * width. The widths here are taken from Stanford's June~'87 $cmr10$~font
-     * and represent hundredths of a point (rounded), but since they're used
-     * only for relative comparisons, the units have no meaning.
-     */
-
-    private static int[] widths;
-
-    static {
-        if (BibtexWidth.widths == null) {
-            BibtexWidth.widths = new int[128];
-
-            for (int i = 0; i < 128; i++) {
-                BibtexWidth.widths[i] = 0;
-            }
-            BibtexWidth.widths[32] = 278;
-            BibtexWidth.widths[33] = 278;
-            BibtexWidth.widths[34] = 500;
-            BibtexWidth.widths[35] = 833;
-            BibtexWidth.widths[36] = 500;
-            BibtexWidth.widths[37] = 833;
-            BibtexWidth.widths[38] = 778;
-            BibtexWidth.widths[39] = 278;
-            BibtexWidth.widths[40] = 389;
-            BibtexWidth.widths[41] = 389;
-            BibtexWidth.widths[42] = 500;
-            BibtexWidth.widths[43] = 778;
-            BibtexWidth.widths[44] = 278;
-            BibtexWidth.widths[45] = 333;
-            BibtexWidth.widths[46] = 278;
-            BibtexWidth.widths[47] = 500;
-            BibtexWidth.widths[48] = 500;
-            BibtexWidth.widths[49] = 500;
-            BibtexWidth.widths[50] = 500;
-            BibtexWidth.widths[51] = 500;
-            BibtexWidth.widths[52] = 500;
-            BibtexWidth.widths[53] = 500;
-            BibtexWidth.widths[54] = 500;
-            BibtexWidth.widths[55] = 500;
-            BibtexWidth.widths[56] = 500;
-            BibtexWidth.widths[57] = 500;
-            BibtexWidth.widths[58] = 278;
-            BibtexWidth.widths[59] = 278;
-            BibtexWidth.widths[60] = 278;
-            BibtexWidth.widths[61] = 778;
-            BibtexWidth.widths[62] = 472;
-            BibtexWidth.widths[63] = 472;
-            BibtexWidth.widths[64] = 778;
-            BibtexWidth.widths[65] = 750;
-            BibtexWidth.widths[66] = 708;
-            BibtexWidth.widths[67] = 722;
-            BibtexWidth.widths[68] = 764;
-            BibtexWidth.widths[69] = 681;
-            BibtexWidth.widths[70] = 653;
-            BibtexWidth.widths[71] = 785;
-            BibtexWidth.widths[72] = 750;
-            BibtexWidth.widths[73] = 361;
-            BibtexWidth.widths[74] = 514;
-            BibtexWidth.widths[75] = 778;
-            BibtexWidth.widths[76] = 625;
-            BibtexWidth.widths[77] = 917;
-            BibtexWidth.widths[78] = 750;
-            BibtexWidth.widths[79] = 778;
-            BibtexWidth.widths[80] = 681;
-            BibtexWidth.widths[81] = 778;
-            BibtexWidth.widths[82] = 736;
-            BibtexWidth.widths[83] = 556;
-            BibtexWidth.widths[84] = 722;
-            BibtexWidth.widths[85] = 750;
-            BibtexWidth.widths[86] = 750;
-            BibtexWidth.widths[87] = 1028;
-            BibtexWidth.widths[88] = 750;
-            BibtexWidth.widths[89] = 750;
-            BibtexWidth.widths[90] = 611;
-            BibtexWidth.widths[91] = 278;
-            BibtexWidth.widths[92] = 500;
-            BibtexWidth.widths[93] = 278;
-            BibtexWidth.widths[94] = 500;
-            BibtexWidth.widths[95] = 278;
-            BibtexWidth.widths[96] = 278;
-            BibtexWidth.widths[97] = 500;
-            BibtexWidth.widths[98] = 556;
-            BibtexWidth.widths[99] = 444;
-            BibtexWidth.widths[100] = 556;
-            BibtexWidth.widths[101] = 444;
-            BibtexWidth.widths[102] = 306;
-            BibtexWidth.widths[103] = 500;
-            BibtexWidth.widths[104] = 556;
-            BibtexWidth.widths[105] = 278;
-            BibtexWidth.widths[106] = 306;
-            BibtexWidth.widths[107] = 528;
-            BibtexWidth.widths[108] = 278;
-            BibtexWidth.widths[109] = 833;
-            BibtexWidth.widths[110] = 556;
-            BibtexWidth.widths[111] = 500;
-            BibtexWidth.widths[112] = 556;
-            BibtexWidth.widths[113] = 528;
-            BibtexWidth.widths[114] = 392;
-            BibtexWidth.widths[115] = 394;
-            BibtexWidth.widths[116] = 389;
-            BibtexWidth.widths[117] = 556;
-            BibtexWidth.widths[118] = 528;
-            BibtexWidth.widths[119] = 722;
-            BibtexWidth.widths[120] = 528;
-            BibtexWidth.widths[121] = 528;
-            BibtexWidth.widths[122] = 444;
-            BibtexWidth.widths[123] = 500;
-            BibtexWidth.widths[124] = 1000;
-            BibtexWidth.widths[125] = 500;
-            BibtexWidth.widths[126] = 500;
-        }
-    }
-
-    private BibtexWidth() {
-    }
-
-    private static int getSpecialCharWidth(char[] c, int pos) {
-        if ((pos + 1) < c.length) {
-            if ((c[pos] == 'o') && (c[pos + 1] == 'e')) {
-                return 778;
-            }
-            if ((c[pos] == 'O') && (c[pos + 1] == 'E')) {
-                return 1014;
-            }
-            if ((c[pos] == 'a') && (c[pos + 1] == 'e')) {
-                return 722;
-            }
-            if ((c[pos] == 'A') && (c[pos + 1] == 'E')) {
-                return 903;
-            }
-            if ((c[pos] == 's') && (c[pos + 1] == 's')) {
-                return 500;
-            }
-        }
-        return BibtexWidth.getCharWidth(c[pos]);
-    }
-
-    public static int getCharWidth(char c) {
-
-        if ((c >= 0) && (c < 128)) {
-            return BibtexWidth.widths[c];
-        } else {
-            return 0;
-        }
-    }
-
-    public static int width(String toMeasure) {
-
-        /*
-         * From Bibtex: We use the natural width for all but special characters,
-         * and we complain if the string isn't brace-balanced.
-         */
-
-        int i = 0;
-        int n = toMeasure.length();
-        int braceLevel = 0;
-        char[] c = toMeasure.toCharArray();
-        int result = 0;
-
-        /*
-         * From Bibtex:
-         *
-         * We use the natural widths of all characters except that some
-         * characters have no width: braces, control sequences (except for the
-         * usual 13 accented and foreign characters, whose widths are given in
-         * the next module), and |white_space| following control sequences (even
-         * a null control sequence).
-         *
-         */
-        while (i < n) {
-            if (c[i] == '{') {
-                braceLevel++;
-                if ((braceLevel == 1) && ((i + 1) < n) && (c[i + 1] == '\\')) {
-                    i++; // skip brace
-                    while ((i < n) && (braceLevel > 0)) {
-                        i++; // skip backslash
-
-                        int afterBackslash = i;
-                        while ((i < n) && Character.isLetter(c[i])) {
-                            i++;
-                        }
-                        if ((i < n) && (i == afterBackslash)) {
-                            i++; // Skip non-alpha control seq
-                        } else {
-                            if (BibtexCaseChanger.findSpecialChar(c, afterBackslash).isPresent()) {
-                                result += BibtexWidth.getSpecialCharWidth(c, afterBackslash);
-                            }
-                        }
-                        while ((i < n) && Character.isWhitespace(c[i])) {
-                            i++;
-                        }
-                        while ((i < n) && (braceLevel > 0) && (c[i] != '\\')) {
-                            if (c[i] == '}') {
-                                braceLevel--;
-                            } else if (c[i] == '{') {
-                                braceLevel++;
-                            } else {
-                                result += BibtexWidth.getCharWidth(c[i]);
-                            }
-                            i++;
-                        }
-                    }
-                    continue;
-                }
-            } else if (c[i] == '}') {
-                if (braceLevel > 0) {
-                    braceLevel--;
-                } else {
-                    LOGGER.warn("Too many closing braces in string: " + toMeasure);
-                }
-            }
-            result += BibtexWidth.getCharWidth(c[i]);
-            i++;
-        }
-        if (braceLevel > 0) {
-            LOGGER.warn("No enough closing braces in string: " + toMeasure);
-        }
-        return result;
-    }
-}
diff --git a/src/main/java/org/jabref/logic/bst/BstEntry.java b/src/main/java/org/jabref/logic/bst/BstEntry.java
new file mode 100644
index 00000000000..89571de8046
--- /dev/null
+++ b/src/main/java/org/jabref/logic/bst/BstEntry.java
@@ -0,0 +1,21 @@
+package org.jabref.logic.bst;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.jabref.model.entry.BibEntry;
+
+public class BstEntry {
+
+    public final BibEntry entry;
+
+    public final Map<String, String> localStrings = new HashMap<>();
+
+    public final Map<String, String> fields = new HashMap<>();
+
+    public final Map<String, Integer> localIntegers = new HashMap<>();
+
+    public BstEntry(BibEntry e) {
+        this.entry = e;
+    }
+}
diff --git a/src/main/java/org/jabref/logic/bst/BstFunctions.java b/src/main/java/org/jabref/logic/bst/BstFunctions.java
new file mode 100644
index 00000000000..6689f83b2a5
--- /dev/null
+++ b/src/main/java/org/jabref/logic/bst/BstFunctions.java
@@ -0,0 +1,931 @@
+package org.jabref.logic.bst;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Stack;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.jabref.logic.bst.util.BstCaseChanger;
+import org.jabref.logic.bst.util.BstNameFormatter;
+import org.jabref.logic.bst.util.BstPurifier;
+import org.jabref.logic.bst.util.BstTextPrefixer;
+import org.jabref.logic.bst.util.BstWidthCalculator;
+import org.jabref.model.database.BibDatabase;
+import org.jabref.model.entry.Author;
+import org.jabref.model.entry.AuthorList;
+
+import org.antlr.v4.runtime.ParserRuleContext;
+import org.antlr.v4.runtime.tree.ParseTree;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class BstFunctions {
+    private static final Logger LOGGER = LoggerFactory.getLogger(BstFunctions.class);
+    private static final Pattern ADD_PERIOD_PATTERN = Pattern.compile("([^.?!}\\s])(}|\\s)*$");
+
+    private final Map<String, String> strings;
+    private final Map<String, Integer> integers;
+    private final Map<String, BstFunction> functions;
+    private final String preamble;
+
+    private final Stack<Object> stack;
+    private final StringBuilder bbl;
+
+    private int bstWarning = 0;
+
+    @FunctionalInterface
+    public interface BstFunction {
+
+        void execute(BstVMVisitor visitor, ParserRuleContext ctx);
+
+        default void execute(BstVMVisitor visitor, ParserRuleContext ctx, BstEntry bstEntryContext) {
+            this.execute(visitor, ctx);
+        }
+    }
+
+    public BstFunctions(BstVMContext bstVMContext,
+                        StringBuilder bbl) {
+        this.strings = bstVMContext.strings();
+        this.integers = bstVMContext.integers();
+        this.functions = bstVMContext.functions();
+        this.preamble = Optional.ofNullable(bstVMContext.bibDatabase()).flatMap(BibDatabase::getPreamble).orElse("");
+        this.stack = bstVMContext.stack();
+
+        this.bbl = bbl;
+    }
+
+    protected Map<String, BstFunction> getBuiltInFunctions() {
+        Map<String, BstFunction> builtInFunctions = new HashMap<>();
+
+        builtInFunctions.put(">", this::bstIsGreaterThan);
+        builtInFunctions.put("<", this::bstIsLowerThan);
+        builtInFunctions.put("=", this::bstEquals);
+        builtInFunctions.put("+", this::bstAdd);
+        builtInFunctions.put("-", this::bstSubtract);
+        builtInFunctions.put("*", this::bstConcat);
+        builtInFunctions.put(":=", new BstAssignFunction());
+        builtInFunctions.put("add.period$", this::bstAddPeriod);
+        builtInFunctions.put("call.type$", new BstCallTypeFunction());
+        builtInFunctions.put("change.case$", this::bstChangeCase);
+        builtInFunctions.put("chr.to.int$", this::bstChrToInt);
+        builtInFunctions.put("cite$", new BstCiteFunction());
+        builtInFunctions.put("duplicate$", this::bstDuplicate);
+        builtInFunctions.put("empty$", this::bstEmpty);
+        builtInFunctions.put("format.name$", this::bstFormatName);
+        builtInFunctions.put("if$", this::bstIf);
+        builtInFunctions.put("int.to.chr$", this::bstIntToChr);
+        builtInFunctions.put("int.to.str$", this::bstIntToStr);
+        builtInFunctions.put("missing$", this::bstMissing);
+        builtInFunctions.put("newline$", this::bstNewLine);
+        builtInFunctions.put("num.names$", this::bstNumNames);
+        builtInFunctions.put("pop$", this::bstPop);
+        builtInFunctions.put("preamble$", this::bstPreamble);
+        builtInFunctions.put("purify$", this::bstPurify);
+        builtInFunctions.put("quote$", this::bstQuote);
+        builtInFunctions.put("skip$", this::bstSkip);
+        builtInFunctions.put("stack$", this::bstStack);
+        builtInFunctions.put("substring$", this::bstSubstring);
+        builtInFunctions.put("swap$", this::bstSwap);
+        builtInFunctions.put("text.length$", this::bstTextLength);
+        builtInFunctions.put("text.prefix$", this::bstTextPrefix);
+        builtInFunctions.put("top$", this::bstTop);
+        builtInFunctions.put("type$", new BstTypeFunction());
+        builtInFunctions.put("warning$", this::bstWarning);
+        builtInFunctions.put("while$", this::bstWhile);
+        builtInFunctions.put("width$", this::bstWidth);
+        builtInFunctions.put("write$", this::bstWrite);
+
+        return builtInFunctions;
+    }
+
+    /**
+     * Pops the top two (integer) literals, compares them, and pushes
+     * the integer 1 if the second is greater than the first, 0
+     * otherwise.
+     */
+    private void bstIsGreaterThan(BstVMVisitor visitor, ParserRuleContext ctx) {
+        if (stack.size() < 2) {
+            throw new BstVMException("Not enough operands on stack for operation > (line %d)".formatted(ctx.start.getLine()));
+        }
+        Object o2 = stack.pop();
+        Object o1 = stack.pop();
+
+        if (!((o1 instanceof Integer) && (o2 instanceof Integer))) {
+            throw new BstVMException("Can only compare two integers with >");
+        }
+
+        stack.push(((Integer) o1).compareTo((Integer) o2) > 0 ? BstVM.TRUE : BstVM.FALSE);
+    }
+
+    /**
+     * Pops the top two (integer) literals, compares them, and pushes
+     * the integer 1 if the second is lower than the first, 0
+     * otherwise.
+     */
+    private void bstIsLowerThan(BstVMVisitor visitor, ParserRuleContext ctx) {
+        if (stack.size() < 2) {
+            throw new BstVMException("Not enough operands on stack for operation <");
+        }
+        Object o2 = stack.pop();
+        Object o1 = stack.pop();
+
+        if (!((o1 instanceof Integer) && (o2 instanceof Integer))) {
+            throw new BstVMException("Can only compare two integers with < (line %d)".formatted(ctx.start.getLine()));
+        }
+
+        stack.push(((Integer) o1).compareTo((Integer) o2) < 0 ? BstVM.TRUE : BstVM.FALSE);
+    }
+
+    /**
+     * Pops the top two (both integer or both string) literals, compares
+     * them, and pushes the integer 1 if they're equal, 0 otherwise.
+     */
+    private void bstEquals(BstVMVisitor visitor, ParserRuleContext ctx) {
+        if (stack.size() < 2) {
+            throw new BstVMException("Not enough operands on stack for operation = (line %d)".formatted(ctx.start.getLine()));
+        }
+        Object o1 = stack.pop();
+        Object o2 = stack.pop();
+
+        if ((o1 == null) ^ (o2 == null)) {
+            stack.push(BstVM.FALSE);
+            return;
+        }
+
+        if ((o1 == null) && (o2 == null)) {
+            stack.push(BstVM.TRUE);
+            return;
+        }
+
+        stack.push(o1.equals(o2) ? BstVM.TRUE : BstVM.FALSE);
+    }
+
+    /**
+     *  Pops the top two (integer) literals and pushes their sum.
+     */
+    private void bstAdd(BstVMVisitor visitor, ParserRuleContext ctx) {
+        if (stack.size() < 2) {
+            throw new BstVMException("Not enough operands on stack for operation + (line %d)".formatted(ctx.start.getLine()));
+        }
+        Object o2 = stack.pop();
+        Object o1 = stack.pop();
+
+        if (!((o1 instanceof Integer) && (o2 instanceof Integer))) {
+            throw new BstVMException("Can only compare two integers with + (line %d)".formatted(ctx.start.getLine()));
+        }
+
+        stack.push((Integer) o1 + (Integer) o2);
+    }
+
+    /**
+     * Pops the top two (integer) literals and pushes their difference
+     * (the first subtracted from the second).
+     */
+    private void bstSubtract(BstVMVisitor visitor, ParserRuleContext ctx) {
+        if (stack.size() < 2) {
+            throw new BstVMException("Not enough operands on stack for operation - (line %d)".formatted(ctx.start.getLine()));
+        }
+        Object o2 = stack.pop();
+        Object o1 = stack.pop();
+
+        if (!((o1 instanceof Integer) && (o2 instanceof Integer))) {
+            throw new BstVMException("Can only subtract two integers with - (line %d)".formatted(ctx.start.getLine()));
+        }
+
+        stack.push((Integer) o1 - (Integer) o2);
+    }
+
+    /**
+     * Pops the top two (string) literals, concatenates them (in reverse
+     * order, that is, the order in which pushed), and pushes the
+     * resulting string.
+     */
+    private void bstConcat(BstVMVisitor visitor, ParserRuleContext ctx) {
+        if (stack.size() < 2) {
+            throw new BstVMException("Not enough operands on stack for operation * (line %d)".formatted(ctx.start.getLine()));
+        }
+        Object o2 = stack.pop();
+        Object o1 = stack.pop();
+
+        if (o1 == null) {
+            o1 = "";
+        }
+        if (o2 == null) {
+            o2 = "";
+        }
+
+        if (!((o1 instanceof String) && (o2 instanceof String))) {
+            LOGGER.error("o1: {} ({})", o1, o1.getClass());
+            LOGGER.error("o2: {} ({})", o2, o2.getClass());
+            throw new BstVMException("Can only concatenate two String with * (line %d)".formatted(ctx.start.getLine()));
+        }
+
+        stack.push(o1.toString() + o2);
+    }
+
+    /**
+     * Pops the top two literals and assigns to the first (which must be
+     * a global or entry variable) the value of the second.
+     */
+    public class BstAssignFunction implements BstFunction {
+
+        @Override
+        public void execute(BstVMVisitor visitor, ParserRuleContext ctx) {
+            this.execute(visitor, ctx, null);
+        }
+
+        @Override
+        public void execute(BstVMVisitor visitor, ParserRuleContext ctx, BstEntry bstEntry) {
+            if (stack.size() < 2) {
+                throw new BstVMException("Not enough operands on stack for operation := (line %d)".formatted(ctx.start.getLine()));
+            }
+            Object o1 = stack.pop();
+            Object o2 = stack.pop();
+
+            if (!(o1 instanceof BstVMVisitor.Identifier identifier)) {
+                throw new BstVMException("Invalid parameters (line %d)".formatted(ctx.start.getLine()));
+            }
+            String name = identifier.name();
+
+            if (o2 instanceof String value) {
+                if ((bstEntry != null) && bstEntry.localStrings.containsKey(name)) {
+                    bstEntry.localStrings.put(name, value);
+                    return;
+                }
+
+                if (strings.containsKey(name)) {
+                    strings.put(name, value);
+                }
+            } else if (o2 instanceof Integer value) {
+                if ((bstEntry != null) && bstEntry.localIntegers.containsKey(name)) {
+                    bstEntry.localIntegers.put(name, value);
+                    return;
+                }
+
+                if (integers.containsKey(name)) {
+                    integers.put(name, value);
+                }
+            } else {
+                throw new BstVMException("Invalid parameters (line %d)".formatted(ctx.start.getLine()));
+            }
+        }
+    }
+
+    /**
+     * Pops the top (string) literal, adds a `.' to it if the last non
+     * '}' character isn't a `.', `?', or `!', and pushes this resulting
+     * string.
+     */
+    private void bstAddPeriod(BstVMVisitor visitor, ParserRuleContext ctx) {
+        if (stack.isEmpty()) {
+            throw new BstVMException("Not enough operands on stack for operation add.period$ (line %d)".formatted(ctx.start.getLine()));
+        }
+        Object o1 = stack.pop();
+
+        if (!(o1 instanceof String s)) {
+            throw new BstVMException("Can only add a period to a string for add.period$ (line %d)".formatted(ctx.start.getLine()));
+        }
+
+        Matcher m = ADD_PERIOD_PATTERN.matcher(s);
+
+        if (m.find()) {
+            StringBuilder sb = new StringBuilder();
+            m.appendReplacement(sb, m.group(1));
+            sb.append('.');
+            String group2 = m.group(2);
+            if (group2 != null) {
+                sb.append(m.group(2));
+            }
+            stack.push(sb.toString());
+        } else {
+            stack.push(s);
+        }
+    }
+
+    /**
+     * Executes the function whose name is the entry type of an entry.
+     * For example if an entry is of type book, this function executes
+     * the book function. When given as an argument to the ITERATE
+     * command, call.type$ actually produces the output for the entries.
+     * For an entry with an unknown type, it executes the function
+     * default.type. Thus you should define (before the READ command)
+     * one function for each standard entry type as well as a
+     * default.type function.
+     */
+    public class BstCallTypeFunction implements BstFunction {
+        @Override
+        public void execute(BstVMVisitor visitor, ParserRuleContext ctx) {
+            throw new BstVMException("Call.type$ can only be called from within a context (ITERATE or REVERSE). (line %d)".formatted(ctx.start.getLine()));
+        }
+
+        @Override
+        public void execute(BstVMVisitor visitor, ParserRuleContext ctx, BstEntry bstEntry) {
+            if (bstEntry == null) {
+                this.execute(visitor, ctx); // Throw error
+            } else {
+                functions.get(bstEntry.entry.getType().getName()).execute(visitor, ctx, bstEntry);
+            }
+        }
+    }
+
+    /**
+     * Pops the top two (string) literals; it changes the case of the second
+     * according to the specifications of the first, as follows. (Note: The word
+     * `letters' in the next sentence refers only to those at brace-level 0, the
+     * top-most brace level; no other characters are changed, except perhaps for
+     * \special characters", described in Section 4.) If the first literal is the
+     * string `t', it converts to lower case all letters except the very first
+     * character in the string, which it leaves alone, and except the first
+     * character following any colon and then nonnull white space, which it also
+     * leaves alone; if it's the string `l', it converts all letters to lower case;
+     * and if it's the string `u', it converts all letters to upper case. It then
+     * pushes this resulting string. If either type is incorrect, it complains and
+     * pushes the null string; however, if both types are correct but the
+     * specification string (i.e., the first string) isn't one of the legal ones, it
+     * merely pushes the second back onto the stack, after complaining. (Another
+     * note: It ignores case differences in the specification string; for example,
+     * the strings t and T are equivalent for the purposes of this built-in
+     * function.)
+     */
+    private void bstChangeCase(BstVMVisitor visitor, ParserRuleContext ctx) {
+        if (stack.size() < 2) {
+            throw new BstVMException("Not enough operands on stack for operation change.case$ (line %d)".formatted(ctx.start.getLine()));
+        }
+
+        Object o1 = stack.pop();
+        if (!((o1 instanceof String format) && (format.length() == 1))) {
+            throw new BstVMException("A format string of length 1 is needed for change.case$ (line %d)".formatted(ctx.start.getLine()));
+        }
+
+        Object o2 = stack.pop();
+        if (!(o2 instanceof String toChange)) {
+            throw new BstVMException("A string is needed as second parameter for change.case$ (line %d)".formatted(ctx.start.getLine()));
+        }
+
+        stack.push(BstCaseChanger.changeCase(toChange, BstCaseChanger.FormatMode.of(format)));
+    }
+
+    /**
+     * Pops the top (string) literal, makes sure it's a single
+     * character, converts it to the corresponding ASCII integer, and
+     * pushes this integer.
+     */
+    private void bstChrToInt(BstVMVisitor visitor, ParserRuleContext ctx) {
+        if (stack.isEmpty()) {
+            throw new BstVMException("Not enough operands on stack for operation chr.to.int$ (line %d)".formatted(ctx.start.getLine()));
+        }
+        Object o1 = stack.pop();
+
+        if (!((o1 instanceof String s) && (((String) o1).length() == 1))) {
+            throw new BstVMException("Can only perform chr.to.int$ on string with length 1 (line %d)".formatted(ctx.start.getLine()));
+        }
+
+        stack.push((int) s.charAt(0));
+    }
+
+    /**
+     * Pushes the string that was the \cite-command argument for this
+     * entry.
+     */
+    public class BstCiteFunction implements BstFunction {
+        @Override
+        public void execute(BstVMVisitor visitor, ParserRuleContext ctx) {
+            throw new BstVMException("Must have an entry to cite$ (line %d)".formatted(ctx.start.getLine()));
+        }
+
+        @Override
+        public void execute(BstVMVisitor visitor, ParserRuleContext ctx, BstEntry bstEntryContext) {
+            if (bstEntryContext == null) {
+                execute(visitor, ctx);
+                return;
+            }
+
+            stack.push(bstEntryContext.entry.getCitationKey().orElse(null));
+        }
+    }
+
+    /**
+     * Pops the top literal from the stack and pushes two copies of it.
+     */
+    private void bstDuplicate(BstVMVisitor visitor, ParserRuleContext ctx) {
+        if (stack.isEmpty()) {
+            throw new BstVMException("Not enough operands on stack for operation duplicate$ (line %d)".formatted(ctx.start.getLine()));
+        }
+        Object o1 = stack.pop();
+
+        stack.push(o1);
+        stack.push(o1);
+    }
+
+    /**
+     * Pops the top literal and pushes the integer 1 if it's a missing
+     * field or a string having no non-white-space characters, 0
+     * otherwise.
+     */
+    private void bstEmpty(BstVMVisitor visitor, ParserRuleContext ctx) {
+        if (stack.isEmpty()) {
+            throw new BstVMException("Not enough operands on stack for operation empty$ (line %d)".formatted(ctx.start.getLine()));
+        }
+        Object o1 = stack.pop();
+
+        if (o1 == null) {
+            stack.push(BstVM.TRUE);
+            return;
+        }
+
+        if (!(o1 instanceof String s)) {
+            throw new BstVMException("Operand does not match function empty$ (line %d)".formatted(ctx.start.getLine()));
+        }
+
+        stack.push("".equals(s.trim()) ? BstVM.TRUE : BstVM.FALSE);
+    }
+
+    /**
+     * The |built_in| function {\.{format.name\$}} pops the
+     * top three literals (they are a string, an integer, and a string
+     * literal, in that order). The last string literal represents a
+     * name list (each name corresponding to a person), the integer
+     * literal specifies which name to pick from this list, and the
+     * first string literal specifies how to format this name, as
+     * described in the \BibTeX\ documentation. Finally, this function
+     * pushes the formatted name. If any of the types is incorrect, it
+     * complains and pushes the null string.
+     */
+    private void bstFormatName(BstVMVisitor visitor, ParserRuleContext ctx) {
+        if (stack.size() < 3) {
+            throw new BstVMException("Not enough operands on stack for operation format.name$ (line %d)".formatted(ctx.start.getLine()));
+        }
+        Object o1 = stack.pop();
+        Object o2 = stack.pop();
+        Object o3 = stack.pop();
+
+        if (!(o1 instanceof String) && !(o2 instanceof Integer) && !(o3 instanceof String)) {
+            // warning("A string is needed for change.case$");
+            stack.push("");
+            return;
+        }
+
+        String format = (String) o1;
+        Integer name = (Integer) o2;
+        String names = (String) o3;
+
+        if (names == null) {
+            stack.push("");
+        } else {
+            AuthorList a = AuthorList.parse(names);
+            if (name > a.getNumberOfAuthors()) {
+                throw new BstVMException("Author Out of Bounds. Number %d invalid for %s (line %d)".formatted(name, names, ctx.start.getLine()));
+            }
+            Author author = a.getAuthor(name - 1);
+
+            stack.push(BstNameFormatter.formatName(author, format));
+        }
+    }
+
+    /**
+     * Pops the top three literals (they are two function literals and
+     * an integer literal, in that order); if the integer is greater
+     * than 0, it executes the second literal, else it executes the
+     * first.
+     */
+    private void bstIf(BstVMVisitor visitor, ParserRuleContext ctx) {
+        if (stack.size() < 3) {
+            throw new BstVMException("Not enough operands on stack for if$ (line %d)".formatted(ctx.start.getLine()));
+        }
+
+        Object f1 = stack.pop();
+        Object f2 = stack.pop();
+        Object i = stack.pop();
+
+        if (!((f1 instanceof BstVMVisitor.Identifier) || (f1 instanceof ParseTree))
+                && ((f2 instanceof BstVMVisitor.Identifier) || (f2 instanceof ParseTree))
+                && (i instanceof Integer)) {
+            throw new BstVMException("Expecting two functions and an integer for if$ (line %d)".formatted(ctx.start.getLine()));
+        }
+
+        if (((Integer) i) > 0) {
+            callIdentifierOrTree(f2, visitor, ctx);
+        } else {
+            callIdentifierOrTree(f1, visitor, ctx);
+        }
+    }
+
+    private void callIdentifierOrTree(Object f, BstVMVisitor visitor, ParserRuleContext ctx) {
+        if (f instanceof ParseTree tree) {
+            visitor.visit(tree);
+        } else if (f instanceof BstVMVisitor.Identifier identifier) {
+            visitor.resolveIdentifier(identifier.name(), ctx);
+        } else {
+            stack.push(f);
+        }
+    }
+
+    /**
+     * Pops the top (integer) literal, interpreted as the ASCII integer
+     * value of a single character, converts it to the corresponding
+     * single-character string, and pushes this string.
+     */
+    private void bstIntToChr(BstVMVisitor visitor, ParserRuleContext ctx) {
+        if (stack.isEmpty()) {
+            throw new BstVMException("Not enough operands on stack for operation int.to.chr$ (line %d)".formatted(ctx.start.getLine()));
+        }
+        Object o1 = stack.pop();
+
+        if (!(o1 instanceof Integer i)) {
+            throw new BstVMException("Can only perform operation int.to.chr$ on an Integer (line %d)".formatted(ctx.start.getLine()));
+        }
+
+        stack.push(String.valueOf((char) i.intValue()));
+    }
+
+    /**
+     * Pops the top (integer) literal, converts it to its (unique)
+     * string equivalent, and pushes this string.
+     */
+    private void bstIntToStr(BstVMVisitor visitor, ParserRuleContext ctx) {
+        if (stack.isEmpty()) {
+            throw new BstVMException("Not enough operands on stack for operation int.to.str$ (line %d)".formatted(ctx.start.getLine()));
+        }
+        Object o1 = stack.pop();
+
+        if (!(o1 instanceof Integer)) {
+            throw new BstVMException("Can only transform an integer to an string using int.to.str$ (line %d)".formatted(ctx.start.getLine()));
+        }
+
+        stack.push(o1.toString());
+    }
+
+    /**
+     * Pops the top literal and pushes the integer 1 if it's a missing
+     * field, 0 otherwise.
+     */
+    private void bstMissing(BstVMVisitor visitor, ParserRuleContext ctx) {
+        if (stack.isEmpty()) {
+            throw new BstVMException("Not enough operands on stack for operation missing$ (line %d)".formatted(ctx.start.getLine()));
+        }
+        Object o1 = stack.pop();
+
+        if (o1 == null) {
+            stack.push(BstVM.TRUE);
+            return;
+        }
+
+        if (!(o1 instanceof String)) {
+            LOGGER.warn("Not a string or missing field in operation missing$ (line %d)".formatted(ctx.start.getLine()));
+            stack.push(BstVM.TRUE);
+            return;
+        }
+
+        stack.push(BstVM.FALSE);
+    }
+
+    /**
+     * Writes onto the bbl file what is accumulated in the output buffer.
+     * It writes a blank line if and only if the output buffer is empty.
+     * Since write$ does reasonable line breaking, you should use this
+     * function only when you want a blank line or an explicit line
+     * break.
+     */
+    private void bstNewLine(BstVMVisitor visitor, ParserRuleContext ctx) {
+        this.bbl.append('\n');
+    }
+
+    /**
+     * Pops the top (string) literal and pushes the number of names the
+     * string represents one plus the number of occurrences of the
+     * substring "and" (ignoring case differences) surrounded by
+     * non-null white-space at the top brace level.
+     */
+    private void bstNumNames(BstVMVisitor visitor, ParserRuleContext ctx) {
+        if (stack.isEmpty()) {
+            throw new BstVMException("Not enough operands on stack for operation num.names$ (line %d)".formatted(ctx.start.getLine()));
+        }
+        Object o1 = stack.pop();
+
+        if (!(o1 instanceof String s)) {
+            throw new BstVMException("Need a string at the top of the stack for num.names$ (line %d)".formatted(ctx.start.getLine()));
+        }
+
+        stack.push(AuthorList.parse(s).getNumberOfAuthors());
+    }
+
+    /**
+     * Pops the top of the stack but doesn't print it; this gets rid of
+     * an unwanted stack literal.
+     */
+    private void bstPop(BstVMVisitor visitor, ParserRuleContext ctx) {
+        stack.pop();
+    }
+
+    /**
+     * The |built_in| function {\.{preamble\$}} pushes onto the stack
+     * the concatenation of all the \.{preamble} strings read from the
+     * database files. (or the empty string if there were none)
+     * '@PREAMBLE' strings are read from the database files.
+     */
+    private void bstPreamble(BstVMVisitor visitor, ParserRuleContext ctx) {
+        stack.push(preamble);
+    }
+
+    /**
+     * Pops the top (string) literal, removes nonalphanumeric characters
+     * except for white-space characters and hyphens and ties (these all get
+     * converted to a space), removes certain alphabetic characters
+     * contained in the control sequences associated with a \special
+     * character", and pushes the resulting string.
+     */
+    private void bstPurify(BstVMVisitor visitor, ParserRuleContext ctx) {
+        if (stack.isEmpty()) {
+            throw new BstVMException("Not enough operands on stack for operation purify$ (line %d)".formatted(ctx.start.getLine()));
+        }
+        Object o1 = stack.pop();
+
+        if (!(o1 instanceof String)) {
+            LOGGER.warn("A string is needed for purify$");
+            stack.push("");
+            return;
+        }
+
+        stack.push(BstPurifier.purify((String) o1));
+    }
+
+    /**
+     * Pushes the string consisting of the double-quote character.
+     */
+    private void bstQuote(BstVMVisitor visitor, ParserRuleContext ctx) {
+        stack.push("\"");
+    }
+
+    /**
+     * Does nothing.
+     */
+    private void bstSkip(BstVMVisitor visitor, ParserRuleContext ctx) {
+        // no-op
+    }
+
+    /**
+     * Pops and prints the whole stack; it's meant to be used for style
+     * designers while debugging.
+     */
+    private void bstStack(BstVMVisitor visitor, ParserRuleContext ctx) {
+        while (!stack.empty()) {
+            LOGGER.debug("Stack entry {}", stack.pop());
+        }
+    }
+
+    /**
+     * Pops the top three literals (they are the two integers literals
+     * len and start, and a string literal, in that order). It pushes
+     * the substring of the (at most) len consecutive characters
+     * starting at the startth character (assuming 1-based indexing) if
+     * start is positive, and ending at the start-th character
+     * (including) from the end if start is negative (where the first
+     * character from the end is the last character).
+     */
+    private void bstSubstring(BstVMVisitor visitor, ParserRuleContext ctx) {
+        if (stack.size() < 3) {
+            throw new BstVMException("Not enough operands on stack for operation substring$ (line %d)".formatted(ctx.start.getLine()));
+        }
+        Object o1 = stack.pop();
+        Object o2 = stack.pop();
+        Object o3 = stack.pop();
+
+        if (!((o1 instanceof Integer len) && (o2 instanceof Integer start) && (o3 instanceof String s))) {
+            throw new BstVMException("Expecting two integers and a string for substring$ (line %d)".formatted(ctx.start.getLine()));
+        }
+
+        int lenI = len;
+        int startI = start;
+
+        if (lenI > (Integer.MAX_VALUE / 2)) {
+            lenI = Integer.MAX_VALUE / 2;
+        }
+
+        if (startI > (Integer.MAX_VALUE / 2)) {
+            startI = Integer.MAX_VALUE / 2;
+        }
+
+        if (startI < (Integer.MIN_VALUE / 2)) {
+            startI = -Integer.MIN_VALUE / 2;
+        }
+
+        if (startI < 0) {
+            startI += s.length() + 1;
+            startI = Math.max(1, (startI + 1) - lenI);
+        }
+        stack.push(s.substring(startI - 1, Math.min((startI - 1) + lenI, s.length())));
+    }
+
+    /**
+     * Swaps the top two literals on the stack. text.length$ Pops the
+     * top (string) literal, and pushes the number of text characters
+     * it contains, where an accented character (more precisely, a
+     * \special character", defined in Section 4) counts as a single
+     * text character, even if it's missing its matching right brace,
+     * and where braces don't count as text characters.
+     */
+    private void bstSwap(BstVMVisitor visitor, ParserRuleContext ctx) {
+        if (stack.size() < 2) {
+            throw new BstVMException("Not enough operands on stack for operation swap$ (line %d)".formatted(ctx.start.getLine()));
+        }
+        Object f1 = stack.pop();
+        Object f2 = stack.pop();
+
+        stack.push(f1);
+        stack.push(f2);
+    }
+
+    /**
+     * text.length$ Pops the top (string) literal, and pushes the number
+     * of text characters it contains, where an accented character (more
+     * precisely, a "special character", defined in Section 4) counts as
+     * a single text character, even if it's missing its matching right
+     * brace, and where braces don't count as text characters.
+     *
+     * From BibTeXing: For the purposes of counting letters in labels,
+     * BibTEX considers everything contained inside the braces as a
+     * single letter.
+     */
+    private void bstTextLength(BstVMVisitor visitor, ParserRuleContext ctx) {
+        if (stack.isEmpty()) {
+            throw new BstVMException("Not enough operands on stack for operation text.length$ (line %d)".formatted(ctx.start.getLine()));
+        }
+        Object o1 = stack.pop();
+
+        if (!(o1 instanceof String s)) {
+            throw new BstVMException("Can only perform operation on a string text.length$ (line %d)".formatted(ctx.start.getLine()));
+        }
+
+        char[] c = s.toCharArray();
+        int result = 0;
+        int i = 0;
+        int n = s.length();
+        int braceLevel = 0;
+
+        while (i < n) {
+            i++;
+            if (c[i - 1] == '{') {
+                braceLevel++;
+                if ((braceLevel == 1) && (i < n)) {
+                    if (c[i] == '\\') {
+                        i++; // skip over backslash
+                        while ((i < n) && (braceLevel > 0)) {
+                            if (c[i] == '}') {
+                                braceLevel--;
+                            } else if (c[i] == '{') {
+                                braceLevel++;
+                            }
+                            i++;
+                        }
+                        result++;
+                    }
+                }
+            } else if (c[i - 1] == '}') {
+                if (braceLevel > 0) {
+                    braceLevel--;
+                }
+            } else {
+                result++;
+            }
+        }
+        stack.push(result);
+    }
+
+    /**
+     * Pops the top two literals (the integer literal len and a string
+     * literal, in that order). It pushes the substring of the (at most) len
+     * consecutive text characters starting from the beginning of the
+     * string. This function is similar to substring$, but this one
+     * considers a \special character", even if it's missing its matching
+     * right brace, to be a single text character (rather than however many
+     * ASCII characters it actually comprises), and this function doesn't
+     * consider braces to be text characters; furthermore, this function
+     * appends any needed matching right braces.
+     */
+    private void bstTextPrefix(BstVMVisitor visitor, ParserRuleContext ctx) {
+        if (stack.size() < 2) {
+            throw new BstVMException("Not enough operands on stack for operation text.prefix$ (line %d)".formatted(ctx.start.getLine()));
+        }
+
+        Object o1 = stack.pop();
+        if (!(o1 instanceof Integer)) {
+            LOGGER.warn("An integer is needed as first parameter to text.prefix$ (line {})", ctx.start.getLine());
+            stack.push("");
+            return;
+        }
+
+        Object o2 = stack.pop();
+        if (!(o2 instanceof String)) {
+            LOGGER.warn("A string is needed as second parameter to text.prefix$ (line {})", ctx.start.getLine());
+            stack.push("");
+            return;
+        }
+
+        stack.push(BstTextPrefixer.textPrefix((Integer) o1, (String) o2));
+    }
+
+    /**
+     * Pops and prints the top of the stack to the log file. It's useful for debugging.
+     */
+    private void bstTop(BstVMVisitor visitor, ParserRuleContext ctx) {
+        LOGGER.debug("Stack entry {} (line {})", stack.pop(), ctx.start.getLine());
+    }
+
+    /**
+     * Pushes the current entry's type (book, article, etc.), but pushes
+     * the null string if the type is either unknown or undefined.
+     */
+    public class BstTypeFunction implements BstFunction {
+        @Override
+        public void execute(BstVMVisitor visitor, ParserRuleContext ctx) {
+            throw new BstVMException("type$ need a context (line %d)".formatted(ctx.start.getLine()));
+        }
+
+        @Override
+        public void execute(BstVMVisitor visitor, ParserRuleContext ctx, BstEntry bstEntryContext) {
+            if (bstEntryContext == null) {
+                this.execute(visitor, ctx);
+                return;
+            }
+
+            stack.push(bstEntryContext.entry.getType().getName());
+        }
+    }
+
+    /**
+     * Pops the top (string) literal and prints it following a warning
+     * message. This also increments a count of the number of warning
+     * messages issued.
+     */
+    private void bstWarning(BstVMVisitor visitor, ParserRuleContext ctx) {
+        LOGGER.warn("Warning (#{}): {}", bstWarning++, stack.pop());
+    }
+
+    /**
+     * Pops the top two (function) literals, and keeps executing the
+     * second as long as the (integer) literal left on the stack by
+     * executing the first is greater than 0.
+     */
+    private void bstWhile(BstVMVisitor visitor, ParserRuleContext ctx) {
+        if (stack.size() < 2) {
+            throw new BstVMException("Not enough operands on stack for operation while$ (line %d)".formatted(ctx.start.getLine()));
+        }
+        Object f2 = stack.pop();
+        Object f1 = stack.pop();
+
+        if (!((f1 instanceof BstVMVisitor.Identifier) || (f1 instanceof ParseTree))
+                && ((f2 instanceof BstVMVisitor.Identifier) || (f2 instanceof ParseTree))) {
+            throw new BstVMException("Expecting two functions for while$ (line %d)".formatted(ctx.start.getLine()));
+        }
+
+        do {
+            visitor.visit((ParseTree) f1);
+
+            Object i = stack.pop();
+            if (!(i instanceof Integer)) {
+                throw new BstVMException("First parameter to while has to return an integer but was %s (line %d)"
+                        .formatted(i.toString(), ctx.start.getLine()));
+            }
+            if ((Integer) i <= 0) {
+                break;
+            }
+            visitor.visit((ParseTree) f2);
+        } while (true);
+    }
+
+    /**
+     * The |built_in| function {\.{width\$}} pops the top (string) literal and
+     * pushes the integer that represents its width in units specified by the
+     * |char_width| array. This function takes the literal literally; that is, it
+     * assumes each character in the string is to be printed as is, regardless of
+     * whether the character has a special meaning to \TeX, except that special
+     * characters (even without their |right_brace|s) are handled specially. If the
+     * literal isn't a string, it complains and pushes~0.
+     */
+    private void bstWidth(BstVMVisitor visitor, ParserRuleContext ctx) {
+        if (stack.isEmpty()) {
+            throw new BstVMException("Not enough operands on stack for operation width$ (line %d)".formatted(ctx.start.getLine()));
+        }
+        Object o1 = stack.pop();
+
+        if (!(o1 instanceof String)) {
+            LOGGER.warn("A string is needed for width$");
+            stack.push(0);
+            return;
+        }
+
+        stack.push(BstWidthCalculator.width((String) o1));
+    }
+
+    /**
+     * Pops the top (string) literal and writes it on the output buffer
+     * (which will result in stuff being written onto the bbl file when
+     * the buffer fills up).
+     */
+    private void bstWrite(BstVMVisitor visitor, ParserRuleContext ctx) {
+        String s = (String) stack.pop();
+        bbl.append(s);
+    }
+}
diff --git a/src/main/java/org/jabref/logic/bst/BstPreviewLayout.java b/src/main/java/org/jabref/logic/bst/BstPreviewLayout.java
index d0c040842fd..a002d388e60 100644
--- a/src/main/java/org/jabref/logic/bst/BstPreviewLayout.java
+++ b/src/main/java/org/jabref/logic/bst/BstPreviewLayout.java
@@ -23,7 +23,7 @@ public class BstPreviewLayout implements PreviewLayout {
 
     private final String name;
 
-    private VM vm;
+    private BstVM bstVM;
     private String error;
 
     public BstPreviewLayout(Path path) {
@@ -34,7 +34,7 @@ public BstPreviewLayout(Path path) {
             return;
         }
         try {
-            vm = new VM(path.toFile());
+            bstVM = new BstVM(path);
         } catch (Exception e) {
             LOGGER.error("Could not read {}.", path.toAbsolutePath(), e);
             error = Localization.lang("Error opening file '%0'.", path.toString());
@@ -49,7 +49,7 @@ public String generatePreview(BibEntry originalEntry, BibDatabaseContext databas
         // ensure that the entry is of BibTeX format (and do not modify the original entry)
         BibEntry entry = (BibEntry) originalEntry.clone();
         new ConvertToBibtexCleanup().cleanup(entry);
-        String result = vm.run(List.of(entry));
+        String result = bstVM.render(List.of(entry));
         // Remove all comments
         result = result.replaceAll("%.*", "");
         // Remove all LaTeX comments
diff --git a/src/main/java/org/jabref/logic/bst/BstVM.java b/src/main/java/org/jabref/logic/bst/BstVM.java
new file mode 100644
index 00000000000..a2428d683d9
--- /dev/null
+++ b/src/main/java/org/jabref/logic/bst/BstVM.java
@@ -0,0 +1,114 @@
+package org.jabref.logic.bst;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Objects;
+import java.util.Stack;
+
+import org.jabref.model.database.BibDatabase;
+import org.jabref.model.entry.BibEntry;
+
+import org.antlr.v4.runtime.BailErrorStrategy;
+import org.antlr.v4.runtime.BaseErrorListener;
+import org.antlr.v4.runtime.CharStream;
+import org.antlr.v4.runtime.CharStreams;
+import org.antlr.v4.runtime.CommonTokenStream;
+import org.antlr.v4.runtime.RecognitionException;
+import org.antlr.v4.runtime.Recognizer;
+import org.antlr.v4.runtime.misc.ParseCancellationException;
+import org.antlr.v4.runtime.tree.ParseTree;
+
+public class BstVM {
+
+    protected static final Integer FALSE = 0;
+    protected static final Integer TRUE = 1;
+
+    protected final ParseTree tree;
+    protected BstVMContext latestContext; // for testing
+
+    private Path path = null;
+
+    public BstVM(Path path) throws RecognitionException, IOException {
+        this(CharStreams.fromPath(path));
+        this.path = path;
+    }
+
+    public BstVM(String s) throws RecognitionException {
+        this(CharStreams.fromString(s));
+    }
+
+    protected BstVM(CharStream bst) throws RecognitionException {
+        this(charStream2CommonTree(bst));
+    }
+
+    private BstVM(ParseTree tree) {
+        this.tree = tree;
+    }
+
+    private static ParseTree charStream2CommonTree(CharStream query) {
+        BstLexer lexer = new BstLexer(query);
+        lexer.removeErrorListeners();
+        lexer.addErrorListener(ThrowingErrorListener.INSTANCE);
+        BstParser parser = new BstParser(new CommonTokenStream(lexer));
+        parser.removeErrorListeners();
+        parser.addErrorListener(ThrowingErrorListener.INSTANCE);
+        parser.setErrorHandler(new BailErrorStrategy());
+        return parser.bstFile();
+    }
+
+    /**
+     * Transforms the given list of BibEntries to a rendered list of references using the parsed bst program
+     *
+     * @param bibEntries  list of entries to convert
+     * @param bibDatabase (may be null) the bibDatabase used for resolving strings / crossref
+     * @return list of references in plain text form
+     */
+    public String render(Collection<BibEntry> bibEntries, BibDatabase bibDatabase) {
+        Objects.requireNonNull(bibEntries);
+
+        List<BstEntry> entries = new ArrayList<>(bibEntries.size());
+        for (BibEntry entry : bibEntries) {
+            entries.add(new BstEntry(entry));
+        }
+
+        StringBuilder resultBuffer = new StringBuilder();
+
+        BstVMContext bstVMContext = new BstVMContext(entries, bibDatabase, path);
+        bstVMContext.functions().putAll(new BstFunctions(bstVMContext, resultBuffer).getBuiltInFunctions());
+        bstVMContext.integers().put("entry.max$", Integer.MAX_VALUE);
+        bstVMContext.integers().put("global.max$", Integer.MAX_VALUE);
+
+        BstVMVisitor bstVMVisitor = new BstVMVisitor(bstVMContext, resultBuffer);
+        bstVMVisitor.visit(tree);
+
+        latestContext = bstVMContext;
+
+        return resultBuffer.toString();
+    }
+
+    public String render(Collection<BibEntry> bibEntries) {
+        return render(bibEntries, null);
+    }
+
+    protected Stack<Object> getStack() {
+        if (latestContext != null) {
+            return latestContext.stack();
+        } else {
+            throw new BstVMException("BstVM must have rendered at least once to provide the latest stack");
+        }
+    }
+
+    private static class ThrowingErrorListener extends BaseErrorListener {
+        public static final ThrowingErrorListener INSTANCE = new ThrowingErrorListener();
+
+        @Override
+        public void syntaxError(Recognizer<?, ?> recognizer, Object offendingSymbol,
+                                int line, int charPositionInLine, String msg, RecognitionException e)
+                throws ParseCancellationException {
+            throw new ParseCancellationException("line " + line + ":" + charPositionInLine + " " + msg);
+        }
+    }
+}
diff --git a/src/main/java/org/jabref/logic/bst/BstVMContext.java b/src/main/java/org/jabref/logic/bst/BstVMContext.java
new file mode 100644
index 00000000000..8a98f605dd8
--- /dev/null
+++ b/src/main/java/org/jabref/logic/bst/BstVMContext.java
@@ -0,0 +1,22 @@
+package org.jabref.logic.bst;
+
+import java.nio.file.Path;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Stack;
+
+import org.jabref.model.database.BibDatabase;
+
+public record BstVMContext(List<BstEntry> entries,
+                           Map<String, String> strings,
+                           Map<String, Integer> integers,
+                           Map<String, BstFunctions.BstFunction> functions,
+                           Stack<Object> stack,
+                           BibDatabase bibDatabase,
+                           Optional<Path> path) {
+    public BstVMContext(List<BstEntry> entries, BibDatabase bibDatabase, Path path) {
+        this(entries, new HashMap<>(), new HashMap<>(), new HashMap<>(), new Stack<>(), bibDatabase, Optional.ofNullable(path));
+    }
+}
diff --git a/src/main/java/org/jabref/logic/bst/BstVMException.java b/src/main/java/org/jabref/logic/bst/BstVMException.java
new file mode 100644
index 00000000000..2851166d094
--- /dev/null
+++ b/src/main/java/org/jabref/logic/bst/BstVMException.java
@@ -0,0 +1,7 @@
+package org.jabref.logic.bst;
+
+public class BstVMException extends RuntimeException {
+    public BstVMException(String string) {
+        super(string);
+    }
+}
diff --git a/src/main/java/org/jabref/logic/bst/BstVMVisitor.java b/src/main/java/org/jabref/logic/bst/BstVMVisitor.java
new file mode 100644
index 00000000000..a815480e506
--- /dev/null
+++ b/src/main/java/org/jabref/logic/bst/BstVMVisitor.java
@@ -0,0 +1,263 @@
+package org.jabref.logic.bst;
+
+import java.util.Comparator;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Map;
+
+import org.jabref.logic.bibtex.FieldContentFormatterPreferences;
+import org.jabref.logic.bibtex.FieldWriter;
+import org.jabref.logic.bibtex.FieldWriterPreferences;
+import org.jabref.logic.bibtex.InvalidFieldValueException;
+import org.jabref.model.entry.Month;
+import org.jabref.model.entry.field.Field;
+import org.jabref.model.entry.field.FieldFactory;
+import org.jabref.model.entry.field.StandardField;
+
+import org.antlr.v4.runtime.ParserRuleContext;
+import org.antlr.v4.runtime.tree.ParseTree;
+import org.antlr.v4.runtime.tree.TerminalNode;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+class BstVMVisitor extends BstBaseVisitor<Integer> {
+    private static final Logger LOGGER = LoggerFactory.getLogger(BstVMVisitor.class);
+
+    private final BstVMContext bstVMContext;
+    private final StringBuilder bbl;
+
+    private BstEntry selectedBstEntry = null;
+
+    public record Identifier(String name) {
+    }
+
+    public BstVMVisitor(BstVMContext bstVMContext, StringBuilder bbl) {
+        this.bstVMContext = bstVMContext;
+        this.bbl = bbl;
+    }
+
+    @Override
+    public Integer visitStringsCommand(BstParser.StringsCommandContext ctx) {
+        if (ctx.ids.identifier().size() > 20) {
+            throw new BstVMException("Strings limit reached");
+        }
+
+        for (BstParser.IdentifierContext identifierContext : ctx.ids.identifier()) {
+            bstVMContext.strings().put(identifierContext.getText(), null);
+        }
+        return BstVM.TRUE;
+    }
+
+    @Override
+    public Integer visitIntegersCommand(BstParser.IntegersCommandContext ctx) {
+        for (BstParser.IdentifierContext identifierContext : ctx.ids.identifier()) {
+            bstVMContext.integers().put(identifierContext.getText(), 0);
+        }
+        return BstVM.TRUE;
+    }
+
+    @Override
+    public Integer visitFunctionCommand(BstParser.FunctionCommandContext ctx) {
+        bstVMContext.functions().put(ctx.id.getText(),
+                (visitor, functionContext) -> visitor.visit(ctx.function));
+        return BstVM.TRUE;
+    }
+
+    @Override
+    public Integer visitMacroCommand(BstParser.MacroCommandContext ctx) {
+        String replacement = ctx.repl.getText().substring(1, ctx.repl.getText().length() - 1);
+        bstVMContext.functions().put(ctx.id.getText(),
+                (visitor, functionContext) -> bstVMContext.stack().push(replacement));
+        return BstVM.TRUE;
+    }
+
+    @Override
+    public Integer visitReadCommand(BstParser.ReadCommandContext ctx) {
+        FieldWriter fieldWriter = new FieldWriter(new FieldWriterPreferences(true, List.of(StandardField.MONTH), new FieldContentFormatterPreferences()));
+        for (BstEntry e : bstVMContext.entries()) {
+            for (Map.Entry<String, String> mEntry : e.fields.entrySet()) {
+                Field field = FieldFactory.parseField(mEntry.getKey());
+                String fieldValue = e.entry.getResolvedFieldOrAlias(field, bstVMContext.bibDatabase())
+                                           .map(content -> {
+                                               try {
+                                                   String result = fieldWriter.write(field, content);
+                                                   if (result.startsWith("{")) {
+                                                       // Strip enclosing {} from the output
+                                                       return result.substring(1, result.length() - 1);
+                                                   }
+                                                   if (field == StandardField.MONTH) {
+                                                       // We don't have the internal BibTeX strings at hand.
+                                                       // Thus, we look up the full month name in the generic table.
+                                                       return Month.parse(result)
+                                                                   .map(Month::getFullName)
+                                                                   .orElse(result);
+                                                   }
+                                                   return result;
+                                               } catch (
+                                                       InvalidFieldValueException invalidFieldValueException) {
+                                                   // in case there is something wrong with the content, just return the content itself
+                                                   return content;
+                                               }
+                                           })
+                                           .orElse(null);
+                mEntry.setValue(fieldValue);
+            }
+        }
+
+        for (BstEntry e : bstVMContext.entries()) {
+            if (!e.fields.containsKey(StandardField.CROSSREF.getName())) {
+                e.fields.put(StandardField.CROSSREF.getName(), null);
+            }
+        }
+
+        return BstVM.TRUE;
+    }
+
+    @Override
+    public Integer visitExecuteCommand(BstParser.ExecuteCommandContext ctx) {
+        this.selectedBstEntry = null;
+        visit(ctx.bstFunction());
+
+        return BstVM.TRUE;
+    }
+
+    @Override
+    public Integer visitIterateCommand(BstParser.IterateCommandContext ctx) {
+        for (BstEntry entry : bstVMContext.entries()) {
+            this.selectedBstEntry = entry;
+            visit(ctx.bstFunction());
+        }
+
+        return BstVM.TRUE;
+    }
+
+    @Override
+    public Integer visitReverseCommand(BstParser.ReverseCommandContext ctx) {
+        ListIterator<BstEntry> i = bstVMContext.entries().listIterator(bstVMContext.entries().size());
+        while (i.hasPrevious()) {
+            this.selectedBstEntry = i.previous();
+            visit(ctx.bstFunction());
+        }
+
+        return BstVM.TRUE;
+    }
+
+    @Override
+    public Integer visitEntryCommand(BstParser.EntryCommandContext ctx) {
+        // ENTRY command contains 3 optionally filled identifier lists:
+        // Fields, Integers and Strings
+
+        BstParser.IdListOptContext entryFields = ctx.idListOpt(0);
+        for (BstParser.IdentifierContext identifierContext : entryFields.identifier()) {
+            for (BstEntry entry : bstVMContext.entries()) {
+                entry.fields.put(identifierContext.getText(), null);
+            }
+        }
+
+        BstParser.IdListOptContext entryIntegers = ctx.idListOpt(1);
+        for (BstParser.IdentifierContext identifierContext : entryIntegers.identifier()) {
+            for (BstEntry entry : bstVMContext.entries()) {
+                entry.localIntegers.put(identifierContext.getText(), 0);
+            }
+        }
+
+        BstParser.IdListOptContext entryStrings = ctx.idListOpt(2);
+        for (BstParser.IdentifierContext identifierContext : entryStrings.identifier()) {
+            for (BstEntry entry : bstVMContext.entries()) {
+                entry.localStrings.put(identifierContext.getText(), null);
+            }
+        }
+
+        for (BstEntry entry : bstVMContext.entries()) {
+            entry.localStrings.put("sort.key$", null);
+        }
+
+        return BstVM.TRUE;
+    }
+
+    @Override
+    public Integer visitSortCommand(BstParser.SortCommandContext ctx) {
+        bstVMContext.entries().sort(Comparator.comparing(o -> (o.localStrings.get("sort.key$"))));
+        return BstVM.TRUE;
+    }
+
+    @Override
+    public Integer visitIdentifier(BstParser.IdentifierContext ctx) {
+        resolveIdentifier(ctx.IDENTIFIER().getText(), ctx);
+        return BstVM.TRUE;
+    }
+
+    protected void resolveIdentifier(String name, ParserRuleContext ctx) {
+        if (selectedBstEntry != null) {
+            if (selectedBstEntry.fields.containsKey(name)) {
+                bstVMContext.stack().push(selectedBstEntry.fields.get(name));
+                return;
+            }
+            if (selectedBstEntry.localStrings.containsKey(name)) {
+                bstVMContext.stack().push(selectedBstEntry.localStrings.get(name));
+                return;
+            }
+            if (selectedBstEntry.localIntegers.containsKey(name)) {
+                bstVMContext.stack().push(selectedBstEntry.localIntegers.get(name));
+                return;
+            }
+        }
+
+        if (bstVMContext.strings().containsKey(name)) {
+            bstVMContext.stack().push(bstVMContext.strings().get(name));
+            return;
+        }
+        if (bstVMContext.integers().containsKey(name)) {
+            bstVMContext.stack().push(bstVMContext.integers().get(name));
+            return;
+        }
+        if (bstVMContext.functions().containsKey(name)) {
+            bstVMContext.functions().get(name).execute(this, ctx);
+            return;
+        }
+
+        throw new BstVMException("No matching identifier found: " + name);
+    }
+
+    @Override
+    public Integer visitBstFunction(BstParser.BstFunctionContext ctx) {
+        String name = ctx.getChild(0).getText();
+        if (bstVMContext.functions().containsKey(name)) {
+            bstVMContext.functions().get(name).execute(this, ctx, selectedBstEntry);
+        } else {
+            visit(ctx.getChild(0));
+        }
+
+        return BstVM.TRUE;
+    }
+
+    @Override
+    public Integer visitStackitem(BstParser.StackitemContext ctx) {
+        for (ParseTree childNode : ctx.children) {
+            try {
+                if (childNode instanceof TerminalNode token) {
+                    switch (token.getSymbol().getType()) {
+                        case BstParser.STRING -> {
+                            String s = token.getText();
+                            bstVMContext.stack().push(s.substring(1, s.length() - 1));
+                        }
+                        case BstParser.INTEGER ->
+                                bstVMContext.stack().push(Integer.parseInt(token.getText().substring(1)));
+                        case BstParser.QUOTED ->
+                                bstVMContext.stack().push(new Identifier(token.getText().substring(1)));
+                    }
+                } else if (childNode instanceof BstParser.StackContext) {
+                    bstVMContext.stack().push(childNode);
+                } else {
+                    this.visit(childNode);
+                }
+            } catch (BstVMException e) {
+                bstVMContext.path().ifPresentOrElse(
+                        (path) -> LOGGER.error("{} ({})", e.getMessage(), path),
+                        () -> LOGGER.error(e.getMessage()));
+                throw e;
+            }
+        }
+        return BstVM.TRUE;
+    }
+}
diff --git a/src/main/java/org/jabref/logic/bst/ChangeCaseFunction.java b/src/main/java/org/jabref/logic/bst/ChangeCaseFunction.java
deleted file mode 100644
index 65f4f64c619..00000000000
--- a/src/main/java/org/jabref/logic/bst/ChangeCaseFunction.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package org.jabref.logic.bst;
-
-import java.util.Locale;
-import java.util.Stack;
-
-import org.jabref.logic.bst.BibtexCaseChanger.FORMAT_MODE;
-import org.jabref.logic.bst.VM.BstEntry;
-import org.jabref.logic.bst.VM.BstFunction;
-
-/**
- * From the Bibtex manual:
- *
- * Pops the top two (string) literals; it changes the case of the second
- * according to the specifications of the first, as follows. (Note: The word
- * `letters' in the next sentence refers only to those at brace-level 0, the
- * top-most brace level; no other characters are changed, except perhaps for
- * \special characters", described in Section 4.) If the first literal is the
- * string `t', it converts to lower case all letters except the very first
- * character in the string, which it leaves alone, and except the first
- * character following any colon and then nonnull white space, which it also
- * leaves alone; if it's the string `l', it converts all letters to lower case;
- * and if it's the string `u', it converts all letters to upper case. It then
- * pushes this resulting string. If either type is incorrect, it complains and
- * pushes the null string; however, if both types are correct but the
- * specification string (i.e., the first string) isn't one of the legal ones, it
- * merely pushes the second back onto the stack, after complaining. (Another
- * note: It ignores case differences in the specification string; for example,
- * the strings t and T are equivalent for the purposes of this built-in
- * function.)
- *
- * Christopher: I think this should be another grammar! This parser is horrible.
- *
- */
-public class ChangeCaseFunction implements BstFunction {
-
-    private final VM vm;
-
-    public ChangeCaseFunction(VM vm) {
-        this.vm = vm;
-    }
-
-    @Override
-    public void execute(BstEntry context) {
-        Stack<Object> stack = vm.getStack();
-
-        if (stack.size() < 2) {
-            throw new VMException("Not enough operands on stack for operation change.case$");
-        }
-
-        Object o1 = stack.pop();
-        if (!((o1 instanceof String) && (((String) o1).length() == 1))) {
-            throw new VMException("A format string of length 1 is needed for change.case$");
-        }
-
-        Object o2 = stack.pop();
-        if (!(o2 instanceof String)) {
-            throw new VMException("A string is needed as second parameter for change.case$");
-        }
-
-        char format = ((String) o1).toLowerCase(Locale.ROOT).charAt(0);
-        String s = (String) o2;
-
-        stack.push(BibtexCaseChanger.changeCase(s, FORMAT_MODE.getFormatModeForBSTFormat(format)));
-    }
-}
diff --git a/src/main/java/org/jabref/logic/bst/FormatNameFunction.java b/src/main/java/org/jabref/logic/bst/FormatNameFunction.java
deleted file mode 100644
index b2845c89be7..00000000000
--- a/src/main/java/org/jabref/logic/bst/FormatNameFunction.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package org.jabref.logic.bst;
-
-import java.util.Stack;
-
-import org.jabref.logic.bst.VM.BstEntry;
-import org.jabref.logic.bst.VM.BstFunction;
-import org.jabref.model.entry.Author;
-import org.jabref.model.entry.AuthorList;
-
-/**
- * From Bibtex:
- *
- * "The |built_in| function {\.{format.name\$}} pops the
- * top three literals (they are a string, an integer, and a string
- * literal, in that order). The last string literal represents a
- * name list (each name corresponding to a person), the integer
- * literal specifies which name to pick from this list, and the
- * first string literal specifies how to format this name, as
- * described in the \BibTeX\ documentation. Finally, this function
- * pushes the formatted name. If any of the types is incorrect, it
- * complains and pushes the null string."
- *
- * All the pain is encapsulated in BibtexNameFormatter. :-)
- *
- */
-public class FormatNameFunction implements BstFunction {
-
-    private final VM vm;
-
-    public FormatNameFunction(VM vm) {
-        this.vm = vm;
-    }
-
-    @Override
-    public void execute(BstEntry context) {
-        Stack<Object> stack = vm.getStack();
-
-        if (stack.size() < 3) {
-            throw new VMException("Not enough operands on stack for operation format.name$");
-        }
-        Object o1 = stack.pop();
-        Object o2 = stack.pop();
-        Object o3 = stack.pop();
-
-        if (!(o1 instanceof String) && !(o2 instanceof Integer) && !(o3 instanceof String)) {
-            // warning("A string is needed for change.case$");
-            stack.push("");
-            return;
-        }
-
-        String format = (String) o1;
-        Integer name = (Integer) o2;
-        String names = (String) o3;
-
-        if (names == null) {
-            stack.push("");
-        } else {
-            AuthorList a = AuthorList.parse(names);
-            if (name > a.getNumberOfAuthors()) {
-                throw new VMException("Author Out of Bounds. Number " + name + " invalid for " + names);
-            }
-            Author author = a.getAuthor(name - 1);
-
-            stack.push(BibtexNameFormatter.formatName(author, format, vm));
-        }
-    }
-}
diff --git a/src/main/java/org/jabref/logic/bst/PurifyFunction.java b/src/main/java/org/jabref/logic/bst/PurifyFunction.java
deleted file mode 100644
index b0df9df3735..00000000000
--- a/src/main/java/org/jabref/logic/bst/PurifyFunction.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package org.jabref.logic.bst;
-
-import java.util.Stack;
-
-import org.jabref.logic.bst.VM.BstEntry;
-import org.jabref.logic.bst.VM.BstFunction;
-
-/**
- *
- * The |built_in| function {\.{purify\$}} pops the top (string) literal, removes
- * nonalphanumeric characters except for |white_space| and |sep_char| characters
- * (these get converted to a |space|) and removes certain alphabetic characters
- * contained in the control sequences associated with a special character, and
- * pushes the resulting string. If the literal isn't a string, it complains and
- * pushes the null string.
- *
- */
-public class PurifyFunction implements BstFunction {
-
-    private final VM vm;
-
-    public PurifyFunction(VM vm) {
-        this.vm = vm;
-    }
-
-    @Override
-    public void execute(BstEntry context) {
-        Stack<Object> stack = vm.getStack();
-
-        if (stack.isEmpty()) {
-            throw new VMException("Not enough operands on stack for operation purify$");
-        }
-        Object o1 = stack.pop();
-
-        if (!(o1 instanceof String)) {
-            vm.warn("A string is needed for purify$");
-            stack.push("");
-            return;
-        }
-
-        stack.push(BibtexPurify.purify((String) o1, vm));
-    }
-}
diff --git a/src/main/java/org/jabref/logic/bst/TextPrefixFunction.java b/src/main/java/org/jabref/logic/bst/TextPrefixFunction.java
deleted file mode 100644
index 983792ad833..00000000000
--- a/src/main/java/org/jabref/logic/bst/TextPrefixFunction.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package org.jabref.logic.bst;
-
-import java.util.Stack;
-
-import org.jabref.logic.bst.VM.BstEntry;
-import org.jabref.logic.bst.VM.BstFunction;
-
-/**
- The |built_in| function {\.{text.prefix\$}} pops the top two literals
- (the integer literal |pop_lit1| and a string literal, in that order).
- It pushes the substring of the (at most) |pop_lit1| consecutive text
- characters starting from the beginning of the string.  This function
- is similar to {\.{substring\$}}, but this one considers an accented
- character (or more precisely, a ``special character''$\!$, even if
- it's missing its matching |right_brace|) to be a single text character
- (rather than however many |ASCII_code| characters it actually
- comprises), and this function doesn't consider braces to be text
- characters; furthermore, this function appends any needed matching
- |right_brace|s.  If any of the types is incorrect, it complains and
- pushes the null string.
- *
- */
-public class TextPrefixFunction implements BstFunction {
-
-    private final VM vm;
-
-    public TextPrefixFunction(VM vm) {
-        this.vm = vm;
-    }
-
-    @Override
-    public void execute(BstEntry context) {
-        Stack<Object> stack = vm.getStack();
-
-        if (stack.size() < 2) {
-            throw new VMException("Not enough operands on stack for operation text.prefix$");
-        }
-
-        Object o1 = stack.pop();
-        if (!(o1 instanceof Integer)) {
-            vm.warn("An integer is needed as first parameter to text.prefix$");
-            stack.push("");
-            return;
-        }
-
-        Object o2 = stack.pop();
-        if (!(o2 instanceof String)) {
-            vm.warn("A string is needed as second parameter to text.prefix$");
-            stack.push("");
-            return;
-        }
-
-        stack.push(BibtexTextPrefix.textPrefix((Integer) o1, (String) o2, vm));
-    }
-}
diff --git a/src/main/java/org/jabref/logic/bst/VM.java b/src/main/java/org/jabref/logic/bst/VM.java
deleted file mode 100644
index eab8f4003a2..00000000000
--- a/src/main/java/org/jabref/logic/bst/VM.java
+++ /dev/null
@@ -1,1254 +0,0 @@
-package org.jabref.logic.bst;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Stack;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.jabref.logic.bibtex.FieldContentFormatterPreferences;
-import org.jabref.logic.bibtex.FieldWriter;
-import org.jabref.logic.bibtex.FieldWriterPreferences;
-import org.jabref.logic.bibtex.InvalidFieldValueException;
-import org.jabref.model.database.BibDatabase;
-import org.jabref.model.entry.AuthorList;
-import org.jabref.model.entry.BibEntry;
-import org.jabref.model.entry.Month;
-import org.jabref.model.entry.field.Field;
-import org.jabref.model.entry.field.FieldFactory;
-import org.jabref.model.entry.field.StandardField;
-
-import org.antlr.runtime.ANTLRFileStream;
-import org.antlr.runtime.ANTLRStringStream;
-import org.antlr.runtime.CharStream;
-import org.antlr.runtime.CommonTokenStream;
-import org.antlr.runtime.RecognitionException;
-import org.antlr.runtime.tree.CommonTree;
-import org.antlr.runtime.tree.Tree;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * A BibTeX Virtual machine that can execute .bst files.
- * <p>
- * Documentation can be found in the original bibtex distribution:
- * <p>
- * https://www.ctan.org/pkg/bibtex
- */
-public class VM implements Warn {
-
-    public static final Integer FALSE = 0;
-
-    public static final Integer TRUE = 1;
-
-    private static final Pattern ADD_PERIOD_PATTERN = Pattern.compile("([^\\.\\?\\!\\}\\s])(\\}|\\s)*$");
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(VM.class);
-
-    private List<BstEntry> entries;
-
-    private Map<String, String> strings = new HashMap<>();
-
-    private Map<String, Integer> integers = new HashMap<>();
-
-    private Map<String, BstFunction> functions = new HashMap<>();
-
-    private Stack<Object> stack = new Stack<>();
-
-    private final Map<String, BstFunction> buildInFunctions;
-
-    private File file;
-
-    private final CommonTree tree;
-
-    private StringBuilder bbl;
-
-    private String preamble = "";
-
-    public static class Identifier {
-
-        public final String name;
-
-        public Identifier(String name) {
-            this.name = name;
-        }
-
-        public String getName() {
-            return name;
-        }
-    }
-
-    public static class Variable {
-
-        public final String name;
-
-        public Variable(String name) {
-            this.name = name;
-        }
-
-        public String getName() {
-            return name;
-        }
-    }
-
-    @FunctionalInterface
-    public interface BstFunction {
-        void execute(BstEntry context);
-    }
-
-    public VM(File f) throws RecognitionException, IOException {
-        this(new ANTLRFileStream(f.getPath()));
-        this.file = f;
-    }
-
-    public VM(String s) throws RecognitionException {
-        this(new ANTLRStringStream(s));
-    }
-
-    private VM(CharStream bst) throws RecognitionException {
-        this(VM.charStream2CommonTree(bst));
-    }
-
-    private VM(CommonTree tree) {
-        this.tree = tree;
-
-        this.buildInFunctions = new HashMap<>(37);
-
-        /*
-         * Pops the top two (integer) literals, compares them, and pushes
-         * the integer 1 if the second is greater than the first, 0
-         * otherwise.
-         */
-        buildInFunctions.put(">", context -> {
-            if (stack.size() < 2) {
-                throw new VMException("Not enough operands on stack for operation >");
-            }
-            Object o2 = stack.pop();
-            Object o1 = stack.pop();
-
-            if (!((o1 instanceof Integer) && (o2 instanceof Integer))) {
-                throw new VMException("Can only compare two integers with >");
-            }
-
-            stack.push(((Integer) o1).compareTo((Integer) o2) > 0 ? VM.TRUE : VM.FALSE);
-        });
-
-        /* Analogous to >. */
-        buildInFunctions.put("<", context -> {
-            if (stack.size() < 2) {
-                throw new VMException("Not enough operands on stack for operation <");
-            }
-            Object o2 = stack.pop();
-            Object o1 = stack.pop();
-
-            if (!((o1 instanceof Integer) && (o2 instanceof Integer))) {
-                throw new VMException("Can only compare two integers with <");
-            }
-
-            stack.push(((Integer) o1).compareTo((Integer) o2) < 0 ? VM.TRUE : VM.FALSE);
-        });
-
-        /*
-         * Pops the top two (both integer or both string) literals, compares
-         * them, and pushes the integer 1 if they're equal, 0 otherwise.
-         */
-        buildInFunctions.put("=", context -> {
-            if (stack.size() < 2) {
-                throw new VMException("Not enough operands on stack for operation =");
-            }
-            Object o1 = stack.pop();
-            Object o2 = stack.pop();
-
-            if ((o1 == null) ^ (o2 == null)) {
-                stack.push(VM.FALSE);
-                return;
-            }
-
-            if ((o1 == null) && (o2 == null)) {
-                stack.push(VM.TRUE);
-                return;
-            }
-
-            stack.push(o1.equals(o2) ? VM.TRUE : VM.FALSE);
-        });
-
-        /* Pops the top two (integer) literals and pushes their sum. */
-        buildInFunctions.put("+", context -> {
-            if (stack.size() < 2) {
-                throw new VMException("Not enough operands on stack for operation +");
-            }
-            Object o2 = stack.pop();
-            Object o1 = stack.pop();
-
-            if (!((o1 instanceof Integer) && (o2 instanceof Integer))) {
-                throw new VMException("Can only compare two integers with +");
-            }
-
-            stack.push((Integer) o1 + (Integer) o2);
-        });
-
-        /*
-         * Pops the top two (integer) literals and pushes their difference
-         * (the first subtracted from the second).
-         */
-        buildInFunctions.put("-", context -> {
-            if (stack.size() < 2) {
-                throw new VMException("Not enough operands on stack for operation -");
-            }
-            Object o2 = stack.pop();
-            Object o1 = stack.pop();
-
-            if (!((o1 instanceof Integer) && (o2 instanceof Integer))) {
-                throw new VMException("Can only subtract two integers with -");
-            }
-
-            stack.push((Integer) o1 - (Integer) o2);
-        });
-
-        /*
-         * Pops the top two (string) literals, concatenates them (in reverse
-         * order, that is, the order in which pushed), and pushes the
-         * resulting string.
-         */
-        buildInFunctions.put("*", context -> {
-            if (stack.size() < 2) {
-                throw new VMException("Not enough operands on stack for operation *");
-            }
-            Object o2 = stack.pop();
-            Object o1 = stack.pop();
-
-            if (o1 == null) {
-                o1 = "";
-            }
-            if (o2 == null) {
-                o2 = "";
-            }
-
-            if (!((o1 instanceof String) && (o2 instanceof String))) {
-                LOGGER.error("o1: {} ({})", o1, o1.getClass());
-                LOGGER.error("o2: {} ({})", o2, o2.getClass());
-                throw new VMException("Can only concatenate two String with *");
-            }
-
-            stack.push(o1.toString() + o2);
-        });
-
-        /*
-         * Pops the top two literals and assigns to the first (which must be
-         * a global or entry variable) the value of the second.
-         */
-        buildInFunctions.put(":=", context -> {
-            if (stack.size() < 2) {
-                throw new VMException("Invalid call to operation :=");
-            }
-            Object o1 = stack.pop();
-            Object o2 = stack.pop();
-            assign(context, o1, o2);
-        });
-
-        /*
-         * Pops the top (string) literal, adds a `.' to it if the last non
-         * '}' character isn't a `.', `?', or `!', and pushes this resulting
-         * string.
-         */
-        buildInFunctions.put("add.period$", context -> addPeriodFunction());
-
-        /*
-         * Executes the function whose name is the entry type of an entry.
-         * For example if an entry is of type book, this function executes
-         * the book function. When given as an argument to the ITERATE
-         * command, call.type$ actually produces the output for the entries.
-         * For an entry with an unknown type, it executes the function
-         * default.type. Thus you should define (before the READ command)
-         * one function for each standard entry type as well as a
-         * default.type function.
-         */
-        buildInFunctions.put("call.type$", context -> {
-            if (context == null) {
-                throw new VMException("Call.type$ can only be called from within a context (ITERATE or REVERSE).");
-            }
-            VM.this.execute(context.entry.getType().getName(), context);
-        });
-
-        buildInFunctions.put("change.case$", new ChangeCaseFunction(this));
-
-        /*
-         * Pops the top (string) literal, makes sure it's a single
-         * character, converts it to the corresponding ASCII integer, and
-         * pushes this integer.
-         */
-        buildInFunctions.put("chr.to.int$", context -> {
-            if (stack.isEmpty()) {
-                throw new VMException("Not enough operands on stack for operation chr.to.int$");
-            }
-            Object o1 = stack.pop();
-
-            if (!((o1 instanceof String) && (((String) o1).length() == 1))) {
-                throw new VMException("Can only perform chr.to.int$ on string with length 1");
-            }
-
-            String s = (String) o1;
-
-            stack.push((int) s.charAt(0));
-        });
-
-        /*
-         * Pushes the string that was the \cite-command argument for this
-         * entry.
-         */
-        buildInFunctions.put("cite$", context -> {
-            if (context == null) {
-                throw new VMException("Must have an entry to cite$");
-            }
-            stack.push(context.entry.getCitationKey().orElse(null));
-        });
-
-        /*
-         * Pops the top literal from the stack and pushes two copies of it.
-         */
-        buildInFunctions.put("duplicate$", context -> {
-            if (stack.isEmpty()) {
-                throw new VMException("Not enough operands on stack for operation duplicate$");
-            }
-            Object o1 = stack.pop();
-
-            stack.push(o1);
-            stack.push(o1);
-        });
-
-        /*
-         * Pops the top literal and pushes the integer 1 if it's a missing
-         * field or a string having no non-white-space characters, 0
-         * otherwise.
-         */
-        buildInFunctions.put("empty$", context -> {
-            if (stack.isEmpty()) {
-                throw new VMException("Not enough operands on stack for operation empty$");
-            }
-            Object o1 = stack.pop();
-
-            if (o1 == null) {
-                stack.push(VM.TRUE);
-                return;
-            }
-
-            if (!(o1 instanceof String)) {
-                throw new VMException("Operand does not match function empty$");
-            }
-
-            String s = (String) o1;
-
-            stack.push("".equals(s.trim()) ? VM.TRUE : VM.FALSE);
-        });
-
-        buildInFunctions.put("format.name$", new FormatNameFunction(this));
-
-        /*
-         * Pops the top three literals (they are two function literals and
-         * an integer literal, in that order); if the integer is greater
-         * than 0, it executes the second literal, else it executes the
-         * first.
-         */
-        buildInFunctions.put("if$", context -> {
-            if (stack.size() < 3) {
-                throw new VMException("Not enough operands on stack for operation =");
-            }
-            Object f1 = stack.pop();
-            Object f2 = stack.pop();
-            Object i = stack.pop();
-
-            if (!((f1 instanceof Identifier) || (f1 instanceof Tree))
-                    && ((f2 instanceof Identifier) || (f2 instanceof Tree)) && (i instanceof Integer)) {
-                throw new VMException("Expecting two functions and an integer for if$.");
-            }
-
-            if ((Integer) i > 0) {
-                VM.this.executeInContext(f2, context);
-            } else {
-                VM.this.executeInContext(f1, context);
-            }
-        });
-
-        /*
-         * Pops the top (integer) literal, interpreted as the ASCII integer
-         * value of a single character, converts it to the corresponding
-         * single-character string, and pushes this string.
-         */
-        buildInFunctions.put("int.to.chr$", context -> {
-            if (stack.isEmpty()) {
-                throw new VMException("Not enough operands on stack for operation int.to.chr$");
-            }
-            Object o1 = stack.pop();
-
-            if (!(o1 instanceof Integer)) {
-                throw new VMException("Can only perform operation int.to.chr$ on an Integer");
-            }
-
-            Integer i = (Integer) o1;
-
-            stack.push(String.valueOf((char) i.intValue()));
-        });
-
-        /*
-         * Pops the top (integer) literal, converts it to its (unique)
-         * string equivalent, and pushes this string.
-         */
-        buildInFunctions.put("int.to.str$", context -> {
-            if (stack.isEmpty()) {
-                throw new VMException("Not enough operands on stack for operation int.to.str$");
-            }
-            Object o1 = stack.pop();
-
-            if (!(o1 instanceof Integer)) {
-                throw new VMException("Can only transform an integer to an string using int.to.str$");
-            }
-
-            stack.push(o1.toString());
-        });
-
-        /*
-         * Pops the top literal and pushes the integer 1 if it's a missing
-         * field, 0 otherwise.
-         */
-        buildInFunctions.put("missing$", context -> {
-            if (stack.isEmpty()) {
-                throw new VMException("Not enough operands on stack for operation missing$");
-            }
-            Object o1 = stack.pop();
-
-            if (o1 == null) {
-                stack.push(VM.TRUE);
-                return;
-            }
-
-            if (!(o1 instanceof String)) {
-                warn("Not a string or missing field in operation missing$");
-                stack.push(VM.TRUE);
-                return;
-            }
-
-            stack.push(VM.FALSE);
-        });
-
-        /*
-         * Writes onto the bbl file what is accumulated in the output buffer.
-         * It writes a blank line if and only if the output buffer is empty.
-         * Since write$ does reasonable line breaking, you should use this
-         * function only when you want a blank line or an explicit line
-         * break.
-         */
-        buildInFunctions.put("newline$", context -> VM.this.bbl.append('\n'));
-
-        /*
-         * Pops the top (string) literal and pushes the number of names the
-         * string represents one plus the number of occurrences of the
-         * substring "and" (ignoring case differences) surrounded by
-         * non-null white-space at the top brace level.
-         */
-        buildInFunctions.put("num.names$", context -> {
-            if (stack.isEmpty()) {
-                throw new VMException("Not enough operands on stack for operation num.names$");
-            }
-            Object o1 = stack.pop();
-
-            if (!(o1 instanceof String)) {
-                throw new VMException("Need a string at the top of the stack for num.names$");
-            }
-            String s = (String) o1;
-
-            stack.push(AuthorList.parse(s).getNumberOfAuthors());
-        });
-
-        /*
-         * Pops the top of the stack but doesn't print it; this gets rid of
-         * an unwanted stack literal.
-         */
-        buildInFunctions.put("pop$", context -> stack.pop());
-
-        /*
-         * The |built_in| function {\.{preamble\$}} pushes onto the stack
-         * the concatenation of all the \.{preamble} strings read from the
-         * database files. (or the empty string if there where none)
-         *
-         * @PREAMBLE strings read from the database files.
-         */
-        buildInFunctions.put("preamble$", context -> {
-            stack.push(preamble);
-        });
-
-        /*
-         * Pops the top (string) literal, removes nonalphanumeric characters
-         * except for white-space characters and hyphens and ties (these all get
-         * converted to a space), removes certain alphabetic characters
-         * contained in the control sequences associated with a \special
-         * character", and pushes the resulting string.
-         */
-        buildInFunctions.put("purify$", new PurifyFunction(this));
-
-        /*
-         * Pushes the string consisting of the double-quote character.
-         */
-        buildInFunctions.put("quote$", context -> stack.push("\""));
-
-        /*
-         * Is a no-op.
-         */
-        buildInFunctions.put("skip$", context -> {
-            // Nothing to do! Yeah!
-        });
-
-        /*
-         * Pops and prints the whole stack; it's meant to be used for style
-         * designers while debugging.
-         */
-        buildInFunctions.put("stack$", context -> {
-            while (!stack.empty()) {
-                LOGGER.debug("Stack entry {}", stack.pop());
-            }
-        });
-
-        /*
-         * Pops the top three literals (they are the two integers literals
-         * len and start, and a string literal, in that order). It pushes
-         * the substring of the (at most) len consecutive characters
-         * starting at the startth character (assuming 1-based indexing) if
-         * start is positive, and ending at the start-th character
-         * (including) from the end if start is negative (where the first
-         * character from the end is the last character).
-         */
-        buildInFunctions.put("substring$", context -> substringFunction());
-
-        /*
-         * Swaps the top two literals on the stack. text.length$ Pops the
-         * top (string) literal, and pushes the number of text characters
-         * it contains, where an accented character (more precisely, a
-         * \special character", defined in Section 4) counts as a single
-         * text character, even if it's missing its matching right brace,
-         * and where braces don't count as text characters.
-         */
-        buildInFunctions.put("swap$", context -> {
-            if (stack.size() < 2) {
-                throw new VMException("Not enough operands on stack for operation swap$");
-            }
-            Object f1 = stack.pop();
-            Object f2 = stack.pop();
-
-            stack.push(f1);
-            stack.push(f2);
-        });
-
-        /*
-         * text.length$ Pops the top (string) literal, and pushes the number
-         * of text characters it contains, where an accented character (more
-         * precisely, a "special character", defined in Section 4) counts as
-         * a single text character, even if it's missing its matching right
-         * brace, and where braces don't count as text characters.
-         *
-         * From BibTeXing: For the purposes of counting letters in labels,
-         * BibTEX considers everything contained inside the braces as a
-         * single letter.
-         */
-        buildInFunctions.put("text.length$", context -> textLengthFunction());
-
-        /*
-         * Pops the top two literals (the integer literal len and a string
-         * literal, in that order). It pushes the substring of the (at most) len
-         * consecutive text characters starting from the beginning of the
-         * string. This function is similar to substring$, but this one
-         * considers a \special character", even if it's missing its matching
-         * right brace, to be a single text character (rather than however many
-         * ASCII characters it actually comprises), and this function doesn't
-         * consider braces to be text characters; furthermore, this function
-         * appends any needed matching right braces.
-         */
-        buildInFunctions.put("text.prefix$", new TextPrefixFunction(this));
-
-        /*
-         * Pops and prints the top of the stack to the log file. It's useful for debugging.
-         */
-        buildInFunctions.put("top$", context -> LOGGER.debug("Stack entry {}", stack.pop()));
-
-        /*
-         * Pushes the current entry's type (book, article, etc.), but pushes
-         * the null string if the type is either unknown or undefined.
-         */
-        buildInFunctions.put("type$", context -> {
-            if (context == null) {
-                throw new VMException("type$ need a context.");
-            }
-
-            stack.push(context.entry.getType().getName());
-        });
-
-        /*
-         * Pops the top (string) literal and prints it following a warning
-         * message. This also increments a count of the number of warning
-         * messages issued.
-         */
-        buildInFunctions.put("warning$", new BstFunction() {
-
-            int warning = 1;
-
-            @Override
-            public void execute(BstEntry context) {
-                LOGGER.warn("Warning (#" + (warning++) + "): " + stack.pop());
-            }
-        });
-
-        /*
-         * Pops the top two (function) literals, and keeps executing the
-         * second as long as the (integer) literal left on the stack by
-         * executing the first is greater than 0.
-         */
-        buildInFunctions.put("while$", this::whileFunction);
-
-        buildInFunctions.put("width$", new WidthFunction(this));
-
-        /*
-         * Pops the top (string) literal and writes it on the output buffer
-         * (which will result in stuff being written onto the bbl file when
-         * the buffer fills up).
-         */
-        buildInFunctions.put("write$", context -> {
-            String s = (String) stack.pop();
-            VM.this.bbl.append(s);
-        });
-    }
-
-    private void textLengthFunction() {
-        if (stack.isEmpty()) {
-            throw new VMException("Not enough operands on stack for operation text.length$");
-        }
-        Object o1 = stack.pop();
-
-        if (!(o1 instanceof String)) {
-            throw new VMException("Can only perform operation on a string text.length$");
-        }
-
-        String s = (String) o1;
-        char[] c = s.toCharArray();
-        int result = 0;
-
-        // Comments from bibtex.web:
-
-        // sp_ptr := str_start[pop_lit1];
-        int i = 0;
-
-        // sp_end := str_start[pop_lit1+1];
-        int n = s.length();
-
-        // sp_brace_level := 0;
-        int braceLevel = 0;
-
-        // while (sp_ptr < sp_end) do begin
-        while (i < n) {
-            // incr(sp_ptr);
-            i++;
-            // if (str_pool[sp_ptr-1] = left_brace) then
-            // begin
-            if (c[i - 1] == '{') {
-                // incr(sp_brace_level);
-                braceLevel++;
-                // if ((sp_brace_level = 1) and (sp_ptr < sp_end)) then
-                if ((braceLevel == 1) && (i < n)) {
-                    // if (str_pool[sp_ptr] = backslash) then
-                    // begin
-                    if (c[i] == '\\') {
-                        // incr(sp_ptr); {skip over the |backslash|}
-                        i++; // skip over backslash
-                        // while ((sp_ptr < sp_end) and (sp_brace_level
-                        // > 0)) do begin
-                        while ((i < n) && (braceLevel > 0)) {
-                            // if (str_pool[sp_ptr] = right_brace) then
-                            if (c[i] == '}') {
-                                // decr(sp_brace_level)
-                                braceLevel--;
-                            } else if (c[i] == '{') {
-                                // incr(sp_brace_level);
-                                braceLevel++;
-                            }
-                            // incr(sp_ptr);
-                            i++;
-                            // end;
-                        }
-                        // incr(num_text_chars);
-                        result++;
-                        // end;
-                    }
-                    // end
-                }
-
-                // else if (str_pool[sp_ptr-1] = right_brace) then
-                // begin
-            } else if (c[i - 1] == '}') {
-                // if (sp_brace_level > 0) then
-                if (braceLevel > 0) {
-                    // decr(sp_brace_level);
-                    braceLevel--;
-                    // end
-                }
-            } else { // else
-                // incr(num_text_chars);
-                result++;
-            }
-        }
-        stack.push(result);
-    }
-
-    private void whileFunction(BstEntry context) {
-        if (stack.size() < 2) {
-            throw new VMException("Not enough operands on stack for operation while$");
-        }
-        Object f2 = stack.pop();
-        Object f1 = stack.pop();
-
-        if (!((f1 instanceof Identifier) || (f1 instanceof Tree))
-                && ((f2 instanceof Identifier) || (f2 instanceof Tree))) {
-            throw new VMException("Expecting two functions for while$.");
-        }
-
-        do {
-            VM.this.executeInContext(f1, context);
-
-            Object i = stack.pop();
-            if (!(i instanceof Integer)) {
-                throw new VMException("First parameter to while has to return an integer but was " + i);
-            }
-            if ((Integer) i <= 0) {
-                break;
-            }
-            VM.this.executeInContext(f2, context);
-        } while (true);
-    }
-
-    private void substringFunction() {
-        if (stack.size() < 3) {
-            throw new VMException("Not enough operands on stack for operation substring$");
-        }
-        Object o1 = stack.pop();
-        Object o2 = stack.pop();
-        Object o3 = stack.pop();
-
-        if (!((o1 instanceof Integer) && (o2 instanceof Integer) && (o3 instanceof String))) {
-            throw new VMException("Expecting two integers and a string for substring$");
-        }
-
-        Integer len = (Integer) o1;
-        Integer start = (Integer) o2;
-
-        int lenI = len;
-        int startI = start;
-
-        if (lenI > (Integer.MAX_VALUE / 2)) {
-            lenI = Integer.MAX_VALUE / 2;
-        }
-
-        if (startI > (Integer.MAX_VALUE / 2)) {
-            startI = Integer.MAX_VALUE / 2;
-        }
-
-        if (startI < (Integer.MIN_VALUE / 2)) {
-            startI = -Integer.MIN_VALUE / 2;
-        }
-
-        String s = (String) o3;
-
-        if (startI < 0) {
-            startI += s.length() + 1;
-            startI = Math.max(1, (startI + 1) - lenI);
-        }
-        stack.push(s.substring(startI - 1, Math.min((startI - 1) + lenI, s.length())));
-    }
-
-    private void addPeriodFunction() {
-        if (stack.isEmpty()) {
-            throw new VMException("Not enough operands on stack for operation add.period$");
-        }
-        Object o1 = stack.pop();
-
-        if (!(o1 instanceof String)) {
-            throw new VMException("Can only add a period to a string for add.period$");
-        }
-
-        String s = (String) o1;
-        Matcher m = ADD_PERIOD_PATTERN.matcher(s);
-
-        if (m.find()) {
-            StringBuilder sb = new StringBuilder();
-            m.appendReplacement(sb, m.group(1));
-            sb.append('.');
-            String group2 = m.group(2);
-            if (group2 != null) {
-                sb.append(m.group(2));
-            }
-            stack.push(sb.toString());
-        } else {
-            stack.push(s);
-        }
-    }
-
-    private static CommonTree charStream2CommonTree(CharStream bst) throws RecognitionException {
-        BstLexer lex = new BstLexer(bst);
-        CommonTokenStream tokens = new CommonTokenStream(lex);
-        BstParser parser = new BstParser(tokens);
-        BstParser.program_return r = parser.program();
-        return (CommonTree) r.getTree();
-    }
-
-    private boolean assign(BstEntry context, Object o1, Object o2) {
-
-        if (!(o1 instanceof Identifier) || !((o2 instanceof String) || (o2 instanceof Integer))) {
-            throw new VMException("Invalid parameters");
-        }
-
-        String name = ((Identifier) o1).getName();
-
-        if (o2 instanceof String) {
-
-            if ((context != null) && context.localStrings.containsKey(name)) {
-                context.localStrings.put(name, (String) o2);
-                return true;
-            }
-
-            if (strings.containsKey(name)) {
-                strings.put(name, (String) o2);
-                return true;
-            }
-            return false;
-        }
-
-        if ((context != null) && context.localIntegers.containsKey(name)) {
-            context.localIntegers.put(name, (Integer) o2);
-            return true;
-        }
-
-        if (integers.containsKey(name)) {
-            integers.put(name, (Integer) o2);
-            return true;
-        }
-        return false;
-    }
-
-    public String run(BibDatabase db) {
-        preamble = db.getPreamble().orElse("");
-        return run(db.getEntries());
-    }
-
-    public String run(Collection<BibEntry> bibtex) {
-        return this.run(bibtex, null);
-    }
-
-    /**
-     * Transforms the given list of BibEntries to a rendered list of references using the underlying bst file
-     *
-     * @param bibEntries  list of entries to convert
-     * @param bibDatabase (may be null) the bibDatabase used for resolving strings / crossref
-     * @return list of references in plain text form
-     */
-    public String run(Collection<BibEntry> bibEntries, BibDatabase bibDatabase) {
-        Objects.requireNonNull(bibEntries);
-
-        // Reset
-        bbl = new StringBuilder();
-
-        strings = new HashMap<>();
-
-        integers = new HashMap<>();
-        integers.put("entry.max$", Integer.MAX_VALUE);
-        integers.put("global.max$", Integer.MAX_VALUE);
-
-        functions = new HashMap<>();
-        functions.putAll(buildInFunctions);
-
-        stack = new Stack<>();
-
-        // Create entries
-        entries = new ArrayList<>(bibEntries.size());
-        for (BibEntry entry : bibEntries) {
-            entries.add(new BstEntry(entry));
-        }
-
-        // Go
-        for (int i = 0; i < tree.getChildCount(); i++) {
-            Tree child = tree.getChild(i);
-            switch (child.getType()) {
-                case BstParser.STRINGS:
-                    strings(child);
-                    break;
-                case BstParser.INTEGERS:
-                    integers(child);
-                    break;
-                case BstParser.FUNCTION:
-                    function(child);
-                    break;
-                case BstParser.EXECUTE:
-                    execute(child);
-                    break;
-                case BstParser.SORT:
-                    sort();
-                    break;
-                case BstParser.ITERATE:
-                    iterate(child);
-                    break;
-                case BstParser.REVERSE:
-                    reverse(child);
-                    break;
-                case BstParser.ENTRY:
-                    entry(child);
-                    break;
-                case BstParser.READ:
-                    read(bibDatabase);
-                    break;
-                case BstParser.MACRO:
-                    macro(child);
-                    break;
-                default:
-                    LOGGER.info("Unknown type: {}", child.getType());
-                    break;
-            }
-        }
-
-        return bbl.toString();
-    }
-
-    /**
-     * Dredges up from the database file the field values for each entry in the list. It has no arguments. If a database
-     * entry doesn't have a value for a field (and probably no database entry will have a value for every field), that
-     * field variable is marked as missing for the entry.
-     * <p>
-     * We use null for the missing entry designator.
-     * @param bibDatabase
-     */
-    private void read(BibDatabase bibDatabase) {
-        FieldWriter fieldWriter = new FieldWriter(new FieldWriterPreferences(true, List.of(StandardField.MONTH), new FieldContentFormatterPreferences()));
-        for (BstEntry e : entries) {
-            for (Map.Entry<String, String> mEntry : e.fields.entrySet()) {
-                Field field = FieldFactory.parseField(mEntry.getKey());
-                String fieldValue = e.entry.getResolvedFieldOrAlias(field, bibDatabase)
-                                           .map(content -> {
-                                               try {
-                                                   String result = fieldWriter.write(field, content);
-                                                   if (result.startsWith("{")) {
-                                                       // Strip enclosing {} from the output
-                                                       return result.substring(1, result.length() - 1);
-                                                   }
-                                                   if (field == StandardField.MONTH) {
-                                                       // We don't have the internal BibTeX strings at hand.
-                                                       // We nevertheless want to have the full month name.
-                                                       // Thus, we lookup the full month name here.
-                                                       return Month.parse(result)
-                                                                   .map(month -> month.getFullName())
-                                                                   .orElse(result);
-                                                   }
-                                                   return result;
-                                               } catch (InvalidFieldValueException invalidFieldValueException) {
-                                                   // in case there is something wrong with the content, just return the content itself
-                                                   return content;
-                                               }
-                                           })
-                                           .orElse(null);
-                mEntry.setValue(fieldValue);
-            }
-        }
-
-        for (BstEntry e : entries) {
-            if (!e.fields.containsKey(StandardField.CROSSREF.getName())) {
-                e.fields.put(StandardField.CROSSREF.getName(), null);
-            }
-        }
-    }
-
-    /**
-     * Defines a string macro. It has two arguments; the first is the macro's name, which is treated like any other
-     * variable or function name, and the second is its definition, which must be double-quote-delimited. You must have
-     * one for each three-letter month abbreviation; in addition, you should have one for common journal names. The
-     * user's database may override any definition you define using this command. If you want to define a string the
-     * user can't touch, use the FUNCTION command, which has a compatible syntax.
-     */
-    private void macro(Tree child) {
-        String name = child.getChild(0).getText();
-        String replacement = child.getChild(1).getText();
-        functions.put(name, new MacroFunction(replacement));
-    }
-
-    public class MacroFunction implements BstFunction {
-
-        private final String replacement;
-
-        public MacroFunction(String replacement) {
-            this.replacement = replacement;
-        }
-
-        @Override
-        public void execute(BstEntry context) {
-            VM.this.push(replacement);
-        }
-    }
-
-    /**
-     * Declares the fields and entry variables. It has three arguments, each a (possibly empty) list of variable names.
-     * The three lists are of: fields, integer entry variables, and string entry variables. There is an additional field
-     * that BibTEX automatically declares, crossref, used for cross referencing. And there is an additional string entry
-     * variable automatically declared, sort.key$, used by the SORT command. Each of these variables has a value for
-     * each entry on the list.
-     */
-    private void entry(Tree child) {
-        // Fields first
-        Tree t = child.getChild(0);
-
-        for (int i = 0; i < t.getChildCount(); i++) {
-            String name = t.getChild(i).getText();
-
-            for (BstEntry entry : entries) {
-                entry.fields.put(name, null);
-            }
-        }
-
-        // Integers
-        t = child.getChild(1);
-
-        for (int i = 0; i < t.getChildCount(); i++) {
-            String name = t.getChild(i).getText();
-
-            for (BstEntry entry : entries) {
-                entry.localIntegers.put(name, 0);
-            }
-        }
-        // Strings
-        t = child.getChild(2);
-
-        for (int i = 0; i < t.getChildCount(); i++) {
-            String name = t.getChild(i).getText();
-            for (BstEntry entry : entries) {
-                entry.localStrings.put(name, null);
-            }
-        }
-        for (BstEntry entry : entries) {
-            entry.localStrings.put("sort.key$", null);
-        }
-    }
-
-    private void reverse(Tree child) {
-
-        BstFunction f = functions.get(child.getChild(0).getText());
-
-        ListIterator<BstEntry> i = entries.listIterator(entries.size());
-        while (i.hasPrevious()) {
-            f.execute(i.previous());
-        }
-    }
-
-    private void iterate(Tree child) {
-        BstFunction f = functions.get(child.getChild(0).getText());
-
-        for (BstEntry entry : entries) {
-            f.execute(entry);
-        }
-    }
-
-    /**
-     * Sorts the entry list using the values of the string entry variable sort.key$. It has no arguments.
-     */
-    private void sort() {
-        entries.sort(Comparator.comparing(o -> (o.localStrings.get("sort.key$"))));
-    }
-
-    private void executeInContext(Object o, BstEntry context) {
-        if (o instanceof Tree) {
-            Tree t = (Tree) o;
-            new StackFunction(t).execute(context);
-        } else if (o instanceof Identifier) {
-            execute(((Identifier) o).getName(), context);
-        }
-    }
-
-    private void execute(Tree child) {
-        execute(child.getChild(0).getText(), null);
-    }
-
-    public class StackFunction implements BstFunction {
-
-        private final Tree localTree;
-
-        public StackFunction(Tree stack) {
-            localTree = stack;
-        }
-
-        public Tree getTree() {
-            return localTree;
-        }
-
-        @Override
-        public void execute(BstEntry context) {
-
-            for (int i = 0; i < localTree.getChildCount(); i++) {
-
-                Tree c = localTree.getChild(i);
-                try {
-
-                    switch (c.getType()) {
-                        case BstParser.STRING:
-                            String s = c.getText();
-                            push(s.substring(1, s.length() - 1));
-                            break;
-                        case BstParser.INTEGER:
-                            push(Integer.parseInt(c.getText().substring(1)));
-                            break;
-                        case BstParser.QUOTED:
-                            push(new Identifier(c.getText().substring(1)));
-                            break;
-                        case BstParser.STACK:
-                            push(c);
-                            break;
-                        default:
-                            VM.this.execute(c.getText(), context);
-                            break;
-                    }
-                } catch (VMException e) {
-                    if (file == null) {
-                        LOGGER.error("ERROR " + e.getMessage() + " (" + c.getLine() + ")");
-                    } else {
-                        LOGGER.error("ERROR " + e.getMessage() + " (" + file.getPath() + ":"
-                                + c.getLine() + ")");
-                    }
-                    throw e;
-                }
-            }
-        }
-    }
-
-    private void push(Tree t) {
-        stack.push(t);
-    }
-
-    private void execute(String name, BstEntry context) {
-
-        if (context != null) {
-
-            if (context.fields.containsKey(name)) {
-                stack.push(context.fields.get(name));
-                return;
-            }
-            if (context.localStrings.containsKey(name)) {
-                stack.push(context.localStrings.get(name));
-                return;
-            }
-            if (context.localIntegers.containsKey(name)) {
-                stack.push(context.localIntegers.get(name));
-                return;
-            }
-        }
-        if (strings.containsKey(name)) {
-            stack.push(strings.get(name));
-            return;
-        }
-        if (integers.containsKey(name)) {
-            stack.push(integers.get(name));
-            return;
-        }
-
-        if (functions.containsKey(name)) {
-            // OK to have a null context
-            functions.get(name).execute(context);
-            return;
-        }
-
-        throw new VMException("No matching identifier found: " + name);
-    }
-
-    private void function(Tree child) {
-        String name = child.getChild(0).getText();
-        Tree localStack = child.getChild(1);
-        functions.put(name, new StackFunction(localStack));
-    }
-
-    /**
-     * Declares global integer variables. It has one argument, a list of variable names. There are two such
-     * automatically-declared variables, entry.max$ and global.max$, used for limiting the lengths of string vari-
-     * ables. You may have any number of these commands, but a variable's declaration must precede its use.
-     */
-    private void integers(Tree child) {
-        Tree t = child.getChild(0);
-
-        for (int i = 0; i < t.getChildCount(); i++) {
-            String name = t.getChild(i).getText();
-            integers.put(name, 0);
-        }
-    }
-
-    /**
-     * Declares global string variables. It has one argument, a list of variable names. You may have any number of these
-     * commands, but a variable's declaration must precede its use.
-     *
-     * @param child
-     */
-    private void strings(Tree child) {
-        Tree t = child.getChild(0);
-
-        for (int i = 0; i < t.getChildCount(); i++) {
-            String name = t.getChild(i).getText();
-            strings.put(name, null);
-        }
-    }
-
-    public static class BstEntry {
-
-        public final BibEntry entry;
-
-        public final Map<String, String> localStrings = new HashMap<>();
-
-        // keys filled by org.jabref.logic.bst.VM.entry based on the contents of the bst file
-        public final Map<String, String> fields = new HashMap<>();
-
-        public final Map<String, Integer> localIntegers = new HashMap<>();
-
-        public BstEntry(BibEntry e) {
-            this.entry = e;
-        }
-    }
-
-    private void push(Integer integer) {
-        stack.push(integer);
-    }
-
-    private void push(String string) {
-        stack.push(string);
-    }
-
-    private void push(Identifier identifier) {
-        stack.push(identifier);
-    }
-
-    public Map<String, String> getStrings() {
-        return strings;
-    }
-
-    public Map<String, Integer> getIntegers() {
-        return integers;
-    }
-
-    public List<BstEntry> getEntries() {
-        return entries;
-    }
-
-    public Map<String, BstFunction> getFunctions() {
-        return functions;
-    }
-
-    public Stack<Object> getStack() {
-        return stack;
-    }
-
-    @Override
-    public void warn(String string) {
-        LOGGER.warn(string);
-    }
-}
diff --git a/src/main/java/org/jabref/logic/bst/VMException.java b/src/main/java/org/jabref/logic/bst/VMException.java
deleted file mode 100644
index f46c5cd5277..00000000000
--- a/src/main/java/org/jabref/logic/bst/VMException.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.jabref.logic.bst;
-
-public class VMException extends RuntimeException {
-
-    public VMException(String string) {
-        super(string);
-    }
-}
diff --git a/src/main/java/org/jabref/logic/bst/Warn.java b/src/main/java/org/jabref/logic/bst/Warn.java
deleted file mode 100644
index 7a524ad9834..00000000000
--- a/src/main/java/org/jabref/logic/bst/Warn.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.jabref.logic.bst;
-
-@FunctionalInterface
-public interface Warn {
-
-    void warn(String s);
-}
diff --git a/src/main/java/org/jabref/logic/bst/WidthFunction.java b/src/main/java/org/jabref/logic/bst/WidthFunction.java
deleted file mode 100644
index 06784267bf0..00000000000
--- a/src/main/java/org/jabref/logic/bst/WidthFunction.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package org.jabref.logic.bst;
-
-import java.util.Stack;
-
-import org.jabref.logic.bst.VM.BstEntry;
-import org.jabref.logic.bst.VM.BstFunction;
-
-/**
- * The |built_in| function {\.{width\$}} pops the top (string) literal and
- * pushes the integer that represents its width in units specified by the
- * |char_width| array. This function takes the literal literally; that is, it
- * assumes each character in the string is to be printed as is, regardless of
- * whether the character has a special meaning to \TeX, except that special
- * characters (even without their |right_brace|s) are handled specially. If the
- * literal isn't a string, it complains and pushes~0.
- *
- */
-public class WidthFunction implements BstFunction {
-
-    private final VM vm;
-
-    public WidthFunction(VM vm) {
-        this.vm = vm;
-    }
-
-    @Override
-    public void execute(BstEntry context) {
-        Stack<Object> stack = vm.getStack();
-
-        if (stack.isEmpty()) {
-            throw new VMException("Not enough operands on stack for operation width$");
-        }
-        Object o1 = stack.pop();
-
-        if (!(o1 instanceof String)) {
-            vm.warn("A string is needed for change.case$");
-            stack.push(0);
-            return;
-        }
-
-        stack.push(BibtexWidth.width((String) o1));
-    }
-}
diff --git a/src/main/java/org/jabref/logic/bst/BibtexCaseChanger.java b/src/main/java/org/jabref/logic/bst/util/BstCaseChanger.java
similarity index 83%
rename from src/main/java/org/jabref/logic/bst/BibtexCaseChanger.java
rename to src/main/java/org/jabref/logic/bst/util/BstCaseChanger.java
index e05ce998e80..dd3e7c7b05c 100644
--- a/src/main/java/org/jabref/logic/bst/BibtexCaseChanger.java
+++ b/src/main/java/org/jabref/logic/bst/util/BstCaseChanger.java
@@ -1,4 +1,4 @@
-package org.jabref.logic.bst;
+package org.jabref.logic.bst.util;
 
 import java.util.Locale;
 import java.util.Optional;
@@ -6,9 +6,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public final class BibtexCaseChanger {
+public final class BstCaseChanger {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(BibtexCaseChanger.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(BstCaseChanger.class);
 
     // stores whether the char before the current char was a colon
     private boolean prevColon = true;
@@ -16,7 +16,7 @@ public final class BibtexCaseChanger {
     // global variable to store the current brace level
     private int braceLevel;
 
-    public enum FORMAT_MODE {
+    public enum FormatMode {
         // First character and character after a ":" as upper case - everything else in lower case. Obey {}.
         TITLE_LOWERS('t'),
 
@@ -40,7 +40,7 @@ public enum FORMAT_MODE {
 
         private final char asChar;
 
-        FORMAT_MODE(char asChar) {
+        FormatMode(char asChar) {
             this.asChar = asChar;
         }
 
@@ -53,17 +53,21 @@ public char asChar() {
          *
          * @throws IllegalArgumentException if char is not 't', 'l', 'u'
          */
-        public static FORMAT_MODE getFormatModeForBSTFormat(final char bstFormat) {
-            for (FORMAT_MODE mode : FORMAT_MODE.values()) {
+        public static FormatMode of(final char bstFormat) {
+            for (FormatMode mode : FormatMode.values()) {
                 if (mode.asChar == bstFormat) {
                     return mode;
                 }
             }
             throw new IllegalArgumentException();
         }
+
+        public static FormatMode of(final String bstFormat) {
+            return of(bstFormat.toLowerCase(Locale.ROOT).charAt(0));
+        }
     }
 
-    private BibtexCaseChanger() {
+    private BstCaseChanger() {
     }
 
     /**
@@ -72,11 +76,11 @@ private BibtexCaseChanger() {
      * @param s      the string to handle
      * @param format the format
      */
-    public static String changeCase(String s, FORMAT_MODE format) {
-        return (new BibtexCaseChanger()).doChangeCase(s, format);
+    public static String changeCase(String s, FormatMode format) {
+        return (new BstCaseChanger()).doChangeCase(s, format);
     }
 
-    private String doChangeCase(String s, FORMAT_MODE format) {
+    private String doChangeCase(String s, FormatMode format) {
         char[] c = s.toCharArray();
 
         StringBuilder sb = new StringBuilder();
@@ -93,7 +97,7 @@ private String doChangeCase(String s, FORMAT_MODE format) {
                     i++;
                     continue;
                 }
-                if ((format == FORMAT_MODE.TITLE_LOWERS) && ((i == 0) || (prevColon && Character.isWhitespace(c[i - 1])))) {
+                if ((format == FormatMode.TITLE_LOWERS) && ((i == 0) || (prevColon && Character.isWhitespace(c[i - 1])))) {
                     sb.append('{');
                     i++;
                     prevColon = false;
@@ -136,12 +140,9 @@ private String doChangeCase(String s, FORMAT_MODE format) {
      * is other stuff, too, between braces, but it doesn't try to do anything
      * special with |colon|s.
      *
-     * @param c
      * @param start  the current position. It points to the opening brace
-     * @param format
-     * @return
      */
-    private int convertSpecialChar(StringBuilder sb, char[] c, int start, FORMAT_MODE format) {
+    private int convertSpecialChar(StringBuilder sb, char[] c, int start, FormatMode format) {
         int i = start;
 
         sb.append(c[i]);
@@ -152,7 +153,7 @@ private int convertSpecialChar(StringBuilder sb, char[] c, int start, FORMAT_MOD
             i++;
             // skip over the |backslash|
 
-            Optional<String> s = BibtexCaseChanger.findSpecialChar(c, i);
+            Optional<String> s = BstCaseChanger.findSpecialChar(c, i);
             if (s.isPresent()) {
                 i = convertAccented(c, i, s.get(), sb, format);
             }
@@ -174,14 +175,9 @@ private int convertSpecialChar(StringBuilder sb, char[] c, int start, FORMAT_MOD
      * up) and append the result to the stringBuffer, return the updated
      * position.
      *
-     * @param c
-     * @param start
-     * @param s
-     * @param sb
-     * @param format
      * @return the new position
      */
-    private int convertAccented(char[] c, int start, String s, StringBuilder sb, FORMAT_MODE format) {
+    private int convertAccented(char[] c, int start, String s, StringBuilder sb, FormatMode format) {
         int pos = start;
         pos += s.length();
 
@@ -214,29 +210,27 @@ private int convertAccented(char[] c, int start, String s, StringBuilder sb, FOR
         return pos;
     }
 
-    private int convertNonControl(char[] c, int start, StringBuilder sb, FORMAT_MODE format) {
+    private int convertNonControl(char[] c, int start, StringBuilder sb, FormatMode format) {
         int pos = start;
         switch (format) {
-            case TITLE_LOWERS:
-            case ALL_LOWERS:
+            case TITLE_LOWERS, ALL_LOWERS -> {
                 sb.append(Character.toLowerCase(c[pos]));
                 pos++;
-                break;
-            case ALL_UPPERS:
+            }
+            case ALL_UPPERS -> {
                 sb.append(Character.toUpperCase(c[pos]));
                 pos++;
-                break;
-            default:
-                LOGGER.info("convertNonControl - Unknown format: " + format);
-                break;
+            }
+            default ->
+                    LOGGER.info("convertNonControl - Unknown format: " + format);
         }
         return pos;
     }
 
-    private int convertCharIfBraceLevelIsZero(char[] c, int start, StringBuilder sb, FORMAT_MODE format) {
+    private int convertCharIfBraceLevelIsZero(char[] c, int start, StringBuilder sb, FormatMode format) {
         int i = start;
         switch (format) {
-            case TITLE_LOWERS:
+            case TITLE_LOWERS -> {
                 if ((i == 0) || (prevColon && Character.isWhitespace(c[i - 1]))) {
                     sb.append(c[i]);
                 } else {
@@ -247,16 +241,13 @@ private int convertCharIfBraceLevelIsZero(char[] c, int start, StringBuilder sb,
                 } else if (!Character.isWhitespace(c[i])) {
                     prevColon = false;
                 }
-                break;
-            case ALL_LOWERS:
-                sb.append(Character.toLowerCase(c[i]));
-                break;
-            case ALL_UPPERS:
-                sb.append(Character.toUpperCase(c[i]));
-                break;
-            default:
-                LOGGER.info("convertCharIfBraceLevelIsZero - Unknown format: " + format);
-                break;
+            }
+            case ALL_LOWERS ->
+                    sb.append(Character.toLowerCase(c[i]));
+            case ALL_UPPERS ->
+                    sb.append(Character.toUpperCase(c[i]));
+            default ->
+                    LOGGER.info("convertCharIfBraceLevelIsZero - Unknown format: " + format);
         }
         i++;
         return i;
diff --git a/src/main/java/org/jabref/logic/bst/BibtexNameFormatter.java b/src/main/java/org/jabref/logic/bst/util/BstNameFormatter.java
similarity index 76%
rename from src/main/java/org/jabref/logic/bst/BibtexNameFormatter.java
rename to src/main/java/org/jabref/logic/bst/util/BstNameFormatter.java
index 83b775a7c12..c4986dc12dd 100644
--- a/src/main/java/org/jabref/logic/bst/BibtexNameFormatter.java
+++ b/src/main/java/org/jabref/logic/bst/util/BstNameFormatter.java
@@ -1,13 +1,17 @@
-package org.jabref.logic.bst;
+package org.jabref.logic.bst.util;
 
 import java.util.Arrays;
 import java.util.Locale;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
+import org.jabref.logic.bst.BstVMException;
 import org.jabref.model.entry.Author;
 import org.jabref.model.entry.AuthorList;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 /**
  * From Bibtex:
  *
@@ -24,9 +28,10 @@
  * Sounds easy - is a nightmare... X-(
  *
  */
-public class BibtexNameFormatter {
+public class BstNameFormatter {
+    private static final Logger LOGGER = LoggerFactory.getLogger(BstNameFormatter.class);
 
-    private BibtexNameFormatter() {
+    private BstNameFormatter() {
     }
 
     /**
@@ -35,24 +40,18 @@ private BibtexNameFormatter() {
      * @param authorsNameList The string from an author field
      * @param whichName       index of the list, starting with 1
      * @param formatString    TODO
-     * @param warn            collects the warnings, may-be-null
-     * @return
      */
-    public static String formatName(String authorsNameList, int whichName, String formatString, Warn warn) {
+    public static String formatName(String authorsNameList, int whichName, String formatString) {
         AuthorList al = AuthorList.parse(authorsNameList);
 
         if ((whichName < 1) && (whichName > al.getNumberOfAuthors())) {
-            warn.warn("AuthorList " + authorsNameList + " does not contain an author with number " + whichName);
+            LOGGER.warn("AuthorList {} does not contain an author with number {}", authorsNameList, whichName);
             return "";
         }
-        return BibtexNameFormatter.formatName(al.getAuthor(whichName - 1), formatString, warn);
+        return BstNameFormatter.formatName(al.getAuthor(whichName - 1), formatString);
     }
 
-    /**
-     * @param warn collects the warnings, may-be-null
-     */
-    public static String formatName(Author author, String format, Warn warn) {
-
+    public static String formatName(Author author, String format) {
         StringBuilder sb = new StringBuilder();
 
         char[] c = format.toCharArray();
@@ -82,11 +81,7 @@ public static String formatName(Author author, String format, Warn warn) {
                     }
                     if ((braceLevel == 1) && Character.isLetter(c[i])) {
                         if ("fvlj".indexOf(c[i]) == -1) {
-                            if (warn != null) {
-                                warn.warn(
-                                        "Format string in format.name$ may only contain fvlj on brace level 1 in group "
-                                                + group + ": " + format);
-                            }
+                            LOGGER.warn("Format string in format.name$ may only contain fvlj on brace level 1 in group {}: {}", group, format);
                         } else {
                             level1Chars.append(c[i]);
                         }
@@ -100,31 +95,26 @@ public static String formatName(Author author, String format, Warn warn) {
                     continue;
                 }
 
-                if ((control.length() > 2) && (warn != null)) {
-                    warn.warn("Format string in format.name$ may only be one or two character long on brace level 1 in group " + group + ": " + format);
+                if ((control.length() > 2)) {
+                    LOGGER.warn("Format string in format.name$ may only be one or two character long on brace level 1 in group {}: {}", group, format);
                 }
 
                 char type = control.charAt(0);
 
-                Optional<String> tokenS;
-                switch (type) {
-                    case 'f':
-                        tokenS = author.getFirst();
-                        break;
-                    case 'v':
-                        tokenS = author.getVon();
-                        break;
-                    case 'l':
-                        tokenS = author.getLast();
-                        break;
-                    case 'j':
-                        tokenS = author.getJr();
-                        break;
-                    default:
-                        throw new VMException("Internal error");
-                }
-
-                if (!tokenS.isPresent()) {
+                Optional<String> tokenS = switch (type) {
+                    case 'f' ->
+                            author.getFirst();
+                    case 'v' ->
+                            author.getVon();
+                    case 'l' ->
+                            author.getLast();
+                    case 'j' ->
+                            author.getJr();
+                    default ->
+                            throw new BstVMException("Internal error");
+                };
+
+                if (tokenS.isEmpty()) {
                     i++;
                     continue;
                 }
@@ -136,9 +126,7 @@ public static String formatName(Author author, String format, Warn warn) {
                     if (control.charAt(1) == control.charAt(0)) {
                         abbreviateThatIsSingleLetter = false;
                     } else {
-                        if (warn != null) {
-                            warn.warn("Format string in format.name$ may only contain one type of vlfj on brace level 1 in group " + group + ": " + format);
-                        }
+                        LOGGER.warn("Format string in format.name$ may only contain one type of vlfj on brace level 1 in group {}: {}", group, format);
                     }
                 }
 
@@ -156,7 +144,6 @@ public static String formatName(Author author, String format, Warn warn) {
                 int groupStart = sb.length();
 
                 for (int j = 0; j < d.length; j++) {
-
                     if (Character.isLetter(d[j]) && (bLevel == 1)) {
                         groupStart = sb.length();
                         if (!abbreviateThatIsSingleLetter) {
@@ -164,7 +151,7 @@ public static String formatName(Author author, String format, Warn warn) {
                         }
                         if (((j + 1) < d.length) && (d[j + 1] == '{')) {
                             StringBuilder interTokenSb = new StringBuilder();
-                            j = BibtexNameFormatter.consumeToMatchingBrace(interTokenSb, d, j + 1);
+                            j = BstNameFormatter.consumeToMatchingBrace(interTokenSb, d, j + 1);
                             interToken = interTokenSb.substring(1, interTokenSb.length() - 1);
                         }
 
@@ -173,7 +160,7 @@ public static String formatName(Author author, String format, Warn warn) {
                             if (abbreviateThatIsSingleLetter) {
                                 String[] dashes = token.split("-");
 
-                                token = Arrays.asList(dashes).stream().map(BibtexNameFormatter::getFirstCharOfString)
+                                token = Arrays.stream(dashes).map(BstNameFormatter::getFirstCharOfString)
                                               .collect(Collectors.joining(".-"));
                             }
 
@@ -189,7 +176,7 @@ public static String formatName(Author author, String format, Warn warn) {
                                     // No clue what this means (What the hell are tokens anyway???
                                     // if (lex_class[name_sep_char[cur_token]] = sep_char) then
                                     //    append_ex_buf_char_and_check (name_sep_char[cur_token])
-                                    if ((k == (tokens.length - 2)) || (BibtexNameFormatter.numberOfChars(sb.substring(groupStart, sb.length()), 3) < 3)) {
+                                    if ((k == (tokens.length - 2)) || (BstNameFormatter.numberOfChars(sb.substring(groupStart, sb.length()), 3) < 3)) {
                                         sb.append('~');
                                     } else {
                                         sb.append(' ');
@@ -214,7 +201,7 @@ public static String formatName(Author author, String format, Warn warn) {
                 if (sb.length() > 0) {
                     boolean noDisTie = false;
                     if ((sb.charAt(sb.length() - 1) == '~') &&
-                            ((BibtexNameFormatter.numberOfChars(sb.substring(groupStart, sb.length()), 4) >= 4) ||
+                            ((BstNameFormatter.numberOfChars(sb.substring(groupStart, sb.length()), 4) >= 4) ||
                                     ((sb.length() > 1) && (noDisTie = sb.charAt(sb.length() - 2) == '~')))) {
                         sb.deleteCharAt(sb.length() - 1);
                         if (!noDisTie) {
@@ -223,16 +210,14 @@ public static String formatName(Author author, String format, Warn warn) {
                     }
                 }
             } else if (c[i] == '}') {
-                if (warn != null) {
-                    warn.warn("Unmatched brace in format string: " + format);
-                }
+                LOGGER.warn("Unmatched brace in format string: {}", format);
             } else {
                 sb.append(c[i]); // verbatim
             }
             i++;
         }
-        if ((braceLevel != 0) && (warn != null)) {
-            warn.warn("Unbalanced brace in format string for nameFormat: " + format);
+        if ((braceLevel != 0)) {
+            LOGGER.warn("Unbalanced brace in format string for nameFormat: {}", format);
         }
 
         return sb.toString();
@@ -240,14 +225,8 @@ public static String formatName(Author author, String format, Warn warn) {
 
     /**
      * Including the matching brace.
-     *
-     * @param interTokenSb
-     * @param c
-     * @param pos
-     * @return
      */
     public static int consumeToMatchingBrace(StringBuilder interTokenSb, char[] c, int pos) {
-
         int braceLevel = 0;
 
         for (int i = pos; i < c.length; i++) {
@@ -267,9 +246,6 @@ public static int consumeToMatchingBrace(StringBuilder interTokenSb, char[] c, i
 
     /**
      * Takes care of special characters too
-     *
-     * @param s
-     * @return
      */
     public static String getFirstCharOfString(String s) {
         char[] c = s.toCharArray();
@@ -279,7 +255,7 @@ public static String getFirstCharOfString(String s) {
             }
             if ((c[i] == '{') && ((i + 1) < c.length) && (c[i + 1] == '\\')) {
                 StringBuilder sb = new StringBuilder();
-                BibtexNameFormatter.consumeToMatchingBrace(sb, c, i);
+                BstNameFormatter.consumeToMatchingBrace(sb, c, i);
                 return sb.toString();
             }
         }
diff --git a/src/main/java/org/jabref/logic/bst/BibtexPurify.java b/src/main/java/org/jabref/logic/bst/util/BstPurifier.java
similarity index 77%
rename from src/main/java/org/jabref/logic/bst/BibtexPurify.java
rename to src/main/java/org/jabref/logic/bst/util/BstPurifier.java
index 2714368c782..90818a0749f 100644
--- a/src/main/java/org/jabref/logic/bst/BibtexPurify.java
+++ b/src/main/java/org/jabref/logic/bst/util/BstPurifier.java
@@ -1,4 +1,7 @@
-package org.jabref.logic.bst;
+package org.jabref.logic.bst.util;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  *
@@ -10,18 +13,13 @@
  * pushes the null string.
  *
  */
-public class BibtexPurify {
+public class BstPurifier {
+    private static final Logger LOGGER = LoggerFactory.getLogger(BstPurifier.class);
 
-    private BibtexPurify() {
+    private BstPurifier() {
     }
 
-    /**
-     * @param toPurify
-     * @param warn     may-be-null
-     * @return
-     */
-    public static String purify(String toPurify, Warn warn) {
-
+    public static String purify(String toPurify) {
         StringBuilder sb = new StringBuilder();
 
         char[] cs = toPurify.toCharArray();
@@ -42,7 +40,7 @@ public static String purify(String toPurify, Warn warn) {
                     i++; // skip brace
                     while ((i < n) && (braceLevel > 0)) {
                         i++; // skip backslash
-                        BibtexCaseChanger.findSpecialChar(cs, i).ifPresent(sb::append);
+                        BstCaseChanger.findSpecialChar(cs, i).ifPresent(sb::append);
 
                         while ((i < n) && Character.isLetter(cs[i])) {
                             i++;
@@ -64,15 +62,13 @@ public static String purify(String toPurify, Warn warn) {
                 if (braceLevel > 0) {
                     braceLevel--;
                 } else {
-                    if (warn != null) {
-                        warn.warn("Unbalanced brace in string for purify$: " + toPurify);
-                    }
+                    LOGGER.warn("Unbalanced brace in string for purify$: {}", toPurify);
                 }
             }
             i++;
         }
-        if ((braceLevel != 0) && (warn != null)) {
-            warn.warn("Unbalanced brace in string for purify$: " + toPurify);
+        if ((braceLevel != 0)) {
+            LOGGER.warn("Unbalanced brace in string for purify$: {}", toPurify);
         }
 
         return sb.toString();
diff --git a/src/main/java/org/jabref/logic/bst/BibtexTextPrefix.java b/src/main/java/org/jabref/logic/bst/util/BstTextPrefixer.java
similarity index 84%
rename from src/main/java/org/jabref/logic/bst/BibtexTextPrefix.java
rename to src/main/java/org/jabref/logic/bst/util/BstTextPrefixer.java
index 721838e29fe..31cbc71de9b 100644
--- a/src/main/java/org/jabref/logic/bst/BibtexTextPrefix.java
+++ b/src/main/java/org/jabref/logic/bst/util/BstTextPrefixer.java
@@ -1,4 +1,7 @@
-package org.jabref.logic.bst;
+package org.jabref.logic.bst.util;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * The |built_in| function {\.{text.prefix\$}} pops the top two literals (the
@@ -14,15 +17,13 @@
  * complains and pushes the null string.
  *
  */
-public class BibtexTextPrefix {
+public class BstTextPrefixer {
+    private static final Logger LOGGER = LoggerFactory.getLogger(BstTextPrefixer.class);
 
-    private BibtexTextPrefix() {
+    private BstTextPrefixer() {
     }
 
-    /**
-     * @param warn may-be-null
-     */
-    public static String textPrefix(int inNumOfChars, String toPrefix, Warn warn) {
+    public static String textPrefix(int inNumOfChars, String toPrefix) {
         int numOfChars = inNumOfChars;
         StringBuilder sb = new StringBuilder();
 
@@ -53,15 +54,13 @@ public static String textPrefix(int inNumOfChars, String toPrefix, Warn warn) {
                 if (braceLevel > 0) {
                     braceLevel--;
                 } else {
-                    if (warn != null) {
-                        warn.warn("Unbalanced brace in string for purify$: " + toPrefix);
-                    }
+                    LOGGER.warn("Unbalanced brace in string for purify$: {}", toPrefix);
                 }
             } else {
                 numOfChars--;
             }
         }
-        sb.append(toPrefix.substring(0, i));
+        sb.append(toPrefix, 0, i);
         while (braceLevel > 0) {
             sb.append('}');
             braceLevel--;
diff --git a/src/main/java/org/jabref/logic/bst/util/BstWidthCalculator.java b/src/main/java/org/jabref/logic/bst/util/BstWidthCalculator.java
new file mode 100644
index 00000000000..c286fe1497b
--- /dev/null
+++ b/src/main/java/org/jabref/logic/bst/util/BstWidthCalculator.java
@@ -0,0 +1,241 @@
+package org.jabref.logic.bst.util;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ *
+ * The |built_in| function {\.{purify\$}} pops the top (string) literal, removes
+ * nonalphanumeric characters except for |white_space| and |sep_char| characters
+ * (these get converted to a |space|) and removes certain alphabetic characters
+ * contained in the control sequences associated with a special character, and
+ * pushes the resulting string. If the literal isn't a string, it complains and
+ * pushes the null string.
+ *
+ */
+public class BstWidthCalculator {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(BstWidthCalculator.class);
+
+    /*
+     * Quoted from Bibtex:
+     *
+     * Now we initialize the system-dependent |char_width| array, for which
+     * |space| is the only |white_space| character given a nonzero printing
+     * width. The widths here are taken from Stanford's June~'87 $cmr10$~font
+     * and represent hundredths of a point (rounded), but since they're used
+     * only for relative comparisons, the units have no meaning.
+     */
+
+    private static int[] widths;
+
+    static {
+        if (BstWidthCalculator.widths == null) {
+            BstWidthCalculator.widths = new int[128];
+
+            for (int i = 0; i < 128; i++) {
+                BstWidthCalculator.widths[i] = 0;
+            }
+            BstWidthCalculator.widths[32] = 278;
+            BstWidthCalculator.widths[33] = 278;
+            BstWidthCalculator.widths[34] = 500;
+            BstWidthCalculator.widths[35] = 833;
+            BstWidthCalculator.widths[36] = 500;
+            BstWidthCalculator.widths[37] = 833;
+            BstWidthCalculator.widths[38] = 778;
+            BstWidthCalculator.widths[39] = 278;
+            BstWidthCalculator.widths[40] = 389;
+            BstWidthCalculator.widths[41] = 389;
+            BstWidthCalculator.widths[42] = 500;
+            BstWidthCalculator.widths[43] = 778;
+            BstWidthCalculator.widths[44] = 278;
+            BstWidthCalculator.widths[45] = 333;
+            BstWidthCalculator.widths[46] = 278;
+            BstWidthCalculator.widths[47] = 500;
+            BstWidthCalculator.widths[48] = 500;
+            BstWidthCalculator.widths[49] = 500;
+            BstWidthCalculator.widths[50] = 500;
+            BstWidthCalculator.widths[51] = 500;
+            BstWidthCalculator.widths[52] = 500;
+            BstWidthCalculator.widths[53] = 500;
+            BstWidthCalculator.widths[54] = 500;
+            BstWidthCalculator.widths[55] = 500;
+            BstWidthCalculator.widths[56] = 500;
+            BstWidthCalculator.widths[57] = 500;
+            BstWidthCalculator.widths[58] = 278;
+            BstWidthCalculator.widths[59] = 278;
+            BstWidthCalculator.widths[60] = 278;
+            BstWidthCalculator.widths[61] = 778;
+            BstWidthCalculator.widths[62] = 472;
+            BstWidthCalculator.widths[63] = 472;
+            BstWidthCalculator.widths[64] = 778;
+            BstWidthCalculator.widths[65] = 750;
+            BstWidthCalculator.widths[66] = 708;
+            BstWidthCalculator.widths[67] = 722;
+            BstWidthCalculator.widths[68] = 764;
+            BstWidthCalculator.widths[69] = 681;
+            BstWidthCalculator.widths[70] = 653;
+            BstWidthCalculator.widths[71] = 785;
+            BstWidthCalculator.widths[72] = 750;
+            BstWidthCalculator.widths[73] = 361;
+            BstWidthCalculator.widths[74] = 514;
+            BstWidthCalculator.widths[75] = 778;
+            BstWidthCalculator.widths[76] = 625;
+            BstWidthCalculator.widths[77] = 917;
+            BstWidthCalculator.widths[78] = 750;
+            BstWidthCalculator.widths[79] = 778;
+            BstWidthCalculator.widths[80] = 681;
+            BstWidthCalculator.widths[81] = 778;
+            BstWidthCalculator.widths[82] = 736;
+            BstWidthCalculator.widths[83] = 556;
+            BstWidthCalculator.widths[84] = 722;
+            BstWidthCalculator.widths[85] = 750;
+            BstWidthCalculator.widths[86] = 750;
+            BstWidthCalculator.widths[87] = 1028;
+            BstWidthCalculator.widths[88] = 750;
+            BstWidthCalculator.widths[89] = 750;
+            BstWidthCalculator.widths[90] = 611;
+            BstWidthCalculator.widths[91] = 278;
+            BstWidthCalculator.widths[92] = 500;
+            BstWidthCalculator.widths[93] = 278;
+            BstWidthCalculator.widths[94] = 500;
+            BstWidthCalculator.widths[95] = 278;
+            BstWidthCalculator.widths[96] = 278;
+            BstWidthCalculator.widths[97] = 500;
+            BstWidthCalculator.widths[98] = 556;
+            BstWidthCalculator.widths[99] = 444;
+            BstWidthCalculator.widths[100] = 556;
+            BstWidthCalculator.widths[101] = 444;
+            BstWidthCalculator.widths[102] = 306;
+            BstWidthCalculator.widths[103] = 500;
+            BstWidthCalculator.widths[104] = 556;
+            BstWidthCalculator.widths[105] = 278;
+            BstWidthCalculator.widths[106] = 306;
+            BstWidthCalculator.widths[107] = 528;
+            BstWidthCalculator.widths[108] = 278;
+            BstWidthCalculator.widths[109] = 833;
+            BstWidthCalculator.widths[110] = 556;
+            BstWidthCalculator.widths[111] = 500;
+            BstWidthCalculator.widths[112] = 556;
+            BstWidthCalculator.widths[113] = 528;
+            BstWidthCalculator.widths[114] = 392;
+            BstWidthCalculator.widths[115] = 394;
+            BstWidthCalculator.widths[116] = 389;
+            BstWidthCalculator.widths[117] = 556;
+            BstWidthCalculator.widths[118] = 528;
+            BstWidthCalculator.widths[119] = 722;
+            BstWidthCalculator.widths[120] = 528;
+            BstWidthCalculator.widths[121] = 528;
+            BstWidthCalculator.widths[122] = 444;
+            BstWidthCalculator.widths[123] = 500;
+            BstWidthCalculator.widths[124] = 1000;
+            BstWidthCalculator.widths[125] = 500;
+            BstWidthCalculator.widths[126] = 500;
+        }
+    }
+
+    private BstWidthCalculator() {
+    }
+
+    private static int getSpecialCharWidth(char[] c, int pos) {
+        if ((pos + 1) < c.length) {
+            if ((c[pos] == 'o') && (c[pos + 1] == 'e')) {
+                return 778;
+            }
+            if ((c[pos] == 'O') && (c[pos + 1] == 'E')) {
+                return 1014;
+            }
+            if ((c[pos] == 'a') && (c[pos + 1] == 'e')) {
+                return 722;
+            }
+            if ((c[pos] == 'A') && (c[pos + 1] == 'E')) {
+                return 903;
+            }
+            if ((c[pos] == 's') && (c[pos + 1] == 's')) {
+                return 500;
+            }
+        }
+        return BstWidthCalculator.getCharWidth(c[pos]);
+    }
+
+    public static int getCharWidth(char c) {
+        if ((c >= 0) && (c < 128)) {
+            return BstWidthCalculator.widths[c];
+        } else {
+            return 0;
+        }
+    }
+
+    public static int width(String toMeasure) {
+        /*
+         * From Bibtex: We use the natural width for all but special characters,
+         * and we complain if the string isn't brace-balanced.
+         */
+
+        int i = 0;
+        int n = toMeasure.length();
+        int braceLevel = 0;
+        char[] c = toMeasure.toCharArray();
+        int result = 0;
+
+        /*
+         * From Bibtex:
+         *
+         * We use the natural widths of all characters except that some
+         * characters have no width: braces, control sequences (except for the
+         * usual 13 accented and foreign characters, whose widths are given in
+         * the next module), and |white_space| following control sequences (even
+         * a null control sequence).
+         *
+         */
+        while (i < n) {
+            if (c[i] == '{') {
+                braceLevel++;
+                if ((braceLevel == 1) && ((i + 1) < n) && (c[i + 1] == '\\')) {
+                    i++; // skip brace
+                    while ((i < n) && (braceLevel > 0)) {
+                        i++; // skip backslash
+
+                        int afterBackslash = i;
+                        while ((i < n) && Character.isLetter(c[i])) {
+                            i++;
+                        }
+                        if ((i < n) && (i == afterBackslash)) {
+                            i++; // Skip non-alpha control seq
+                        } else {
+                            if (BstCaseChanger.findSpecialChar(c, afterBackslash).isPresent()) {
+                                result += BstWidthCalculator.getSpecialCharWidth(c, afterBackslash);
+                            }
+                        }
+                        while ((i < n) && Character.isWhitespace(c[i])) {
+                            i++;
+                        }
+                        while ((i < n) && (braceLevel > 0) && (c[i] != '\\')) {
+                            if (c[i] == '}') {
+                                braceLevel--;
+                            } else if (c[i] == '{') {
+                                braceLevel++;
+                            } else {
+                                result += BstWidthCalculator.getCharWidth(c[i]);
+                            }
+                            i++;
+                        }
+                    }
+                    continue;
+                }
+            } else if (c[i] == '}') {
+                if (braceLevel > 0) {
+                    braceLevel--;
+                } else {
+                    LOGGER.warn("Too many closing braces in string: " + toMeasure);
+                }
+            }
+            result += BstWidthCalculator.getCharWidth(c[i]);
+            i++;
+        }
+        if (braceLevel > 0) {
+            LOGGER.warn("No enough closing braces in string: " + toMeasure);
+        }
+        return result;
+    }
+}
diff --git a/src/main/java/org/jabref/logic/citationkeypattern/BracketedPattern.java b/src/main/java/org/jabref/logic/citationkeypattern/BracketedPattern.java
index 9d743121766..ea7615db8bd 100644
--- a/src/main/java/org/jabref/logic/citationkeypattern/BracketedPattern.java
+++ b/src/main/java/org/jabref/logic/citationkeypattern/BracketedPattern.java
@@ -711,13 +711,14 @@ private static String keepLettersAndDigitsOnly(String in) {
      * Gets the last name of the first author/editor
      *
      * @param authorList an {@link AuthorList}
-     * @return the surname of an author/editor or "" if no author was found This method is guaranteed to never return
-     * null.
+     * @return the surname of an author/editor or the von part if no lastname is prsent or ""  if no author was found or both firstname+lastname are empty
+     * This method is guaranteed to never return null.
      */
     private static String firstAuthor(AuthorList authorList) {
         return authorList.getAuthors().stream()
                          .findFirst()
-                         .flatMap(Author::getLast).orElse("");
+                         .flatMap(author -> author.getLast().isPresent() ? author.getLast() : author.getVon())
+                         .orElse("");
     }
 
     /**
@@ -967,7 +968,7 @@ private static String authshort(AuthorList authorList) {
         if (numberOfAuthors == 1) {
             author.append(authorList.getAuthor(0).getLast().orElse(""));
         } else if (numberOfAuthors >= 2) {
-            for (int i = 0; i < numberOfAuthors && i < 3; i++) {
+            for (int i = 0; (i < numberOfAuthors) && (i < 3); i++) {
                 author.append(authNofMth(authorList, 1, i + 1));
             }
             if (numberOfAuthors > 3) {
@@ -1004,7 +1005,7 @@ private static String authshort(AuthorList authorList) {
      *                   to "" be returned.
      */
     private static String authIniN(AuthorList authorList, int n) {
-        if (n <= 0 || authorList.isEmpty()) {
+        if ((n <= 0) || authorList.isEmpty()) {
             return "";
         }
 
@@ -1233,7 +1234,7 @@ private static String generateInstitutionKey(String content) {
                 }
             } else if ((tokenTypes.contains(Institution.SCHOOL)
                     || tokenTypes.contains(Institution.DEPARTMENT))
-                    && institutionNameTokens.length > 1) {
+                    && (institutionNameTokens.length > 1)) {
                 // School is an abbreviation of all the words beginning with a
                 // capital letter excluding: department, school and faculty words.
                 StringBuilder schoolSB = new StringBuilder();
diff --git a/src/main/java/org/jabref/logic/citationkeypattern/CitationKeyGenerator.java b/src/main/java/org/jabref/logic/citationkeypattern/CitationKeyGenerator.java
index 1a46e9a0d68..43972fa011d 100644
--- a/src/main/java/org/jabref/logic/citationkeypattern/CitationKeyGenerator.java
+++ b/src/main/java/org/jabref/logic/citationkeypattern/CitationKeyGenerator.java
@@ -133,7 +133,7 @@ public String generateKey(BibEntry entry) {
     private String appendLettersToKey(String key, String oldKey) {
         long occurrences = database.getNumberOfCitationKeyOccurrences(key);
 
-        if (Objects.equals(oldKey, key)) {
+        if ((occurrences > 0) && Objects.equals(oldKey, key)) {
             occurrences--; // No change, so we can accept one dupe.
         }
 
diff --git a/src/main/java/org/jabref/logic/citationstyle/CSLAdapter.java b/src/main/java/org/jabref/logic/citationstyle/CSLAdapter.java
index 88467782466..3aadcfdc777 100644
--- a/src/main/java/org/jabref/logic/citationstyle/CSLAdapter.java
+++ b/src/main/java/org/jabref/logic/citationstyle/CSLAdapter.java
@@ -5,18 +5,22 @@
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
+import java.util.Locale;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 
 import org.jabref.logic.formatter.bibtexfields.RemoveNewlinesFormatter;
+import org.jabref.logic.integrity.PagesChecker;
 import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.model.database.BibDatabaseMode;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.BibEntryType;
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.entry.Month;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.StandardField;
+import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.model.strings.LatexToUnicodeAdapter;
 
 import de.undercouch.citeproc.CSL;
@@ -54,6 +58,7 @@ public class CSLAdapter {
     /**
      * Creates the bibliography of the provided items. This method needs to run synchronized because the underlying
      * CSL engine is not thread-safe.
+     *
      * @param databaseContext {@link BibDatabaseContext} is used to be able to resolve fields and their aliases
      */
     public synchronized List<String> makeBibliography(List<BibEntry> bibEntries, String style, CitationStyleOutputFormat outputFormat, BibDatabaseContext databaseContext, BibEntryTypesManager entryTypesManager) throws IOException, IllegalArgumentException {
@@ -72,14 +77,15 @@ public synchronized List<String> makeBibliography(List<BibEntry> bibEntries, Str
      * @throws IOException An error occurred in the underlying JavaScript framework
      */
     private void initialize(String newStyle, CitationStyleOutputFormat newFormat) throws IOException {
-        if ((cslInstance == null) || !Objects.equals(newStyle, style)) {
+        final boolean newCslInstanceNeedsToBeCreated = (cslInstance == null) || !Objects.equals(newStyle, style);
+        if (newCslInstanceNeedsToBeCreated) {
             // lang and forceLang are set to the default values of other CSL constructors
             cslInstance = new CSL(dataProvider, new JabRefLocaleProvider(),
                     new DefaultAbbreviationProvider(), newStyle, "en-US");
             style = newStyle;
         }
 
-        if (!Objects.equals(newFormat, format)) {
+        if (newCslInstanceNeedsToBeCreated || (!Objects.equals(newFormat, format))) {
             cslInstance.setOutputFormat(newFormat.getFormat());
             format = newFormat;
         }
@@ -94,12 +100,15 @@ private static class JabRefItemDataProvider implements ItemDataProvider {
         private final List<BibEntry> data = new ArrayList<>();
         private BibDatabaseContext bibDatabaseContext;
         private BibEntryTypesManager entryTypesManager;
+        private PagesChecker pagesChecker;
 
         /**
          * Converts the {@link BibEntry} into {@link CSLItemData}.
          */
-        private static CSLItemData bibEntryToCSLItemData(BibEntry bibEntry, BibDatabaseContext bibDatabaseContext, BibEntryTypesManager entryTypesManager) {
-
+        private CSLItemData bibEntryToCSLItemData(BibEntry originalBibEntry, BibDatabaseContext bibDatabaseContext, BibEntryTypesManager entryTypesManager) {
+            // We need to make a deep copy, because we modify the entry according to the logic presented at
+            // https://github.com/JabRef/jabref/issues/8372#issuecomment-1014941935
+            BibEntry bibEntry = (BibEntry) originalBibEntry.clone();
             String citeKey = bibEntry.getCitationKey().orElse("");
             BibTeXEntry bibTeXEntry = new BibTeXEntry(new Key(bibEntry.getType().getName()), new Key(citeKey));
 
@@ -108,8 +117,55 @@ private static CSLItemData bibEntryToCSLItemData(BibEntry bibEntry, BibDatabaseC
 
             Optional<BibEntryType> entryType = entryTypesManager.enrich(bibEntry.getType(), bibDatabaseContext.getMode());
 
-            Set<Field> fields = entryType.map(BibEntryType::getAllFields).orElse(bibEntry.getFields());
+            if (bibEntry.getType().equals(StandardEntryType.Article)) {
+                // Patch bibEntry to contain the right BibTeX (not BibLaTeX) fields
+                // Note that we do not need to convert from "pages" to "page", because CiteProc already handles it
+                // See BibTeXConverter
+                if (bibDatabaseContext.isBiblatexMode()) {
+                    // Map "number" to CSL "issue", unless no number exists
+                    Optional<String> numberField = bibEntry.getField(StandardField.NUMBER);
+                    numberField.ifPresent(number -> {
+                            bibEntry.setField(StandardField.ISSUE, number);
+                            bibEntry.clearField(StandardField.NUMBER);
+                        }
+                    );
+                /* TODO: fix tests in CitationStyleGeneratorTest.java using APA style, once APA recognizes a "number" field (and thereby will be able to render the "eid" field)
+                 * tracked at https://github.com/citation-style-language/styles/issues/5827
+                 *
+                 * Further info:
+                 * www.zotero.org/styles/apa-6th-edition
+                 * https://docs.citationstyles.org/en/stable/specification.html#number-variables
+                 * https://apastyle.apa.org/style-grammar-guidelines/references/examples/journal-article-references#2
+                 */
+                  bibEntry.getField(StandardField.EID).ifPresent(eid -> {
+                   if (!bibEntry.hasField(StandardField.NUMBER)) {
+                       bibEntry.setField(StandardField.NUMBER, eid);
+                       bibEntry.clearField(StandardField.EID);
+                        }
+                    });
+                } else {
+                    // BibTeX mode
+                    bibEntry.getField(StandardField.NUMBER).ifPresent(number -> {
+                        bibEntry.setField(StandardField.ISSUE, number);
+                        bibEntry.clearField(StandardField.NUMBER);
+                    });
+                    bibEntry.getField(StandardField.PAGES).ifPresent(pages -> {
+                        if (pages.toLowerCase(Locale.ROOT).startsWith("article ")) {
+                            pages = pages.substring("Article ".length());
+                            bibEntry.setField(StandardField.NUMBER, pages);
+                        }
+                    });
+                    bibEntry.getField(StandardField.EID).ifPresent(eid -> {
+                        if (!bibEntry.hasField(StandardField.PAGES)) {
+                            bibEntry.setField(StandardField.PAGES, eid);
+                            bibEntry.clearField(StandardField.EID);
+                        }
+                    });
+                }
+            }
 
+            Set<Field> fields = entryType.map(BibEntryType::getAllFields).orElse(bibEntry.getFields());
+            fields.addAll(bibEntry.getFields());
             for (Field key : fields) {
                 bibEntry.getResolvedFieldOrAlias(key, bibDatabaseContext.getDatabase())
                         .map(removeNewlinesFormatter::format)
@@ -120,7 +176,6 @@ private static CSLItemData bibEntryToCSLItemData(BibEntry bibEntry, BibDatabaseC
                                 value = bibEntry.getMonth().map(Month::getShortName).orElse(value);
                             }
                             bibTeXEntry.addField(new Key(key.getName()), new DigitStringValue(value));
-
                         });
             }
             return BIBTEX_CONVERTER.toItemData(bibTeXEntry);
@@ -131,13 +186,19 @@ public void setData(List<BibEntry> data, BibDatabaseContext bibDatabaseContext,
             this.data.addAll(data);
             this.bibDatabaseContext = bibDatabaseContext;
             this.entryTypesManager = entryTypesManager;
+
+            // Quick solution to always use BibLaTeX mode at the checker to allow pages ranges with single dash, too
+            // Example: pages = {1-2}
+            BibDatabaseContext ctx = new BibDatabaseContext();
+            ctx.setMode(BibDatabaseMode.BIBLATEX);
+            this.pagesChecker = new PagesChecker(ctx);
         }
 
         @Override
         public CSLItemData retrieveItem(String id) {
             return data.stream()
                        .filter(entry -> entry.getCitationKey().orElse("").equals(id))
-                       .map(entry -> JabRefItemDataProvider.bibEntryToCSLItemData(entry, bibDatabaseContext, entryTypesManager))
+                       .map(entry -> bibEntryToCSLItemData(entry, bibDatabaseContext, entryTypesManager))
                        .findFirst().orElse(null);
         }
 
diff --git a/src/main/java/org/jabref/logic/citationstyle/CitationStyle.java b/src/main/java/org/jabref/logic/citationstyle/CitationStyle.java
index e467dae04d1..eb002ec8bcc 100644
--- a/src/main/java/org/jabref/logic/citationstyle/CitationStyle.java
+++ b/src/main/java/org/jabref/logic/citationstyle/CitationStyle.java
@@ -17,7 +17,6 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 
@@ -39,10 +38,11 @@
 public class CitationStyle {
 
     public static final String DEFAULT = "/ieee.csl";
+
     private static final Logger LOGGER = LoggerFactory.getLogger(CitationStyle.class);
     private static final String STYLES_ROOT = "/csl-styles";
-
     private static final List<CitationStyle> STYLES = new ArrayList<>();
+    private static final DocumentBuilderFactory FACTORY = DocumentBuilderFactory.newInstance();
 
     private final String filePath;
     private final String title;
@@ -60,13 +60,19 @@ private CitationStyle(final String filename, final String title, final String so
     private static Optional<CitationStyle> createCitationStyleFromSource(final String source, final String filename) {
         if ((filename != null) && !filename.isEmpty() && (source != null) && !source.isEmpty()) {
             try {
-                DocumentBuilder db = DocumentBuilderFactory.newInstance().newDocumentBuilder();
-                InputSource is = new InputSource();
-                is.setCharacterStream(new StringReader(stripInvalidProlog(source)));
+                InputSource inputSource = new InputSource();
+                inputSource.setCharacterStream(new StringReader(stripInvalidProlog(source)));
 
-                Document doc = db.parse(is);
-                NodeList nodes = doc.getElementsByTagName("info");
+                Document doc = FACTORY.newDocumentBuilder().parse(inputSource);
+
+                // See CSL#canFormatBibliographies, checks if the tag exists
+                NodeList bibs = doc.getElementsByTagName("bibliography");
+                if (bibs.getLength() <= 0) {
+                    LOGGER.debug("no bibliography element for file {} ", filename);
+                    return Optional.empty();
+                }
 
+                NodeList nodes = doc.getElementsByTagName("info");
                 NodeList titleNode = ((Element) nodes.item(0)).getElementsByTagName("title");
                 String title = ((CharacterData) titleNode.item(0).getFirstChild()).getData();
 
@@ -100,6 +106,7 @@ public static Optional<CitationStyle> createCitationStyleFromFile(final String s
             String text;
             String internalFile = STYLES_ROOT + (styleFile.startsWith("/") ? "" : "/") + styleFile;
             URL url = CitationStyle.class.getResource(internalFile);
+
             if (url != null) {
                 text = CSLUtils.readURLToString(url, StandardCharsets.UTF_8.toString());
             } else {
@@ -108,7 +115,7 @@ public static Optional<CitationStyle> createCitationStyleFromFile(final String s
             }
             return createCitationStyleFromSource(text, styleFile);
         } catch (NoSuchFileException e) {
-            LOGGER.error("Could not find file: " + styleFile, e);
+            LOGGER.error("Could not find file: {}", styleFile, e);
         } catch (IOException e) {
             LOGGER.error("Error reading source file", e);
         }
@@ -140,7 +147,6 @@ public static List<CitationStyle> discoverCitationStyles() {
         try {
             URI uri = url.toURI();
             Path path = Path.of(uri).getParent();
-
             STYLES.addAll(discoverCitationStylesInPath(path));
 
             return STYLES;
diff --git a/src/main/java/org/jabref/logic/cleanup/Cleanups.java b/src/main/java/org/jabref/logic/cleanup/Cleanups.java
index 726da9eb134..e73c526cf2d 100644
--- a/src/main/java/org/jabref/logic/cleanup/Cleanups.java
+++ b/src/main/java/org/jabref/logic/cleanup/Cleanups.java
@@ -56,7 +56,6 @@ public static List<Formatter> getBuiltInFormatters() {
     }
 
     public static List<FieldFormatterCleanup> parse(String formatterString) {
-
         if ((formatterString == null) || formatterString.isEmpty()) {
             // no save actions defined in the meta data
             return new ArrayList<>();
@@ -68,9 +67,8 @@ public static List<FieldFormatterCleanup> parse(String formatterString) {
         int startIndex = 0;
 
         // first remove all newlines for easier parsing
-        String remainingString = formatterString;
+        String remainingString = StringUtil.unifyLineBreaks(formatterString, "");
 
-        remainingString = StringUtil.unifyLineBreaks(remainingString, "");
         try {
             while (startIndex < formatterString.length()) {
                 // read the field name
@@ -109,7 +107,6 @@ public static List<FieldFormatterCleanup> parse(String formatterString) {
     }
 
     public static FieldFormatterCleanups parse(List<String> formatterMetaList) {
-
         if ((formatterMetaList != null) && (formatterMetaList.size() >= 2)) {
             boolean enablementStatus = FieldFormatterCleanups.ENABLED.equals(formatterMetaList.get(0));
             String formatterString = formatterMetaList.get(1);
diff --git a/src/main/java/org/jabref/logic/cleanup/DoiCleanup.java b/src/main/java/org/jabref/logic/cleanup/DoiCleanup.java
index a7fe33dccd5..0b3b335fa94 100644
--- a/src/main/java/org/jabref/logic/cleanup/DoiCleanup.java
+++ b/src/main/java/org/jabref/logic/cleanup/DoiCleanup.java
@@ -1,5 +1,7 @@
 package org.jabref.logic.cleanup;
 
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -25,13 +27,20 @@ public class DoiCleanup implements CleanupJob {
 
     @Override
     public List<FieldChange> cleanup(BibEntry entry) {
-
         List<FieldChange> changes = new ArrayList<>();
 
         // First check if the Doi Field is empty
         if (entry.hasField(StandardField.DOI)) {
             String doiFieldValue = entry.getField(StandardField.DOI).orElse(null);
 
+            String decodeDoiFieldValue = "";
+            try {
+                decodeDoiFieldValue = URLDecoder.decode(doiFieldValue, "UTF-8");
+            } catch (UnsupportedEncodingException e) {
+                decodeDoiFieldValue = doiFieldValue;
+            }
+            doiFieldValue = decodeDoiFieldValue;
+
             Optional<DOI> doi = DOI.parse(doiFieldValue);
 
             if (doi.isPresent()) {
@@ -46,7 +55,7 @@ public List<FieldChange> cleanup(BibEntry entry) {
                 // Doi field seems to contain Doi -> cleanup note, url, ee field
                 for (Field field : FIELDS) {
                     entry.getField(field).flatMap(DOI::parse)
-                        .ifPresent(unused -> removeFieldValue(entry, field, changes));
+                         .ifPresent(unused -> removeFieldValue(entry, field, changes));
                 }
             }
         } else {
diff --git a/src/main/java/org/jabref/logic/cleanup/EprintCleanup.java b/src/main/java/org/jabref/logic/cleanup/EprintCleanup.java
index 8f332ae029a..27ab856c499 100644
--- a/src/main/java/org/jabref/logic/cleanup/EprintCleanup.java
+++ b/src/main/java/org/jabref/logic/cleanup/EprintCleanup.java
@@ -18,7 +18,6 @@ public class EprintCleanup implements CleanupJob {
 
     @Override
     public List<FieldChange> cleanup(BibEntry entry) {
-
         List<FieldChange> changes = new ArrayList<>();
 
         for (Field field : Arrays.asList(StandardField.URL, StandardField.JOURNAL, StandardField.JOURNALTITLE, StandardField.NOTE)) {
diff --git a/src/main/java/org/jabref/logic/cleanup/FieldFormatterCleanup.java b/src/main/java/org/jabref/logic/cleanup/FieldFormatterCleanup.java
index b02049573c5..0d1cf5c5ad6 100644
--- a/src/main/java/org/jabref/logic/cleanup/FieldFormatterCleanup.java
+++ b/src/main/java/org/jabref/logic/cleanup/FieldFormatterCleanup.java
@@ -56,9 +56,6 @@ private List<FieldChange> cleanupSingleField(Field fieldKey, BibEntry entry) {
 
         // Run formatter
         String newValue = formatter.format(oldValue);
-        if (formatter instanceof NormalizeNewlinesFormatter) {
-            newValue = oldValue;
-        }
 
         if (oldValue.equals(newValue)) {
             return Collections.emptyList();
diff --git a/src/main/java/org/jabref/logic/cleanup/MoveFieldCleanup.java b/src/main/java/org/jabref/logic/cleanup/MoveFieldCleanup.java
index bdf61432441..86b04f816f2 100644
--- a/src/main/java/org/jabref/logic/cleanup/MoveFieldCleanup.java
+++ b/src/main/java/org/jabref/logic/cleanup/MoveFieldCleanup.java
@@ -23,7 +23,6 @@ public MoveFieldCleanup(Field sourceField, Field targetField) {
 
     @Override
     public List<FieldChange> cleanup(BibEntry entry) {
-
         Optional<FieldChange> setFieldChange = entry.getField(sourceField).flatMap(
                 value -> entry.setField(targetField, value));
         Optional<FieldChange> clearFieldChange = entry.clearField(sourceField);
diff --git a/src/main/java/org/jabref/logic/cleanup/NormalizeNewlinesFormatter.java b/src/main/java/org/jabref/logic/cleanup/NormalizeNewlinesFormatter.java
deleted file mode 100644
index 42e59d01928..00000000000
--- a/src/main/java/org/jabref/logic/cleanup/NormalizeNewlinesFormatter.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package org.jabref.logic.cleanup;
-
-import java.util.Objects;
-
-import org.jabref.logic.l10n.Localization;
-import org.jabref.logic.util.OS;
-
-/**
- * Trim all whitespace characters (defined in java) in the string.
- */
-public class NormalizeNewlinesFormatter extends Formatter {
-
-    @Override
-    public String getName() {
-        return Localization.lang("Normalize newline characters");
-    }
-
-    @Override
-    public String getKey() {
-        return "normalize_newlines";
-    }
-
-    @Override
-    public String format(String value) {
-        Objects.requireNonNull(value);
-
-        boolean shouldNormalizeNewlines = !value.contains(OS.NEWLINE) && value.contains("\n");
-        if (shouldNormalizeNewlines) {
-            // if we don't have real new lines, but pseudo newlines, we replace them
-            // On Win 8.1, this is always true for multiline fields
-            return value.replace("\n", OS.NEWLINE);
-        } else {
-            return value;
-        }
-    }
-
-    @Override
-    public String getDescription() {
-        return Localization.lang("Normalizes all newline characters in the field content.");
-    }
-
-    @Override
-    public String getExampleInput() {
-        return "\r\n InCDMA\n ";
-    }
-}
diff --git a/src/main/java/org/jabref/logic/crawler/Crawler.java b/src/main/java/org/jabref/logic/crawler/Crawler.java
index 8df3e5d4154..04bed30f0b0 100644
--- a/src/main/java/org/jabref/logic/crawler/Crawler.java
+++ b/src/main/java/org/jabref/logic/crawler/Crawler.java
@@ -8,6 +8,7 @@
 import org.jabref.logic.exporter.SavePreferences;
 import org.jabref.logic.git.SlrGitHandler;
 import org.jabref.logic.importer.ImportFormatPreferences;
+import org.jabref.logic.importer.ImporterPreferences;
 import org.jabref.logic.importer.ParseException;
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.study.QueryResult;
@@ -32,10 +33,30 @@ public class Crawler {
      *
      * @param studyRepositoryRoot The path to the study repository
      */
-    public Crawler(Path studyRepositoryRoot, SlrGitHandler gitHandler, GeneralPreferences generalPreferences, ImportFormatPreferences importFormatPreferences, SavePreferences savePreferences, BibEntryTypesManager bibEntryTypesManager, FileUpdateMonitor fileUpdateMonitor) throws IllegalArgumentException, IOException, ParseException {
-        studyRepository = new StudyRepository(studyRepositoryRoot, gitHandler, generalPreferences, importFormatPreferences, fileUpdateMonitor, savePreferences, bibEntryTypesManager);
-        StudyDatabaseToFetcherConverter studyDatabaseToFetcherConverter = new StudyDatabaseToFetcherConverter(studyRepository.getActiveLibraryEntries(), importFormatPreferences);
-        this.studyFetcher = new StudyFetcher(studyDatabaseToFetcherConverter.getActiveFetchers(), studyRepository.getSearchQueryStrings());
+    public Crawler(Path studyRepositoryRoot,
+                   SlrGitHandler gitHandler,
+                   GeneralPreferences generalPreferences,
+                   ImportFormatPreferences importFormatPreferences,
+                   ImporterPreferences importerPreferences,
+                   SavePreferences savePreferences,
+                   BibEntryTypesManager bibEntryTypesManager,
+                   FileUpdateMonitor fileUpdateMonitor) throws IllegalArgumentException, IOException, ParseException {
+        this.studyRepository = new StudyRepository(
+                studyRepositoryRoot,
+                gitHandler,
+                generalPreferences,
+                importFormatPreferences,
+                importerPreferences,
+                fileUpdateMonitor,
+                savePreferences,
+                bibEntryTypesManager);
+        StudyDatabaseToFetcherConverter studyDatabaseToFetcherConverter = new StudyDatabaseToFetcherConverter(
+                studyRepository.getActiveLibraryEntries(),
+                importFormatPreferences,
+                importerPreferences);
+        this.studyFetcher = new StudyFetcher(
+                studyDatabaseToFetcherConverter.getActiveFetchers(),
+                studyRepository.getSearchQueryStrings());
     }
 
     /**
diff --git a/src/main/java/org/jabref/logic/crawler/StudyDatabaseToFetcherConverter.java b/src/main/java/org/jabref/logic/crawler/StudyDatabaseToFetcherConverter.java
index a5b51854cd8..70eef519aa3 100644
--- a/src/main/java/org/jabref/logic/crawler/StudyDatabaseToFetcherConverter.java
+++ b/src/main/java/org/jabref/logic/crawler/StudyDatabaseToFetcherConverter.java
@@ -6,6 +6,7 @@
 import java.util.stream.Collectors;
 
 import org.jabref.logic.importer.ImportFormatPreferences;
+import org.jabref.logic.importer.ImporterPreferences;
 import org.jabref.logic.importer.SearchBasedFetcher;
 import org.jabref.logic.importer.WebFetchers;
 import org.jabref.model.study.StudyDatabase;
@@ -16,10 +17,14 @@
 class StudyDatabaseToFetcherConverter {
     private final List<StudyDatabase> libraryEntries;
     private final ImportFormatPreferences importFormatPreferences;
+    private final ImporterPreferences importerPreferences;
 
-    public StudyDatabaseToFetcherConverter(List<StudyDatabase> libraryEntries, ImportFormatPreferences importFormatPreferences) {
+    public StudyDatabaseToFetcherConverter(List<StudyDatabase> libraryEntries,
+                                           ImportFormatPreferences importFormatPreferences,
+                                           ImporterPreferences importerPreferences) {
         this.libraryEntries = libraryEntries;
         this.importFormatPreferences = importFormatPreferences;
+        this.importerPreferences = importerPreferences;
     }
 
     /**
@@ -53,10 +58,10 @@ private List<SearchBasedFetcher> getFetchersFromLibraryEntries(List<StudyDatabas
      * @return An instance of the fetcher defined by the library entry.
      */
     private SearchBasedFetcher createFetcherFromLibraryEntry(StudyDatabase studyDatabase) {
-        Set<SearchBasedFetcher> searchBasedFetchers = WebFetchers.getSearchBasedFetchers(importFormatPreferences);
+        Set<SearchBasedFetcher> searchBasedFetchers = WebFetchers.getSearchBasedFetchers(importFormatPreferences, importerPreferences);
         String libraryNameFromFetcher = studyDatabase.getName();
         return searchBasedFetchers.stream()
-                                  .filter(searchBasedFetcher -> searchBasedFetcher.getName().toLowerCase().equals(libraryNameFromFetcher.toLowerCase()))
+                                  .filter(searchBasedFetcher -> searchBasedFetcher.getName().equalsIgnoreCase(libraryNameFromFetcher))
                                   .findAny()
                                   .orElse(null);
     }
diff --git a/src/main/java/org/jabref/logic/crawler/StudyRepository.java b/src/main/java/org/jabref/logic/crawler/StudyRepository.java
index e876d94f0fa..19fdd7e4abe 100644
--- a/src/main/java/org/jabref/logic/crawler/StudyRepository.java
+++ b/src/main/java/org/jabref/logic/crawler/StudyRepository.java
@@ -6,7 +6,6 @@
 import java.nio.charset.UnsupportedCharsetException;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.temporal.ChronoUnit;
 import java.util.List;
@@ -21,11 +20,12 @@
 import org.jabref.logic.exporter.SavePreferences;
 import org.jabref.logic.git.SlrGitHandler;
 import org.jabref.logic.importer.ImportFormatPreferences;
+import org.jabref.logic.importer.ImporterPreferences;
 import org.jabref.logic.importer.OpenDatabase;
-import org.jabref.logic.importer.ParseException;
 import org.jabref.logic.importer.SearchBasedFetcher;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.OS;
+import org.jabref.logic.util.io.FileNameCleaner;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntryTypesManager;
@@ -65,6 +65,7 @@ class StudyRepository {
     private final Study study;
     private final GeneralPreferences generalPreferences;
     private final ImportFormatPreferences importFormatPreferences;
+    private final ImporterPreferences importerPreferences;
     private final FileUpdateMonitor fileUpdateMonitor;
     private final SavePreferences savePreferences;
     private final BibEntryTypesManager bibEntryTypesManager;
@@ -78,19 +79,20 @@ class StudyRepository {
      *                                  contain the study definition file.
      * @throws IOException              Thrown if the given repository does not exists, or the study definition file
      *                                  does not exist
-     * @throws ParseException           Problem parsing the study definition file.
      */
     public StudyRepository(Path pathToRepository,
                            SlrGitHandler gitHandler,
                            GeneralPreferences generalPreferences,
                            ImportFormatPreferences importFormatPreferences,
+                           ImporterPreferences importerPreferences,
                            FileUpdateMonitor fileUpdateMonitor,
                            SavePreferences savePreferences,
-                           BibEntryTypesManager bibEntryTypesManager) throws IOException, ParseException {
+                           BibEntryTypesManager bibEntryTypesManager) throws IOException {
         this.repositoryPath = pathToRepository;
         this.gitHandler = gitHandler;
         this.generalPreferences = generalPreferences;
         this.importFormatPreferences = importFormatPreferences;
+        this.importerPreferences = importerPreferences;
         this.fileUpdateMonitor = fileUpdateMonitor;
         this.studyDefinitionFile = Path.of(repositoryPath.toString(), STUDY_DEFINITION_FILE_NAME);
         this.savePreferences = savePreferences;
@@ -116,7 +118,7 @@ public StudyRepository(Path pathToRepository,
             gitHandler.createCommitOnCurrentBranch("Setup/Update Repository Structure", false);
             gitHandler.checkoutBranch(SEARCH_BRANCH);
             // If study definition does not exist on this branch or was changed on work branch, copy it from work
-            boolean studyDefinitionDoesNotExistOrChanged = !(Files.exists(studyDefinitionFile) && new StudyYamlParser().parseStudyYamlFile(studyDefinitionFile).equalsBesideLastSearchDate(study));
+            boolean studyDefinitionDoesNotExistOrChanged = !(Files.exists(studyDefinitionFile) && new StudyYamlParser().parseStudyYamlFile(studyDefinitionFile).equals(study));
             if (studyDefinitionDoesNotExistOrChanged) {
                 new StudyYamlParser().writeStudyYamlFile(study, studyDefinitionFile);
             }
@@ -137,7 +139,7 @@ public StudyRepository(Path pathToRepository,
      */
     public BibDatabaseContext getFetcherResultEntries(String query, String fetcherName) throws IOException {
         if (Files.exists(getPathToFetcherResultFile(query, fetcherName))) {
-            return OpenDatabase.loadDatabase(getPathToFetcherResultFile(query, fetcherName), generalPreferences, importFormatPreferences, fileUpdateMonitor).getDatabaseContext();
+            return OpenDatabase.loadDatabase(getPathToFetcherResultFile(query, fetcherName), importFormatPreferences, fileUpdateMonitor).getDatabaseContext();
         }
         return new BibDatabaseContext();
     }
@@ -147,7 +149,7 @@ public BibDatabaseContext getFetcherResultEntries(String query, String fetcherNa
      */
     public BibDatabaseContext getQueryResultEntries(String query) throws IOException {
         if (Files.exists(getPathToQueryResultFile(query))) {
-            return OpenDatabase.loadDatabase(getPathToQueryResultFile(query), generalPreferences, importFormatPreferences, fileUpdateMonitor).getDatabaseContext();
+            return OpenDatabase.loadDatabase(getPathToQueryResultFile(query), importFormatPreferences, fileUpdateMonitor).getDatabaseContext();
         }
         return new BibDatabaseContext();
     }
@@ -157,7 +159,7 @@ public BibDatabaseContext getQueryResultEntries(String query) throws IOException
      */
     public BibDatabaseContext getStudyResultEntries() throws IOException {
         if (Files.exists(getPathToStudyResultFile())) {
-            return OpenDatabase.loadDatabase(getPathToStudyResultFile(), generalPreferences, importFormatPreferences, fileUpdateMonitor).getDatabaseContext();
+            return OpenDatabase.loadDatabase(getPathToStudyResultFile(), importFormatPreferences, fileUpdateMonitor).getDatabaseContext();
         }
         return new BibDatabaseContext();
     }
@@ -215,15 +217,13 @@ public Study getStudy() {
      */
     public void persist(List<QueryResult> crawlResults) throws IOException, GitAPIException, SaveException {
         updateWorkAndSearchBranch();
-        study.setLastSearchDate(LocalDate.now());
         persistStudy();
         gitHandler.createCommitOnCurrentBranch("Update search date", true);
         gitHandler.checkoutBranch(SEARCH_BRANCH);
         persistResults(crawlResults);
-        study.setLastSearchDate(LocalDate.now());
         persistStudy();
         try {
-            // First commit changes to search branch branch and update remote
+            // First commit changes to search branch and update remote
             String commitMessage = "Conducted search: " + LocalDateTime.now().truncatedTo(ChronoUnit.SECONDS);
             boolean newSearchResults = gitHandler.createCommitOnCurrentBranch(commitMessage, false);
             gitHandler.checkoutBranch(WORK_BRANCH);
@@ -274,7 +274,10 @@ private void persistStudy() throws IOException {
      */
     private void setUpRepositoryStructure() throws IOException {
         // Cannot use stream here since IOException has to be thrown
-        StudyDatabaseToFetcherConverter converter = new StudyDatabaseToFetcherConverter(this.getActiveLibraryEntries(), importFormatPreferences);
+        StudyDatabaseToFetcherConverter converter = new StudyDatabaseToFetcherConverter(
+                this.getActiveLibraryEntries(),
+                importFormatPreferences,
+                importerPreferences);
         for (String query : this.getSearchQueryStrings()) {
             createQueryResultFolder(query);
             converter.getActiveFetchers()
@@ -421,14 +424,14 @@ private void writeResultToFile(Path pathToFile, BibDatabase entries) throws IOEx
             BibtexDatabaseWriter databaseWriter = new BibtexDatabaseWriter(bibWriter, generalPreferences, savePreferences, bibEntryTypesManager);
             databaseWriter.saveDatabase(new BibDatabaseContext(entries));
         } catch (UnsupportedCharsetException ex) {
-            throw new SaveException(Localization.lang("Character encoding '%0' is not supported.", generalPreferences.getDefaultEncoding().displayName()), ex);
+            throw new SaveException(Localization.lang("Character encoding UTF-8 is not supported.", ex));
         } catch (IOException ex) {
             throw new SaveException("Problems saving: " + ex, ex);
         }
     }
 
     private Path getPathToFetcherResultFile(String query, String fetcherName) {
-        return Path.of(repositoryPath.toString(), trimNameAndAddID(query), fetcherName + ".bib");
+        return Path.of(repositoryPath.toString(), trimNameAndAddID(query), FileNameCleaner.cleanFileName(fetcherName) + ".bib");
     }
 
     private Path getPathToQueryResultFile(String query) {
diff --git a/src/main/java/org/jabref/logic/database/DuplicateCheck.java b/src/main/java/org/jabref/logic/database/DuplicateCheck.java
index fbcd0dd4c3f..b2053c21120 100644
--- a/src/main/java/org/jabref/logic/database/DuplicateCheck.java
+++ b/src/main/java/org/jabref/logic/database/DuplicateCheck.java
@@ -319,10 +319,6 @@ private static double similarity(final String first, final String second) {
 
     /**
      * Checks if the two entries represent the same publication.
-     *
-     * @param one BibEntry
-     * @param two BibEntry
-     * @return boolean
      */
     public boolean isDuplicate(final BibEntry one, final BibEntry two, final BibDatabaseMode bibDatabaseMode) {
         if (haveSameIdentifier(one, two)) {
diff --git a/src/main/java/org/jabref/logic/exporter/AtomicFileOutputStream.java b/src/main/java/org/jabref/logic/exporter/AtomicFileOutputStream.java
index 11b60b6c380..5694d79b803 100644
--- a/src/main/java/org/jabref/logic/exporter/AtomicFileOutputStream.java
+++ b/src/main/java/org/jabref/logic/exporter/AtomicFileOutputStream.java
@@ -3,6 +3,7 @@
 import java.io.FileOutputStream;
 import java.io.FilterOutputStream;
 import java.io.IOException;
+import java.io.OutputStream;
 import java.nio.channels.FileLock;
 import java.nio.channels.OverlappingFileLockException;
 import java.nio.file.Files;
@@ -12,6 +13,7 @@
 import java.util.EnumSet;
 import java.util.Set;
 
+import org.jabref.logic.util.BackupFileType;
 import org.jabref.logic.util.io.FileUtil;
 
 import org.slf4j.Logger;
@@ -47,7 +49,7 @@ public class AtomicFileOutputStream extends FilterOutputStream {
     private static final Logger LOGGER = LoggerFactory.getLogger(AtomicFileOutputStream.class);
 
     private static final String TEMPORARY_EXTENSION = ".tmp";
-    private static final String BACKUP_EXTENSION = ".bak";
+    private static final String SAVE_EXTENSION = "." + BackupFileType.SAVE.getExtensions().get(0);
 
     /**
      * The file we want to create/replace.
@@ -58,13 +60,17 @@ public class AtomicFileOutputStream extends FilterOutputStream {
      * The file to which writes are redirected to.
      */
     private final Path temporaryFile;
+
     private final FileLock temporaryFileLock;
     /**
      * A backup of the target file (if it exists), created when the stream is closed
      */
     private final Path backupFile;
+
     private final boolean keepBackup;
 
+    private boolean errorDuringWrite = false;
+
     /**
      * Creates a new output stream to write to or replace the file at the specified path.
      *
@@ -72,11 +78,28 @@ public class AtomicFileOutputStream extends FilterOutputStream {
      * @param keepBackup whether to keep the backup file after a successful write process
      */
     public AtomicFileOutputStream(Path path, boolean keepBackup) throws IOException {
-        super(Files.newOutputStream(getPathOfTemporaryFile(path)));
+        // Files.newOutputStream(getPathOfTemporaryFile(path)) leads to a "sun.nio.ch.ChannelOutputStream", which does not offer "lock"
+        this(path, getPathOfTemporaryFile(path), new FileOutputStream(getPathOfTemporaryFile(path).toFile()), keepBackup);
+    }
+
+    /**
+     * Creates a new output stream to write to or replace the file at the specified path.
+     * The backup file is deleted when write was successful.
+     *
+     * @param path the path of the file to write to or replace
+     */
+    public AtomicFileOutputStream(Path path) throws IOException {
+        this(path, false);
+    }
 
+    /**
+     * Required for proper testing
+     */
+    AtomicFileOutputStream(Path path, Path pathOfTemporaryFile, OutputStream temporaryFileOutputStream, boolean keepBackup) throws IOException {
+        super(temporaryFileOutputStream);
         this.targetFile = path;
-        this.temporaryFile = getPathOfTemporaryFile(path);
-        this.backupFile = getPathOfBackupFile(path);
+        this.temporaryFile = pathOfTemporaryFile;
+        this.backupFile = getPathOfSaveBackupFile(path);
         this.keepBackup = keepBackup;
 
         try {
@@ -91,21 +114,12 @@ public AtomicFileOutputStream(Path path, boolean keepBackup) throws IOException
         }
     }
 
-    /**
-     * Creates a new output stream to write to or replace the file at the specified path. The backup file is deleted when the write was successful.
-     *
-     * @param path the path of the file to write to or replace
-     */
-    public AtomicFileOutputStream(Path path) throws IOException {
-        this(path, false);
-    }
-
     private static Path getPathOfTemporaryFile(Path targetFile) {
         return FileUtil.addExtension(targetFile, TEMPORARY_EXTENSION);
     }
 
-    private static Path getPathOfBackupFile(Path targetFile) {
-        return FileUtil.addExtension(targetFile, BACKUP_EXTENSION);
+    private static Path getPathOfSaveBackupFile(Path targetFile) {
+        return FileUtil.addExtension(targetFile, SAVE_EXTENSION);
     }
 
     /**
@@ -116,7 +130,7 @@ public Path getBackup() {
     }
 
     /**
-     * Override for performance reasons.
+     * Overridden because of cleanup actions in case of an error
      */
     @Override
     public void write(byte b[], int off, int len) throws IOException {
@@ -124,6 +138,7 @@ public void write(byte b[], int off, int len) throws IOException {
             out.write(b, off, len);
         } catch (IOException exception) {
             cleanup();
+            errorDuringWrite = true;
             throw exception;
         }
     }
@@ -132,32 +147,36 @@ public void write(byte b[], int off, int len) throws IOException {
      * Closes the write process to the temporary file but does not commit to the target file.
      */
     public void abort() {
+        errorDuringWrite = true;
         try {
             super.close();
             Files.deleteIfExists(temporaryFile);
             Files.deleteIfExists(backupFile);
         } catch (IOException exception) {
-            LOGGER.debug("Unable to abort writing to file " + temporaryFile, exception);
+            LOGGER.debug("Unable to abort writing to file {}", temporaryFile, exception);
         }
     }
 
     private void cleanup() {
-        try {
-            Files.deleteIfExists(temporaryFile);
-        } catch (IOException exception) {
-            LOGGER.debug("Unable to delete file " + temporaryFile, exception);
-        }
-
         try {
             if (temporaryFileLock != null) {
                 temporaryFileLock.release();
             }
         } catch (IOException exception) {
-            LOGGER.warn("Unable to release lock on file " + temporaryFile, exception);
+            // Currently, we always get the exception:
+            // Unable to release lock on file C:\Users\koppor\AppData\Local\Temp\junit11976839611279549873\error-during-save.txt.tmp: java.nio.channels.ClosedChannelException
+            LOGGER.debug("Unable to release lock on file {}", temporaryFile, exception);
+        }
+        try {
+            Files.deleteIfExists(temporaryFile);
+        } catch (IOException exception) {
+            LOGGER.debug("Unable to delete file {}", temporaryFile, exception);
         }
     }
 
-    // perform the final operations to move the temporary file to its final destination
+    /**
+     * perform the final operations to move the temporary file to its final destination
+     */
     @Override
     public void close() throws IOException {
         try {
@@ -174,6 +193,11 @@ public void close() throws IOException {
             }
             super.close();
 
+            if (errorDuringWrite) {
+                // in case there was an error during write, we do not replace the original file
+                return;
+            }
+
             // We successfully wrote everything to the temporary file, lets copy it to the correct place
             // First, make backup of original file and try to save file permissions to restore them later (by default: 664)
             Set<PosixFilePermission> oldFilePermissions = EnumSet.of(PosixFilePermission.OWNER_READ,
@@ -182,8 +206,12 @@ public void close() throws IOException {
                     PosixFilePermission.GROUP_WRITE,
                     PosixFilePermission.OTHERS_READ);
             if (Files.exists(targetFile)) {
-                Files.copy(targetFile, backupFile, StandardCopyOption.REPLACE_EXISTING);
-                if (FileUtil.IS_POSIX_COMPILANT) {
+                try {
+                    Files.copy(targetFile, backupFile, StandardCopyOption.REPLACE_EXISTING);
+                } catch (Exception e) {
+                    LOGGER.warn("Could not create backup file {}", backupFile);
+                }
+                if (FileUtil.IS_POSIX_COMPLIANT) {
                     try {
                         oldFilePermissions = Files.getPosixFilePermissions(targetFile);
                     } catch (IOException exception) {
@@ -192,11 +220,16 @@ public void close() throws IOException {
                 }
             }
 
-            // Move temporary file (replace original if it exists)
-            Files.move(temporaryFile, targetFile, StandardCopyOption.ATOMIC_MOVE, StandardCopyOption.REPLACE_EXISTING);
+            try {
+                // Move temporary file (replace original if it exists)
+                Files.move(temporaryFile, targetFile, StandardCopyOption.ATOMIC_MOVE, StandardCopyOption.REPLACE_EXISTING);
+            } catch (Exception e) {
+                LOGGER.warn("Could not move temporary file", e);
+                throw e;
+            }
 
             // Restore file permissions
-            if (FileUtil.IS_POSIX_COMPILANT) {
+            if (FileUtil.IS_POSIX_COMPLIANT) {
                 try {
                     Files.setPosixFilePermissions(targetFile, oldFilePermissions);
                 } catch (IOException exception) {
diff --git a/src/main/java/org/jabref/logic/exporter/BibDatabaseWriter.java b/src/main/java/org/jabref/logic/exporter/BibDatabaseWriter.java
index 3f345e04523..de558fddca0 100644
--- a/src/main/java/org/jabref/logic/exporter/BibDatabaseWriter.java
+++ b/src/main/java/org/jabref/logic/exporter/BibDatabaseWriter.java
@@ -2,6 +2,7 @@
 
 import java.io.IOException;
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -27,7 +28,6 @@
 import org.jabref.logic.citationkeypattern.GlobalCitationKeyPattern;
 import org.jabref.logic.cleanup.FieldFormatterCleanup;
 import org.jabref.logic.cleanup.FieldFormatterCleanups;
-import org.jabref.logic.cleanup.NormalizeNewlinesFormatter;
 import org.jabref.logic.formatter.bibtexfields.TrimWhitespaceFormatter;
 import org.jabref.model.FieldChange;
 import org.jabref.model.database.BibDatabase;
@@ -78,9 +78,9 @@ private static List<FieldChange> applySaveActions(List<BibEntry> toChange, MetaD
             }
         });
 
-        // Run a couple of standard cleanups
+        // Run standard cleanups
         List<FieldFormatterCleanup> preSaveCleanups =
-                Stream.of(new TrimWhitespaceFormatter(), new NormalizeNewlinesFormatter())
+                Stream.of(new TrimWhitespaceFormatter())
                       .map(formatter -> new FieldFormatterCleanup(InternalField.INTERNAL_ALL_FIELD, formatter))
                       .collect(Collectors.toList());
         for (FieldFormatterCleanup formatter : preSaveCleanups) {
@@ -183,7 +183,7 @@ public void savePartOfDatabase(BibDatabaseContext bibDatabaseContext, List<BibEn
 
         // Some file formats write something at the start of the file (like the encoding)
         if (savePreferences.getSaveType() != SavePreferences.DatabaseSaveType.PLAIN_BIBTEX) {
-            Charset charset = bibDatabaseContext.getMetaData().getEncoding().orElse(generalPreferences.getDefaultEncoding());
+            Charset charset = bibDatabaseContext.getMetaData().getEncoding().orElse(StandardCharsets.UTF_8);
             writeProlog(bibDatabaseContext, charset);
         }
 
diff --git a/src/main/java/org/jabref/logic/exporter/BibTeXMLExporter.java b/src/main/java/org/jabref/logic/exporter/BibTeXMLExporter.java
index 071463bab30..03fccacba9d 100644
--- a/src/main/java/org/jabref/logic/exporter/BibTeXMLExporter.java
+++ b/src/main/java/org/jabref/logic/exporter/BibTeXMLExporter.java
@@ -3,7 +3,6 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.math.BigInteger;
-import java.nio.charset.Charset;
 import java.nio.file.Path;
 import java.util.Arrays;
 import java.util.List;
@@ -13,10 +12,6 @@
 import java.util.Optional;
 import java.util.stream.Collectors;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Marshaller;
 import javax.xml.datatype.DatatypeConfigurationException;
 import javax.xml.datatype.DatatypeFactory;
 import javax.xml.datatype.XMLGregorianCalendar;
@@ -47,6 +42,10 @@
 import org.jabref.model.entry.types.EntryType;
 import org.jabref.model.entry.types.StandardEntryType;
 
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Marshaller;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -65,7 +64,7 @@ public BibTeXMLExporter() {
     }
 
     @Override
-    public void export(final BibDatabaseContext databaseContext, final Path resultFile, final Charset encoding,
+    public void export(final BibDatabaseContext databaseContext, final Path resultFile,
                        List<BibEntry> entries) throws SaveException {
         Objects.requireNonNull(databaseContext);
         Objects.requireNonNull(entries);
diff --git a/src/main/java/org/jabref/logic/exporter/BibtexDatabaseWriter.java b/src/main/java/org/jabref/logic/exporter/BibtexDatabaseWriter.java
index c0f564800c0..1b98ae4aa15 100644
--- a/src/main/java/org/jabref/logic/exporter/BibtexDatabaseWriter.java
+++ b/src/main/java/org/jabref/logic/exporter/BibtexDatabaseWriter.java
@@ -110,7 +110,11 @@ protected void writeEntryTypeDefinition(BibEntryType customType) throws IOExcept
 
     @Override
     protected void writeProlog(BibDatabaseContext bibDatabaseContext, Charset encoding) throws IOException {
-        if ((encoding == null) || (encoding == StandardCharsets.UTF_8)) {
+        // We write the encoding if
+        //   - it is provided (!= null)
+        //   - explicitly set in the .bib file OR not equal to UTF_8
+        // Otherwise, we do not write anything and return
+        if ((encoding == null) || (!bibDatabaseContext.getMetaData().getEncodingExplicitlySupplied() && (encoding == StandardCharsets.UTF_8))) {
             return;
         }
 
diff --git a/src/main/java/org/jabref/logic/exporter/EmbeddedBibFilePdfExporter.java b/src/main/java/org/jabref/logic/exporter/EmbeddedBibFilePdfExporter.java
index ab584fbfbb4..3752dc6a209 100644
--- a/src/main/java/org/jabref/logic/exporter/EmbeddedBibFilePdfExporter.java
+++ b/src/main/java/org/jabref/logic/exporter/EmbeddedBibFilePdfExporter.java
@@ -4,7 +4,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.StringWriter;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.HashMap;
@@ -19,11 +19,13 @@
 import org.jabref.logic.util.OS;
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.logic.util.io.FileUtil;
+import org.jabref.logic.xmp.XmpUtilWriter;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.database.BibDatabaseMode;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.BibEntryTypesManager;
 
+import org.apache.pdfbox.Loader;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDDocumentNameDictionary;
 import org.apache.pdfbox.pdmodel.PDEmbeddedFilesNameTreeNode;
@@ -51,24 +53,31 @@ public EmbeddedBibFilePdfExporter(BibDatabaseMode bibDatabaseMode, BibEntryTypes
     /**
      * @param databaseContext the database to export from
      * @param file            the file to write to. If it contains "split", then the output is split into different files
-     * @param encoding        the encoding to use
      * @param entries         a list containing all entries that should be exported
      */
     @Override
-    public void export(BibDatabaseContext databaseContext, Path file, Charset encoding, List<BibEntry> entries) throws Exception {
+    public void export(BibDatabaseContext databaseContext, Path file, List<BibEntry> entries) throws Exception {
         Objects.requireNonNull(databaseContext);
         Objects.requireNonNull(file);
         Objects.requireNonNull(entries);
 
         String bibString = getBibString(entries);
-        embedBibTex(bibString, file, encoding);
+        embedBibTex(bibString, file);
     }
 
-    private void embedBibTex(String bibTeX, Path file, Charset encoding) throws IOException {
-        if (!Files.exists(file) || !FileUtil.isPDFFile(file)) {
+    /**
+     * Similar method: {@link XmpUtilWriter#writeXmp(java.nio.file.Path, java.util.List, org.jabref.model.database.BibDatabase, org.jabref.logic.xmp.XmpPreferences)}
+     */
+    private void embedBibTex(String bibTeX, Path path) throws IOException {
+        if (!Files.exists(path) || !FileUtil.isPDFFile(path)) {
             return;
         }
-        try (PDDocument document = PDDocument.load(file.toFile())) {
+
+        // Read from another file
+        // Reason: Apache PDFBox does not support writing while the file is opened
+        // See https://issues.apache.org/jira/browse/PDFBOX-4028
+        Path newFile = Files.createTempFile("JabRef", "pdf");
+        try (PDDocument document = Loader.loadPDF(path.toFile())) {
             PDDocumentNameDictionary nameDictionary = document.getDocumentCatalog().getNames();
             PDEmbeddedFilesNameTreeNode efTree;
             Map<String, PDComplexFileSpecification> names;
@@ -99,7 +108,7 @@ private void embedBibTex(String bibTeX, Path file, Charset encoding) throws IOEx
                 fileSpecification = new PDComplexFileSpecification();
             }
             if (efTree != null) {
-                InputStream inputStream = new ByteArrayInputStream(bibTeX.getBytes(encoding));
+                InputStream inputStream = new ByteArrayInputStream(bibTeX.getBytes(StandardCharsets.UTF_8));
                 fileSpecification.setFile(EMBEDDED_FILE_NAME);
                 PDEmbeddedFile embeddedFile = new PDEmbeddedFile(document, inputStream);
                 embeddedFile.setSubtype("text/x-bibtex");
@@ -110,7 +119,7 @@ private void embedBibTex(String bibTeX, Path file, Charset encoding) throws IOEx
                     try {
                         names.put(EMBEDDED_FILE_NAME, fileSpecification);
                     } catch (UnsupportedOperationException e) {
-                        throw new IOException(Localization.lang("File '%0' is write protected.", file.toString()));
+                        throw new IOException(Localization.lang("File '%0' is write protected.", path.toString()));
                     }
                 }
 
@@ -118,8 +127,10 @@ private void embedBibTex(String bibTeX, Path file, Charset encoding) throws IOEx
                 nameDictionary.setEmbeddedFiles(efTree);
                 document.getDocumentCatalog().setNames(nameDictionary);
             }
-            document.save(file.toFile());
+            document.save(newFile.toFile());
+            FileUtil.copyFile(newFile, path, true);
         }
+        Files.delete(newFile);
     }
 
     private String getBibString(List<BibEntry> entries) throws IOException {
diff --git a/src/main/java/org/jabref/logic/exporter/Exporter.java b/src/main/java/org/jabref/logic/exporter/Exporter.java
index 60749453575..fb2f1267b3f 100644
--- a/src/main/java/org/jabref/logic/exporter/Exporter.java
+++ b/src/main/java/org/jabref/logic/exporter/Exporter.java
@@ -1,6 +1,5 @@
 package org.jabref.logic.exporter;
 
-import java.nio.charset.Charset;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Arrays;
@@ -57,29 +56,28 @@ public String toString() {
      *
      * @param databaseContext the database to export from
      * @param file            the file to write to
-     * @param encoding        the encoding to use
      * @param entries         a list containing all entries that should be exported
      */
-    public abstract void export(BibDatabaseContext databaseContext, Path file, Charset encoding, List<BibEntry> entries) throws Exception;
+    public abstract void export(BibDatabaseContext databaseContext, Path file, List<BibEntry> entries) throws Exception;
 
     /**
      * Exports to all files linked to a given entry
+     *
      * @param databaseContext   the database to export from
-     * @param encoding          the encoding to use
      * @param filePreferences   the filePreferences to use for resolving paths
      * @param entryToWriteOn    the entry for which we want to write on all linked pdfs
      * @param entriesToWrite    the content that we want to export to the pdfs
      * @return whether any file was written on
      * @throws Exception if the writing fails
      */
-    public boolean exportToAllFilesOfEntry(BibDatabaseContext databaseContext, Charset encoding, FilePreferences filePreferences, BibEntry entryToWriteOn, List<BibEntry> entriesToWrite) throws Exception {
+    public boolean exportToAllFilesOfEntry(BibDatabaseContext databaseContext, FilePreferences filePreferences, BibEntry entryToWriteOn, List<BibEntry> entriesToWrite) throws Exception {
         boolean writtenToAFile = false;
 
         for (LinkedFile file : entryToWriteOn.getFiles()) {
             if (file.getFileType().equals(fileType.getName())) {
                 Optional<Path> filePath = file.findIn(databaseContext, filePreferences);
                 if (filePath.isPresent()) {
-                    export(databaseContext, filePath.get(), encoding, entriesToWrite);
+                    export(databaseContext, filePath.get(), entriesToWrite);
                     writtenToAFile = true;
                 }
             }
@@ -93,15 +91,15 @@ public boolean exportToAllFilesOfEntry(BibDatabaseContext databaseContext, Chars
      * Behaviour in case the file is linked to different bib-entries depends on the implementation of {@link #export}.
      * If it overwrites any existing information, only the last found bib-entry will be exported (as the previous exports are overwritten).
      * If it extends existing information, all found bib-entries will be exported.
+     *
      * @param databaseContext   the database-context to export from
      * @param dataBase          the database to export from
-     * @param encoding          the encoding to use
      * @param filePreferences   the filePreferences to use for resolving paths
      * @param filePath          the path to the file we want to write on
      * @return whether the file was written on at least once
      * @throws Exception if the writing fails
      */
-    public boolean exportToFileByPath(BibDatabaseContext databaseContext, BibDatabase dataBase, Charset encoding, FilePreferences filePreferences, Path filePath) throws Exception {
+    public boolean exportToFileByPath(BibDatabaseContext databaseContext, BibDatabase dataBase, FilePreferences filePreferences, Path filePath) throws Exception {
         if (!Files.exists(filePath)) {
             return false;
         }
@@ -111,7 +109,7 @@ public boolean exportToFileByPath(BibDatabaseContext databaseContext, BibDatabas
                 if (linkedFile.getFileType().equals(fileType.getName())) {
                     Optional<Path> linkedFilePath = linkedFile.findIn(databaseContext.getFileDirectories(filePreferences));
                     if (!linkedFilePath.isEmpty() && Files.exists(linkedFilePath.get()) && Files.isSameFile(linkedFilePath.get(), filePath)) {
-                        export(databaseContext, filePath, encoding, Arrays.asList((entry)));
+                        export(databaseContext, filePath, Arrays.asList((entry)));
                         writtenABibEntry = true;
                     }
                 }
diff --git a/src/main/java/org/jabref/logic/exporter/ExporterFactory.java b/src/main/java/org/jabref/logic/exporter/ExporterFactory.java
index ccc32055ddc..0bdc3420238 100644
--- a/src/main/java/org/jabref/logic/exporter/ExporterFactory.java
+++ b/src/main/java/org/jabref/logic/exporter/ExporterFactory.java
@@ -1,6 +1,5 @@
 package org.jabref.logic.exporter;
 
-import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -55,7 +54,7 @@ public static ExporterFactory create(List<TemplateExporter> customFormats,
         exporters.add(new TemplateExporter("ISO 690", "iso690txt", "iso690", "iso690txt", StandardFileType.TXT, layoutPreferences, savePreferences));
         exporters.add(new TemplateExporter("Endnote", "endnote", "EndNote", "endnote", StandardFileType.TXT, layoutPreferences, savePreferences));
         exporters.add(new TemplateExporter("OpenOffice/LibreOffice CSV", "oocsv", "openoffice-csv", "openoffice", StandardFileType.CSV, layoutPreferences, savePreferences));
-        exporters.add(new TemplateExporter("RIS", "ris", "ris", "ris", StandardFileType.RIS, layoutPreferences, savePreferences, BlankLineBehaviour.DELETE_BLANKS).withEncoding(StandardCharsets.UTF_8));
+        exporters.add(new TemplateExporter("RIS", "ris", "ris", "ris", StandardFileType.RIS, layoutPreferences, savePreferences, BlankLineBehaviour.DELETE_BLANKS));
         exporters.add(new TemplateExporter("MIS Quarterly", "misq", "misq", "misq", StandardFileType.RTF, layoutPreferences, savePreferences));
         exporters.add(new TemplateExporter("CSL YAML", "yaml", "yaml", null, StandardFileType.YAML, layoutPreferences, savePreferences, BlankLineBehaviour.DELETE_BLANKS));
         exporters.add(new BibTeXMLExporter());
diff --git a/src/main/java/org/jabref/logic/exporter/GroupSerializer.java b/src/main/java/org/jabref/logic/exporter/GroupSerializer.java
index 4e9c9997dd8..d9ae19ad5ef 100644
--- a/src/main/java/org/jabref/logic/exporter/GroupSerializer.java
+++ b/src/main/java/org/jabref/logic/exporter/GroupSerializer.java
@@ -100,7 +100,6 @@ private void appendGroupDetails(StringBuilder builder, AbstractGroup group) {
      * @return a representation of the tree based at this node as a list of strings
      */
     public List<String> serializeTree(GroupTreeNode node) {
-
         List<String> representation = new ArrayList<>();
 
         // Append current node
diff --git a/src/main/java/org/jabref/logic/exporter/MSBibExporter.java b/src/main/java/org/jabref/logic/exporter/MSBibExporter.java
index 9a4ff1a2088..1a1da69dab1 100644
--- a/src/main/java/org/jabref/logic/exporter/MSBibExporter.java
+++ b/src/main/java/org/jabref/logic/exporter/MSBibExporter.java
@@ -1,7 +1,6 @@
 package org.jabref.logic.exporter;
 
 import java.io.IOException;
-import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.util.List;
@@ -31,7 +30,7 @@ public MSBibExporter() {
 
     @Override
     public void export(final BibDatabaseContext databaseContext, final Path file,
-                       final Charset encoding, List<BibEntry> entries) throws SaveException {
+                       List<BibEntry> entries) throws SaveException {
         Objects.requireNonNull(databaseContext);
         Objects.requireNonNull(entries);
 
diff --git a/src/main/java/org/jabref/logic/exporter/ModsExporter.java b/src/main/java/org/jabref/logic/exporter/ModsExporter.java
index 46f7632954d..da8afbcbcb8 100644
--- a/src/main/java/org/jabref/logic/exporter/ModsExporter.java
+++ b/src/main/java/org/jabref/logic/exporter/ModsExporter.java
@@ -1,7 +1,6 @@
 package org.jabref.logic.exporter;
 
 import java.math.BigInteger;
-import java.nio.charset.Charset;
 import java.nio.file.Path;
 import java.util.Comparator;
 import java.util.List;
@@ -9,10 +8,6 @@
 import java.util.Objects;
 import java.util.TreeMap;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Marshaller;
 import javax.xml.namespace.QName;
 
 import org.jabref.logic.importer.fileformat.mods.AbstractDefinition;
@@ -52,6 +47,11 @@
 import org.jabref.model.entry.field.UnknownField;
 import org.jabref.model.entry.types.EntryType;
 
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Marshaller;
+
 /**
  * TemplateExporter for exporting in MODS XML format.
  */
@@ -68,7 +68,7 @@ public ModsExporter() {
     }
 
     @Override
-    public void export(final BibDatabaseContext databaseContext, final Path file, final Charset encoding, List<BibEntry> entries) throws SaveException {
+    public void export(final BibDatabaseContext databaseContext, final Path file, List<BibEntry> entries) throws SaveException {
         Objects.requireNonNull(databaseContext);
         Objects.requireNonNull(entries);
         if (entries.isEmpty()) { // Only export if entries exist
diff --git a/src/main/java/org/jabref/logic/exporter/OpenDocumentSpreadsheetCreator.java b/src/main/java/org/jabref/logic/exporter/OpenDocumentSpreadsheetCreator.java
index 08391fb7a09..f8462664548 100644
--- a/src/main/java/org/jabref/logic/exporter/OpenDocumentSpreadsheetCreator.java
+++ b/src/main/java/org/jabref/logic/exporter/OpenDocumentSpreadsheetCreator.java
@@ -11,7 +11,6 @@
 import java.io.OutputStreamWriter;
 import java.io.Writer;
 import java.net.URL;
-import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -50,7 +49,6 @@ public OpenDocumentSpreadsheetCreator() {
     private static void storeOpenDocumentSpreadsheetFile(Path file, InputStream source) throws IOException {
 
         try (ZipOutputStream out = new ZipOutputStream(new BufferedOutputStream(Files.newOutputStream(file)))) {
-
             // addResourceFile("mimetype", "/resource/ods/mimetype", out);
             ZipEntry ze = new ZipEntry("mimetype");
             String mime = "application/vnd.oasis.opendocument.spreadsheet";
@@ -101,7 +99,7 @@ private static void exportOpenDocumentSpreadsheet(Path file, BibDatabase databas
 
     @Override
     public void export(final BibDatabaseContext databaseContext, final Path file,
-                       final Charset encoding, List<BibEntry> entries) throws IOException {
+                       List<BibEntry> entries) throws IOException {
         Objects.requireNonNull(databaseContext);
         Objects.requireNonNull(entries);
         if (!entries.isEmpty()) { // Only export if entries exists
@@ -113,7 +111,6 @@ private static void exportOpenDocumentSpreadsheetXML(File tmpFile, BibDatabase d
         OpenDocumentRepresentation od = new OpenDocumentRepresentation(database, entries);
 
         try (Writer ps = new OutputStreamWriter(new FileOutputStream(tmpFile), StandardCharsets.UTF_8)) {
-
             DOMSource source = new DOMSource(od.getDOMrepresentation());
             StreamResult result = new StreamResult(ps);
             Transformer trans = TransformerFactory.newInstance().newTransformer();
diff --git a/src/main/java/org/jabref/logic/exporter/OpenOfficeDocumentCreator.java b/src/main/java/org/jabref/logic/exporter/OpenOfficeDocumentCreator.java
index 57c64cfd3af..0ab35a55bd0 100644
--- a/src/main/java/org/jabref/logic/exporter/OpenOfficeDocumentCreator.java
+++ b/src/main/java/org/jabref/logic/exporter/OpenOfficeDocumentCreator.java
@@ -11,7 +11,6 @@
 import java.io.OutputStreamWriter;
 import java.io.Writer;
 import java.net.URL;
-import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -82,7 +81,7 @@ private static void exportOpenOfficeCalc(Path file, BibDatabase database, List<B
 
     @Override
     public void export(final BibDatabaseContext databaseContext, final Path file,
-                       final Charset encoding, List<BibEntry> entries) throws Exception {
+                       List<BibEntry> entries) throws Exception {
         Objects.requireNonNull(databaseContext);
         Objects.requireNonNull(entries);
         if (!entries.isEmpty()) { // Do not export if no entries
diff --git a/src/main/java/org/jabref/logic/exporter/TemplateExporter.java b/src/main/java/org/jabref/logic/exporter/TemplateExporter.java
index 268b3d53522..1baf1643d33 100644
--- a/src/main/java/org/jabref/logic/exporter/TemplateExporter.java
+++ b/src/main/java/org/jabref/logic/exporter/TemplateExporter.java
@@ -47,7 +47,6 @@ public class TemplateExporter extends Exporter {
     private final String directory;
     private final LayoutFormatterPreferences layoutPreferences;
     private final SavePreferences savePreferences;
-    private Charset encodingOverwritten; // If this value is set, it will be used to override the default encoding for the getCurrentBasePanel.
     private boolean customExport;
     private BlankLineBehaviour blankLineBehaviour;
 
@@ -140,16 +139,6 @@ public void setCustomExport(boolean custom) {
         this.customExport = custom;
     }
 
-    /**
-     * Set an encoding which will be used in preference to the default value obtained from the basepanel.
-     *
-     * @param encoding The name of the encoding to use.
-     */
-    public TemplateExporter withEncoding(Charset encoding) {
-        this.encodingOverwritten = encoding;
-        return this;
-    }
-
     /**
      * This method should return a reader from which the given layout file can be read.
      * <p>
@@ -193,16 +182,11 @@ private Reader getReader(String filename) throws IOException {
 
     @Override
     public void export(final BibDatabaseContext databaseContext, final Path file,
-                       final Charset encoding, List<BibEntry> entries) throws Exception {
+                       List<BibEntry> entries) throws Exception {
         Objects.requireNonNull(databaseContext);
         Objects.requireNonNull(entries);
 
         Charset encodingToUse = StandardCharsets.UTF_8;
-        if (encoding != null) {
-            encodingToUse = encoding;
-        } else if (this.encodingOverwritten != null) {
-            encodingToUse = this.encodingOverwritten;
-        }
 
         if (entries.isEmpty()) { // Do not export if no entries to export -- avoids exports with only template text
             return;
diff --git a/src/main/java/org/jabref/logic/exporter/XmpExporter.java b/src/main/java/org/jabref/logic/exporter/XmpExporter.java
index ee52b9e3fbf..23730852ee0 100644
--- a/src/main/java/org/jabref/logic/exporter/XmpExporter.java
+++ b/src/main/java/org/jabref/logic/exporter/XmpExporter.java
@@ -1,8 +1,6 @@
 package org.jabref.logic.exporter;
 
-import java.io.BufferedWriter;
 import java.io.IOException;
-import java.nio.charset.Charset;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Collections;
@@ -35,11 +33,10 @@ public XmpExporter(XmpPreferences xmpPreferences) {
     /**
      * @param databaseContext the database to export from
      * @param file            the file to write to. If it contains "split", then the output is split into different files
-     * @param encoding        the encoding to use
      * @param entries         a list containing all entries that should be exported
      */
     @Override
-    public void export(BibDatabaseContext databaseContext, Path file, Charset encoding, List<BibEntry> entries) throws Exception {
+    public void export(BibDatabaseContext databaseContext, Path file, List<BibEntry> entries) throws Exception {
         Objects.requireNonNull(databaseContext);
         Objects.requireNonNull(file);
         Objects.requireNonNull(entries);
@@ -58,20 +55,17 @@ public void export(BibDatabaseContext databaseContext, Path file, Charset encodi
                 if (file.getParent() == null) {
                     entryFile = Path.of(suffix);
                 } else {
-                    entryFile = Path.of(file.getParent().toString() + "/" + suffix);
+                    entryFile = Path.of(file.getParent() + "/" + suffix);
                 }
-                this.writeBibToXmp(entryFile, Collections.singletonList(entry), encoding);
+                this.writeBibToXmp(entryFile, Collections.singletonList(entry));
             }
         } else {
-            this.writeBibToXmp(file, entries, encoding);
+            this.writeBibToXmp(file, entries);
         }
     }
 
-    private void writeBibToXmp(Path file, List<BibEntry> entries, Charset encoding) throws IOException {
-        String xmpContent = XmpUtilWriter.generateXmpStringWithoutXmpDeclaration(entries, this.xmpPreferences);
-        try (BufferedWriter writer = Files.newBufferedWriter(file, encoding)) {
-            writer.write(xmpContent);
-            writer.flush();
-        }
+    private void writeBibToXmp(Path file, List<BibEntry> entries) throws IOException {
+        String xmpContent = new XmpUtilWriter(this.xmpPreferences).generateXmpStringWithoutXmpDeclaration(entries);
+        Files.writeString(file, xmpContent);
     }
 }
diff --git a/src/main/java/org/jabref/logic/exporter/XmpPdfExporter.java b/src/main/java/org/jabref/logic/exporter/XmpPdfExporter.java
index 1b62a4f7b4f..f6ece8646c2 100644
--- a/src/main/java/org/jabref/logic/exporter/XmpPdfExporter.java
+++ b/src/main/java/org/jabref/logic/exporter/XmpPdfExporter.java
@@ -1,6 +1,5 @@
 package org.jabref.logic.exporter;
 
-import java.nio.charset.Charset;
 import java.nio.file.Path;
 import java.util.List;
 import java.util.Objects;
@@ -22,14 +21,13 @@ public XmpPdfExporter(XmpPreferences xmpPreferences) {
     }
 
     @Override
-    public void export(BibDatabaseContext databaseContext, Path pdfFile, Charset encoding, List<BibEntry> entries) throws Exception {
-
+    public void export(BibDatabaseContext databaseContext, Path pdfFile, List<BibEntry> entries) throws Exception {
         Objects.requireNonNull(databaseContext);
         Objects.requireNonNull(pdfFile);
         Objects.requireNonNull(entries);
 
         if (pdfFile.toString().endsWith(".pdf")) {
-            XmpUtilWriter.writeXmp(pdfFile, entries, databaseContext.getDatabase(), xmpPreferences);
+            new XmpUtilWriter(xmpPreferences).writeXmp(pdfFile, entries, databaseContext.getDatabase());
         }
     }
 }
diff --git a/src/main/java/org/jabref/logic/externalfiles/ExternalFilesContentImporter.java b/src/main/java/org/jabref/logic/externalfiles/ExternalFilesContentImporter.java
index b990eb36b29..e75b1df2683 100644
--- a/src/main/java/org/jabref/logic/externalfiles/ExternalFilesContentImporter.java
+++ b/src/main/java/org/jabref/logic/externalfiles/ExternalFilesContentImporter.java
@@ -1,38 +1,31 @@
 package org.jabref.logic.externalfiles;
 
 import java.io.IOException;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 
 import org.jabref.logic.importer.ImportFormatPreferences;
-import org.jabref.logic.importer.ImporterPreferences;
 import org.jabref.logic.importer.OpenDatabase;
 import org.jabref.logic.importer.ParserResult;
 import org.jabref.logic.importer.fileformat.PdfMergeMetadataImporter;
 import org.jabref.model.util.FileUpdateMonitor;
-import org.jabref.preferences.GeneralPreferences;
 
 public class ExternalFilesContentImporter {
 
-    private final GeneralPreferences generalPreferences;
-    private final ImporterPreferences importerPreferences;
     private final ImportFormatPreferences importFormatPreferences;
 
-    public ExternalFilesContentImporter(GeneralPreferences generalPreferences, ImporterPreferences importerPreferences, ImportFormatPreferences importFormatPreferences) {
-        this.generalPreferences = generalPreferences;
-        this.importerPreferences = importerPreferences;
+    public ExternalFilesContentImporter(ImportFormatPreferences importFormatPreferences) {
         this.importFormatPreferences = importFormatPreferences;
     }
 
     public ParserResult importPDFContent(Path file) {
         try {
-            return new PdfMergeMetadataImporter(importerPreferences, importFormatPreferences).importDatabase(file, StandardCharsets.UTF_8);
+            return new PdfMergeMetadataImporter(importFormatPreferences).importDatabase(file);
         } catch (IOException e) {
            return ParserResult.fromError(e);
         }
     }
 
     public ParserResult importFromBibFile(Path bibFile, FileUpdateMonitor fileUpdateMonitor) throws IOException {
-        return OpenDatabase.loadDatabase(bibFile, generalPreferences, importFormatPreferences, fileUpdateMonitor);
+        return OpenDatabase.loadDatabase(bibFile, importFormatPreferences, fileUpdateMonitor);
     }
 }
diff --git a/src/main/java/org/jabref/logic/formatter/Formatters.java b/src/main/java/org/jabref/logic/formatter/Formatters.java
index 0eddde42194..cc89cfcfb03 100644
--- a/src/main/java/org/jabref/logic/formatter/Formatters.java
+++ b/src/main/java/org/jabref/logic/formatter/Formatters.java
@@ -11,6 +11,7 @@
 import org.jabref.logic.formatter.bibtexfields.CleanupUrlFormatter;
 import org.jabref.logic.formatter.bibtexfields.ClearFormatter;
 import org.jabref.logic.formatter.bibtexfields.EscapeAmpersandsFormatter;
+import org.jabref.logic.formatter.bibtexfields.EscapeDollarSignFormatter;
 import org.jabref.logic.formatter.bibtexfields.EscapeUnderscoresFormatter;
 import org.jabref.logic.formatter.bibtexfields.HtmlToLatexFormatter;
 import org.jabref.logic.formatter.bibtexfields.HtmlToUnicodeFormatter;
@@ -75,6 +76,7 @@ public static List<Formatter> getOthers() {
                 new UnitsToLatexFormatter(),
                 new EscapeUnderscoresFormatter(),
                 new EscapeAmpersandsFormatter(),
+                new EscapeDollarSignFormatter(),
                 new ShortenDOIFormatter(),
                 new UnprotectTermsFormatter()
         );
diff --git a/src/main/java/org/jabref/logic/formatter/bibtexfields/CleanupUrlFormatter.java b/src/main/java/org/jabref/logic/formatter/bibtexfields/CleanupUrlFormatter.java
index e1299e520e9..d14596de208 100644
--- a/src/main/java/org/jabref/logic/formatter/bibtexfields/CleanupUrlFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/bibtexfields/CleanupUrlFormatter.java
@@ -1,7 +1,9 @@
 package org.jabref.logic.formatter.bibtexfields;
 
 import java.net.URLDecoder;
+import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
+import java.util.Objects;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -9,7 +11,10 @@
 import org.jabref.logic.l10n.Localization;
 
 /**
- * Cleanup URL link
+ * Cleanup URL link.
+ * <p>
+ *     Expose string representations URL links clean up logic.
+ * </p>
  */
 public class CleanupUrlFormatter extends Formatter {
 
@@ -26,14 +31,30 @@ public String getKey() {
         return "cleanup_url";
     }
 
+    /**
+     * Escape and decodes a String from the application/x-www-form-urlencoded MIME format.
+     * <p>
+     * Method will also try to find a URL placed after "url=" or "to=".
+     * <p>
+     * The conversion process is the same as executed by {@link URLDecoder} to try to
+     * take guarantees against code injections.
+     * <p>
+     * The plus sign is replaced by its correspondent code (%2b) to avoid the character
+     * to be replaced by a space during the decoding execution.
+     *
+     * @param url should not be null
+     * @return the decoded URL as a String representation
+     *
+     * @see URLDecoder#decode(String, Charset)
+     */
     @Override
-    public String format(String value) {
-        String decodedLink = value;
-        String toDecode = value;
-
-        Matcher matcher = PATTERN_URL.matcher(value);
+    public String format(String url) {
+        var toDecode = Objects
+                .requireNonNull(url, "Null url")
+                .replaceAll("\\+", "%2b");
+        Matcher matcher = PATTERN_URL.matcher(toDecode);
         if (matcher.find()) {
-            toDecode = matcher.group(1);
+            return URLDecoder.decode(matcher.group(1), StandardCharsets.UTF_8);
         }
         return URLDecoder.decode(toDecode, StandardCharsets.UTF_8);
     }
@@ -46,8 +67,9 @@ public String getDescription() {
     @Override
     public String getExampleInput() {
         return "https://www.google.de/url?sa=t&rct=j&q=&esrc=s&source=web&cd=11&cad=" +
-                "rja&uact=8&ved=0ahUKEwjg3ZrB_ZPXAhVGuhoKHYdOBOg4ChAWCCYwAA&url=" +
-                "http%3A%2F%2Fwww.focus.de%2Fgesundheit%2Fratgeber%2Fherz%2Ftest%2" +
-                "Flebenserwartung-werden-sie-100-jahre-alt_aid_363828.html" + "&usg=AOvVaw1G6m2jf-pTHYkXceii4hXU";
+               "rja&uact=8&ved=0ahUKEwjg3ZrB_ZPXAhVGuhoKHYdOBOg4ChAWCCYwAA&url=" +
+               "http%3A%2F%2Fwww.focus.de%2Fgesundheit%2Fratgeber%2Fherz%2Ftest%2" +
+               "Flebenserwartung-werden-sie-100-jahre-alt_aid_363828.html" +
+               "&usg=AOvVaw1G6m2jf-pTHYkXceii4hXU";
     }
 }
diff --git a/src/main/java/org/jabref/logic/formatter/bibtexfields/EscapeDollarSignFormatter.java b/src/main/java/org/jabref/logic/formatter/bibtexfields/EscapeDollarSignFormatter.java
new file mode 100644
index 00000000000..d3f53708614
--- /dev/null
+++ b/src/main/java/org/jabref/logic/formatter/bibtexfields/EscapeDollarSignFormatter.java
@@ -0,0 +1,36 @@
+package org.jabref.logic.formatter.bibtexfields;
+
+import java.util.Objects;
+import java.util.regex.Matcher;
+
+import org.jabref.logic.cleanup.Formatter;
+import org.jabref.logic.l10n.Localization;
+
+public class EscapeDollarSignFormatter extends Formatter {
+
+    @Override
+    public String getName() {
+        return Localization.lang("Escape dollar sign");
+    }
+
+    @Override
+    public String getKey() {
+        return "escapeDollarSign";
+    }
+
+    @Override
+    public String format(String value) {
+        Objects.requireNonNull(value);
+        return value.replaceAll("(?<!\\\\)\\$", Matcher.quoteReplacement("\\$"));
+    }
+
+    @Override
+    public String getDescription() {
+        return Localization.lang("Escape dollar sign");
+    }
+
+    @Override
+    public String getExampleInput() {
+        return "Text$with$dollar$sign";
+    }
+}
diff --git a/src/main/java/org/jabref/logic/formatter/bibtexfields/HtmlToLatexFormatter.java b/src/main/java/org/jabref/logic/formatter/bibtexfields/HtmlToLatexFormatter.java
index 33faf96345b..33664983425 100644
--- a/src/main/java/org/jabref/logic/formatter/bibtexfields/HtmlToLatexFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/bibtexfields/HtmlToLatexFormatter.java
@@ -41,11 +41,15 @@ public String format(String text) {
         // Note that (at least) the IEEE Xplore fetcher must be fixed as it relies on the current way to
         // remove tags for its image alt-tag to equation converter
         for (int i = 0; i < result.length(); i++) {
-
             int c = result.charAt(i);
 
             if (c == '<') {
+                int oldI = i;
                 i = readTag(result, i);
+                if (oldI == i) {
+                    // just a single <, which needs to be kept
+                    sb.append('<');
+                }
             } else {
                 sb.append((char) c);
             }
diff --git a/src/main/java/org/jabref/logic/formatter/bibtexfields/TrimWhitespaceFormatter.java b/src/main/java/org/jabref/logic/formatter/bibtexfields/TrimWhitespaceFormatter.java
index da83f421c63..8f80fdfaeb5 100644
--- a/src/main/java/org/jabref/logic/formatter/bibtexfields/TrimWhitespaceFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/bibtexfields/TrimWhitespaceFormatter.java
@@ -6,7 +6,7 @@
 import org.jabref.logic.l10n.Localization;
 
 /**
- * Trim all whitespace characters(defined in java) in the string.
+ * Trim all whitespace characters (as defined in Java) in the beginning and at the end of the string.
  */
 public class TrimWhitespaceFormatter extends Formatter {
 
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 bf5eee51bb6..dbc162fc8a5 100644
--- a/src/main/java/org/jabref/logic/formatter/casechanger/Word.java
+++ b/src/main/java/org/jabref/logic/formatter/casechanger/Word.java
@@ -17,11 +17,13 @@ public final class Word {
      * Set containing common lowercase function words
      */
     public static final Set<String> SMALLER_WORDS;
+    public static final Set<Character> DASHES;
     private final char[] chars;
     private final boolean[] protectedChars;
 
     static {
         Set<String> smallerWords = new HashSet<>();
+        Set<Character> dashes = new HashSet<>();
 
         // Articles
         smallerWords.addAll(Arrays.asList("a", "an", "the"));
@@ -30,10 +32,20 @@ public final class Word {
         // Conjunctions
         smallerWords.addAll(Arrays.asList("and", "but", "for", "nor", "or", "so", "yet"));
 
+        // Dashes
+        dashes.addAll(Arrays.asList(
+                '-', '~', '⸗', '〰', '᐀', '֊', '־', '‐', '‑', '‒',
+                '–', '—', '―', '⁓', '⁻', '₋', '−', '⸺', '⸻',
+                '〜', '゠', '︱', '︲', '﹘', '﹣', '－'
+        ));
+
+        // unmodifiable for thread safety
+        DASHES = dashes;
+
         // unmodifiable for thread safety
         SMALLER_WORDS = smallerWords.stream()
-                            .map(word -> word.toLowerCase(Locale.ROOT))
-                            .collect(Collectors.toUnmodifiableSet());
+                                    .map(word -> word.toLowerCase(Locale.ROOT))
+                                    .collect(Collectors.toUnmodifiableSet());
     }
 
     public Word(char[] chars, boolean[] protectedChars) {
@@ -77,7 +89,7 @@ public void toLowerCase() {
     public void toUpperFirst() {
         for (int i = 0; i < chars.length; i++) {
             if (!protectedChars[i]) {
-                chars[i] = (i == 0) ?
+                chars[i] = (i == 0 || DASHES.contains(chars[i - 1])) ?
                         Character.toUpperCase(chars[i]) :
                         Character.toLowerCase(chars[i]);
             }
diff --git a/src/main/java/org/jabref/logic/git/GitHandler.java b/src/main/java/org/jabref/logic/git/GitHandler.java
index f486ae52878..7ad89689672 100644
--- a/src/main/java/org/jabref/logic/git/GitHandler.java
+++ b/src/main/java/org/jabref/logic/git/GitHandler.java
@@ -110,6 +110,7 @@ Optional<Ref> getRefForBranch(String branchName) throws GitAPIException, IOExcep
 
     /**
      * Creates a commit on the currently checked out branch
+     *
      * @param amend Whether to amend to the last commit (true), or not (false)
      * @return Returns true if a new commit was created. This is the case if the repository was not clean on method invocation
      */
diff --git a/src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java b/src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java
index 652cb52255d..9f32ca3ba7b 100644
--- a/src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java
@@ -4,13 +4,11 @@
 
 import org.jabref.logic.importer.fetcher.ArXiv;
 import org.jabref.logic.importer.fetcher.DoiFetcher;
-import org.jabref.logic.importer.fetcher.IacrEprintFetcher;
 import org.jabref.logic.importer.fetcher.IsbnFetcher;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.identifier.ArXivIdentifier;
 import org.jabref.model.entry.identifier.DOI;
 import org.jabref.model.entry.identifier.ISBN;
-import org.jabref.model.entry.identifier.IacrEprint;
 
 public class CompositeIdFetcher {
 
@@ -33,10 +31,11 @@ public Optional<BibEntry> performSearchById(String identifier) throws FetcherExc
         if (isbn.isPresent()) {
             return new IsbnFetcher(importFormatPreferences).performSearchById(isbn.get().getNormalized());
         }
+        /* TODO: IACR is currently disabled, because it needs to be reworked: https://github.com/JabRef/jabref/issues/8876
         Optional<IacrEprint> iacrEprint = IacrEprint.parse(identifier);
         if (iacrEprint.isPresent()) {
             return new IacrEprintFetcher(importFormatPreferences).performSearchById(iacrEprint.get().getNormalized());
-        }
+        }*/
 
         return Optional.empty();
     }
diff --git a/src/main/java/org/jabref/logic/importer/EntryBasedFetcher.java b/src/main/java/org/jabref/logic/importer/EntryBasedFetcher.java
index a85c8468060..781a0ed6288 100644
--- a/src/main/java/org/jabref/logic/importer/EntryBasedFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/EntryBasedFetcher.java
@@ -6,7 +6,7 @@
 
 /**
  * Searches web resources for bibliographic information based on a {@link BibEntry}.
- * Useful to complete an existing entry with fetched information.
+ * Useful to <emph>complete</emph> an existing entry with fetched information.
  * May return multiple search hits.
  */
 public interface EntryBasedFetcher extends WebFetcher {
diff --git a/src/main/java/org/jabref/logic/importer/FetcherClientException.java b/src/main/java/org/jabref/logic/importer/FetcherClientException.java
new file mode 100644
index 00000000000..8de9d0d6114
--- /dev/null
+++ b/src/main/java/org/jabref/logic/importer/FetcherClientException.java
@@ -0,0 +1,19 @@
+package org.jabref.logic.importer;
+
+/**
+ *  Should be thrown when you encounter a http status code error >= 400 and < 500
+ */
+public class FetcherClientException extends FetcherException {
+
+    public FetcherClientException(String errorMessage, Throwable cause) {
+        super(errorMessage, cause);
+    }
+
+    public FetcherClientException(String errorMessage) {
+        super(errorMessage);
+    }
+
+    public FetcherClientException(String errorMessage, String localizedMessage, Throwable cause) {
+        super(errorMessage, localizedMessage, cause);
+    }
+}
diff --git a/src/main/java/org/jabref/logic/importer/FetcherServerException.java b/src/main/java/org/jabref/logic/importer/FetcherServerException.java
new file mode 100644
index 00000000000..537d71ff530
--- /dev/null
+++ b/src/main/java/org/jabref/logic/importer/FetcherServerException.java
@@ -0,0 +1,18 @@
+package org.jabref.logic.importer;
+/**
+ *  Should be thrown when you encounter a http status code error >= 500
+ */
+public class FetcherServerException extends FetcherException {
+
+    public FetcherServerException(String errorMessage, Throwable cause) {
+        super(errorMessage, cause);
+    }
+
+    public FetcherServerException(String errorMessage) {
+        super(errorMessage);
+    }
+
+    public FetcherServerException(String errorMessage, String localizedMessage, Throwable cause) {
+        super(errorMessage, localizedMessage, cause);
+    }
+}
diff --git a/src/main/java/org/jabref/logic/importer/FulltextFetchers.java b/src/main/java/org/jabref/logic/importer/FulltextFetchers.java
index 57ad3f6c187..753beb94b59 100644
--- a/src/main/java/org/jabref/logic/importer/FulltextFetchers.java
+++ b/src/main/java/org/jabref/logic/importer/FulltextFetchers.java
@@ -48,8 +48,8 @@ public class FulltextFetchers {
         return false;
     };
 
-    public FulltextFetchers(ImportFormatPreferences importFormatPreferences) {
-        this(WebFetchers.getFullTextFetchers(importFormatPreferences));
+    public FulltextFetchers(ImportFormatPreferences importFormatPreferences, ImporterPreferences importerPreferences) {
+        this(WebFetchers.getFullTextFetchers(importFormatPreferences, importerPreferences));
     }
 
     FulltextFetchers(Set<FulltextFetcher> fetcher) {
diff --git a/src/main/java/org/jabref/logic/importer/IdBasedFetcher.java b/src/main/java/org/jabref/logic/importer/IdBasedFetcher.java
index 0238ef6b89a..62caee59199 100644
--- a/src/main/java/org/jabref/logic/importer/IdBasedFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/IdBasedFetcher.java
@@ -6,6 +6,7 @@
 
 /**
  * Searches web resources for bibliographic information based on an identifier.
+ * Examples are ISBN numbers and DOIs.
  */
 public interface IdBasedFetcher extends WebFetcher {
 
diff --git a/src/main/java/org/jabref/logic/importer/IdBasedParserFetcher.java b/src/main/java/org/jabref/logic/importer/IdBasedParserFetcher.java
index bf3ba431063..e348b69b8d8 100644
--- a/src/main/java/org/jabref/logic/importer/IdBasedParserFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/IdBasedParserFetcher.java
@@ -69,8 +69,7 @@ default Optional<BibEntry> performSearchById(String identifier) throws FetcherEx
             }
 
             if (fetchedEntries.size() > 1) {
-                LOGGER.info("Fetcher " + getName() + "found more than one result for identifier " + identifier
-                        + ". We will use the first entry.");
+                LOGGER.info("Fetcher {} found more than one result for identifier {}. We will use the first entry.", getName(), identifier);
             }
 
             BibEntry entry = fetchedEntries.get(0);
@@ -82,7 +81,10 @@ default Optional<BibEntry> performSearchById(String identifier) throws FetcherEx
         } catch (URISyntaxException e) {
             throw new FetcherException("Search URI is malformed", e);
         } catch (IOException e) {
-            // TODO: Catch HTTP Response 401 errors and report that user has no rights to access resource. It might be that there is an UnknownHostException (eutils.ncbi.nlm.nih.gov cannot be resolved).
+            // check for the case where we already have a FetcherException from UrlDownload
+            if (e.getCause() instanceof FetcherException fe) {
+                throw fe;
+            }
             throw new FetcherException("A network error occurred", e);
         } catch (ParseException e) {
             throw new FetcherException("An internal parser error occurred", e);
diff --git a/src/main/java/org/jabref/logic/importer/IdParserFetcher.java b/src/main/java/org/jabref/logic/importer/IdParserFetcher.java
index bf4b2bb32b9..b9b5ed92e44 100644
--- a/src/main/java/org/jabref/logic/importer/IdParserFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/IdParserFetcher.java
@@ -88,8 +88,10 @@ default Optional<T> findIdentifier(BibEntry entry) throws FetcherException {
             LOGGER.debug("Id not found");
             return Optional.empty();
         } catch (IOException e) {
-            // TODO: Catch HTTP Response 401 errors and report that user has no rights to access resource
-            // TODO catch 503 service unavailable and alert user
+            // check for the case where we already have a FetcherException from UrlDownload
+            if (e.getCause() instanceof FetcherException fe) {
+                throw fe;
+            }
             throw new FetcherException("An I/O exception occurred", e);
         } catch (ParseException e) {
             throw new FetcherException("An internal parser error occurred", e);
diff --git a/src/main/java/org/jabref/logic/importer/ImportFormatPreferences.java b/src/main/java/org/jabref/logic/importer/ImportFormatPreferences.java
index f051370ed81..8b8fa654053 100644
--- a/src/main/java/org/jabref/logic/importer/ImportFormatPreferences.java
+++ b/src/main/java/org/jabref/logic/importer/ImportFormatPreferences.java
@@ -1,48 +1,38 @@
 package org.jabref.logic.importer;
 
-import java.util.Set;
-
 import org.jabref.logic.bibtex.FieldContentFormatterPreferences;
 import org.jabref.logic.citationkeypattern.CitationKeyPatternPreferences;
-import org.jabref.logic.importer.fileformat.CustomImporter;
+import org.jabref.logic.importer.fetcher.GrobidPreferences;
 import org.jabref.logic.preferences.DOIPreferences;
 import org.jabref.logic.xmp.XmpPreferences;
 
 public class ImportFormatPreferences {
 
-    private final Set<CustomImporter> customImportList;
     private final Character keywordSeparator;
     private final CitationKeyPatternPreferences citationKeyPatternPreferences;
     private final FieldContentFormatterPreferences fieldContentFormatterPreferences;
     private final XmpPreferences xmpPreferences;
     private final DOIPreferences doiPreferences;
+    private final GrobidPreferences grobidPreferences;
 
-    public ImportFormatPreferences(Set<CustomImporter> customImportList,
-                                   Character keywordSeparator,
+    public ImportFormatPreferences(Character keywordSeparator,
                                    CitationKeyPatternPreferences citationKeyPatternPreferences,
                                    FieldContentFormatterPreferences fieldContentFormatterPreferences,
                                    XmpPreferences xmpPreferences,
-                                   DOIPreferences doiPreferences) {
-        this.customImportList = customImportList;
+                                   DOIPreferences doiPreferences,
+                                   GrobidPreferences grobidPreferences) {
         this.keywordSeparator = keywordSeparator;
         this.citationKeyPatternPreferences = citationKeyPatternPreferences;
         this.fieldContentFormatterPreferences = fieldContentFormatterPreferences;
         this.xmpPreferences = xmpPreferences;
         this.doiPreferences = doiPreferences;
+        this.grobidPreferences = grobidPreferences;
     }
 
     public DOIPreferences getDoiPreferences() {
         return doiPreferences;
     }
 
-    /**
-     * @deprecated importer should not know about the other custom importers
-     */
-    @Deprecated
-    public Set<CustomImporter> getCustomImportList() {
-        return customImportList;
-    }
-
     public Character getKeywordSeparator() {
         return keywordSeparator;
     }
@@ -58,4 +48,8 @@ public FieldContentFormatterPreferences getFieldContentFormatterPreferences() {
     public XmpPreferences getXmpPreferences() {
         return xmpPreferences;
     }
+
+    public GrobidPreferences getGrobidPreferences() {
+        return grobidPreferences;
+    }
 }
diff --git a/src/main/java/org/jabref/logic/importer/ImportFormatReader.java b/src/main/java/org/jabref/logic/importer/ImportFormatReader.java
index e7c10b96f09..67ceeb59647 100644
--- a/src/main/java/org/jabref/logic/importer/ImportFormatReader.java
+++ b/src/main/java/org/jabref/logic/importer/ImportFormatReader.java
@@ -13,6 +13,7 @@
 import org.jabref.logic.importer.fileformat.BiblioscapeImporter;
 import org.jabref.logic.importer.fileformat.BibtexImporter;
 import org.jabref.logic.importer.fileformat.CffImporter;
+import org.jabref.logic.importer.fileformat.CitaviXmlImporter;
 import org.jabref.logic.importer.fileformat.CopacImporter;
 import org.jabref.logic.importer.fileformat.EndnoteImporter;
 import org.jabref.logic.importer.fileformat.EndnoteXmlImporter;
@@ -33,12 +34,10 @@
 import org.jabref.logic.importer.fileformat.RisImporter;
 import org.jabref.logic.importer.fileformat.SilverPlatterImporter;
 import org.jabref.logic.l10n.Localization;
-import org.jabref.logic.xmp.XmpPreferences;
 import org.jabref.model.database.BibDatabases;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.strings.StringUtil;
 import org.jabref.model.util.FileUpdateMonitor;
-import org.jabref.preferences.GeneralPreferences;
 
 public class ImportFormatReader {
 
@@ -50,11 +49,11 @@ public class ImportFormatReader {
      */
     private final List<Importer> formats = new ArrayList<>();
 
-    private GeneralPreferences generalPreferences;
     private ImportFormatPreferences importFormatPreferences;
 
-    public void resetImportFormats(ImporterPreferences importerPreferences, GeneralPreferences generalPreferences, ImportFormatPreferences newImportFormatPreferences, XmpPreferences xmpPreferences, FileUpdateMonitor fileMonitor) {
-        this.generalPreferences = generalPreferences;
+    public void resetImportFormats(ImporterPreferences importerPreferences,
+                                   ImportFormatPreferences newImportFormatPreferences,
+                                   FileUpdateMonitor fileMonitor) {
         this.importFormatPreferences = newImportFormatPreferences;
 
         formats.clear();
@@ -70,23 +69,24 @@ public void resetImportFormats(ImporterPreferences importerPreferences, GeneralP
         formats.add(new ModsImporter(importFormatPreferences));
         formats.add(new MsBibImporter());
         formats.add(new OvidImporter());
-        formats.add(new PdfMergeMetadataImporter(importerPreferences, importFormatPreferences));
+        formats.add(new PdfMergeMetadataImporter(importFormatPreferences));
         formats.add(new PdfVerbatimBibTextImporter(importFormatPreferences));
         formats.add(new PdfContentImporter(importFormatPreferences));
         formats.add(new PdfEmbeddedBibFileImporter(importFormatPreferences));
-        if (importerPreferences.isGrobidEnabled()) {
-            formats.add(new PdfGrobidImporter(importerPreferences, importFormatPreferences));
+        if (importFormatPreferences.getGrobidPreferences().isGrobidEnabled()) {
+            formats.add(new PdfGrobidImporter(importFormatPreferences));
         }
-        formats.add(new PdfXmpImporter(xmpPreferences));
+        formats.add(new PdfXmpImporter(importFormatPreferences.getXmpPreferences()));
         formats.add(new RepecNepImporter(importFormatPreferences));
         formats.add(new RisImporter());
         formats.add(new SilverPlatterImporter());
         formats.add(new CffImporter());
         formats.add(new BiblioscapeImporter());
         formats.add(new BibtexImporter(importFormatPreferences, fileMonitor));
+        formats.add(new CitaviXmlImporter());
 
         // Get custom import formats
-        formats.addAll(importFormatPreferences.getCustomImportList());
+        formats.addAll(importerPreferences.getCustomImportList());
     }
 
     /**
@@ -115,7 +115,7 @@ public ParserResult importFromFile(String format, Path file) throws ImportExcept
         }
 
         try {
-            return importer.get().importDatabase(file, generalPreferences.getDefaultEncoding());
+            return importer.get().importDatabase(file);
         } catch (IOException e) {
             throw new ImportException(e);
         }
@@ -182,18 +182,18 @@ public UnknownFormatImport importUnknownFormat(Path filePath, FileUpdateMonitor
         Objects.requireNonNull(filePath);
 
         try {
-            UnknownFormatImport unknownFormatImport = importUnknownFormat(importer -> importer.importDatabase(filePath, generalPreferences.getDefaultEncoding()), importer -> importer.isRecognizedFormat(filePath, generalPreferences.getDefaultEncoding()));
+            UnknownFormatImport unknownFormatImport = importUnknownFormat(importer -> importer.importDatabase(filePath), importer -> importer.isRecognizedFormat(filePath));
             unknownFormatImport.parserResult.setPath(filePath);
             return unknownFormatImport;
         } catch (ImportException e) {
             // If all importers fail, try to read the file as BibTeX
             try {
-                ParserResult parserResult = OpenDatabase.loadDatabase(filePath, generalPreferences, importFormatPreferences, fileMonitor);
+                ParserResult parserResult = OpenDatabase.loadDatabase(filePath, importFormatPreferences, fileMonitor);
                 if (parserResult.getDatabase().hasEntries() || !parserResult.getDatabase().hasNoStrings()) {
                     parserResult.setPath(filePath);
                     return new UnknownFormatImport(ImportFormatReader.BIBTEX_FORMAT, parserResult);
                 } else {
-                    throw new ImportException(Localization.lang("Could not find a suitable import format."));
+                    throw new ImportException(parserResult.getErrorMessage());
                 }
             } catch (IOException ignore) {
                 // Ignored
diff --git a/src/main/java/org/jabref/logic/importer/Importer.java b/src/main/java/org/jabref/logic/importer/Importer.java
index 1c790537677..56bde6f0e3e 100644
--- a/src/main/java/org/jabref/logic/importer/Importer.java
+++ b/src/main/java/org/jabref/logic/importer/Importer.java
@@ -1,5 +1,6 @@
 package org.jabref.logic.importer;
 
+import java.io.BufferedInputStream;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
@@ -10,16 +11,25 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardOpenOption;
+import java.util.Arrays;
 import java.util.Objects;
 
 import org.jabref.logic.util.FileType;
+import org.jabref.logic.util.io.FileUtil;
 import org.jabref.model.database.BibDatabaseModeDetection;
 
+import com.ibm.icu.text.CharsetDetector;
+import com.ibm.icu.text.CharsetMatch;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 /**
  * Role of an importer for JabRef.
  */
 public abstract class Importer implements Comparable<Importer> {
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(Importer.class);
+
     /**
      * Check whether the source is in the correct format for this importer.
      * <p>
@@ -35,12 +45,11 @@ public abstract class Importer implements Comparable<Importer> {
      * Check whether the source is in the correct format for this importer.
      *
      * @param filePath the path of the file to check
-     * @param encoding the encoding of the file
      * @return true, if the file is in a recognized format
      * @throws IOException Signals that an I/O exception has occurred.
      */
-    public boolean isRecognizedFormat(Path filePath, Charset encoding) throws IOException {
-        try (BufferedReader bufferedReader = getReader(filePath, encoding)) {
+    public boolean isRecognizedFormat(Path filePath) throws IOException {
+        try (BufferedReader bufferedReader = getReader(filePath)) {
             return isRecognizedFormat(bufferedReader);
         }
     }
@@ -76,17 +85,21 @@ public boolean isRecognizedFormat(String data) throws IOException {
 
     /**
      * Parse the database in the specified file.
-     * <p>
-     * Importer having the facilities to detect the correct encoding of a file should overwrite this method, determine
-     * the encoding and then call {@link #importDatabase(BufferedReader)}.
      *
      * @param filePath the path to the file which should be imported
-     * @param encoding the encoding used to decode the file
      */
-    public ParserResult importDatabase(Path filePath, Charset encoding) throws IOException {
-        try (BufferedReader bufferedReader = getReader(filePath, encoding)) {
+    public ParserResult importDatabase(Path filePath) throws IOException {
+        try (InputStream inputStream = Files.newInputStream(filePath, StandardOpenOption.READ)) {
+            BufferedInputStream bufferedInputStream = new BufferedInputStream(inputStream);
+
+            Charset charset = StandardCharsets.UTF_8;
+
+            BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(bufferedInputStream, charset));
             ParserResult parserResult = importDatabase(bufferedReader);
-            parserResult.getMetaData().setEncoding(encoding);
+
+            // store the detected encoding
+            parserResult.getMetaData().setEncoding(charset);
+
             parserResult.setPath(filePath);
 
             // Make sure the mode is always set
@@ -97,6 +110,33 @@ public ParserResult importDatabase(Path filePath, Charset encoding) throws IOExc
         }
     }
 
+    protected static Charset getCharset(BufferedInputStream bufferedInputStream) {
+        Charset defaultCharSet = StandardCharsets.UTF_8;
+
+        // This reads the first 8000 bytes only, thus the default size of 8192 of the bufferedInputStream is OK.
+        // See https://github.com/unicode-org/icu/blob/06ef8867f35befee7340e35082fefc9d3561d230/icu4j/main/classes/core/src/com/ibm/icu/text/CharsetDetector.java#L125 for details
+        CharsetDetector charsetDetector = new CharsetDetector();
+        try {
+            charsetDetector.setText(bufferedInputStream);
+
+            CharsetMatch[] matches = charsetDetector.detectAll();
+            if ((matches == null) || (matches.length == 0)) {
+                return defaultCharSet;
+            }
+
+            if (Arrays.stream(matches).anyMatch(charset -> "ASCII".equals(charset.getName()))) {
+                return defaultCharSet;
+            }
+
+            if (matches[0] != null) {
+                return Charset.forName(matches[0].getName());
+            }
+        } catch (IOException e) {
+            LOGGER.error("Could not determine charset. Using default one.", e);
+        }
+        return defaultCharSet;
+    }
+
     /**
      * Parse the database in the specified string.
      * <p>
@@ -114,18 +154,21 @@ public ParserResult importDatabase(String data) throws IOException {
         }
     }
 
-    protected static BufferedReader getUTF8Reader(Path filePath) throws IOException {
-        return getReader(filePath, StandardCharsets.UTF_8);
-    }
+    public static BufferedReader getReader(Path filePath) throws IOException {
+        InputStream stream = Files.newInputStream(filePath, StandardOpenOption.READ);
 
-    protected static BufferedReader getUTF16Reader(Path filePath) throws IOException {
-        return getReader(filePath, StandardCharsets.UTF_16);
+        if (FileUtil.isBibFile(filePath)) {
+            return getReader(stream);
+        }
+
+        return new BufferedReader(new InputStreamReader(stream, StandardCharsets.UTF_8));
     }
 
-    public static BufferedReader getReader(Path filePath, Charset encoding)
-            throws IOException {
-        InputStream stream = Files.newInputStream(filePath, StandardOpenOption.READ);
-        return new BufferedReader(new InputStreamReader(stream, encoding));
+    public static BufferedReader getReader(InputStream stream) {
+        BufferedInputStream bufferedInputStream = new BufferedInputStream(stream);
+        Charset charset = getCharset(bufferedInputStream);
+        InputStreamReader reader = new InputStreamReader(bufferedInputStream, charset);
+        return new BufferedReader(reader);
     }
 
     /**
diff --git a/src/main/java/org/jabref/logic/importer/ImporterPreferences.java b/src/main/java/org/jabref/logic/importer/ImporterPreferences.java
index d2da57015f6..198eab8e51e 100644
--- a/src/main/java/org/jabref/logic/importer/ImporterPreferences.java
+++ b/src/main/java/org/jabref/logic/importer/ImporterPreferences.java
@@ -1,22 +1,27 @@
 package org.jabref.logic.importer;
 
+import java.util.Set;
+
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
-import javafx.beans.property.SimpleStringProperty;
-import javafx.beans.property.StringProperty;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableSet;
+
+import org.jabref.logic.importer.fileformat.CustomImporter;
+import org.jabref.logic.preferences.FetcherApiKey;
 
 public class ImporterPreferences {
 
     private final BooleanProperty generateNewKeyOnImport;
-    private final BooleanProperty grobidEnabled;
-    private final BooleanProperty grobidOptOut;
-    private final StringProperty grobidURL;
+    private final ObservableSet<FetcherApiKey> apiKeys;
+    private final ObservableSet<CustomImporter> customImportList;
 
-    public ImporterPreferences(boolean generateNewKeyOnImport, boolean grobidEnabled, boolean grobidOptOut, String grobidURL) {
+    public ImporterPreferences(boolean generateNewKeyOnImport,
+                               Set<CustomImporter> customImportList,
+                               Set<FetcherApiKey> apiKeys) {
         this.generateNewKeyOnImport = new SimpleBooleanProperty(generateNewKeyOnImport);
-        this.grobidEnabled = new SimpleBooleanProperty(grobidEnabled);
-        this.grobidOptOut = new SimpleBooleanProperty(grobidOptOut);
-        this.grobidURL = new SimpleStringProperty(grobidURL);
+        this.customImportList = FXCollections.observableSet(customImportList);
+        this.apiKeys = FXCollections.observableSet(apiKeys);
     }
 
     public boolean isGenerateNewKeyOnImport() {
@@ -27,43 +32,15 @@ public BooleanProperty generateNewKeyOnImportProperty() {
         return generateNewKeyOnImport;
     }
 
-    public boolean isGrobidEnabled() {
-        return grobidEnabled.get();
-    }
-
-    public BooleanProperty grobidEnabledProperty() {
-        return grobidEnabled;
-    }
-
-    public boolean isGrobidOptOut() {
-        return grobidOptOut.get();
-    }
-
-    public BooleanProperty grobidOptOutProperty() {
-        return grobidOptOut;
-    }
-
-    public String getGrobidURL() {
-        return grobidURL.get();
-    }
-
-    public StringProperty grobidURLProperty() {
-        return grobidURL;
-    }
-
     public void setGenerateNewKeyOnImport(boolean generateNewKeyOnImport) {
         this.generateNewKeyOnImport.set(generateNewKeyOnImport);
     }
 
-    public void setGrobidEnabled(boolean grobidEnabled) {
-        this.grobidEnabled.set(grobidEnabled);
-    }
-
-    public void setGrobidOptOut(boolean grobidOptOut) {
-        this.grobidOptOut.set(grobidOptOut);
+    public ObservableSet<FetcherApiKey> getApiKeys() {
+        return apiKeys;
     }
 
-    public void setGrobidURL(String grobidURL) {
-        this.grobidURL.set(grobidURL);
+    public ObservableSet<CustomImporter> getCustomImportList() {
+        return customImportList;
     }
 }
diff --git a/src/main/java/org/jabref/logic/importer/OpenDatabase.java b/src/main/java/org/jabref/logic/importer/OpenDatabase.java
index bbc4796a22d..f5e2fc1cd9c 100644
--- a/src/main/java/org/jabref/logic/importer/OpenDatabase.java
+++ b/src/main/java/org/jabref/logic/importer/OpenDatabase.java
@@ -11,7 +11,6 @@
 import org.jabref.migrations.PostOpenMigration;
 import org.jabref.migrations.SpecialFieldsToSeparateFields;
 import org.jabref.model.util.FileUpdateMonitor;
-import org.jabref.preferences.GeneralPreferences;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -29,10 +28,9 @@ private OpenDatabase() {
      * @param fileToOpen Name of the BIB-file to open
      * @return ParserResult which never is null
      */
-    public static ParserResult loadDatabase(Path fileToOpen, GeneralPreferences generalPreferences, ImportFormatPreferences importFormatPreferences, FileUpdateMonitor fileMonitor)
+    public static ParserResult loadDatabase(Path fileToOpen, ImportFormatPreferences importFormatPreferences, FileUpdateMonitor fileMonitor)
             throws IOException {
-        ParserResult result = new BibtexImporter(importFormatPreferences, fileMonitor).importDatabase(fileToOpen,
-                generalPreferences.getDefaultEncoding());
+        ParserResult result = new BibtexImporter(importFormatPreferences, fileMonitor).importDatabase(fileToOpen);
 
         performLoadDatabaseMigrations(result, importFormatPreferences.getKeywordSeparator());
 
diff --git a/src/main/java/org/jabref/logic/importer/PagedSearchBasedFetcher.java b/src/main/java/org/jabref/logic/importer/PagedSearchBasedFetcher.java
index a6b1cd4aea1..bafae176485 100644
--- a/src/main/java/org/jabref/logic/importer/PagedSearchBasedFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/PagedSearchBasedFetcher.java
@@ -52,8 +52,8 @@ default int getPageSize() {
      * @param luceneQuery the root node of the lucene query
      * @return a list of {@link BibEntry}, which are matched by the query (may be empty)
      */
+    @Override
     default List<BibEntry> performSearch(QueryNode luceneQuery) throws FetcherException {
         return new ArrayList<>(performSearchPaged(luceneQuery, 0).getContent());
     }
-
 }
diff --git a/src/main/java/org/jabref/logic/importer/PagedSearchBasedParserFetcher.java b/src/main/java/org/jabref/logic/importer/PagedSearchBasedParserFetcher.java
index bbbc848cc99..9f08d042c69 100644
--- a/src/main/java/org/jabref/logic/importer/PagedSearchBasedParserFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/PagedSearchBasedParserFetcher.java
@@ -40,8 +40,9 @@ private List<BibEntry> getBibEntries(URL urlForQuery) throws FetcherException {
 
     /**
      * Constructs a URL based on the query, size and page number.
-     *  @param luceneQuery      the search query
-     * @param pageNumber the number of the page indexed from 0
+     *
+     * @param luceneQuery the search query
+     * @param pageNumber  the number of the page indexed from 0
      */
     URL getURLForQuery(QueryNode luceneQuery, int pageNumber) throws URISyntaxException, MalformedURLException, FetcherException;
 
diff --git a/src/main/java/org/jabref/logic/importer/SearchBasedFetcher.java b/src/main/java/org/jabref/logic/importer/SearchBasedFetcher.java
index 8e3e3d75533..34858548f7e 100644
--- a/src/main/java/org/jabref/logic/importer/SearchBasedFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/SearchBasedFetcher.java
@@ -15,6 +15,9 @@
 /**
  * Searches web resources for bibliographic information based on a free-text query.
  * May return multiple search hits.
+ * <p>
+ *    This interface is used for web resources which directly return BibTeX data ({@link BibEntry})
+ * </p>
  */
 public interface SearchBasedFetcher extends WebFetcher {
 
diff --git a/src/main/java/org/jabref/logic/importer/SearchBasedParserFetcher.java b/src/main/java/org/jabref/logic/importer/SearchBasedParserFetcher.java
index 9aadba697b9..1d9c2882acf 100644
--- a/src/main/java/org/jabref/logic/importer/SearchBasedParserFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/SearchBasedParserFetcher.java
@@ -13,12 +13,25 @@
 import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 
 /**
- * Provides a convenient interface for search-based fetcher, which follow the usual three-step procedure:
+ * Provides a convenient interface for search-based fetcher, which follows the usual three-step procedure:
  * <ol>
  *     <li>Open a URL based on the search query</li>
  *     <li>Parse the response to get a list of {@link BibEntry}</li>
  *     <li>Post-process fetched entries</li>
  * </ol>
+ * <p>
+ *     This interface is used for web resources which do NOT provide BibTeX data {@link BibEntry}.
+ *     JabRef's infrastructure to convert arbitrary input data to BibTeX is {@link Parser}.
+ * </p>
+ * <p>
+ *     This interface inherits {@link SearchBasedFetcher}, because the methods <code>performSearch</code> have to be provided by both.
+ *     As non-BibTeX web fetcher one could do "magic" stuff without this helper interface and directly use {@link WebFetcher}, but this is more work.
+ * </p>
+ * <p>
+ *     Note that this interface "should" be an abstract class.
+ *     However, Java does not support multi inheritance with classes (but with interfaces).
+ *     We need multi inheritance, because a fetcher might implement multiple query types (such as id fetching {@link IdBasedFetcher}), complete entry {@link EntryBasedFetcher}, and search-based fetcher (this class).
+ * </p>
  */
 public interface SearchBasedParserFetcher extends SearchBasedFetcher {
 
diff --git a/src/main/java/org/jabref/logic/importer/WebFetchers.java b/src/main/java/org/jabref/logic/importer/WebFetchers.java
index efe64b8b3a7..5a78fe3e4e1 100644
--- a/src/main/java/org/jabref/logic/importer/WebFetchers.java
+++ b/src/main/java/org/jabref/logic/importer/WebFetchers.java
@@ -1,6 +1,5 @@
 package org.jabref.logic.importer;
 
-import java.nio.charset.Charset;
 import java.util.Comparator;
 import java.util.HashSet;
 import java.util.Optional;
@@ -13,11 +12,14 @@
 import org.jabref.logic.importer.fetcher.ApsFetcher;
 import org.jabref.logic.importer.fetcher.ArXiv;
 import org.jabref.logic.importer.fetcher.AstrophysicsDataSystem;
+import org.jabref.logic.importer.fetcher.BiodiversityLibrary;
 import org.jabref.logic.importer.fetcher.CiteSeer;
 import org.jabref.logic.importer.fetcher.CollectionOfComputerScienceBibliographiesFetcher;
 import org.jabref.logic.importer.fetcher.CompositeSearchBasedFetcher;
 import org.jabref.logic.importer.fetcher.CrossRef;
+import org.jabref.logic.importer.fetcher.CustomizableKeyFetcher;
 import org.jabref.logic.importer.fetcher.DBLPFetcher;
+import org.jabref.logic.importer.fetcher.DOABFetcher;
 import org.jabref.logic.importer.fetcher.DOAJFetcher;
 import org.jabref.logic.importer.fetcher.DiVA;
 import org.jabref.logic.importer.fetcher.DoiFetcher;
@@ -32,8 +34,10 @@
 import org.jabref.logic.importer.fetcher.MedlineFetcher;
 import org.jabref.logic.importer.fetcher.Medra;
 import org.jabref.logic.importer.fetcher.OpenAccessDoi;
+import org.jabref.logic.importer.fetcher.ResearchGate;
 import org.jabref.logic.importer.fetcher.RfcFetcher;
 import org.jabref.logic.importer.fetcher.ScienceDirect;
+import org.jabref.logic.importer.fetcher.SemanticScholar;
 import org.jabref.logic.importer.fetcher.SpringerFetcher;
 import org.jabref.logic.importer.fetcher.SpringerLink;
 import org.jabref.logic.importer.fetcher.TitleFetcher;
@@ -88,36 +92,41 @@ public static Optional<IdFetcher<? extends Identifier>> getIdFetcherForField(Fie
     /**
      * @return sorted set containing search based fetchers
      */
-    public static SortedSet<SearchBasedFetcher> getSearchBasedFetchers(ImportFormatPreferences importFormatPreferences) {
+    public static SortedSet<SearchBasedFetcher> getSearchBasedFetchers(ImportFormatPreferences importFormatPreferences, ImporterPreferences importerPreferences) {
         SortedSet<SearchBasedFetcher> set = new TreeSet<>(Comparator.comparing(WebFetcher::getName));
         set.add(new ArXiv(importFormatPreferences));
         set.add(new INSPIREFetcher(importFormatPreferences));
         set.add(new GvkFetcher());
         set.add(new MedlineFetcher());
-        set.add(new AstrophysicsDataSystem(importFormatPreferences));
+        set.add(new AstrophysicsDataSystem(importFormatPreferences, importerPreferences));
         set.add(new MathSciNet(importFormatPreferences));
         set.add(new ZbMATH(importFormatPreferences));
         set.add(new ACMPortalFetcher());
         // set.add(new GoogleScholar(importFormatPreferences));
         set.add(new DBLPFetcher(importFormatPreferences));
-        set.add(new SpringerFetcher());
+        set.add(new SpringerFetcher(importerPreferences));
         set.add(new CrossRef());
         set.add(new CiteSeer());
         set.add(new DOAJFetcher(importFormatPreferences));
-        set.add(new IEEE(importFormatPreferences));
+        set.add(new IEEE(importFormatPreferences, importerPreferences));
         set.add(new CompositeSearchBasedFetcher(set, 30));
         set.add(new CollectionOfComputerScienceBibliographiesFetcher(importFormatPreferences));
+        set.add(new DOABFetcher());
         // set.add(new JstorFetcher(importFormatPreferences));
-        return set;
+        set.add(new SemanticScholar());
+        set.add(new ResearchGate(importFormatPreferences));
+        set.add(new BiodiversityLibrary(importerPreferences));
+      return set;
     }
 
     /**
      * @return sorted set containing id based fetchers
      */
-    public static SortedSet<IdBasedFetcher> getIdBasedFetchers(ImportFormatPreferences importFormatPreferences) {
+    public static SortedSet<IdBasedFetcher> getIdBasedFetchers(ImportFormatPreferences importFormatPreferences,
+                                                               ImporterPreferences importerPreferences) {
         SortedSet<IdBasedFetcher> set = new TreeSet<>(Comparator.comparing(WebFetcher::getName));
         set.add(new ArXiv(importFormatPreferences));
-        set.add(new AstrophysicsDataSystem(importFormatPreferences));
+        set.add(new AstrophysicsDataSystem(importFormatPreferences, importerPreferences));
         set.add(new IsbnFetcher(importFormatPreferences));
         set.add(new DiVA(importFormatPreferences));
         set.add(new DoiFetcher(importFormatPreferences));
@@ -137,15 +146,20 @@ public static SortedSet<IdBasedFetcher> getIdBasedFetchers(ImportFormatPreferenc
     /**
      * @return sorted set containing entry based fetchers
      */
-    public static SortedSet<EntryBasedFetcher> getEntryBasedFetchers(ImporterPreferences importerPreferences, ImportFormatPreferences importFormatPreferences, FilePreferences filePreferences, BibDatabaseContext databaseContext, Charset defaultEncoding) {
+    public static SortedSet<EntryBasedFetcher> getEntryBasedFetchers(ImporterPreferences importerPreferences,
+                                                                     ImportFormatPreferences importFormatPreferences,
+                                                                     FilePreferences filePreferences,
+                                                                     BibDatabaseContext databaseContext) {
         SortedSet<EntryBasedFetcher> set = new TreeSet<>(Comparator.comparing(WebFetcher::getName));
-        set.add(new AstrophysicsDataSystem(importFormatPreferences));
+        set.add(new AstrophysicsDataSystem(importFormatPreferences, importerPreferences));
         set.add(new DoiFetcher(importFormatPreferences));
         set.add(new IsbnFetcher(importFormatPreferences));
         set.add(new MathSciNet(importFormatPreferences));
         set.add(new CrossRef());
         set.add(new ZbMATH(importFormatPreferences));
-        set.add(new PdfMergeMetadataImporter.EntryBasedFetcherWrapper(importerPreferences, importFormatPreferences, filePreferences, databaseContext, defaultEncoding));
+        set.add(new PdfMergeMetadataImporter.EntryBasedFetcherWrapper(importFormatPreferences, filePreferences, databaseContext));
+        set.add(new SemanticScholar());
+        set.add(new ResearchGate(importFormatPreferences));
         return set;
     }
 
@@ -162,25 +176,39 @@ public static SortedSet<IdFetcher<? extends Identifier>> getIdFetchers(ImportFor
     /**
      * @return set containing fulltext fetchers
      */
-    public static Set<FulltextFetcher> getFullTextFetchers(ImportFormatPreferences importFormatPreferences) {
+    public static Set<FulltextFetcher> getFullTextFetchers(ImportFormatPreferences importFormatPreferences, ImporterPreferences importerPreferences) {
         Set<FulltextFetcher> fetchers = new HashSet<>();
 
         // Original
         fetchers.add(new DoiResolution(importFormatPreferences.getDoiPreferences()));
 
         // Publishers
-        fetchers.add(new ScienceDirect());
-        fetchers.add(new SpringerLink());
+        fetchers.add(new ScienceDirect(importerPreferences));
+        fetchers.add(new SpringerLink(importerPreferences));
         fetchers.add(new ACS());
         fetchers.add(new ArXiv(importFormatPreferences));
-        fetchers.add(new IEEE(importFormatPreferences));
+        fetchers.add(new IEEE(importFormatPreferences, importerPreferences));
         fetchers.add(new ApsFetcher());
 
         // Meta search
         // fetchers.add(new JstorFetcher(importFormatPreferences));
         // fetchers.add(new GoogleScholar(importFormatPreferences));
         fetchers.add(new OpenAccessDoi());
+        fetchers.add(new SemanticScholar());
+        fetchers.add(new ResearchGate(importFormatPreferences));
+        return fetchers;
+    }
 
+    /**
+     * @return set containing customizable api key fetchers
+     */
+    public static Set<CustomizableKeyFetcher> getCustomizableKeyFetchers(ImportFormatPreferences importFormatPreferences, ImporterPreferences importerPreferences) {
+        Set<CustomizableKeyFetcher> fetchers = new HashSet<>();
+        fetchers.add(new IEEE(importFormatPreferences, importerPreferences));
+        fetchers.add(new SpringerFetcher(importerPreferences));
+        fetchers.add(new ScienceDirect(importerPreferences));
+        fetchers.add(new AstrophysicsDataSystem(importFormatPreferences, importerPreferences));
+        fetchers.add(new BiodiversityLibrary(importerPreferences));
         return fetchers;
     }
 }
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/ACMPortalFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/ACMPortalFetcher.java
index a981dd835bc..10ba0e1b1b4 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/ACMPortalFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/ACMPortalFetcher.java
@@ -62,5 +62,4 @@ public URL getURLForQuery(QueryNode query) throws URISyntaxException, MalformedU
     public Parser getParser() {
         return new ACMPortalParser();
     }
-
 }
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/ApsFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/ApsFetcher.java
index 9cdf1cb6c87..3d589ffa9c7 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/ApsFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/ApsFetcher.java
@@ -41,7 +41,6 @@ public Optional<URL> findFullText(BibEntry entry) throws IOException {
         Optional<String> id = getId(doi.get().getDOI());
 
         if (id.isPresent()) {
-
             String pdfRequestUrl = PDF_URL + id.get();
             int code = Unirest.head(pdfRequestUrl).asJson().getStatus();
 
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/AstrophysicsDataSystem.java b/src/main/java/org/jabref/logic/importer/fetcher/AstrophysicsDataSystem.java
index c3dc605e7ef..d59df7ed972 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/AstrophysicsDataSystem.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/AstrophysicsDataSystem.java
@@ -24,12 +24,14 @@
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.IdBasedParserFetcher;
 import org.jabref.logic.importer.ImportFormatPreferences;
+import org.jabref.logic.importer.ImporterPreferences;
 import org.jabref.logic.importer.PagedSearchBasedParserFetcher;
 import org.jabref.logic.importer.ParseException;
 import org.jabref.logic.importer.Parser;
 import org.jabref.logic.importer.fetcher.transformers.DefaultQueryTransformer;
 import org.jabref.logic.importer.fileformat.BibtexParser;
 import org.jabref.logic.net.URLDownload;
+import org.jabref.logic.preferences.FetcherApiKey;
 import org.jabref.logic.util.BuildInfo;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
@@ -45,18 +47,21 @@
 import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 
 /**
- * Fetches data from the SAO/NASA Astrophysics Data System (https://ui.adsabs.harvard.edu/)
+ * Fetches data from the SAO/NASA Astrophysics Data System (<a href="https://ui.adsabs.harvard.edu/">https://ui.adsabs.harvard.edu/</a>)
  */
-public class AstrophysicsDataSystem implements IdBasedParserFetcher, PagedSearchBasedParserFetcher, EntryBasedParserFetcher {
+public class AstrophysicsDataSystem
+        implements IdBasedParserFetcher, PagedSearchBasedParserFetcher, EntryBasedParserFetcher, CustomizableKeyFetcher {
 
     private static final String API_SEARCH_URL = "https://api.adsabs.harvard.edu/v1/search/query";
     private static final String API_EXPORT_URL = "https://api.adsabs.harvard.edu/v1/export/bibtexabs";
 
     private static final String API_KEY = new BuildInfo().astrophysicsDataSystemAPIKey;
     private final ImportFormatPreferences preferences;
+    private final ImporterPreferences importerPreferences;
 
-    public AstrophysicsDataSystem(ImportFormatPreferences preferences) {
+    public AstrophysicsDataSystem(ImportFormatPreferences preferences, ImporterPreferences importerPreferences) {
         this.preferences = Objects.requireNonNull(preferences);
+        this.importerPreferences = importerPreferences;
     }
 
     /**
@@ -80,6 +85,16 @@ public String getName() {
         return "SAO/NASA ADS";
     }
 
+    private String getApiKey() {
+        return importerPreferences.getApiKeys()
+                                  .stream()
+                                  .filter(key -> key.getName().equalsIgnoreCase(this.getName()))
+                                  .filter(FetcherApiKey::shouldUse)
+                                  .findFirst()
+                                  .map(FetcherApiKey::getKey)
+                                  .orElse(API_KEY);
+    }
+
     /**
      * @param luceneQuery query string, matching the apache solr format
      * @return URL which points to a search request for given query
@@ -163,7 +178,7 @@ public void doPostCleanup(BibEntry entry) {
         entry.getField(StandardField.ABSTRACT)
              .map(abstractText -> abstractText.replace("<P />", ""))
              .map(abstractText -> abstractText.replace("\\textbackslash", ""))
-             .map(abstractText -> abstractText.trim())
+             .map(String::trim)
              .ifPresent(abstractText -> entry.setField(StandardField.ABSTRACT, abstractText));
         // The fetcher adds some garbage (number of found entries etc before)
         entry.setCommentsBeforeEntry("");
@@ -245,7 +260,7 @@ private List<BibEntry> performSearchByIds(Collection<String> identifiers) throws
         try {
             String postData = buildPostData(ids);
             URLDownload download = new URLDownload(getURLforExport());
-            download.addHeader("Authorization", "Bearer " + API_KEY);
+            download.addHeader("Authorization", "Bearer " + this.getApiKey());
             download.addHeader("ContentType", "application/json");
             download.setPostData(postData);
             String content = download.asString();
@@ -306,8 +321,7 @@ public Page<BibEntry> performSearchPaged(QueryNode luceneQuery, int pageNumber)
     @Override
     public URLDownload getUrlDownload(URL url) {
         URLDownload urlDownload = new URLDownload(url);
-        urlDownload.addHeader("Authorization", "Bearer " + API_KEY);
+        urlDownload.addHeader("Authorization", "Bearer " + this.getApiKey());
         return urlDownload;
     }
-
 }
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/BiodiversityLibrary.java b/src/main/java/org/jabref/logic/importer/fetcher/BiodiversityLibrary.java
new file mode 100644
index 00000000000..7a75a38675e
--- /dev/null
+++ b/src/main/java/org/jabref/logic/importer/fetcher/BiodiversityLibrary.java
@@ -0,0 +1,223 @@
+package org.jabref.logic.importer.fetcher;
+
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.IntStream;
+
+import org.jabref.logic.importer.FetcherException;
+import org.jabref.logic.importer.ImporterPreferences;
+import org.jabref.logic.importer.ParseException;
+import org.jabref.logic.importer.Parser;
+import org.jabref.logic.importer.SearchBasedParserFetcher;
+import org.jabref.logic.importer.fetcher.transformers.BiodiversityLibraryTransformer;
+import org.jabref.logic.importer.util.JsonReader;
+import org.jabref.logic.net.URLDownload;
+import org.jabref.logic.preferences.FetcherApiKey;
+import org.jabref.logic.util.BuildInfo;
+import org.jabref.model.entry.Author;
+import org.jabref.model.entry.AuthorList;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.field.StandardField;
+import org.jabref.model.entry.types.StandardEntryType;
+
+import kong.unirest.json.JSONArray;
+import kong.unirest.json.JSONException;
+import kong.unirest.json.JSONObject;
+import org.apache.http.client.utils.URIBuilder;
+import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
+import org.tinylog.Logger;
+
+/**
+ * Fetches data from the Biodiversity Heritage Library
+ *
+ * @implNote
+ * <a href="https://www.biodiversitylibrary.org/docs/api3.html">API documentation</a>
+ */
+public class BiodiversityLibrary implements SearchBasedParserFetcher, CustomizableKeyFetcher {
+
+    private static final String API_KEY = new BuildInfo().biodiversityHeritageApiKey;
+    private static final String BASE_URL = "https://www.biodiversitylibrary.org/api3";
+    private static final String RESPONSE_FORMAT = "json";
+    private static final String TEST_URL_WITHOUT_API_KEY = "https://www.biodiversitylibrary.org/api3?apikey=";
+
+    private static final String FETCHER_NAME = "Biodiversity Heritage";
+
+    private final ImporterPreferences importerPreferences;
+
+    public BiodiversityLibrary(ImporterPreferences importerPreferences) {
+        this.importerPreferences = importerPreferences;
+    }
+
+    @Override
+    public String getName() {
+        return FETCHER_NAME;
+    }
+
+    @Override
+    public String getTestUrl() {
+        return TEST_URL_WITHOUT_API_KEY;
+    }
+
+    public URL getBaseURL() throws URISyntaxException, MalformedURLException {
+        URIBuilder baseURI = new URIBuilder(BASE_URL);
+        baseURI.addParameter("apikey", getApiKey());
+        baseURI.addParameter("format", RESPONSE_FORMAT);
+
+        return baseURI.build().toURL();
+    }
+
+    public URL getItemMetadataURL(String identifier) throws URISyntaxException, MalformedURLException {
+        URIBuilder uriBuilder = new URIBuilder(getBaseURL().toURI());
+        uriBuilder.addParameter("op", "GetItemMetadata");
+        uriBuilder.addParameter("pages", "f");
+        uriBuilder.addParameter("ocr", "f");
+        uriBuilder.addParameter("ocr", "f");
+        uriBuilder.addParameter("id", identifier);
+
+        return uriBuilder.build().toURL();
+    }
+
+    public URL getPartMetadataURL(String identifier) throws URISyntaxException, MalformedURLException {
+        URIBuilder uriBuilder = new URIBuilder(getBaseURL().toURI());
+        uriBuilder.addParameter("op", "GetPartMetadata");
+        uriBuilder.addParameter("pages", "f");
+        uriBuilder.addParameter("names", "f");
+        uriBuilder.addParameter("id", identifier);
+
+        return uriBuilder.build().toURL();
+    }
+
+    public JSONObject getDetails(URL url) throws IOException {
+        URLDownload download = new URLDownload(url);
+        String response = download.asString();
+        Logger.debug("Response {}", response);
+        return new JSONObject(response).getJSONArray("Result").getJSONObject(0);
+    }
+
+    public BibEntry parseBibJSONtoBibtex(JSONObject item, BibEntry entry) throws IOException, URISyntaxException {
+        if (item.has("BHLType")) {
+            if (item.getString("BHLType").equals("Part")) {
+                URL url = getPartMetadataURL(item.getString("PartID"));
+                JSONObject itemsDetails = getDetails(url);
+                entry.setField(StandardField.LANGUAGE, itemsDetails.optString("Language", ""));
+
+                entry.setField(StandardField.DOI, itemsDetails.optString("Doi", ""));
+
+                entry.setField(StandardField.PUBLISHER, itemsDetails.optString("PublisherName", ""));
+                entry.setField(StandardField.DATE, itemsDetails.optString("Date", ""));
+                entry.setField(StandardField.VOLUME, itemsDetails.optString("Volume", ""));
+                entry.setField(StandardField.URL, itemsDetails.optString("PartUrl", ""));
+            }
+
+            if (item.getString("BHLType").equals("Item")) {
+                URL url = getItemMetadataURL(item.getString("ItemID"));
+                JSONObject itemsDetails = getDetails(url);
+                entry.setField(StandardField.EDITOR, itemsDetails.optString("Sponsor", ""));
+                entry.setField(StandardField.PUBLISHER, itemsDetails.optString("HoldingInstitution", ""));
+                entry.setField(StandardField.LANGUAGE, itemsDetails.optString("Language", ""));
+                entry.setField(StandardField.URL, itemsDetails.optString("ItemUrl", ""));
+                if (itemsDetails.has("Date") && !entry.hasField(StandardField.DATE) && !entry.hasField(StandardField.YEAR)) {
+                    entry.setField(StandardField.DATE, itemsDetails.getString("Date"));
+                }
+            }
+        }
+
+        return entry;
+    }
+
+    public BibEntry jsonResultToBibEntry(JSONObject item) {
+        BibEntry entry = new BibEntry();
+
+        if ("Book".equals(item.optString("Genre"))) {
+            entry.setType(StandardEntryType.Book);
+        } else {
+            entry.setType(StandardEntryType.Article);
+        }
+        entry.setField(StandardField.TITLE, item.optString("Title", ""));
+
+        entry.setField(StandardField.AUTHOR, toAuthors(item.optJSONArray("Authors")));
+
+        entry.setField(StandardField.PAGES, item.optString("PageRange", ""));
+        entry.setField(StandardField.LOCATION, item.optString("PublisherPlace", ""));
+        entry.setField(StandardField.PUBLISHER, item.optString("PublisherName", ""));
+
+        entry.setField(StandardField.DATE, item.optString("Date", ""));
+        entry.setField(StandardField.YEAR, item.optString("PublicationDate", ""));
+        entry.setField(StandardField.JOURNALTITLE, item.optString("ContainerTitle", ""));
+        entry.setField(StandardField.VOLUME, item.optString("Volume", ""));
+
+        return entry;
+    }
+
+    private String toAuthors(JSONArray authors) {
+        if (authors == null) {
+            return "";
+        }
+
+        // input: list of { "Name": "Author name,"}
+        return IntStream.range(0, authors.length())
+                        .mapToObj(authors::getJSONObject)
+                        .map((author) -> new Author(
+                                author.optString("Name", ""), "", "", "", ""))
+                        .collect(AuthorList.collect())
+                        .getAsFirstLastNamesWithAnd();
+    }
+
+    @Override
+    public Parser getParser() {
+        return inputStream -> {
+            JSONObject response = JsonReader.toJsonObject(inputStream);
+            if (response.isEmpty()) {
+                return Collections.emptyList();
+            }
+
+            String errorMessage = response.getString("ErrorMessage");
+            if (!errorMessage.isBlank()) {
+                return Collections.emptyList();
+            }
+
+            JSONArray items = response.getJSONArray("Result");
+            List<BibEntry> entries = new ArrayList<>(items.length());
+            for (int i = 0; i < items.length(); i++) {
+                JSONObject item = items.getJSONObject(i);
+                BibEntry entry = jsonResultToBibEntry(item);
+                try {
+                    entry = parseBibJSONtoBibtex(item, entry);
+                } catch (
+                        JSONException |
+                        IOException |
+                        URISyntaxException exception) {
+                    throw new ParseException("Error when parsing entry", exception);
+                }
+                entries.add(entry);
+            }
+
+            return entries;
+        };
+    }
+
+    @Override
+    public URL getURLForQuery(QueryNode luceneQuery) throws URISyntaxException, MalformedURLException, FetcherException {
+        URIBuilder uriBuilder = new URIBuilder(getBaseURL().toURI());
+        BiodiversityLibraryTransformer transformer = new BiodiversityLibraryTransformer();
+        uriBuilder.addParameter("op", "PublicationSearch");
+        uriBuilder.addParameter("searchtype", "C");
+        uriBuilder.addParameter("searchterm", transformer.transformLuceneQuery(luceneQuery).orElse(""));
+        return uriBuilder.build().toURL();
+    }
+
+    private String getApiKey() {
+        return importerPreferences.getApiKeys()
+                                  .stream()
+                                  .filter(key -> key.getName().equalsIgnoreCase(this.getName()))
+                                  .filter(FetcherApiKey::shouldUse)
+                                  .findFirst()
+                                  .map(FetcherApiKey::getKey)
+                                  .orElse(API_KEY);
+    }
+}
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/CustomizableKeyFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/CustomizableKeyFetcher.java
new file mode 100644
index 00000000000..35215f1709c
--- /dev/null
+++ b/src/main/java/org/jabref/logic/importer/fetcher/CustomizableKeyFetcher.java
@@ -0,0 +1,9 @@
+package org.jabref.logic.importer.fetcher;
+
+import org.jabref.logic.importer.WebFetcher;
+
+public interface CustomizableKeyFetcher extends WebFetcher {
+    default String getTestUrl() {
+        return null;
+    }
+}
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/DOABFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/DOABFetcher.java
new file mode 100644
index 00000000000..6adbb920937
--- /dev/null
+++ b/src/main/java/org/jabref/logic/importer/fetcher/DOABFetcher.java
@@ -0,0 +1,145 @@
+package org.jabref.logic.importer.fetcher;
+
+import java.net.MalformedURLException;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.StringJoiner;
+
+import org.jabref.logic.importer.FetcherException;
+import org.jabref.logic.importer.Parser;
+import org.jabref.logic.importer.SearchBasedParserFetcher;
+import org.jabref.logic.importer.fetcher.transformers.DefaultQueryTransformer;
+import org.jabref.logic.importer.util.JsonReader;
+import org.jabref.model.entry.Author;
+import org.jabref.model.entry.AuthorList;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.field.StandardField;
+import org.jabref.model.entry.types.StandardEntryType;
+
+import kong.unirest.json.JSONArray;
+import kong.unirest.json.JSONException;
+import kong.unirest.json.JSONObject;
+import org.apache.http.client.utils.URIBuilder;
+import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
+
+/**
+ * fetches books from https://www.doabooks.org/ through
+ * <a href="https://www.doabooks.org/en/resources/metadata-harvesting-and-content-dissemination">their API</a>.
+ */
+public class DOABFetcher implements SearchBasedParserFetcher {
+    private static final String SEARCH_URL = "https://directory.doabooks.org/rest/search?";
+
+    @Override
+    public String getName() {
+        return "DOAB";
+    }
+
+    @Override
+    public URL getURLForQuery(QueryNode luceneQuery) throws URISyntaxException, MalformedURLException, FetcherException {
+        URIBuilder builder = new URIBuilder(SEARCH_URL);
+        String query = new DefaultQueryTransformer().transformLuceneQuery(luceneQuery).orElse("");
+        // adding quotations for the query for more specified results
+        // without the quotation the results returned are not relevant to the query
+        query = ("\"".concat(query)).concat("\"");
+        builder.addParameter("query", query);
+        builder.addParameter("expand", "metadata");
+
+        return builder.build().toURL();
+    }
+
+    @Override
+    public Parser getParser() {
+        return InputStream -> {
+            // can't use this method JsonReader.toJsonObject(inputStream) because the results are sent in an array
+            // like format resulting in an error when trying to convert them into a json object
+            // created a similar method suitable for this case "toJsonArray"
+            JSONArray response = JsonReader.toJsonArray(InputStream);
+            if (response.isEmpty()) {
+                return Collections.emptyList();
+            }
+            if (response.length() == 1) {
+                // the information used for bibtex entries are in an array inside the resulting jsonarray
+                // see this query for reference https://directory.doabooks.org/rest/search?query="i open fire"&expand=metadata
+                JSONArray metadataArray = response.getJSONObject(0).getJSONArray("metadata");
+                BibEntry entry = jsonToBibEntry(metadataArray);
+                return Collections.singletonList(entry);
+            }
+            List<BibEntry> entries = new ArrayList<>(response.length());
+            for (int i = 0; i < response.length(); i++) {
+                JSONArray metadataArray = response.getJSONObject(i).getJSONArray("metadata");
+                BibEntry entry = jsonToBibEntry(metadataArray);
+                entries.add(entry);
+            }
+            return entries;
+        };
+    }
+
+    private BibEntry jsonToBibEntry(JSONArray metadataArray) {
+        BibEntry entry = new BibEntry();
+        List<Author> authorsList = new ArrayList<>();
+        List<Author> editorsList = new ArrayList<>();
+        StringJoiner keywordJoiner = new StringJoiner(", ");
+        for (int i = 0; i < metadataArray.length(); i++) {
+            JSONObject dataObject = metadataArray.getJSONObject(i);
+            switch (dataObject.getString("key")) {
+                case "dc.contributor.author" -> {
+                    if (dataObject.getString("value").contains("(Ed.)")) {
+                       editorsList.add(toAuthor(namePreprocessing(dataObject.getString("value"))));
+                    } else {
+                        authorsList.add(toAuthor(dataObject.getString("value")));
+                    }
+                }
+                case "dc.type" -> entry.setType(StandardEntryType.Book);
+                case "dc.date.issued" -> entry.setField(StandardField.YEAR, String.valueOf(
+                        dataObject.getInt("value")));
+                case "oapen.identifier.doi" -> entry.setField(StandardField.DOI,
+                        dataObject.getString("value"));
+                case "dc.title" -> entry.setField(StandardField.TITLE,
+                        dataObject.getString("value"));
+                case "oapen.pages" -> {
+                    try {
+                        entry.setField(StandardField.PAGES, String.valueOf(dataObject.getInt("value")));
+                    } catch (JSONException e) {
+                        entry.setField(StandardField.PAGES, dataObject.getString("value"));
+                    }
+                }
+                case "dc.description.abstract" -> entry.setField(StandardField.ABSTRACT,
+                        dataObject.getString("value"));
+                case "dc.language" -> entry.setField(StandardField.LANGUAGE,
+                        dataObject.getString("value"));
+                case "publisher.name" -> entry.setField(StandardField.PUBLISHER,
+                        dataObject.getString("value"));
+                case "dc.identifier.uri" -> entry.setField(StandardField.URI,
+                        dataObject.getString("value"));
+                case "dc.identifier" -> {
+                    if (dataObject.getString("value").contains("http")) {
+                       entry.setField(StandardField.URL, dataObject.getString("value"));
+                    }
+                }
+                case "dc.subject.other" -> keywordJoiner.add(dataObject.getString("value"));
+                case "dc.contributor.editor" -> editorsList.add(toAuthor(dataObject.getString("value")));
+                case "oapen.volume" -> entry.setField(StandardField.VOLUME,
+                        dataObject.getString("value"));
+                case "oapen.relation.isbn" -> entry.setField(StandardField.ISBN,
+                        dataObject.getString("value"));
+                case "dc.title.alternative" -> entry.setField(StandardField.SUBTITLE,
+                        dataObject.getString("value"));
+            }
+        }
+        entry.setField(StandardField.AUTHOR, AuthorList.of(authorsList).getAsFirstLastNamesWithAnd());
+        entry.setField(StandardField.EDITOR, AuthorList.of(editorsList).getAsFirstLastNamesWithAnd());
+        entry.setField(StandardField.KEYWORDS, String.valueOf(keywordJoiner));
+        return entry;
+    }
+
+    private Author toAuthor(String author) {
+        return AuthorList.parse((author)).getAuthor(0);
+    }
+
+    private String namePreprocessing(String name) {
+        return name.replace("(Ed.)", "");
+    }
+}
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/DoiFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/DoiFetcher.java
index 41afea25707..4f0927ef468 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/DoiFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/DoiFetcher.java
@@ -72,7 +72,6 @@ public Optional<BibEntry> performSearchById(String identifier) throws FetcherExc
                     return new Medra().performSearchById(identifier);
                 }
                 URL doiURL = new URL(doi.get().getURIAsASCIIString());
-
                 // BibTeX data
                 URLDownload download = getUrlDownload(doiURL);
                 download.addHeader("Accept", MediaTypes.APPLICATION_BIBTEX);
@@ -80,8 +79,11 @@ public Optional<BibEntry> performSearchById(String identifier) throws FetcherExc
                 try {
                     bibtexString = download.asString();
                 } catch (IOException e) {
-                    // an IOException will be thrown if download is unable to download from the doiURL
-                    throw new FetcherException(Localization.lang("No DOI data exists"), e);
+                    // an IOException with a nested FetcherException will be thrown when you encounter a 400x or 500x http status code
+                    if (e.getCause() instanceof FetcherException fe) {
+                        throw fe;
+                    }
+                    throw e;
                 }
 
                 // BibTeX entry
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/DoiResolution.java b/src/main/java/org/jabref/logic/importer/fetcher/DoiResolution.java
index 8a2ba23d13b..e8c341427ac 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/DoiResolution.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/DoiResolution.java
@@ -80,7 +80,7 @@ public Optional<URL> findFullText(BibEntry entry) throws IOException {
             connection.followRedirects(true);
             connection.ignoreHttpErrors(true);
             // some publishers are quite slow (default is 3s)
-            connection.timeout(10000);
+            connection.timeout(30_000);
 
             Connection.Response response = connection.execute();
 
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/GrobidCitationFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/GrobidCitationFetcher.java
index 4dccde35980..c33d7e83ac8 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/GrobidCitationFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/GrobidCitationFetcher.java
@@ -10,7 +10,6 @@
 
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.ImportFormatPreferences;
-import org.jabref.logic.importer.ImporterPreferences;
 import org.jabref.logic.importer.ParseException;
 import org.jabref.logic.importer.SearchBasedFetcher;
 import org.jabref.logic.importer.util.GrobidService;
@@ -24,11 +23,11 @@ public class GrobidCitationFetcher implements SearchBasedFetcher {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(GrobidCitationFetcher.class);
 
-    private ImportFormatPreferences importFormatPreferences;
-    private GrobidService grobidService;
+    private final ImportFormatPreferences importFormatPreferences;
+    private final GrobidService grobidService;
 
-    public GrobidCitationFetcher(ImporterPreferences importerPreferences, ImportFormatPreferences importFormatPreferences) {
-        this(importFormatPreferences, new GrobidService(importerPreferences));
+    public GrobidCitationFetcher(GrobidPreferences grobidPreferences, ImportFormatPreferences importFormatPreferences) {
+        this(importFormatPreferences, new GrobidService(grobidPreferences));
     }
 
     GrobidCitationFetcher(ImportFormatPreferences importFormatPreferences, GrobidService grobidService) {
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/GrobidPreferences.java b/src/main/java/org/jabref/logic/importer/fetcher/GrobidPreferences.java
new file mode 100644
index 00000000000..e87b54f08fe
--- /dev/null
+++ b/src/main/java/org/jabref/logic/importer/fetcher/GrobidPreferences.java
@@ -0,0 +1,56 @@
+package org.jabref.logic.importer.fetcher;
+
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+
+public class GrobidPreferences {
+    private final BooleanProperty grobidEnabled;
+    private final BooleanProperty grobidOptOut;
+    private final StringProperty grobidURL;
+
+    public GrobidPreferences(boolean grobidEnabled,
+                             boolean grobidOptOut,
+                             String grobidURL) {
+        this.grobidEnabled = new SimpleBooleanProperty(grobidEnabled);
+        this.grobidOptOut = new SimpleBooleanProperty(grobidOptOut);
+        this.grobidURL = new SimpleStringProperty(grobidURL);
+    }
+
+    public boolean isGrobidEnabled() {
+        return grobidEnabled.get();
+    }
+
+    public BooleanProperty grobidEnabledProperty() {
+        return grobidEnabled;
+    }
+
+    public void setGrobidEnabled(boolean grobidEnabled) {
+        this.grobidEnabled.set(grobidEnabled);
+    }
+
+    public boolean isGrobidOptOut() {
+        return grobidOptOut.get();
+    }
+
+    public BooleanProperty grobidOptOutProperty() {
+        return grobidOptOut;
+    }
+
+    public void setGrobidOptOut(boolean grobidOptOut) {
+        this.grobidOptOut.set(grobidOptOut);
+    }
+
+    public String getGrobidURL() {
+        return grobidURL.get();
+    }
+
+    public StringProperty grobidURLProperty() {
+        return grobidURL;
+    }
+
+    public void setGrobidURL(String grobidURL) {
+        this.grobidURL.set(grobidURL);
+    }
+}
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/IEEE.java b/src/main/java/org/jabref/logic/importer/fetcher/IEEE.java
index a5e320a92ff..3ca57ff3cbf 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/IEEE.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/IEEE.java
@@ -18,10 +18,12 @@
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.FulltextFetcher;
 import org.jabref.logic.importer.ImportFormatPreferences;
+import org.jabref.logic.importer.ImporterPreferences;
 import org.jabref.logic.importer.PagedSearchBasedParserFetcher;
 import org.jabref.logic.importer.Parser;
 import org.jabref.logic.importer.fetcher.transformers.IEEEQueryTransformer;
 import org.jabref.logic.net.URLDownload;
+import org.jabref.logic.preferences.FetcherApiKey;
 import org.jabref.logic.util.BuildInfo;
 import org.jabref.logic.util.OS;
 import org.jabref.model.entry.BibEntry;
@@ -44,9 +46,12 @@
  *
  * @implNote <a href="https://developer.ieee.org/docs">API documentation</a>
  */
-public class IEEE implements FulltextFetcher, PagedSearchBasedParserFetcher {
+public class IEEE implements FulltextFetcher, PagedSearchBasedParserFetcher, CustomizableKeyFetcher {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(IEEE.class);
+
+    private static final String FETCHER_NAME = "IEEEXplore";
+
     private static final String STAMP_BASE_STRING_DOCUMENT = "/stamp/stamp.jsp?tp=&arnumber=";
     private static final Pattern STAMP_PATTERN = Pattern.compile("(/stamp/stamp.jsp\\?t?p?=?&?arnumber=[0-9]+)");
     private static final Pattern DOCUMENT_PATTERN = Pattern.compile("document/([0-9]+)/");
@@ -55,13 +60,16 @@ public class IEEE implements FulltextFetcher, PagedSearchBasedParserFetcher {
     private static final String IEEE_DOI = "10.1109";
     private static final String BASE_URL = "https://ieeexplore.ieee.org";
     private static final String API_KEY = new BuildInfo().ieeeAPIKey;
+    private static final String TEST_URL_WITHOUT_API_KEY = "https://ieeexploreapi.ieee.org/api/v1/search/articles?max_records=0&apikey=";
 
-    private final ImportFormatPreferences preferences;
+    private final ImportFormatPreferences importFormatPreferences;
+    private final ImporterPreferences importerPreferences;
 
     private IEEEQueryTransformer transformer;
 
-    public IEEE(ImportFormatPreferences preferences) {
-        this.preferences = Objects.requireNonNull(preferences);
+    public IEEE(ImportFormatPreferences importFormatPreferences, ImporterPreferences importerPreferences) {
+        this.importFormatPreferences = Objects.requireNonNull(importFormatPreferences);
+        this.importerPreferences = Objects.requireNonNull(importerPreferences);
     }
 
     /**
@@ -136,7 +144,6 @@ public Optional<URL> findFullText(BibEntry entry) throws IOException {
         // Try URL first -- will primarily work for entries from the old IEEE search
         Optional<String> urlString = entry.getField(StandardField.URL);
         if (urlString.isPresent()) {
-
             Matcher documentUrlMatcher = DOCUMENT_PATTERN.matcher(urlString.get());
             if (documentUrlMatcher.find()) {
                 String docId = documentUrlMatcher.group(1);
@@ -207,18 +214,18 @@ public Parser getParser() {
                 JSONArray results = jsonObject.getJSONArray("articles");
                 for (int i = 0; i < results.length(); i++) {
                     JSONObject jsonEntry = results.getJSONObject(i);
-                    BibEntry entry = parseJsonResponse(jsonEntry, preferences.getKeywordSeparator());
+                    BibEntry entry = parseJsonResponse(jsonEntry, importFormatPreferences.getKeywordSeparator());
                     boolean addEntry;
                     // In case entry has no year, add it
                     // In case an entry has a year, check if its in the year range
                     // The implementation uses some Java 8 Optional magic to implement that
                     if (entry.hasField(StandardField.YEAR)) {
                         addEntry = entry.getField(StandardField.YEAR).filter(year -> {
-                            Integer yearAsInteger = Integer.valueOf(year);
+                            int yearAsInteger = Integer.parseInt(year);
                             return
                                     transformer.getStartYear().map(startYear -> yearAsInteger >= startYear).orElse(true) &&
                                             transformer.getEndYear().map(endYear -> yearAsInteger <= endYear).orElse(true);
-                        }).map(x -> true).orElse(false);
+                        }).isPresent();
                     } else {
                         addEntry = true;
                     }
@@ -234,7 +241,7 @@ public Parser getParser() {
 
     @Override
     public String getName() {
-        return "IEEEXplore";
+        return FETCHER_NAME;
     }
 
     @Override
@@ -242,6 +249,21 @@ public Optional<HelpFile> getHelpPage() {
         return Optional.of(HelpFile.FETCHER_IEEEXPLORE);
     }
 
+    private String getApiKey() {
+        return importerPreferences.getApiKeys()
+                                  .stream()
+                                  .filter(key -> key.getName().equalsIgnoreCase(this.getName()))
+                                  .filter(FetcherApiKey::shouldUse)
+                                  .findFirst()
+                                  .map(FetcherApiKey::getKey)
+                                  .orElse(API_KEY);
+    }
+
+    @Override
+    public String getTestUrl() {
+        return TEST_URL_WITHOUT_API_KEY;
+    }
+
     @Override
     public URL getURLForQuery(QueryNode luceneQuery, int pageNumber) throws URISyntaxException, MalformedURLException, FetcherException {
         // transformer is stored globally, because we need to filter out the bib entries by the year manually
@@ -249,7 +271,7 @@ public URL getURLForQuery(QueryNode luceneQuery, int pageNumber) throws URISynta
         transformer = new IEEEQueryTransformer();
         String transformedQuery = transformer.transformLuceneQuery(luceneQuery).orElse("");
         URIBuilder uriBuilder = new URIBuilder("https://ieeexploreapi.ieee.org/api/v1/search/articles");
-        uriBuilder.addParameter("apikey", API_KEY);
+        uriBuilder.addParameter("apikey", getApiKey());
         if (!transformedQuery.isBlank()) {
             uriBuilder.addParameter("querytext", transformedQuery);
         }
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/IacrEprintFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/IacrEprintFetcher.java
index 6eae4cf35c2..42777780515 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/IacrEprintFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/IacrEprintFetcher.java
@@ -1,17 +1,8 @@
 package org.jabref.logic.importer.fetcher;
 
 import java.io.IOException;
-import java.time.DateTimeException;
-import java.time.format.DateTimeFormatter;
-import java.time.format.DateTimeParseException;
-import java.time.temporal.TemporalAccessor;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Locale;
 import java.util.Optional;
 import java.util.function.Predicate;
-import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import org.jabref.logic.importer.FetcherException;
@@ -26,25 +17,16 @@
 import org.jabref.model.strings.StringUtil;
 import org.jabref.model.util.DummyFileUpdateMonitor;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 public class IacrEprintFetcher implements IdBasedFetcher {
 
     public static final String NAME = "IACR eprints";
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(IacrEprintFetcher.class);
-    private static final Pattern DATE_FROM_WEBSITE_AFTER_2000_PATTERN = Pattern.compile("[a-z ]+(\\d{1,2} [A-Za-z][a-z]{2} \\d{4})");
-    private static final Pattern DATE_FROM_WEBSITE_BEFORE_2000_PATTERN = Pattern.compile("[A-Za-z ]+? ([A-Za-z][a-z]{2,10} \\d{1,2}(th|st|nd|rd)?, \\d{4})\\.?");
     private static final Pattern WITHOUT_LETTERS_SPACE = Pattern.compile("[^0-9/]");
 
-    private static final DateTimeFormatter DATE_FORMAT_WEBSITE_AFTER_2000 = DateTimeFormatter.ofPattern("d MMM yyyy", Locale.US);
-    private static final DateTimeFormatter DATE_FORMAT_WEBSITE_BEFORE_2000_LONG_MONTHS = DateTimeFormatter.ofPattern("MMMM d['th']['st']['nd']['rd'] yyyy", Locale.US);
-    private static final DateTimeFormatter DATE_FORMAT_WEBSITE_BEFORE_2000_SHORT_MONTHS = DateTimeFormatter.ofPattern("MMM d['th']['st']['nd']['rd'] yyyy", Locale.US);
-    private static final DateTimeFormatter DATE_FORMAT_BIBTEX = DateTimeFormatter.ISO_LOCAL_DATE;
     private static final Predicate<String> IDENTIFIER_PREDICATE = Pattern.compile("\\d{4}/\\d{3,5}").asPredicate();
-    private static final String CITATION_URL_PREFIX = "https://eprint.iacr.org/eprint-bin/cite.pl?entry=";
+    private static final String CITATION_URL_PREFIX = "https://eprint.iacr.org/";
     private static final String DESCRIPTION_URL_PREFIX = "https://eprint.iacr.org/";
+    private static final String VERSION_URL_PREFIX = "https://eprint.iacr.org/archive/versions/";
 
     private final ImportFormatPreferences prefs;
 
@@ -74,7 +56,7 @@ private Optional<BibEntry> createEntryFromIacrCitation(String validIdentifier) t
         if (bibtexCitationHtml.contains("No such report found")) {
             throw new FetcherException(Localization.lang("No results found."));
         }
-        String actualEntry = getRequiredValueBetween("<pre>", "</pre>", bibtexCitationHtml);
+        String actualEntry = getRequiredValueBetween("<pre id=\"bibtex\">", "</pre>", bibtexCitationHtml);
 
         try {
             return BibtexParser.singleFromString(actualEntry, prefs, new DummyFileUpdateMonitor());
@@ -86,86 +68,36 @@ private Optional<BibEntry> createEntryFromIacrCitation(String validIdentifier) t
     private void setAdditionalFields(BibEntry entry, String identifier) throws FetcherException {
         String entryUrl = DESCRIPTION_URL_PREFIX + identifier;
         String descriptiveHtml = getHtml(entryUrl);
+
         entry.setField(StandardField.ABSTRACT, getAbstract(descriptiveHtml));
-        String dateStringAsInHtml = getRequiredValueBetween("<b>Date: </b>", "<p />", descriptiveHtml);
-        entry.setField(StandardField.DATE, getLatestDate(dateStringAsInHtml));
+        entry.setField(StandardField.DATE, getDate(descriptiveHtml));
 
+        // Version information for entries after year 2000
         if (isFromOrAfterYear2000(entry)) {
-            String version = getVersion(identifier, descriptiveHtml);
+            String entryVersion = VERSION_URL_PREFIX + identifier;
+            String versionHtml = getHtml(entryVersion);
+            String version = getVersion(identifier, versionHtml);
             entry.setField(StandardField.VERSION, version);
             entry.setField(StandardField.URL, entryUrl + "/" + version);
-        } else {
-            // No version information for entries before year 2000
-            entry.setField(StandardField.URL, entryUrl);
         }
     }
 
-    private String getVersion(String identifier, String descriptiveHtml) throws FetcherException {
-        String startOfVersionString = "<b>Version: </b><a href=\"/" + identifier + "/";
-        String version = getRequiredValueBetween(startOfVersionString, "\"", descriptiveHtml);
+    private String getVersion(String identifier, String versionHtml) throws FetcherException {
+        String startOfVersionString = "<li><a href=\"/archive/" + identifier + "/";
+        String version = getRequiredValueBetween(startOfVersionString, "\">", versionHtml);
         return version;
     }
 
     private String getAbstract(String descriptiveHtml) throws FetcherException {
-        String abstractText = getRequiredValueBetween("<b>Abstract: </b>", "<p />", descriptiveHtml);
-        // for some reason, all spaces are doubled...
-        abstractText = abstractText.replaceAll("\\s(\\s)", "$1");
+        String startOfAbstractString = "<h5 class=\"mt-3\">Abstract</h5>\n    <p style=\"white-space: pre-wrap;\">";
+        String abstractText = getRequiredValueBetween(startOfAbstractString, "</p>", descriptiveHtml);
         return abstractText;
     }
 
-    private String getLatestDate(String dateStringAsInHtml) throws FetcherException {
-        if (dateStringAsInHtml.contains("withdrawn")) {
-            throw new FetcherException(Localization.lang("This paper has been withdrawn."));
-        }
-        String[] rawDates = dateStringAsInHtml.split(", \\D");
-        List<String> formattedDates = new ArrayList<>();
-        for (String rawDate : rawDates) {
-            TemporalAccessor date = parseSingleDateFromWebsite(rawDate);
-            if (date != null) {
-                formattedDates.add(DATE_FORMAT_BIBTEX.format(date));
-            }
-        }
-
-        if (formattedDates.isEmpty()) {
-            throw new FetcherException(Localization.lang("Entry from %0 could not be parsed.", "IACR"));
-        }
-
-        Collections.sort(formattedDates, Collections.reverseOrder());
-        return formattedDates.get(0);
-    }
-
-    private TemporalAccessor parseSingleDateFromWebsite(String dateStringFromWebsite) {
-        TemporalAccessor date = null;
-        // Some entries contain double spaces in the date string (which would break our regexs below)
-        String dateStringWithoutDoubleSpaces = dateStringFromWebsite.replaceAll("\\s\\s+", " ");
-
-        Matcher dateMatcherAfter2000 = DATE_FROM_WEBSITE_AFTER_2000_PATTERN.matcher(dateStringWithoutDoubleSpaces.trim());
-        if (dateMatcherAfter2000.find()) {
-            try {
-                date = DATE_FORMAT_WEBSITE_AFTER_2000.parse(dateMatcherAfter2000.group(1));
-            } catch (DateTimeParseException e) {
-                LOGGER.warn("Date from IACR could not be parsed", e);
-            }
-        }
-
-        // Entries before year 2000 use a variety of date formats - fortunately, we can match them with only two different
-        // date formats (each of which differ from the unified format of post-2000 entries).
-        Matcher dateMatcherBefore2000 = DATE_FROM_WEBSITE_BEFORE_2000_PATTERN.matcher(dateStringWithoutDoubleSpaces.trim());
-        if (dateMatcherBefore2000.find()) {
-            String dateWithoutComma = dateMatcherBefore2000.group(1).replace(",", "");
-            try {
-                date = DATE_FORMAT_WEBSITE_BEFORE_2000_LONG_MONTHS.parse(dateWithoutComma);
-            } catch (DateTimeParseException e) {
-                try {
-                    date = DATE_FORMAT_WEBSITE_BEFORE_2000_SHORT_MONTHS.parse(dateWithoutComma);
-                } catch (DateTimeException e1) {
-                    LOGGER.warn("Date from IACR could not be parsed", e);
-                    LOGGER.warn("Date from IACR could not be parsed", e1);
-                }
-            }
-        }
-
-        return date;
+    private String getDate(String descriptiveHtml) throws FetcherException {
+        String startOfHistoryString = "<dt>History</dt>\n      \n      \n      <dd>";
+        String dateStringAsInHtml = getRequiredValueBetween(startOfHistoryString, ":", descriptiveHtml);
+        return dateStringAsInHtml;
     }
 
     private String getHtml(String url) throws FetcherException {
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/IsbnFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/IsbnFetcher.java
index 626ae6a1edb..f4dedae3e7c 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/IsbnFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/IsbnFetcher.java
@@ -49,14 +49,20 @@ public Optional<BibEntry> performSearchById(String identifier) throws FetcherExc
         // remove any newlines and spaces.
         identifier = NEWLINE_SPACE_PATTERN.matcher(identifier).replaceAll("");
 
-        IsbnViaEbookDeFetcher isbnViaEbookDeFetcher = new IsbnViaEbookDeFetcher(importFormatPreferences);
-        Optional<BibEntry> bibEntry = isbnViaEbookDeFetcher.performSearchById(identifier);
+        OpenLibraryFetcher openLibraryFetcher = new OpenLibraryFetcher(importFormatPreferences);
 
-        // nothing found at ebook.de: try ottobib
-        if (!bibEntry.isPresent()) {
-            LOGGER.debug("No entry found at ebook.de; trying ottobib");
-            IsbnViaOttoBibFetcher isbnViaOttoBibFetcher = new IsbnViaOttoBibFetcher(importFormatPreferences);
-            bibEntry = isbnViaOttoBibFetcher.performSearchById(identifier);
+        Optional<BibEntry> bibEntry = Optional.empty();
+        try {
+            bibEntry = openLibraryFetcher.performSearchById(identifier);
+        } catch (FetcherException ex) {
+            LOGGER.debug("Got a fetcher exception for IBSN search", ex);
+        } finally {
+            // nothing found at OpenLibrary: try ebook.de
+            if (!bibEntry.isPresent()) {
+                LOGGER.debug("No entry found at OpenLibrary; trying ebook.de");
+                IsbnViaEbookDeFetcher isbnViaEbookDeFetcher = new IsbnViaEbookDeFetcher(importFormatPreferences);
+                bibEntry = isbnViaEbookDeFetcher.performSearchById(identifier);
+            }
         }
 
         return bibEntry;
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/IsbnViaOttoBibFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/IsbnViaOttoBibFetcher.java
deleted file mode 100644
index 30e6f8513ff..00000000000
--- a/src/main/java/org/jabref/logic/importer/fetcher/IsbnViaOttoBibFetcher.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package org.jabref.logic.importer.fetcher;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.Optional;
-
-import org.jabref.logic.importer.FetcherException;
-import org.jabref.logic.importer.ImportFormatPreferences;
-import org.jabref.logic.importer.ParseException;
-import org.jabref.logic.importer.fileformat.BibtexParser;
-import org.jabref.logic.net.URLDownload;
-import org.jabref.model.entry.BibEntry;
-import org.jabref.model.strings.StringUtil;
-import org.jabref.model.util.DummyFileUpdateMonitor;
-
-import org.jsoup.Jsoup;
-import org.jsoup.nodes.Document;
-import org.jsoup.nodes.Element;
-
-/**
- * Fetcher for ISBN using https://www.ottobib.com
- */
-public class IsbnViaOttoBibFetcher extends AbstractIsbnFetcher {
-
-    private static final String BASE_URL = "https://www.ottobib.com/isbn/";
-
-    public IsbnViaOttoBibFetcher(ImportFormatPreferences importFormatPreferences) {
-        super(importFormatPreferences);
-    }
-
-    @Override
-    public String getName() {
-        return "ISBN (OttoBib)";
-    }
-
-    /**
-     * @return null, because the identifier is passed using form data. This method is not used.
-     */
-    @Override
-    public URL getUrlForIdentifier(String identifier) throws URISyntaxException, MalformedURLException, FetcherException {
-        return null;
-    }
-
-    @Override
-    public Optional<BibEntry> performSearchById(String identifier) throws FetcherException {
-        if (StringUtil.isBlank(identifier)) {
-            return Optional.empty();
-        }
-
-        this.ensureThatIsbnIsValid(identifier);
-
-        Document html;
-        try {
-            html = Jsoup.connect(BASE_URL + identifier + "/bibtex").userAgent(URLDownload.USER_AGENT).get();
-        } catch (IOException e) {
-            throw new FetcherException("Could not ", e);
-        }
-        Element textArea = html.select("textarea").first();
-
-        // inspect the "no results" error message (if there is one)
-        Optional<Element> potentialErrorMessageDiv = Optional.ofNullable((html.select("div#flash-notice.notice.add-bottom").first()));
-        if (potentialErrorMessageDiv.isPresent() && potentialErrorMessageDiv.get().text().contains("No Results")) {
-            LOGGER.error("ISBN {} not found at ottobib", identifier);
-        }
-
-        Optional<BibEntry> entry = Optional.empty();
-        try {
-            entry = BibtexParser.singleFromString(textArea.text(), importFormatPreferences, new DummyFileUpdateMonitor());
-        } catch (ParseException e) {
-            throw new FetcherException("An internal parser error occurred", e);
-        }
-        entry.ifPresent(bibEntry -> doPostCleanup(bibEntry));
-        return entry;
-    }
-}
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/MedlineFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/MedlineFetcher.java
index 42731cc1ae5..b37eb30daed 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/MedlineFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/MedlineFetcher.java
@@ -28,7 +28,7 @@
 import org.jabref.logic.importer.Parser;
 import org.jabref.logic.importer.ParserResult;
 import org.jabref.logic.importer.SearchBasedFetcher;
-import org.jabref.logic.importer.fetcher.transformers.DefaultQueryTransformer;
+import org.jabref.logic.importer.fetcher.transformers.MedlineQueryTransformer;
 import org.jabref.logic.importer.fileformat.MedlineImporter;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.BibEntry;
@@ -54,16 +54,6 @@ public class MedlineFetcher implements IdBasedParserFetcher, SearchBasedFetcher
 
     private int numberOfResultsFound;
 
-    /**
-     * Replaces all commas in a given string with " AND "
-     *
-     * @param query input to remove commas
-     * @return input without commas
-     */
-    private static String replaceCommaWithAND(String query) {
-        return query.replaceAll(", ", " AND ").replaceAll(",", " AND ");
-    }
-
     /**
      * When using 'esearch.fcgi?db=&lt;database>&term=&lt;query>' we will get a list of IDs matching the query.
      * Input: Any text query (&term)
@@ -164,7 +154,7 @@ private URL createSearchUrl(String query) throws URISyntaxException, MalformedUR
         uriBuilder.addParameter("db", "pubmed");
         uriBuilder.addParameter("sort", "relevance");
         uriBuilder.addParameter("retmax", String.valueOf(NUMBER_TO_FETCH));
-        uriBuilder.addParameter("term", replaceCommaWithAND(query));
+        uriBuilder.addParameter("term", query); // already lucene query
         return uriBuilder.build().toURL();
     }
 
@@ -200,7 +190,7 @@ private List<BibEntry> fetchMedline(List<String> ids) throws FetcherException {
     @Override
     public List<BibEntry> performSearch(QueryNode luceneQuery) throws FetcherException {
         List<BibEntry> entryList;
-        DefaultQueryTransformer transformer = new DefaultQueryTransformer();
+        MedlineQueryTransformer transformer = new MedlineQueryTransformer();
         Optional<String> transformedQuery = transformer.transformLuceneQuery(luceneQuery);
 
         if (transformedQuery.isEmpty() || transformedQuery.get().isBlank()) {
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/OpenLibraryFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/OpenLibraryFetcher.java
new file mode 100644
index 00000000000..7428ec888ef
--- /dev/null
+++ b/src/main/java/org/jabref/logic/importer/fetcher/OpenLibraryFetcher.java
@@ -0,0 +1,168 @@
+package org.jabref.logic.importer.fetcher;
+
+import java.net.MalformedURLException;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+import java.util.stream.Stream;
+
+import org.jabref.logic.importer.AuthorListParser;
+import org.jabref.logic.importer.FetcherException;
+import org.jabref.logic.importer.ImportFormatPreferences;
+import org.jabref.logic.importer.ParseException;
+import org.jabref.logic.importer.Parser;
+import org.jabref.logic.importer.util.JsonReader;
+import org.jabref.model.entry.Author;
+import org.jabref.model.entry.AuthorList;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.Date;
+import org.jabref.model.entry.field.StandardField;
+import org.jabref.model.entry.types.StandardEntryType;
+import org.jabref.model.strings.StringUtil;
+
+import kong.unirest.JsonNode;
+import kong.unirest.Unirest;
+import kong.unirest.json.JSONArray;
+import kong.unirest.json.JSONException;
+import kong.unirest.json.JSONObject;
+import org.apache.http.client.utils.URIBuilder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Fetcher for OpenLibrary.
+ * <a href="https://openlibrary.org/dev/docs/api/books">API documentation</a>.
+ */
+public class OpenLibraryFetcher extends AbstractIsbnFetcher {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(OpenLibraryFetcher.class);
+    private static final String BASE_URL = "https://openlibrary.org";
+
+    public OpenLibraryFetcher(ImportFormatPreferences importFormatPreferences) {
+        super(importFormatPreferences);
+    }
+
+    @Override
+    public String getName() {
+        return "OpenLibrary";
+    }
+
+    @Override
+    public URL getUrlForIdentifier(String identifier) throws URISyntaxException, MalformedURLException, FetcherException {
+        this.ensureThatIsbnIsValid(identifier);
+        URIBuilder uriBuilder = new URIBuilder(BASE_URL + "/isbn/" + identifier + ".json");
+        return uriBuilder.build().toURL();
+    }
+
+    @Override
+    public Parser getParser() {
+        return inputStream -> {
+            JSONObject response = JsonReader.toJsonObject(inputStream);
+            if (response.isEmpty()) {
+                return Collections.emptyList();
+            }
+
+            String error = response.optString("error");
+            if (StringUtil.isNotBlank(error)) {
+                throw new ParseException(error);
+            }
+
+            BibEntry entry = jsonItemToBibEntry(response);
+            return List.of(entry);
+        };
+    }
+
+    @Override
+    public void doPostCleanup(BibEntry entry) {
+    }
+
+    private BibEntry jsonItemToBibEntry(JSONObject item) throws ParseException {
+        try {
+            BibEntry entry = new BibEntry(StandardEntryType.Book);
+            String authors = toAuthors(item.optJSONArray("authors"));
+            if (authors.isEmpty()) {
+                JSONArray works = item.optJSONArray("works");
+                authors = fromWorksToAuthors(works);
+            }
+            entry.setField(StandardField.AUTHOR, authors);
+            entry.setField(StandardField.PAGES, item.optString("number_of_pages"));
+            entry.setField(StandardField.ISBN,
+                    Optional.ofNullable(item.optJSONArray("isbn_13")).map(array -> array.getString(0))
+                            .or(() -> Optional.ofNullable(item.optJSONArray("isbn_10")).map(array -> array.getString(0)))
+                            .orElse(""));
+            entry.setField(StandardField.TITLE,
+                    Optional.ofNullable(item.optString("full_title", null))
+                            .or(() -> Optional.ofNullable(item.optString("title", null)))
+                            .orElse(""));
+            entry.setField(StandardField.SUBTITLE, item.optString("subtitle"));
+            Optional<String> yearOpt = Date.parse(item.optString("publish_date")).flatMap(Date::getYear).map(year -> year.toString());
+            yearOpt.ifPresent(year -> {
+                entry.setField(StandardField.YEAR, year);
+            });
+            entry.setField(StandardField.PUBLISHER,
+                    Optional.ofNullable(item.optJSONArray("publishers")).map(array -> array.getString(0))
+                            .orElse(""));
+            return entry;
+        } catch (JSONException exception) {
+            throw new ParseException("CrossRef API JSON format has changed", exception);
+        }
+    }
+
+    private String toAuthors(JSONArray authors) {
+        if (authors == null) {
+            return "";
+        }
+        return IntStream.range(0, authors.length())
+                        .mapToObj(authors::getJSONObject)
+                        .map(authorObject -> toAuthor(authorObject.getString("key")))
+                        .collect(AuthorList.collect())
+                        .getAsLastFirstNamesWithAnd(false);
+    }
+
+    private Author toAuthor(String key) {
+        JsonNode authorResponse = Unirest.get(BASE_URL + key + ".json").asJson().getBody();
+        if (authorResponse == null) {
+            LOGGER.warn("Could not parse author");
+            return new Author(null, null, null, null, null);
+        }
+        JSONObject result = authorResponse.getObject();
+        Optional<String> nameOptional = Optional.ofNullable(result.optString("personal_name", null)).or(() -> Optional.ofNullable(result.optString("name", null)));
+        if (nameOptional.isEmpty()) {
+            LOGGER.warn("Could not parse author name");
+            return new Author(null, null, null, null, null);
+        }
+        AuthorListParser authorListParser = new AuthorListParser();
+        AuthorList authorList = authorListParser.parse(nameOptional.get());
+        return authorList.getAuthor(0);
+    }
+
+    private String fromWorksToAuthors(JSONArray works) {
+        if (works == null) {
+            return "";
+        }
+
+        List<Author> authors = IntStream.range(0, works.length())
+                                          .mapToObj(works::getJSONObject)
+                                          .map(obj -> obj.getString("key"))
+                                          .map(worksLink -> BASE_URL + worksLink + ".json")
+                                          .flatMap(link -> fromWorkToAuthors(link))
+                                          .collect(Collectors.toList());
+        return AuthorList.of(authors).getAsLastFirstNamesWithAnd(false);
+    }
+
+    private Stream<Author> fromWorkToAuthors(String link) {
+        JsonNode body = Unirest.get(link).asJson().getBody();
+        JSONArray authors = body.getObject().optJSONArray("authors");
+        if (authors == null) {
+            return Stream.empty();
+        }
+
+        return IntStream.range(0, authors.length())
+                        .mapToObj(authors::getJSONObject)
+                        .map(authorObject -> toAuthor(authorObject.getJSONObject("author").getString("key")));
+    }
+}
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/ResearchGate.java b/src/main/java/org/jabref/logic/importer/fetcher/ResearchGate.java
new file mode 100644
index 00000000000..ca856474158
--- /dev/null
+++ b/src/main/java/org/jabref/logic/importer/fetcher/ResearchGate.java
@@ -0,0 +1,275 @@
+package org.jabref.logic.importer.fetcher;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import org.jabref.logic.importer.EntryBasedFetcher;
+import org.jabref.logic.importer.FetcherException;
+import org.jabref.logic.importer.FulltextFetcher;
+import org.jabref.logic.importer.ImportFormatPreferences;
+import org.jabref.logic.importer.ParseException;
+import org.jabref.logic.importer.SearchBasedFetcher;
+import org.jabref.logic.importer.fetcher.transformers.DefaultQueryTransformer;
+import org.jabref.logic.importer.fileformat.BibtexParser;
+import org.jabref.logic.layout.format.RTFChars;
+import org.jabref.logic.net.URLDownload;
+import org.jabref.logic.util.OS;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.field.StandardField;
+import org.jabref.model.entry.identifier.DOI;
+import org.jabref.model.util.DummyFileUpdateMonitor;
+
+import org.apache.http.client.utils.URIBuilder;
+import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
+import org.jsoup.Connection;
+import org.jsoup.Jsoup;
+import org.jsoup.nodes.Document;
+import org.jsoup.select.Elements;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class ResearchGate implements FulltextFetcher, EntryBasedFetcher, SearchBasedFetcher {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(ResearchGate.class);
+    private static final String HOST = "https://www.researchgate.net/";
+    private static final String GOOGLE_SEARCH = "https://www.google.com/search?q=";
+    private static final String GOOGLE_SITE = "%20site:researchgate.net";
+    private static final String SEARCH = "https://www.researchgate.net/search.Search.html?";
+    private static final String SEARCH_FOR_BIB_ENTRY = "https://www.researchgate.net/lite.publication.PublicationDownloadCitationModal.downloadCitation.html?fileType=BibTeX&citation=citationAndAbstract&publicationUid=";
+    private final ImportFormatPreferences formatPreferences;
+
+    public ResearchGate(ImportFormatPreferences importFormatPreferences) {
+        this.formatPreferences = importFormatPreferences;
+    }
+
+    /**
+     * Tries to find a fulltext URL for a given BibTex entry.
+     * <p>
+     * Search by title first, as DOI is not searchable directly. When the title is not present, the search is made with DOI via google.com with site:researchgate.net
+     *
+     * @param entry The Bibtex entry
+     * @return The fulltext PDF URL Optional, if found, or an empty Optional if not found.
+     * @throws IOException      if an IO operation has failed
+     * @throws FetcherException if the ResearchGate refuses to serve the page
+     */
+    @Override
+    public Optional<URL> findFullText(BibEntry entry) throws IOException, FetcherException {
+        Objects.requireNonNull(entry);
+
+        Document html;
+        try {
+            html = getHTML(entry);
+        } catch (FetcherException | NullPointerException e) {
+            LOGGER.debug("ResearchGate server is not available");
+            return Optional.empty();
+        }
+        Elements eLink = html.getElementsByTag("section");
+        String link = eLink.select("a[href^=https]").select("a[href$=.pdf]").attr("href");
+        LOGGER.debug("PDF link: {}", link);
+
+        if (link.contains("researchgate.net")) {
+            return Optional.of(new URL(link));
+        }
+        return Optional.empty();
+    }
+
+    private Document getHTML(BibEntry entry) throws FetcherException, IOException {
+        // DOI search
+        Optional<String> title = entry.getField(StandardField.TITLE);
+        Optional<DOI> doi = entry.getField(StandardField.DOI).flatMap(DOI::parse);
+
+        // Retrieve PDF link
+        Optional<String> linkForSearch;
+        if (title.isPresent()) {
+            LOGGER.trace("Search by Title");
+            linkForSearch = getURLByString(title.get());
+            if (linkForSearch.isPresent()) {
+                Connection connection = Jsoup.connect(linkForSearch.get());
+                return connection
+                        .cookieStore(connection.cookieStore())
+                        .userAgent(URLDownload.USER_AGENT)
+                        .referrer("www.google.com")
+                        .ignoreHttpErrors(true)
+                        .get();
+            }
+        }
+        if (doi.isPresent()) {
+            LOGGER.trace("Search by DOI");
+            // Retrieve PDF link
+            linkForSearch = getURLByDoi(doi.get());
+            if (linkForSearch.isPresent()) {
+                Connection connection = Jsoup.connect(linkForSearch.get());
+                return connection
+                        .cookieStore(connection.cookieStore())
+                        .userAgent(URLDownload.USER_AGENT)
+                        .ignoreHttpErrors(true)
+                        .get();
+            }
+        }
+        throw new FetcherException("Could not find a pdf");
+    }
+
+    Optional<String> getURLByString(String query) throws IOException, NullPointerException {
+        URIBuilder source;
+        String link;
+        try {
+            source = new URIBuilder(SEARCH);
+            source.addParameter("type", "publication");
+            source.addParameter("query", query);
+
+            URLDownload urlDownload = new URLDownload(source.toString());
+            urlDownload.getCookieFromUrl();
+            Document html = Jsoup.connect(source.toString())
+                                 .userAgent(URLDownload.USER_AGENT)
+                                 .referrer("www.google.com")
+                                 .ignoreHttpErrors(true)
+                                 .get();
+
+            link = HOST + Objects.requireNonNull(html.getElementById("content"))
+                                 .select("a[href^=publication/]")
+                                 .attr("href");
+            if (link.contains("?")) {
+                link = link.substring(0, link.indexOf("?"));
+            }
+        } catch (URISyntaxException e) {
+            return Optional.empty();
+        }
+        LOGGER.trace("URL for page: {}", link);
+        return Optional.of(link);
+    }
+
+    Optional<String> getURLByDoi(DOI doi) throws IOException, NullPointerException {
+        String link;
+        try {
+            URIBuilder source = new URIBuilder(SEARCH);
+            source.addParameter("type", "publication");
+            source.addParameter("query", doi.getDOI());
+
+            source = new URIBuilder(GOOGLE_SEARCH + doi.getDOI() + GOOGLE_SITE);
+            Connection connection = Jsoup.connect(source.toString());
+            Document html = connection
+                    .cookieStore(connection.cookieStore())
+                    .userAgent(URLDownload.USER_AGENT)
+                    .ignoreHttpErrors(true)
+                    .get();
+
+            link = Objects.requireNonNull(html.getElementById("search"))
+                          .select("a").attr("href");
+        } catch (URISyntaxException e) {
+            return Optional.empty();
+        }
+        LOGGER.trace("URL for page: {}", link);
+        return Optional.of(link);
+    }
+
+    /**
+     * Constructs a URL based on the query, size and page number.
+     * <p>
+     * Extract the numerical internal ID and add it to the URL to receive a link to a {@link BibEntry}
+     *
+     * @param luceneQuery the search query.
+     * @return A URL that lets us download a .bib file
+     * @throws URISyntaxException from {@link URIBuilder}'s build() method
+     * @throws IOException        from {@link Connection}'s get() method
+     */
+    private Document getPage(QueryNode luceneQuery) throws URISyntaxException, IOException {
+        String query = new DefaultQueryTransformer().transformLuceneQuery(luceneQuery).orElse("");
+        URIBuilder source = new URIBuilder(SEARCH);
+        source.addParameter("type", "publication");
+        source.addParameter("query", query);
+        return Jsoup.connect(source.build().toString())
+                    .userAgent(URLDownload.USER_AGENT)
+                    .referrer("www.google.com")
+                    .ignoreHttpErrors(true)
+                    .get();
+    }
+
+    @Override
+    public TrustLevel getTrustLevel() {
+        return TrustLevel.META_SEARCH;
+    }
+
+    /**
+     * This method is used to send complex queries using fielded search.
+     *
+     * @param luceneQuery the root node of the lucene query
+     * @return a list of {@link BibEntry}, which are matched by the query (maybe empty)
+     * @throws FetcherException if the ResearchGate refuses to serve the page
+     */
+    @Override
+    public List<BibEntry> performSearch(QueryNode luceneQuery) throws FetcherException {
+        Document html;
+        try {
+            html = getPage(luceneQuery);
+            // ResearchGate's server blocks when too many request are made
+            if (!html.getElementsByClass("nova-legacy-v-publication-item__title").hasText()) {
+                throw new FetcherException("ResearchGate server unavailable");
+            }
+        } catch (URISyntaxException | IOException e) {
+            throw new FetcherException("URL is not correct", e);
+        }
+
+        Elements sol = html.getElementsByClass("nova-legacy-v-publication-item__title");
+        List<String> urls = sol.select("a").eachAttr("href").stream()
+                               .filter(stream -> stream.contains("publication/"))
+                               .map(resultStream -> resultStream.substring(resultStream.indexOf("publication/") + 12, resultStream.indexOf("_")))
+                               .map(idStream -> SEARCH_FOR_BIB_ENTRY + idStream)
+                               .map(this::getInputStream)
+                               .filter(Objects::nonNull)
+                               .map(stream -> stream.lines().collect(Collectors.joining(OS.NEWLINE)))
+                               .toList();
+
+        List<BibEntry> list = new ArrayList<>();
+        for (String bib : urls) {
+            BibtexParser parser = new BibtexParser(formatPreferences, new DummyFileUpdateMonitor());
+            Optional<BibEntry> entry;
+            try {
+                entry = parser.parseSingleEntry(bib);
+                entry.ifPresent(list::add);
+            } catch (ParseException e) {
+                LOGGER.debug("Entry is not convertible to Bibtex", e);
+            }
+        }
+        return list;
+    }
+
+    private BufferedReader getInputStream(String urlString) {
+        try {
+            URL url = new URL((urlString));
+            return new BufferedReader(new InputStreamReader(url.openStream()));
+        } catch (IOException e) {
+            LOGGER.debug("Wrong URL:", e);
+        }
+        return null;
+    }
+
+    @Override
+    public String getName() {
+        return "ResearchGate";
+    }
+
+    /**
+     * Looks for hits which are matched by the given {@link BibEntry}.
+     *
+     * @param entry entry to search bibliographic information for
+     * @return a list of {@link BibEntry}, which are matched by the query (maybe empty)
+     * @throws FetcherException if the ResearchGate refuses to serve the page
+     */
+    @Override
+    public List<BibEntry> performSearch(BibEntry entry) throws FetcherException {
+        Optional<String> title = entry.getTitle();
+        if (title.isEmpty()) {
+            return new ArrayList<>();
+        }
+        return performSearch(new RTFChars().format(title.get()));
+    }
+}
+
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/ScienceDirect.java b/src/main/java/org/jabref/logic/importer/fetcher/ScienceDirect.java
index 3ebda1c0bbd..96a30c3703f 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/ScienceDirect.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/ScienceDirect.java
@@ -8,7 +8,9 @@
 import java.util.stream.Collectors;
 
 import org.jabref.logic.importer.FulltextFetcher;
+import org.jabref.logic.importer.ImporterPreferences;
 import org.jabref.logic.net.URLDownload;
+import org.jabref.logic.preferences.FetcherApiKey;
 import org.jabref.logic.util.BuildInfo;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
@@ -32,11 +34,18 @@
  * FulltextFetcher implementation that attempts to find a PDF URL at <a href="https://www.sciencedirect.com/">ScienceDirect</a>.
  * See <a href="https://dev.elsevier.com/">https://dev.elsevier.com/</a>.
  */
-public class ScienceDirect implements FulltextFetcher {
+public class ScienceDirect implements FulltextFetcher, CustomizableKeyFetcher {
     private static final Logger LOGGER = LoggerFactory.getLogger(ScienceDirect.class);
 
     private static final String API_URL = "https://api.elsevier.com/content/article/doi/";
     private static final String API_KEY = new BuildInfo().scienceDirectApiKey;
+    private static final String FETCHER_NAME = "ScienceDirect";
+
+    private final ImporterPreferences importerPreferences;
+
+    public ScienceDirect(ImporterPreferences importerPreferences) {
+        this.importerPreferences = importerPreferences;
+    }
 
     @Override
     public Optional<URL> findFullText(BibEntry entry) throws IOException {
@@ -131,7 +140,7 @@ private String getUrlByDoi(String doi) throws UnirestException {
         try {
             String request = API_URL + doi;
             HttpResponse<JsonNode> jsonResponse = Unirest.get(request)
-                                                         .header("X-ELS-APIKey", API_KEY)
+                                                         .header("X-ELS-APIKey", this.getApiKey())
                                                          .queryString("httpAccept", "application/json")
                                                          .asJson();
 
@@ -152,4 +161,19 @@ private String getUrlByDoi(String doi) throws UnirestException {
             return sciLink;
         }
     }
+
+    @Override
+    public String getName() {
+        return FETCHER_NAME;
+    }
+
+    private String getApiKey() {
+        return importerPreferences.getApiKeys()
+                                  .stream()
+                                  .filter(key -> key.getName().equalsIgnoreCase(this.getName()))
+                                  .filter(FetcherApiKey::shouldUse)
+                                  .findFirst()
+                                  .map(FetcherApiKey::getKey)
+                                  .orElse(API_KEY);
+    }
 }
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/SemanticScholar.java b/src/main/java/org/jabref/logic/importer/fetcher/SemanticScholar.java
new file mode 100644
index 00000000000..76a96ad71f6
--- /dev/null
+++ b/src/main/java/org/jabref/logic/importer/fetcher/SemanticScholar.java
@@ -0,0 +1,229 @@
+package org.jabref.logic.importer.fetcher;
+
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+import org.jabref.logic.importer.EntryBasedFetcher;
+import org.jabref.logic.importer.FetcherException;
+import org.jabref.logic.importer.FulltextFetcher;
+import org.jabref.logic.importer.PagedSearchBasedParserFetcher;
+import org.jabref.logic.importer.ParseException;
+import org.jabref.logic.importer.Parser;
+import org.jabref.logic.importer.fetcher.transformers.DefaultQueryTransformer;
+import org.jabref.logic.importer.util.JsonReader;
+import org.jabref.logic.net.URLDownload;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.field.StandardField;
+import org.jabref.model.entry.identifier.ArXivIdentifier;
+import org.jabref.model.entry.identifier.DOI;
+import org.jabref.model.entry.types.StandardEntryType;
+
+import kong.unirest.json.JSONArray;
+import kong.unirest.json.JSONException;
+import kong.unirest.json.JSONObject;
+import org.apache.http.client.utils.URIBuilder;
+import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
+import org.jsoup.Jsoup;
+import org.jsoup.nodes.Document;
+import org.jsoup.select.Elements;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class SemanticScholar implements FulltextFetcher, PagedSearchBasedParserFetcher, EntryBasedFetcher {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(SemanticScholar.class);
+
+    private static final String SOURCE_ID_SEARCH = "https://api.semanticscholar.org/v1/paper/";
+    private static final String SOURCE_WEB_SEARCH = "https://api.semanticscholar.org/graph/v1/paper/search?";
+
+    /**
+     * Tries to find a fulltext URL for a given BibTex entry.
+     * <p>
+     * Uses the DOI if present, otherwise the arXiv identifier.
+     *
+     * @param entry The Bibtex entry
+     * @return The fulltext PDF URL Optional, if found, or an empty Optional if not found.
+     * @throws IOException      if a page could not be fetched correctly
+     * @throws FetcherException if the received page differs from what was expected
+     */
+    @Override
+    public Optional<URL> findFullText(BibEntry entry) throws IOException, FetcherException {
+        Objects.requireNonNull(entry);
+
+        Optional<DOI> doi = entry.getField(StandardField.DOI).flatMap(DOI::parse);
+        Optional<ArXivIdentifier> arXiv = entry.getField(StandardField.EPRINT).flatMap(ArXivIdentifier::parse);
+
+        Document html = null;
+        if (doi.isPresent()) {
+            try {
+                // Retrieve PDF link
+                String source = SOURCE_ID_SEARCH + doi.get().getDOI();
+                html = Jsoup.connect(getURLBySource(source))
+                            .userAgent(URLDownload.USER_AGENT)
+                            .referrer("https://www.google.com")
+                            .ignoreHttpErrors(true)
+                            .get();
+            } catch (IOException e) {
+                LOGGER.info("Error for pdf lookup with DOI");
+            }
+        }
+        if (arXiv.isPresent() && entry.getField(StandardField.EPRINT).isPresent()) {
+            // Check if entry is a match
+            String arXivString = entry.getField(StandardField.EPRINT).get();
+            if (!arXivString.startsWith("arXiv:")) {
+                arXivString = "arXiv:" + arXivString;
+            }
+            String source = SOURCE_ID_SEARCH + arXivString;
+            html = Jsoup.connect(getURLBySource(source))
+                        .userAgent(URLDownload.USER_AGENT)
+                        .referrer("https://www.google.com")
+                        .ignoreHttpErrors(true)
+                        .get();
+        }
+        if (html == null) {
+            return Optional.empty();
+        }
+
+        // Retrieve PDF link from button on the webpage
+        // First checked is a drop-down menu, as it has the correct URL if present
+        // Else take the primary button
+        Elements metaLinks = html.getElementsByClass("flex-item alternate-sources__dropdown");
+        String link = metaLinks.select("a").attr("href");
+        if (link.length() < 10) {
+            metaLinks = html.getElementsByClass("flex-paper-actions__button--primary");
+            link = metaLinks.select("a").attr("href");
+        }
+        LOGGER.info("Fulltext PDF found @ SemanticScholar.");
+        return Optional.of(new URL(link));
+    }
+
+    @Override
+    public TrustLevel getTrustLevel() {
+        return TrustLevel.META_SEARCH;
+    }
+
+    String getURLBySource(String source) throws IOException, FetcherException {
+        URLDownload download = new URLDownload(source);
+        JSONObject json = new JSONObject(download.asString());
+        LOGGER.debug("URL for source: {}", json.get("url").toString());
+        if (!json.has("url")) {
+            throw new FetcherException("Page does not contain field \"url\"");
+        }
+        return json.get("url").toString();
+    }
+
+    @Override
+    public URL getURLForQuery(QueryNode luceneQuery, int pageNumber) throws URISyntaxException, MalformedURLException, FetcherException {
+        URIBuilder uriBuilder = new URIBuilder(SOURCE_WEB_SEARCH);
+        uriBuilder.addParameter("query", new DefaultQueryTransformer().transformLuceneQuery(luceneQuery).orElse(""));
+        uriBuilder.addParameter("offset", String.valueOf(pageNumber * getPageSize()));
+        uriBuilder.addParameter("limit", String.valueOf(Math.min(getPageSize(), 10000 - pageNumber * getPageSize())));
+        // All fields need to be specified
+        uriBuilder.addParameter("fields", "paperId,externalIds,url,title,abstract,venue,year,authors");
+        LOGGER.debug("URL for query: {}", uriBuilder.build().toURL());
+        return uriBuilder.build().toURL();
+    }
+
+    /**
+     * Returns the parser used to convert the response to a list of {@link BibEntry}.
+     */
+    @Override
+    public Parser getParser() {
+        return inputStream -> {
+
+            JSONObject response = JsonReader.toJsonObject(inputStream);
+            LOGGER.debug("Response for Parser: {}", response);
+            if (response.isEmpty()) {
+                return Collections.emptyList();
+            }
+
+            int total = response.getInt("total");
+            if (total == 0) {
+                return Collections.emptyList();
+            } else if (response.has("next")) {
+                total = Math.min(total, response.getInt("next") - response.getInt("offset"));
+            }
+
+            // Response contains a list
+            JSONArray items = response.getJSONArray("data");
+            List<BibEntry> entries = new ArrayList<>(items.length());
+            for (int i = 0; i < total; i++) {
+                JSONObject item = items.getJSONObject(i);
+                BibEntry entry = jsonItemToBibEntry(item);
+                entries.add(entry);
+            }
+
+            return entries;
+        };
+    }
+
+    /**
+     * This is copy-paste from CrossRef, need to be checked.
+     *
+     * @param item an entry received, needs to be parsed into a BibEntry
+     * @return The BibEntry that corresponds to the received object
+     * @throws ParseException if the JSONObject could not be parsed
+     */
+    private BibEntry jsonItemToBibEntry(JSONObject item) throws ParseException {
+        try {
+            BibEntry entry = new BibEntry(StandardEntryType.Article);
+            entry.setField(StandardField.URL, item.optString("url"));
+            entry.setField(StandardField.TITLE, item.optString("title"));
+            entry.setField(StandardField.ABSTRACT, item.optString("abstract"));
+            entry.setField(StandardField.VENUE, item.optString("venue"));
+            entry.setField(StandardField.YEAR, item.optString("year"));
+
+            entry.setField(StandardField.AUTHOR,
+                    IntStream.range(0, item.optJSONArray("authors").length())
+                             .mapToObj(item.optJSONArray("authors")::getJSONObject)
+                             .map((author) -> author.has("name") ? author.getString("name") : "")
+                             .collect(Collectors.joining(" and ")));
+
+            JSONObject externalIds = item.optJSONObject("externalIds");
+            entry.setField(StandardField.DOI, externalIds.optString("DOI"));
+            if (externalIds.has("ArXiv")) {
+                entry.setField(StandardField.EPRINT, externalIds.getString("ArXiv"));
+                entry.setField(StandardField.EPRINTTYPE, "arXiv");
+            }
+            entry.setField(StandardField.PMID, externalIds.optString("PubMed"));
+            return entry;
+        } catch (JSONException exception) {
+            throw new ParseException("SemanticScholar API JSON format has changed", exception);
+        }
+    }
+
+    /**
+     * Returns the localized name of this fetcher. The title can be used to display the fetcher in the menu and in the side pane.
+     *
+     * @return the localized name
+     */
+    @Override
+    public String getName() {
+        return "SemanticScholar";
+    }
+
+    /**
+     * Looks for hits which are matched by the given {@link BibEntry}.
+     *
+     * @param entry entry to search bibliographic information for
+     * @return a list of {@link BibEntry}, which are matched by the query (may be empty)
+     * @throws FetcherException if an error linked to the Fetcher applies
+     */
+    @Override
+    public List<BibEntry> performSearch(BibEntry entry) throws FetcherException {
+        Optional<String> title = entry.getTitle();
+        if (title.isEmpty()) {
+            return new ArrayList<>();
+        }
+        return performSearch(title.get());
+    }
+}
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/SpringerFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/SpringerFetcher.java
index efd8f4b325b..d0aa60e4494 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/SpringerFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/SpringerFetcher.java
@@ -12,9 +12,11 @@
 
 import org.jabref.logic.help.HelpFile;
 import org.jabref.logic.importer.FetcherException;
+import org.jabref.logic.importer.ImporterPreferences;
 import org.jabref.logic.importer.PagedSearchBasedParserFetcher;
 import org.jabref.logic.importer.Parser;
 import org.jabref.logic.importer.fetcher.transformers.SpringerQueryTransformer;
+import org.jabref.logic.preferences.FetcherApiKey;
 import org.jabref.logic.util.BuildInfo;
 import org.jabref.logic.util.OS;
 import org.jabref.model.entry.BibEntry;
@@ -36,15 +38,24 @@
  *
  * @implNote see <a href="https://dev.springernature.com/">API documentation</a> for more details
  */
-public class SpringerFetcher implements PagedSearchBasedParserFetcher {
+public class SpringerFetcher implements PagedSearchBasedParserFetcher, CustomizableKeyFetcher {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(SpringerFetcher.class);
 
-    private static final String API_URL = "http://api.springernature.com/meta/v1/json";
+    private static final String API_URL = "https://api.springernature.com/meta/v1/json";
     private static final String API_KEY = new BuildInfo().springerNatureAPIKey;
+    // Springer query using the parameter 'q=doi:10.1007/s11276-008-0131-4s=1' will respond faster
+    private static final String TEST_URL_WITHOUT_API_KEY = "https://api.springernature.com/meta/v1/json?q=doi:10.1007/s11276-008-0131-4s=1&p=1&api_key=";
+    private static final String FETCHER_NAME = "Springer";
+
+    private final ImporterPreferences importerPreferences;
+
+    public SpringerFetcher(ImporterPreferences importerPreferences) {
+        this.importerPreferences = importerPreferences;
+    }
 
     /**
-     * Convert a JSONObject obtained from http://api.springer.com/metadata/json to a BibEntry
+     * Convert a JSONObject obtained from <a href="http://api.springer.com/metadata/json">http://api.springer.com/metadata/json</a> to a BibEntry
      *
      * @param springerJsonEntry the JSONObject from search results
      * @return the converted BibEntry
@@ -152,7 +163,7 @@ public static BibEntry parseSpringerJSONtoBibtex(JSONObject springerJsonEntry) {
 
     @Override
     public String getName() {
-        return "Springer";
+        return FETCHER_NAME;
     }
 
     @Override
@@ -160,11 +171,34 @@ public Optional<HelpFile> getHelpPage() {
         return Optional.of(HelpFile.FETCHER_SPRINGER);
     }
 
+    private String getApiKey() {
+        return importerPreferences.getApiKeys()
+                                  .stream()
+                                  .filter(key -> key.getName().equalsIgnoreCase(FETCHER_NAME))
+                                  .filter(FetcherApiKey::shouldUse)
+                                  .findFirst()
+                                  .map(FetcherApiKey::getKey)
+                                  .orElse(API_KEY);
+    }
+
+    @Override
+    public String getTestUrl() {
+        return TEST_URL_WITHOUT_API_KEY;
+    }
+
+    /**
+     * Gets the query URL
+     *
+     * @param luceneQuery the search query
+     * @param pageNumber  the number of the page indexed from 0
+     * @return URL
+     */
     @Override
     public URL getURLForQuery(QueryNode luceneQuery, int pageNumber) throws URISyntaxException, MalformedURLException, FetcherException {
+
         URIBuilder uriBuilder = new URIBuilder(API_URL);
         uriBuilder.addParameter("q", new SpringerQueryTransformer().transformLuceneQuery(luceneQuery).orElse("")); // Search query
-        uriBuilder.addParameter("api_key", API_KEY); // API key
+        uriBuilder.addParameter("api_key", getApiKey()); // API key
         uriBuilder.addParameter("s", String.valueOf(getPageSize() * pageNumber + 1)); // Start entry, starts indexing at 1
         uriBuilder.addParameter("p", String.valueOf(getPageSize())); // Page size
         return uriBuilder.build().toURL();
@@ -176,7 +210,7 @@ private String constructComplexQueryString(ComplexSearchQuery complexSearchQuery
         complexSearchQuery.getTitlePhrases().forEach(title -> searchTerms.add("title:" + title));
         complexSearchQuery.getJournal().ifPresent(journal -> searchTerms.add("journal:" + journal));
         // Since Springer API does not support year range search, we ignore formYear and toYear and use "singleYear" only
-        complexSearchQuery.getSingleYear().ifPresent(year -> searchTerms.add("date:" + year.toString() + "*"));
+        complexSearchQuery.getSingleYear().ifPresent(year -> searchTerms.add("date:" + year + "*"));
         searchTerms.addAll(complexSearchQuery.getDefaultFieldPhrases());
         return String.join(" AND ", searchTerms);
     }
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/SpringerLink.java b/src/main/java/org/jabref/logic/importer/fetcher/SpringerLink.java
index 06334f42939..78a7a420718 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/SpringerLink.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/SpringerLink.java
@@ -6,6 +6,8 @@
 import java.util.Optional;
 
 import org.jabref.logic.importer.FulltextFetcher;
+import org.jabref.logic.importer.ImporterPreferences;
+import org.jabref.logic.preferences.FetcherApiKey;
 import org.jabref.logic.util.BuildInfo;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
@@ -22,7 +24,7 @@
 /**
  * FulltextFetcher implementation that attempts to find a PDF URL at SpringerLink.
  * <p>
- * Uses Springer API, see @link{https://dev.springer.com}
+ * Uses Springer API, see <a href="https://dev.springer.com">https://dev.springer.com</a>
  */
 public class SpringerLink implements FulltextFetcher {
     private static final Logger LOGGER = LoggerFactory.getLogger(SpringerLink.class);
@@ -30,6 +32,23 @@ public class SpringerLink implements FulltextFetcher {
     private static final String API_URL = "https://api.springer.com/meta/v1/json";
     private static final String API_KEY = new BuildInfo().springerNatureAPIKey;
     private static final String CONTENT_HOST = "link.springer.com";
+    private static final String FETCHER_NAME = "Springer";
+
+    private final ImporterPreferences importerPreferences;
+
+    public SpringerLink(ImporterPreferences importerPreferences) {
+        this.importerPreferences = importerPreferences;
+    }
+
+    private String getApiKey() {
+        return importerPreferences.getApiKeys()
+                                  .stream()
+                                  .filter(key -> key.getName().equalsIgnoreCase(FETCHER_NAME))
+                                  .filter(FetcherApiKey::shouldUse)
+                                  .findFirst()
+                                  .map(FetcherApiKey::getKey)
+                                  .orElse(API_KEY);
+    }
 
     @Override
     public Optional<URL> findFullText(BibEntry entry) throws IOException {
@@ -38,13 +57,13 @@ public Optional<URL> findFullText(BibEntry entry) throws IOException {
         // Try unique DOI first
         Optional<DOI> doi = entry.getField(StandardField.DOI).flatMap(DOI::parse);
 
-        if (!doi.isPresent()) {
+        if (doi.isEmpty()) {
             return Optional.empty();
         }
         // Available in catalog?
         try {
             HttpResponse<JsonNode> jsonResponse = Unirest.get(API_URL)
-                                                         .queryString("api_key", API_KEY)
+                                                         .queryString("api_key", getApiKey())
                                                          .queryString("q", String.format("doi:%s", doi.get().getDOI()))
                                                          .asJson();
             if (jsonResponse.getBody() != null) {
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/transformers/ArXivQueryTransformer.java b/src/main/java/org/jabref/logic/importer/fetcher/transformers/ArXivQueryTransformer.java
index 031333adda0..d37c555f833 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/transformers/ArXivQueryTransformer.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/transformers/ArXivQueryTransformer.java
@@ -47,5 +47,4 @@ protected String handleYear(String year) {
     protected Optional<String> handleUnFieldedTerm(String term) {
         return Optional.of(createKeyValuePair("all", term));
     }
-
 }
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/transformers/BiodiversityLibraryTransformer.java b/src/main/java/org/jabref/logic/importer/fetcher/transformers/BiodiversityLibraryTransformer.java
new file mode 100644
index 00000000000..431f545d576
--- /dev/null
+++ b/src/main/java/org/jabref/logic/importer/fetcher/transformers/BiodiversityLibraryTransformer.java
@@ -0,0 +1,39 @@
+package org.jabref.logic.importer.fetcher.transformers;
+
+public class BiodiversityLibraryTransformer extends AbstractQueryTransformer {
+
+    @Override
+    protected String getLogicalAndOperator() {
+        return "+";
+    }
+
+    @Override
+    protected String getLogicalOrOperator() {
+        return "+";
+    }
+
+    @Override
+    protected String getLogicalNotOperator() {
+        return "+";
+    }
+
+    @Override
+    protected String handleAuthor(String author) {
+        return author;
+    }
+
+    @Override
+    protected String handleTitle(String title) {
+        return title;
+    }
+
+    @Override
+    protected String handleJournal(String journalTitle) {
+        return journalTitle;
+    }
+
+    @Override
+    protected String handleYear(String year) {
+        return year;
+    }
+}
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/transformers/MedlineQueryTransformer.java b/src/main/java/org/jabref/logic/importer/fetcher/transformers/MedlineQueryTransformer.java
new file mode 100644
index 00000000000..155b08b89d2
--- /dev/null
+++ b/src/main/java/org/jabref/logic/importer/fetcher/transformers/MedlineQueryTransformer.java
@@ -0,0 +1,54 @@
+package org.jabref.logic.importer.fetcher.transformers;
+
+/**
+ *
+ * Medline/Pubmed specific transformer which uses suffixes for searches
+ * see <a href="https://pubmed.ncbi.nlm.nih.gov/help/#search-tags">Pubmed help</a> for details
+ *
+ */
+public class MedlineQueryTransformer extends AbstractQueryTransformer {
+
+    @Override
+    protected String getLogicalAndOperator() {
+        return " AND ";
+    }
+
+    @Override
+    protected String getLogicalOrOperator() {
+        return " OR ";
+    }
+
+    @Override
+    protected String getLogicalNotOperator() {
+        return "NOT ";
+    }
+
+    @Override
+    protected String handleAuthor(String author) {
+        return author + "[au]";
+    }
+
+    @Override
+    protected String handleTitle(String title) {
+        return title + "[ti]";
+    }
+
+    @Override
+    protected String handleJournal(String journalTitle) {
+        return journalTitle + "[ta]";
+    }
+
+    @Override
+    protected String handleYear(String year) {
+        return year + "[dp]";
+    }
+
+    @Override
+    protected String handleYearRange(String yearRange) {
+        parseYearRange(yearRange);
+        if (endYear == Integer.MAX_VALUE) {
+            return yearRange;
+        }
+        return Integer.toString(startYear) + ":" + Integer.toString(endYear) + "[dp]";
+    }
+}
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/transformers/ResearchGateQueryTransformer.java b/src/main/java/org/jabref/logic/importer/fetcher/transformers/ResearchGateQueryTransformer.java
new file mode 100644
index 00000000000..3dab7dcdfdd
--- /dev/null
+++ b/src/main/java/org/jabref/logic/importer/fetcher/transformers/ResearchGateQueryTransformer.java
@@ -0,0 +1,41 @@
+package org.jabref.logic.importer.fetcher.transformers;
+
+import org.jabref.model.strings.StringUtil;
+
+public class ResearchGateQueryTransformer extends AbstractQueryTransformer {
+
+    @Override
+    protected String getLogicalAndOperator() {
+        return " AND ";
+    }
+
+    @Override
+    protected String getLogicalOrOperator() {
+        return " OR ";
+    }
+
+    @Override
+    protected String getLogicalNotOperator() {
+        return "NOT ";
+    }
+
+    @Override
+    protected String handleAuthor(String author) {
+        return StringUtil.quoteStringIfSpaceIsContained(author);
+    }
+
+    @Override
+    protected String handleTitle(String title) {
+        return StringUtil.quoteStringIfSpaceIsContained(title);
+    }
+
+    @Override
+    protected String handleJournal(String journalTitle) {
+        return StringUtil.quoteStringIfSpaceIsContained(journalTitle);
+    }
+
+    @Override
+    protected String handleYear(String year) {
+        return StringUtil.quoteStringIfSpaceIsContained(year);
+    }
+}
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/transformers/SpringerQueryTransformer.java b/src/main/java/org/jabref/logic/importer/fetcher/transformers/SpringerQueryTransformer.java
index d8aaf31f7a3..45a8a5af772 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/transformers/SpringerQueryTransformer.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/transformers/SpringerQueryTransformer.java
@@ -35,7 +35,6 @@ protected String handleTitle(String title) {
     @Override
     protected String handleJournal(String journalTitle) {
         return createKeyValuePair("journal", journalTitle);
-
     }
 
     @Override
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/ACMPortalParser.java b/src/main/java/org/jabref/logic/importer/fileformat/ACMPortalParser.java
index 0e46e834134..71d84a6d12e 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/ACMPortalParser.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/ACMPortalParser.java
@@ -71,8 +71,8 @@ public List<String> parseDoiSearchPage(InputStream stream) throws ParseException
             Elements doiHrefs = doc.select("div.issue-item__content-right > h5 > span > a");
 
             for (Element elem : doiHrefs) {
-                String fullSegement = elem.attr("href");
-                String doi = fullSegement.substring(fullSegement.indexOf("10"));
+                String fullSegment = elem.attr("href");
+                String doi = fullSegment.substring(fullSegment.indexOf("10"));
                 doiList.add(doi);
             }
         } catch (IOException ex) {
@@ -227,5 +227,4 @@ public BibEntry parseBibEntry(String jsonStr) {
 
         return bibEntry;
     }
-
 }
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/BibTeXMLImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/BibTeXMLImporter.java
index 0627a300fc0..65301e2a7a1 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/BibTeXMLImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/BibTeXMLImporter.java
@@ -14,10 +14,6 @@
 import java.util.Optional;
 import java.util.regex.Pattern;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Unmarshaller;
 import javax.xml.datatype.XMLGregorianCalendar;
 
 import org.jabref.logic.importer.Importer;
@@ -34,6 +30,10 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
 
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Unmarshaller;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -184,7 +184,7 @@ private <T> void parse(T entryType, Map<Field, String> fields) {
                 } else if (isMethodToIgnore(method.getName())) {
                     continue;
                 } else if (method.getName().startsWith("get")) {
-                    putIfValueNotNull(fields, FieldFactory.parseField(method.getName().replace("get", "")), (String) method.invoke(entryType));
+                    putIfValueNotNull(fields, FieldFactory.parseField(entryType, method.getName().replace("get", "")), (String) method.invoke(entryType));
                 }
             } catch (IllegalArgumentException | InvocationTargetException | IllegalAccessException e) {
                 LOGGER.error("Could not invoke method", e);
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/BibtexImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/BibtexImporter.java
index c3d09baa057..590ae78de4e 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/BibtexImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/BibtexImporter.java
@@ -1,8 +1,14 @@
 package org.jabref.logic.importer.fileformat;
 
+import java.io.BufferedInputStream;
 import java.io.BufferedReader;
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.nio.charset.Charset;
+import java.nio.charset.CharsetDecoder;
+import java.nio.charset.CodingErrorAction;
+import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Objects;
 import java.util.Optional;
@@ -12,13 +18,19 @@
 import org.jabref.logic.importer.Importer;
 import org.jabref.logic.importer.ParserResult;
 import org.jabref.logic.util.StandardFileType;
+import org.jabref.model.database.BibDatabaseModeDetection;
 import org.jabref.model.util.FileUpdateMonitor;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 /**
  * This is a full class to read .bib files. It is used for <code>--import</code> and <code>--importToOpen </code>, too.
  */
 public class BibtexImporter extends Importer {
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(BibtexImporter.class);
+
     // Signature written at the top of the .bib file in earlier versions.
     private static final String SIGNATURE = "This file was created with JabRef";
 
@@ -41,30 +53,58 @@ public boolean isRecognizedFormat(BufferedReader reader) {
     }
 
     @Override
-    public ParserResult importDatabase(Path filePath, Charset defaultEncoding) throws IOException {
-        // We want to check if there is a JabRef signature in the file, because that would tell us
-        // which character encoding is used. However, to read the signature we must be using a compatible
-        // encoding in the first place. Since the signature doesn't contain any fancy characters, we can
-        // read it regardless of encoding, with either UTF-8 or UTF-16. That's the hypothesis, at any rate.
-        // 8 bit is most likely, so we try that first:
-        Optional<Charset> suppliedEncoding;
-        try (BufferedReader utf8Reader = getUTF8Reader(filePath)) {
-            suppliedEncoding = getSuppliedEncoding(utf8Reader);
+    public ParserResult importDatabase(Path filePath) throws IOException {
+        // We want to check if there is a JabRef encoding heading in the file, because that would tell us
+        // which character encoding is used.
+
+        // In general, we have to use InputStream and not a Reader, because a Reader requires an encoding specification.
+        // We do not want to do a byte-by-byte reading or doing wild try/catch magic.
+        // We therefore use a charset detection library and then read JabRefs "% Encoding" mark
+
+        Charset detectedCharset;
+        try (InputStream inputStream = Files.newInputStream(filePath)) {
+            BufferedInputStream bufferedInputStream = new BufferedInputStream(inputStream);
+            bufferedInputStream.mark(8192);
+            detectedCharset = getCharset(bufferedInputStream);
+            bufferedInputStream.reset();
+            LOGGER.debug("Detected charset: {}", detectedCharset.name());
         }
-        // Now if that did not get us anywhere, we check with the 16 bit encoding:
-        if (!suppliedEncoding.isPresent()) {
-            try (BufferedReader utf16Reader = getUTF16Reader(filePath)) {
-                suppliedEncoding = getSuppliedEncoding(utf16Reader);
-            }
+
+        Charset encoding;
+        boolean encodingExplicitlySupplied;
+        try (BufferedReader reader = Files.newBufferedReader(filePath, detectedCharset)) {
+            Optional<Charset> suppliedEncoding = getSuppliedEncoding(reader);
+            LOGGER.debug("Supplied encoding: {}", suppliedEncoding);
+            encodingExplicitlySupplied = suppliedEncoding.isPresent();
+
+            // in case no encoding information is present, use the detected one
+            encoding = suppliedEncoding.orElse(detectedCharset);
+            LOGGER.debug("Encoding used to read the file: {}", encoding);
         }
 
-        if (suppliedEncoding.isPresent()) {
-            return super.importDatabase(filePath, suppliedEncoding.get());
-        } else {
-            return super.importDatabase(filePath, defaultEncoding);
+        // We replace unreadable characters
+        // Unfortunately, no warning will be issued to the user
+        // As this is a very seldom case, we accept that
+        CharsetDecoder decoder = encoding.newDecoder();
+        decoder.onMalformedInput(CodingErrorAction.REPLACE);
+
+        try (InputStreamReader inputStreamReader = new InputStreamReader(Files.newInputStream(filePath), decoder);
+             BufferedReader reader = new BufferedReader(inputStreamReader)) {
+            ParserResult parserResult = this.importDatabase(reader);
+            parserResult.getMetaData().setEncoding(encoding);
+            parserResult.getMetaData().setEncodingExplicitlySupplied(encodingExplicitlySupplied);
+            parserResult.setPath(filePath);
+            if (parserResult.getMetaData().getMode().isEmpty()) {
+                parserResult.getMetaData().setMode(BibDatabaseModeDetection.inferMode(parserResult.getDatabase()));
+            }
+            return parserResult;
         }
     }
 
+    /**
+     * This method does not set the metadata encoding information. The caller needs to set the encoding of the supplied
+     * reader manually to the meta data
+     */
     @Override
     public ParserResult importDatabase(BufferedReader reader) throws IOException {
         return new BibtexParser(importFormatPreferences, fileMonitor).parse(reader);
@@ -122,7 +162,7 @@ private static Optional<Charset> getSuppliedEncoding(BufferedReader reader) {
                 }
             }
         } catch (IOException ignored) {
-            // Ignored
+            LOGGER.error("Supplied encoding could not be determined", ignored);
         }
         return Optional.empty();
     }
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/BibtexParser.java b/src/main/java/org/jabref/logic/importer/fileformat/BibtexParser.java
index b2bc701cb87..12479f18a65 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/BibtexParser.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/BibtexParser.java
@@ -1,13 +1,10 @@
 package org.jabref.logic.importer.fileformat;
 
-import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.io.PushbackReader;
 import java.io.Reader;
 import java.io.StringWriter;
-import java.nio.charset.StandardCharsets;
 import java.util.Collection;
 import java.util.Deque;
 import java.util.HashMap;
@@ -26,6 +23,7 @@
 import org.jabref.logic.exporter.BibtexDatabaseWriter;
 import org.jabref.logic.exporter.SavePreferences;
 import org.jabref.logic.importer.ImportFormatPreferences;
+import org.jabref.logic.importer.Importer;
 import org.jabref.logic.importer.ParseException;
 import org.jabref.logic.importer.Parser;
 import org.jabref.logic.importer.ParserResult;
@@ -109,12 +107,9 @@ public static Optional<BibEntry> singleFromString(String bibtexString, ImportFor
 
     @Override
     public List<BibEntry> parseEntries(InputStream inputStream) throws ParseException {
-        BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8));
-        return parseEntries(reader);
-    }
-
-    public List<BibEntry> parseEntries(Reader reader) throws ParseException {
+        Reader reader;
         try {
+            reader = Importer.getReader(inputStream);
             return parse(reader).getDatabase().getEntries();
         } catch (IOException e) {
             throw new ParseException(e);
@@ -126,11 +121,13 @@ public Optional<BibEntry> parseSingleEntry(String bibtexString) throws ParseExce
     }
 
     /**
-     * Parses BibTeX data found when reading from reader. Ignores any encoding supplied in the file by "Encoding: myEncoding".
+     * Parses BibTeX data found when reading from reader.
      * <p>
      * The reader will be consumed.
      * <p>
      * Multiple calls to parse() return the same results
+     * <p>
+     * Handling of encoding is done at {@link BibtexImporter}
      */
     public ParserResult parse(Reader in) throws IOException {
         Objects.requireNonNull(in);
@@ -215,7 +212,7 @@ private ParserResult parseFileContent() throws IOException {
                 database.setPreamble(parsePreamble());
                 // Consume a new line which separates the preamble from the next part (if the file was written with JabRef)
                 skipOneNewline();
-                // the preamble is saved verbatim anyways, so the text read so far can be dropped
+                // the preamble is saved verbatim anyway, so the text read so far can be dropped
                 dumpTextReadSoFarToString();
             } else if ("string".equals(entryType)) {
                 parseBibtexString();
@@ -229,7 +226,7 @@ private ParserResult parseFileContent() throws IOException {
             skipWhitespace();
         }
 
-        // Instantiate meta data:
+        // Instantiate meta data
         try {
             parserResult.setMetaData(metaDataParser.parse(meta, importFormatPreferences.getKeywordSeparator()));
         } catch (ParseException exception) {
@@ -286,7 +283,7 @@ private void parseAndAddEntry(String type) {
 
             LOGGER.debug("Could not parse entry", ex);
             parserResult.addWarning(Localization.lang("Error occurred when parsing entry") + ": '" + ex.getMessage()
-                    + "'. " + Localization.lang("Skipped entry."));
+                    + "'. " + "\n\n" + Localization.lang("JabRef skipped the entry."));
         }
     }
 
@@ -305,7 +302,6 @@ private void parseJabRefComment(Map<String, String> meta) {
 
         String comment = buffer.toString().replaceAll("[\\x0d\\x0a]", "");
         if (comment.substring(0, Math.min(comment.length(), MetaData.META_FLAG.length())).equals(MetaData.META_FLAG)) {
-
             if (comment.startsWith(MetaData.META_FLAG)) {
                 String rest = comment.substring(MetaData.META_FLAG.length());
 
@@ -369,8 +365,13 @@ private String dumpTextReadSoFarToString() {
         }
     }
 
+    /**
+     * Purges the given stringToPurge (if it exists) from the given context
+     *
+     * @return a stripped version of the context
+     */
     private String purge(String context, String stringToPurge) {
-        // purge the encoding line if it exists
+        // purge the given string line if it exists
         int runningIndex = context.indexOf(stringToPurge);
         int indexOfAt = context.indexOf("@");
         while (runningIndex < indexOfAt) {
@@ -386,8 +387,8 @@ private String purge(String context, String stringToPurge) {
         }
         // strip empty lines
         while ((runningIndex < indexOfAt) &&
-                (context.charAt(runningIndex) == '\r' ||
-                        context.charAt(runningIndex) == '\n')) {
+                ((context.charAt(runningIndex) == '\r') ||
+                        (context.charAt(runningIndex) == '\n'))) {
             runningIndex++;
         }
         return context.substring(runningIndex);
@@ -408,7 +409,6 @@ private String getPureTextFromFile() {
      * @return a String without eof characters
      */
     private String purgeEOFCharacters(String input) {
-
         StringBuilder remainingText = new StringBuilder();
         for (Character character : input.toCharArray()) {
             if (!(isEOFCharacter(character))) {
@@ -634,7 +634,7 @@ private String parseFieldContent(Field field) throws IOException {
                 value.append(fieldContentFormatter.format(text, field));
             } else if (character == '{') {
                 // Value is a string enclosed in brackets. There can be pairs
-                // of brackets inside of a field, so we need to count the
+                // of brackets inside a field, so we need to count the
                 // brackets to know when the string is finished.
                 StringBuilder text = parseBracketedTextExactly();
                 value.append(fieldContentFormatter.format(text, field));
@@ -724,7 +724,6 @@ private String fixKey() throws IOException {
                     // Begin of entryfieldname (e.g. author) -> push back:
                     unread(currentChar);
                     if ((currentChar == ' ') || (currentChar == '\n')) {
-
                         /*
                          * found whitespaces, entryfieldname completed -> key in
                          * keybuffer, skip whitespaces
@@ -814,7 +813,6 @@ private String parseKey() throws IOException {
                     || (character == ':') || ("#{}~,=\uFFFD".indexOf(character) == -1))) {
                 token.append((char) character);
             } else {
-
                 if (Character.isWhitespace((char) character)) {
                     // We have encountered white space instead of the comma at
                     // the end of
@@ -845,7 +843,6 @@ private String parseBracketedText() throws IOException {
         int brackets = 0;
 
         while (!((isClosingBracketNext()) && (brackets == 0))) {
-
             int character = read();
             if (isEOFCharacter(character)) {
                 throw new IOException("Error in line " + line + ": EOF in mid-string");
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/CffImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/CffImporter.java
index c683841ae77..afbe5af657d 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/CffImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/CffImporter.java
@@ -14,6 +14,7 @@
 import org.jabref.model.entry.Author;
 import org.jabref.model.entry.AuthorList;
 import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.field.BiblatexSoftwareField;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.field.UnknownField;
@@ -75,7 +76,6 @@ public CffAuthor() {
         private void setValues(String key, String value) {
             values.put(key, value);
         }
-
     }
 
     private static class CffIdentifier {
@@ -96,7 +96,7 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
         StandardEntryType entryType = StandardEntryType.Software;
 
         // Map CFF fields to JabRef Fields
-        HashMap<String, StandardField> fieldMap = getFieldMappings();
+        HashMap<String, Field> fieldMap = getFieldMappings();
         for (Map.Entry<String, String> property : citation.values.entrySet()) {
             if (fieldMap.containsKey(property.getKey())) {
                 entryMap.put(fieldMap.get(property.getKey()), property.getValue());
@@ -121,7 +121,7 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
         entryMap.put(StandardField.AUTHOR, authorStr);
 
         // Select DOI to keep
-        if (entryMap.get(StandardField.DOI) == null && citation.ids != null) {
+        if ((entryMap.get(StandardField.DOI) == null) && (citation.ids != null)) {
             List<CffIdentifier> doiIds = citation.ids.stream()
                             .filter(id -> id.type.equals("doi"))
                             .collect(Collectors.toList());
@@ -138,14 +138,14 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
                                            .collect(Collectors.toList());
 
             if (swhIds.size() == 1) {
-                entryMap.put(StandardField.SWHID, swhIds.get(0));
+                entryMap.put(BiblatexSoftwareField.SWHID, swhIds.get(0));
             } else if (swhIds.size() > 1) {
                 List<String> relSwhIds = swhIds.stream()
                                                .filter(id -> id.split(":").length > 3) // quick filter for invalid swhids
                                                .filter(id -> id.split(":")[2].equals("rel"))
                                                .collect(Collectors.toList());
                 if (relSwhIds.size() == 1) {
-                    entryMap.put(StandardField.SWHID, relSwhIds.get(0));
+                    entryMap.put(BiblatexSoftwareField.SWHID, relSwhIds.get(0));
                 }
             }
         }
@@ -167,19 +167,19 @@ public boolean isRecognizedFormat(BufferedReader reader) throws IOException {
 
         try {
             citation = mapper.readValue(reader, CffFormat.class);
-            return citation != null && citation.values.get("title") != null;
+            return (citation != null) && (citation.values.get("title") != null);
         } catch (IOException e) {
             return false;
         }
     }
 
-    private HashMap<String, StandardField> getFieldMappings() {
-        HashMap<String, StandardField> fieldMappings = new HashMap<>();
+    private HashMap<String, Field> getFieldMappings() {
+        HashMap<String, Field> fieldMappings = new HashMap<>();
         fieldMappings.put("title", StandardField.TITLE);
         fieldMappings.put("version", StandardField.VERSION);
         fieldMappings.put("doi", StandardField.DOI);
-        fieldMappings.put("license", StandardField.LICENSE);
-        fieldMappings.put("repository", StandardField.REPOSITORY);
+        fieldMappings.put("license", BiblatexSoftwareField.LICENSE);
+        fieldMappings.put("repository", BiblatexSoftwareField.REPOSITORY);
         fieldMappings.put("url", StandardField.URL);
         fieldMappings.put("abstract", StandardField.ABSTRACT);
         fieldMappings.put("message", StandardField.COMMENT);
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/CitaviXmlImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/CitaviXmlImporter.java
new file mode 100644
index 00000000000..c7f78d794ac
--- /dev/null
+++ b/src/main/java/org/jabref/logic/importer/fileformat/CitaviXmlImporter.java
@@ -0,0 +1,516 @@
+package org.jabref.logic.importer.fileformat;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedReader;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.PushbackInputStream;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
+import java.nio.file.StandardOpenOption;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.StringJoiner;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+
+import org.jabref.logic.formatter.bibtexfields.HtmlToLatexFormatter;
+import org.jabref.logic.formatter.bibtexfields.NormalizePagesFormatter;
+import org.jabref.logic.importer.Importer;
+import org.jabref.logic.importer.Parser;
+import org.jabref.logic.importer.ParserResult;
+import org.jabref.logic.importer.fileformat.citavi.CitaviExchangeData;
+import org.jabref.logic.importer.fileformat.citavi.CitaviExchangeData.KnowledgeItems;
+import org.jabref.logic.importer.fileformat.citavi.CitaviExchangeData.KnowledgeItems.KnowledgeItem;
+import org.jabref.logic.importer.fileformat.citavi.CitaviExchangeData.Persons.Person;
+import org.jabref.logic.util.StandardFileType;
+import org.jabref.model.entry.Author;
+import org.jabref.model.entry.AuthorList;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.Keyword;
+import org.jabref.model.entry.KeywordList;
+import org.jabref.model.entry.field.StandardField;
+import org.jabref.model.entry.types.EntryType;
+import org.jabref.model.entry.types.IEEETranEntryType;
+import org.jabref.model.entry.types.StandardEntryType;
+import org.jabref.model.strings.StringUtil;
+
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Unmarshaller;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class CitaviXmlImporter extends Importer implements Parser {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(CitaviXmlImporter.class);
+    private static final byte UUID_LENGTH = 36;
+    private static final byte UUID_SEMICOLON_OFFSET_INDEX = 37;
+    private static final EnumSet<QuotationTypeMapping> QUOTATION_TYPES = EnumSet.allOf(QuotationTypeMapping.class);
+    private final HtmlToLatexFormatter htmlToLatexFormatter = new HtmlToLatexFormatter();
+    private final NormalizePagesFormatter pagesFormatter = new NormalizePagesFormatter();
+
+    private final Map<String, Author> knownPersons = new HashMap<>();
+    private final Map<String, Keyword> knownKeywords = new HashMap<>();
+    private final Map<String, String> knownPublishers = new HashMap<>();
+
+    private Map<String, String> refIdWithAuthors = new HashMap<>();
+    private Map<String, String> refIdWithEditors = new HashMap<>();
+    private Map<String, String> refIdWithKeywords = new HashMap<>();
+    private Map<String, String> refIdWithPublishers = new HashMap<>();
+
+    private CitaviExchangeData.Persons persons;
+    private CitaviExchangeData.Keywords keywords;
+    private CitaviExchangeData.Publishers publishers;
+    private KnowledgeItems knowledgeItems;
+
+    private CitaviExchangeData.ReferenceAuthors refAuthors;
+    private CitaviExchangeData.ReferenceEditors refEditors;
+    private CitaviExchangeData.ReferenceKeywords refKeywords;
+    private CitaviExchangeData.ReferencePublishers refPublishers;
+
+    private Unmarshaller unmarshaller;
+
+    @Override
+    public String getName() {
+        return "Citavi XML";
+    }
+
+    @Override
+    public StandardFileType getFileType() {
+        return StandardFileType.CITAVI;
+    }
+
+    @Override
+    public String getId() {
+        return "citavi";
+    }
+
+    @Override
+    public String getDescription() {
+        return "Importer for the Citavi XML format.";
+    }
+
+    @Override
+    public boolean isRecognizedFormat(BufferedReader reader) throws IOException {
+        Objects.requireNonNull(reader);
+        return false;
+    }
+
+    @Override
+    public boolean isRecognizedFormat(Path filePath) throws IOException {
+        try (BufferedReader reader = getReaderFromZip(filePath)) {
+            String str;
+            int i = 0;
+            while (((str = reader.readLine()) != null) && (i < 50)) {
+                if (str.toLowerCase(Locale.ROOT).contains("citaviexchangedata")) {
+                    return true;
+                }
+                i++;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public ParserResult importDatabase(Path filePath) throws IOException {
+        try (BufferedReader reader = getReaderFromZip(filePath)) {
+            Object unmarshalledObject = unmarshallRoot(reader);
+
+            if (unmarshalledObject instanceof CitaviExchangeData) {
+                // Check whether we have an article set, an article, a book article, or a book article set
+                CitaviExchangeData data = (CitaviExchangeData) unmarshalledObject;
+                List<BibEntry> bibEntries = parseDataList(data);
+
+                return new ParserResult(bibEntries);
+            } else {
+                return ParserResult.fromErrorMessage("File does not start with xml tag.");
+            }
+        } catch (JAXBException | XMLStreamException e) {
+            LOGGER.debug("could not parse document", e);
+            return ParserResult.fromError(e);
+        }
+    }
+
+    private List<BibEntry> parseDataList(CitaviExchangeData data) {
+        List<BibEntry> bibEntries = new ArrayList<>();
+
+        persons = data.getPersons();
+        keywords = data.getKeywords();
+        publishers = data.getPublishers();
+        knowledgeItems = data.getKnowledgeItems();
+
+        refAuthors = data.getReferenceAuthors();
+        refEditors = data.getReferenceEditors();
+        refKeywords = data.getReferenceKeywords();
+        refPublishers = data.getReferencePublishers();
+
+        if (refAuthors != null) {
+            this.refIdWithAuthors = buildPersonList(refAuthors.getOnetoN());
+        }
+        if (refEditors != null) {
+            this.refIdWithEditors = buildPersonList(refEditors.getOnetoN());
+        }
+        if (refKeywords != null) {
+            this.refIdWithKeywords = buildKeywordList(refKeywords.getOnetoN());
+        }
+        if (refPublishers != null) {
+            this.refIdWithPublishers = buildPublisherList(refPublishers.getOnetoN());
+        }
+
+        bibEntries = data
+                         .getReferences().getReference()
+                         .stream()
+                         .map(this::parseData)
+                         .collect(Collectors.toList());
+
+        return bibEntries;
+    }
+
+    private BibEntry parseData(CitaviExchangeData.References.Reference data) {
+        BibEntry entry = new BibEntry();
+
+        entry.setType(getType(data));
+        Optional.ofNullable(data.getTitle())
+                .ifPresent(value -> entry.setField(StandardField.TITLE, clean(value)));
+        Optional.ofNullable(data.getAbstract())
+                .ifPresent(value -> entry.setField(StandardField.ABSTRACT, clean(value)));
+        Optional.ofNullable(data.getYear())
+                .ifPresent(value -> entry.setField(StandardField.YEAR, clean(value)));
+        Optional.ofNullable(data.getDoi())
+                .ifPresent(value -> entry.setField(StandardField.DOI, clean(value)));
+        Optional.ofNullable(data.getIsbn())
+                .ifPresent(value -> entry.setField(StandardField.ISBN, clean(value)));
+
+        String pages = clean(getPages(data));
+        // Cleans also unicode minus signs
+        pages = pagesFormatter.format(pages);
+        entry.setField(StandardField.PAGES, pages);
+
+        Optional.ofNullable(data.getVolume())
+                .ifPresent(value -> entry.setField(StandardField.VOLUME, clean(value)));
+        Optional.ofNullable(getAuthorName(data))
+                .ifPresent(value -> entry.setField(StandardField.AUTHOR, clean(value)));
+        Optional.ofNullable(getEditorName(data))
+                .ifPresent(value -> entry.setField(StandardField.EDITOR, clean(value)));
+        Optional.ofNullable(getKeywords(data))
+                .ifPresent(value -> entry.setField(StandardField.KEYWORDS, clean(value)));
+        Optional.ofNullable(getPublisher(data))
+                .ifPresent(value -> entry.setField(StandardField.PUBLISHER, clean(value)));
+        Optional.ofNullable(getKnowledgeItem(data))
+                .ifPresent(value -> entry.setField(StandardField.COMMENT, StringUtil.unifyLineBreaks(value, "\n")));
+        return entry;
+    }
+
+    private EntryType getType(CitaviExchangeData.References.Reference data) {
+        return Optional.ofNullable(data.getReferenceType())
+                       .map(CitaviXmlImporter::convertRefNameToType)
+                       .orElse(StandardEntryType.Article);
+    }
+
+    private static EntryType convertRefNameToType(String refName) {
+        return switch (refName.toLowerCase().trim()) {
+            case "artwork", "generic", "musicalbum", "audioorvideodocument", "movie" -> StandardEntryType.Misc;
+            case "electronic article" -> IEEETranEntryType.Electronic;
+            case "book section" -> StandardEntryType.InBook;
+            case "book", "bookedited", "audiobook" -> StandardEntryType.Book;
+            case "report" -> StandardEntryType.Report;
+            // case "journal article" -> StandardEntryType.Article;
+            default -> StandardEntryType.Article;
+        };
+    }
+
+    private String getPages(CitaviExchangeData.References.Reference data) {
+        String tmpStr = "";
+        if ((data.getPageCount() != null) && (data.getPageRange() == null)) {
+            tmpStr = data.getPageCount();
+        } else if ((data.getPageCount() == null) && (data.getPageRange() != null)) {
+            tmpStr = data.getPageRange();
+        } else if ((data.getPageCount() == null) && (data.getPageRange() == null)) {
+            return tmpStr;
+        }
+        int count = 0;
+        String pages = "";
+        for (int i = tmpStr.length() - 1; i >= 0; i--) {
+            if (count == 2) {
+                pages = tmpStr.substring(i + 2, (tmpStr.length() - 1 - 5) + 1);
+                break;
+            } else {
+                if (tmpStr.charAt(i) == '>') {
+                    count++;
+                }
+            }
+        }
+        return pages;
+    }
+
+    private String getAuthorName(CitaviExchangeData.References.Reference data) {
+        if (refAuthors == null) {
+            return null;
+        }
+
+        return this.refIdWithAuthors.get(data.getId());
+    }
+
+    private Map<String, String> buildPersonList(List<String> authorsOrEditors) {
+        Map<String, String> refToPerson = new HashMap<>();
+
+        for (String idStringsWithSemicolon : authorsOrEditors) {
+            String refId = idStringsWithSemicolon.substring(0, UUID_LENGTH);
+            String rest = idStringsWithSemicolon.substring(UUID_SEMICOLON_OFFSET_INDEX, idStringsWithSemicolon.length());
+
+            String[] personIds = rest.split(";");
+
+            List<Author> jabrefAuthors = new ArrayList<>();
+
+            for (String personId : personIds) {
+                // Store persons we already encountered, we can have the same author multiple times in the whole database
+                knownPersons.computeIfAbsent(personId, k -> {
+                    Optional<Person> person = persons.getPerson().stream().filter(p -> p.getId().equals(k)).findFirst();
+                    return person.map(p -> new Author(p.getFirstName(), "", "", p.getLastName(), "")).orElse(null);
+                });
+                jabrefAuthors.add(knownPersons.get(personId));
+            }
+            String stringifiedAuthors = AuthorList.of(jabrefAuthors).getAsLastFirstNamesWithAnd(false);
+            refToPerson.put(refId, stringifiedAuthors);
+        }
+        return refToPerson;
+    }
+
+    private Map<String, String> buildKeywordList(List<String> keywordsList) {
+        Map<String, String> refToKeywords = new HashMap<>();
+
+        for (String idStringsWithSemicolon : keywordsList) {
+            String refId = idStringsWithSemicolon.substring(0, UUID_LENGTH);
+            String rest = idStringsWithSemicolon.substring(UUID_SEMICOLON_OFFSET_INDEX, idStringsWithSemicolon.length());
+
+            String[] keywordIds = rest.split(";");
+
+            List<Keyword> jabrefKeywords = new ArrayList<>();
+
+            for (String keywordId : keywordIds) {
+                // store keywords already encountered
+                knownKeywords.computeIfAbsent(keywordId, k -> {
+                    Optional<CitaviExchangeData.Keywords.Keyword> keyword = keywords.getKeyword().stream().filter(p -> p.getId().equals(k)).findFirst();
+                    return keyword.map(kword -> new Keyword(kword.getName())).orElse(null);
+                });
+                jabrefKeywords.add(knownKeywords.get(keywordId));
+            }
+
+            KeywordList list = new KeywordList(List.copyOf(jabrefKeywords));
+            String stringifiedKeywords = list.toString();
+            refToKeywords.put(refId, stringifiedKeywords);
+        }
+        return refToKeywords;
+    }
+
+    private Map<String, String> buildPublisherList(List<String> publishersList) {
+        Map<String, String> refToPublishers = new HashMap<>();
+
+        for (String idStringsWithSemicolon : publishersList) {
+            String refId = idStringsWithSemicolon.substring(0, UUID_LENGTH);
+            String rest = idStringsWithSemicolon.substring(UUID_SEMICOLON_OFFSET_INDEX, idStringsWithSemicolon.length());
+
+            String[] publisherIds = rest.split(";");
+
+            List<String> jabrefPublishers = new ArrayList<>();
+
+            for (String pubId : publisherIds) {
+                // store publishers already encountered
+                knownPublishers.computeIfAbsent(pubId, k -> {
+                    Optional<CitaviExchangeData.Publishers.Publisher> publisher = publishers.getPublisher().stream().filter(p -> p.getId().equals(k)).findFirst();
+                    return publisher.map(p -> new String(p.getName())).orElse(null);
+                });
+                jabrefPublishers.add(knownPublishers.get(pubId));
+            }
+
+            String stringifiedKeywords = String.join(",", jabrefPublishers);
+            refToPublishers.put(refId, stringifiedKeywords);
+        }
+        return refToPublishers;
+    }
+
+    private String getEditorName(CitaviExchangeData.References.Reference data) {
+        if (refEditors == null) {
+            return null;
+        }
+        return this.refIdWithEditors.get(data.getId());
+    }
+
+    private String getKeywords(CitaviExchangeData.References.Reference data) {
+        if (refKeywords == null) {
+            return null;
+        }
+        return this.refIdWithKeywords.get(data.getId());
+    }
+
+    private String getPublisher(CitaviExchangeData.References.Reference data) {
+        if (refPublishers == null) {
+            return null;
+        }
+        return this.refIdWithPublishers.get(data.getId());
+    }
+
+    private String getKnowledgeItem(CitaviExchangeData.References.Reference data) {
+        StringJoiner comment = new StringJoiner("\n\n");
+        List<KnowledgeItem> foundItems = knowledgeItems.getKnowledgeItem().stream().filter(p -> data.getId().equals(p.getReferenceID())).toList();
+        for (KnowledgeItem knowledgeItem : foundItems) {
+            Optional<String> title = Optional.ofNullable(knowledgeItem.getCoreStatement()).filter(Predicate.not(String::isEmpty));
+            title.ifPresent(t -> comment.add("# " + cleanUpText(t)));
+
+            Optional<String> text = Optional.ofNullable(knowledgeItem.getText()).filter(Predicate.not(String::isEmpty));
+            text.ifPresent(t -> comment.add(cleanUpText(t)));
+
+            Optional<Integer> pages = Optional.ofNullable(knowledgeItem.getPageRangeNumber()).filter(range -> range != -1);
+            pages.ifPresent(p -> comment.add("page range: " + p));
+
+            Optional<String> quotationTypeDesc = Optional.ofNullable(knowledgeItem.getQuotationType()).flatMap(type ->
+                                                                    this.QUOTATION_TYPES.stream()
+                                                                    .filter(qt -> type == qt.getCitaviIndexType())
+                                                                    .map(QuotationTypeMapping::getName).findFirst());
+            quotationTypeDesc.ifPresent(qt -> comment.add(String.format("quotation type: %s", qt)));
+
+            Optional<Short> quotationIndex = Optional.ofNullable(knowledgeItem.getQuotationIndex());
+            quotationIndex.ifPresent(index -> comment.add(String.format("quotation index: %d", index)));
+        }
+        return comment.toString();
+    }
+
+    String cleanUpText(String text) {
+        String result = removeSpacesBeforeLineBreak(text);
+        result = result.replaceAll("(?<!\\\\)\\{", "\\\\{");
+        result = result.replaceAll("(?<!\\\\)}", "\\\\}");
+        return result;
+    }
+
+    private String removeSpacesBeforeLineBreak(String string) {
+        return string.replaceAll(" +\r\n", "\r\n")
+              .replaceAll(" +\n", "\n");
+    }
+
+    private void initUnmarshaller() throws JAXBException {
+        if (unmarshaller == null) {
+            // Lazy init because this is expensive
+            JAXBContext context = JAXBContext.newInstance("org.jabref.logic.importer.fileformat.citavi");
+            unmarshaller = context.createUnmarshaller();
+        }
+    }
+
+    private Object unmarshallRoot(BufferedReader reader) throws XMLStreamException, JAXBException {
+        initUnmarshaller();
+
+        XMLInputFactory xmlInputFactory = XMLInputFactory.newFactory();
+        XMLStreamReader xmlStreamReader = xmlInputFactory.createXMLStreamReader(reader);
+
+        // Go to the root element
+        while (!xmlStreamReader.isStartElement()) {
+            xmlStreamReader.next();
+        }
+
+        return unmarshaller.unmarshal(xmlStreamReader);
+    }
+
+    @Override
+    public ParserResult importDatabase(BufferedReader reader) throws IOException {
+        Objects.requireNonNull(reader);
+        throw new UnsupportedOperationException("CitaviXmlImporter does not support importDatabase(BufferedReader reader)."
+                                                + "Instead use importDatabase(Path filePath, Charset defaultEncoding).");
+    }
+
+    @Override
+    public List<BibEntry> parseEntries(InputStream inputStream) {
+        try {
+            return importDatabase(
+                                  new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8))).getDatabase().getEntries();
+        } catch (IOException e) {
+            LOGGER.error(e.getLocalizedMessage(), e);
+        }
+        return Collections.emptyList();
+    }
+
+    private BufferedReader getReaderFromZip(Path filePath) throws IOException {
+        ZipInputStream zis = new ZipInputStream(new FileInputStream(filePath.toFile()));
+        ZipEntry zipEntry = zis.getNextEntry();
+
+        Path newFile = Files.createTempFile("citavicontent", ".xml");
+
+        while (zipEntry != null) {
+            Files.copy(zis, newFile, StandardCopyOption.REPLACE_EXISTING);
+
+            zipEntry = zis.getNextEntry();
+        }
+
+        zis.closeEntry();
+
+        InputStream stream = Files.newInputStream(newFile, StandardOpenOption.READ);
+
+        // check and delete the utf-8 BOM bytes
+        InputStream newStream = checkForUtf8BOMAndDiscardIfAny(stream);
+
+        // clean up the temp file
+        Files.delete(newFile);
+
+        return new BufferedReader(new InputStreamReader(newStream, StandardCharsets.UTF_8));
+    }
+
+    private static InputStream checkForUtf8BOMAndDiscardIfAny(InputStream inputStream) throws IOException {
+        PushbackInputStream pushbackInputStream = new PushbackInputStream(new BufferedInputStream(inputStream), 3);
+        byte[] bom = new byte[3];
+        if (pushbackInputStream.read(bom) != -1) {
+            if (!((bom[0] == (byte) 0xEF) && (bom[1] == (byte) 0xBB) && (bom[2] == (byte) 0xBF))) {
+                pushbackInputStream.unread(bom);
+            }
+        }
+        return pushbackInputStream;
+    }
+
+    private String clean(String input) {
+        String result = StringUtil.unifyLineBreaks(input, " ")
+                         .trim()
+                         .replaceAll(" +", " ");
+        return htmlToLatexFormatter.format(result);
+    }
+
+    enum QuotationTypeMapping {
+        IMAGE_QUOTATION(0, "Image quotation"),
+        DIRECT_QUOTATION(1, "Direct quotation"),
+        INDIRECT_QUOTATION(2, "Indirect quotation"),
+        SUMMARY(3, "Summary"),
+        COMMENT(4, "Comment"),
+        HIGHLIGHT(5, "Highlight"),
+        HIGHLIGHT_RED(6, "Highlight in red");
+
+        int citaviType;
+        String name;
+
+        QuotationTypeMapping(int citaviType, String name) {
+            this.name = name;
+            this.citaviType = citaviType;
+        }
+
+        String getName() {
+            return name;
+        }
+
+        int getCitaviIndexType() {
+            return citaviType;
+        }
+    }
+}
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/CopacImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/CopacImporter.java
index f2320a90b6d..ab638ae4cf3 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/CopacImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/CopacImporter.java
@@ -76,7 +76,6 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
         String str;
 
         while ((str = reader.readLine()) != null) {
-
             if (str.length() < 4) {
                 continue;
             }
@@ -86,8 +85,7 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
             if ("    ".equals(code)) {
                 sb.append(' ').append(str.trim());
             } else {
-
-                // begining of a new item
+                // beginning of a new item
                 if ("TI- ".equals(str.substring(0, 4))) {
                     if (sb.length() > 0) {
                         entries.add(sb.toString());
@@ -105,7 +103,6 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
         List<BibEntry> results = new LinkedList<>();
 
         for (String entry : entries) {
-
             // Copac does not contain enough information on the type of the
             // document. A book is assumed.
             BibEntry b = new BibEntry(StandardEntryType.Book);
@@ -140,7 +137,7 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
                 } else if ("DT- ".equals(code)) {
                     setOrAppend(b, new UnknownField("documenttype"), line.substring(4).trim(), ", ");
                 } else {
-                    setOrAppend(b, FieldFactory.parseField(code.substring(0, 2)), line.substring(4).trim(), ", ");
+                    setOrAppend(b, FieldFactory.parseField(StandardEntryType.Book, line.substring(0, 2)), line.substring(4).trim(), ", ");
                 }
             }
             results.add(b);
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/CustomImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/CustomImporter.java
index 7c671d128a7..956e343816a 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/CustomImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/CustomImporter.java
@@ -57,7 +57,6 @@ public Path getBasePath() {
 
     @Override
     public boolean equals(Object other) {
-
         if (this == other) {
             return true;
         }
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/EndnoteImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/EndnoteImporter.java
index 00ae5eec79f..b9e18996d3b 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/EndnoteImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/EndnoteImporter.java
@@ -111,7 +111,6 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
             boolean isEditedBook = false;
             String[] fields = entry.trim().substring(1).split("\n%");
             for (String field : fields) {
-
                 if (field.length() < 3) {
                     continue;
                 }
@@ -271,6 +270,7 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
      * separated by " and ". This is the correct behaviour.
      * One source lists the names separated by comma, with a comma at the end. We can detect
      * this format and fix it.
+     *
      * @param s The author string
      * @return The fixed author string
      */
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/EndnoteXmlImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/EndnoteXmlImporter.java
index b2ee4e3ff8a..7c011473cc9 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/EndnoteXmlImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/EndnoteXmlImporter.java
@@ -14,9 +14,6 @@
 import java.util.Optional;
 import java.util.stream.Collectors;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Unmarshaller;
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
@@ -61,6 +58,9 @@
 import org.jabref.model.strings.StringUtil;
 import org.jabref.model.util.OptionalUtil;
 
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Unmarshaller;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -173,64 +173,64 @@ private static EntryType convertRefNameToType(String refName) {
         };
     }
 
-    private BibEntry parseRecord(Record record) {
+    private BibEntry parseRecord(Record endNoteRecord) {
         BibEntry entry = new BibEntry();
 
-        entry.setType(getType(record));
-        Optional.ofNullable(getAuthors(record))
+        entry.setType(getType(endNoteRecord));
+        Optional.ofNullable(getAuthors(endNoteRecord))
                 .ifPresent(value -> entry.setField(StandardField.AUTHOR, value));
-        Optional.ofNullable(record.getTitles())
+        Optional.ofNullable(endNoteRecord.getTitles())
                 .map(Titles::getTitle)
                 .map(Title::getStyle)
                 .map(this::mergeStyleContents)
                 .ifPresent(value -> entry.setField(StandardField.TITLE, clean(value)));
-        Optional.ofNullable(record.getTitles())
+        Optional.ofNullable(endNoteRecord.getTitles())
                 .map(Titles::getSecondaryTitle)
                 .map(SecondaryTitle::getStyle)
                 .map(Style::getContent)
                 .ifPresent(value -> entry.setField(StandardField.JOURNAL, clean(value)));
-        Optional.ofNullable(record.getPages())
+        Optional.ofNullable(endNoteRecord.getPages())
                 .map(Pages::getStyle)
                 .map(Style::getContent)
                 .ifPresent(value -> entry.setField(StandardField.PAGES, value));
-        Optional.ofNullable(record.getNumber())
+        Optional.ofNullable(endNoteRecord.getNumber())
                 .map(Number::getStyle)
                 .map(Style::getContent)
                 .ifPresent(value -> entry.setField(StandardField.NUMBER, value));
-        Optional.ofNullable(record.getVolume())
+        Optional.ofNullable(endNoteRecord.getVolume())
                 .map(Volume::getStyle)
                 .map(Style::getContent)
                 .ifPresent(value -> entry.setField(StandardField.VOLUME, value));
-        Optional.ofNullable(record.getDates())
+        Optional.ofNullable(endNoteRecord.getDates())
                 .map(Dates::getYear)
                 .map(Year::getStyle)
                 .map(Style::getContent)
                 .ifPresent(value -> entry.setField(StandardField.YEAR, value));
-        Optional.ofNullable(record.getNotes())
+        Optional.ofNullable(endNoteRecord.getNotes())
                 .map(Notes::getStyle)
                 .map(Style::getContent)
                 .ifPresent(value -> entry.setField(StandardField.NOTE, value.trim()));
-        getUrl(record)
+        getUrl(endNoteRecord)
                 .ifPresent(value -> entry.setField(StandardField.URL, value));
-        entry.putKeywords(getKeywords(record), preferences.getKeywordSeparator());
-        Optional.ofNullable(record.getAbstract())
+        entry.putKeywords(getKeywords(endNoteRecord), preferences.getKeywordSeparator());
+        Optional.ofNullable(endNoteRecord.getAbstract())
                 .map(Abstract::getStyle)
                 .map(Style::getContent)
                 .ifPresent(value -> entry.setField(StandardField.ABSTRACT, value.trim()));
-        entry.setFiles(getLinkedFiles(record));
-        Optional.ofNullable(record.getIsbn())
+        entry.setFiles(getLinkedFiles(endNoteRecord));
+        Optional.ofNullable(endNoteRecord.getIsbn())
                 .map(Isbn::getStyle)
                 .map(Style::getContent)
                 .ifPresent(value -> entry.setField(StandardField.ISBN, clean(value)));
-        Optional.ofNullable(record.getElectronicResourceNum())
+        Optional.ofNullable(endNoteRecord.getElectronicResourceNum())
                 .map(ElectronicResourceNum::getStyle)
                 .map(Style::getContent)
                 .ifPresent(doi -> entry.setField(StandardField.DOI, doi.trim()));
-        Optional.ofNullable(record.getPublisher())
+        Optional.ofNullable(endNoteRecord.getPublisher())
                 .map(Publisher::getStyle)
                 .map(Style::getContent)
                 .ifPresent(value -> entry.setField(StandardField.PUBLISHER, value));
-        Optional.ofNullable(record.getLabel())
+        Optional.ofNullable(endNoteRecord.getLabel())
                 .map(Label::getStyle)
                 .map(Style::getContent)
                 .ifPresent(value -> entry.setField(new UnknownField("endnote-label"), value));
@@ -238,15 +238,15 @@ private BibEntry parseRecord(Record record) {
         return entry;
     }
 
-    private EntryType getType(Record record) {
-        return Optional.ofNullable(record.getRefType())
+    private EntryType getType(Record endNoteRecord) {
+        return Optional.ofNullable(endNoteRecord.getRefType())
                        .map(RefType::getName)
                        .map(EndnoteXmlImporter::convertRefNameToType)
                        .orElse(StandardEntryType.Article);
     }
 
-    private List<LinkedFile> getLinkedFiles(Record record) {
-        Optional<PdfUrls> urls = Optional.ofNullable(record.getUrls())
+    private List<LinkedFile> getLinkedFiles(Record endNoteRecord) {
+        Optional<PdfUrls> urls = Optional.ofNullable(endNoteRecord.getUrls())
                                          .map(Urls::getPdfUrls);
         return OptionalUtil.toStream(urls)
                            .flatMap(pdfUrls -> pdfUrls.getUrl().stream())
@@ -262,8 +262,8 @@ private List<LinkedFile> getLinkedFiles(Record record) {
                            .collect(Collectors.toList());
     }
 
-    private Optional<String> getUrl(Record record) {
-        Optional<RelatedUrls> urls = Optional.ofNullable(record.getUrls())
+    private Optional<String> getUrl(Record endNoteRecord) {
+        Optional<RelatedUrls> urls = Optional.ofNullable(endNoteRecord.getUrls())
                                              .map(Urls::getRelatedUrls);
         return OptionalUtil.toStream(urls)
                            .flatMap(url -> url.getUrl().stream())
@@ -302,23 +302,22 @@ private Optional<String> getUrlValue(Url url) {
         return ret;
     }
 
-    private List<String> getKeywords(Record record) {
-        Keywords keywords = record.getKeywords();
+    private List<String> getKeywords(Record endNoteRecord) {
+        Keywords keywords = endNoteRecord.getKeywords();
         if (keywords != null) {
-
             return keywords.getKeyword()
                            .stream()
                            .map(keyword -> keyword.getStyle())
                            .filter(Objects::nonNull)
-                           .map(style->style.getContent())
+                           .map(style -> style.getContent())
                            .collect(Collectors.toList());
         } else {
             return Collections.emptyList();
         }
     }
 
-    private String getAuthors(Record record) {
-        Optional<Authors> authors = Optional.ofNullable(record.getContributors())
+    private String getAuthors(Record endNoteRecord) {
+        Optional<Authors> authors = Optional.ofNullable(endNoteRecord.getContributors())
                                             .map(Contributors::getAuthors);
         return OptionalUtil.toStream(authors)
                            .flatMap(value -> value.getAuthor().stream())
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/GvkParser.java b/src/main/java/org/jabref/logic/importer/fileformat/GvkParser.java
index 6dc44d0ed67..5837bdf0e34 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/GvkParser.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/GvkParser.java
@@ -57,8 +57,8 @@ private List<BibEntry> parseEntries(Document content) {
             return result;
         }
         List<Element> records = getChildren("zs:record", srwrecords);
-        for (Element record : records) {
-            Element e = getChild("zs:recordData", record);
+        for (Element gvkRecord : records) {
+            Element e = getChild("zs:recordData", gvkRecord);
             if (e != null) {
                 e = getChild("record", e);
                 if (e != null) {
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/IsiImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/IsiImporter.java
index 6f34fada79a..2845756b770 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/IsiImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/IsiImporter.java
@@ -74,7 +74,6 @@ public boolean isRecognizedFormat(BufferedReader reader) throws IOException {
         String str;
         int i = 0;
         while (((str = reader.readLine()) != null) && (i < 50)) {
-
             /*
              * The following line gives false positives for RIS files, so it
              * should not be uncommented. The hypen is a characteristic of the
@@ -92,17 +91,14 @@ public boolean isRecognizedFormat(BufferedReader reader) throws IOException {
     }
 
     public static void processSubSup(Map<Field, String> map) {
-
         Field[] subsup = {StandardField.TITLE, StandardField.ABSTRACT, StandardField.REVIEW, new UnknownField("notes")};
 
         for (Field aSubsup : subsup) {
             if (map.containsKey(aSubsup)) {
-
                 Matcher m = IsiImporter.SUB_SUP_PATTERN.matcher(map.get(aSubsup));
                 StringBuilder sb = new StringBuilder();
 
                 while (m.find()) {
-
                     String group2 = m.group(2);
                     group2 = group2.replaceAll("\\$", "\\\\\\\\\\\\\\$"); // Escaping
                     // insanity!
@@ -123,13 +119,10 @@ public static void processSubSup(Map<Field, String> map) {
     }
 
     private static void processCapitalization(Map<Field, String> map) {
-
         Field[] subsup = {StandardField.TITLE, StandardField.JOURNAL, StandardField.PUBLISHER};
 
         for (Field aSubsup : subsup) {
-
             if (map.containsKey(aSubsup)) {
-
                 String s = map.get(aSubsup);
                 if (s.toUpperCase(Locale.ROOT).equals(s)) {
                     s = new TitleCaseFormatter().format(s);
@@ -288,7 +281,7 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
                     if ("ER".equals(beg) || "EF".equals(beg) || "VR".equals(beg) || "FN".equals(beg)) {
                         continue;
                     }
-                    hm.put(FieldFactory.parseField(beg), value);
+                    hm.put(FieldFactory.parseField(type, beg), value);
                 }
             }
 
@@ -364,7 +357,6 @@ static String parseMonth(String value) {
      * Fixed bug from: http://sourceforge.net/tracker/index.php?func=detail&aid=1542552&group_id=92314&atid=600306
      */
     public static String isiAuthorConvert(String author) {
-
         String[] s = author.split(",");
         if (s.length != 2) {
             return author;
@@ -380,7 +372,6 @@ public static String isiAuthorConvert(String author) {
         String[] firstParts = first.split("\\s+");
 
         for (int i = 0; i < firstParts.length; i++) {
-
             first = firstParts[i];
 
             // Do we have only uppercase chars?
@@ -404,7 +395,6 @@ public static String isiAuthorConvert(String author) {
     }
 
     private static String[] isiAuthorsConvert(String[] authors) {
-
         String[] result = new String[authors.length];
         for (int i = 0; i < result.length; i++) {
             result[i] = IsiImporter.isiAuthorConvert(authors[i]);
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/MedlineImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/MedlineImporter.java
index e3a04dacca8..b9e9eac39d4 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/MedlineImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/MedlineImporter.java
@@ -15,10 +15,6 @@
 import java.util.Objects;
 import java.util.Optional;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Unmarshaller;
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
@@ -84,6 +80,10 @@
 import org.jabref.model.strings.StringUtil;
 
 import com.google.common.base.Joiner;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Unmarshaller;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -129,7 +129,6 @@ public boolean isRecognizedFormat(BufferedReader reader) throws IOException {
         String str;
         int i = 0;
         while (((str = reader.readLine()) != null) && (i < 50)) {
-
             if (str.toLowerCase(ENGLISH).contains("<pubmedarticle>")
                     || str.toLowerCase(ENGLISH).contains("<pubmedbookarticle>")) {
                 return true;
@@ -426,7 +425,7 @@ private void addArticleIdList(Map<Field, String> fields, ArticleIdList articleId
                 if ("pubmed".equals(id.getIdType())) {
                     fields.put(StandardField.PMID, id.getContent());
                 } else {
-                    fields.put(FieldFactory.parseField(id.getIdType()), id.getContent());
+                    fields.put(FieldFactory.parseField(StandardEntryType.Article, id.getIdType()), id.getContent());
                 }
             }
         }
@@ -500,7 +499,7 @@ private void addKeyWords(Map<Field, String> fields, List<KeywordList> allKeyword
     private void addOtherId(Map<Field, String> fields, List<OtherID> otherID) {
         for (OtherID id : otherID) {
             if ((id.getSource() != null) && (id.getContent() != null)) {
-                fields.put(FieldFactory.parseField(id.getSource()), id.getContent());
+                fields.put(FieldFactory.parseField(StandardEntryType.Article, id.getSource()), id.getContent());
             }
         }
     }
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/MedlinePlainImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/MedlinePlainImporter.java
index e71032b6cda..b5ce8310ede 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/MedlinePlainImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/MedlinePlainImporter.java
@@ -80,7 +80,6 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
                                         .split("\\n\\n");
 
         for (String entry1 : entries) {
-
             if (entry1.trim().isEmpty() || !entry1.contains("-")) {
                 continue;
             }
@@ -94,7 +93,6 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
             String[] lines = entry1.split("\n");
 
             for (int j = 0; j < lines.length; j++) {
-
                 StringBuilder current = new StringBuilder(lines[j]);
                 boolean done = false;
 
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 3d0fcff7ad4..69ebd404f14 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/ModsImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/ModsImporter.java
@@ -15,11 +15,6 @@
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Unmarshaller;
-
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.Importer;
 import org.jabref.logic.importer.ParseException;
@@ -63,6 +58,10 @@
 import org.jabref.model.entry.types.EntryTypeFactory;
 
 import com.google.common.base.Joiner;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Unmarshaller;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -149,7 +148,6 @@ private void parseModsGroup(Map<Field, String> fields, List<Object> modsGroup, B
         List<String> notes = new ArrayList<>();
 
         for (Object groupElement : modsGroup) {
-
             // Get the element. Only one of the elements should be not an empty optional.
             Optional<AbstractDefinition> abstractDefinition = getElement(groupElement, AbstractDefinition.class);
             Optional<GenreDefinition> genreDefinition = getElement(groupElement, GenreDefinition.class);
@@ -196,7 +194,6 @@ private void parseModsGroup(Map<Field, String> fields, List<Object> modsGroup, B
             identifierDefinition.ifPresent(identifier -> parseIdentifier(fields, identifier, entry));
 
             titleInfoDefinition.ifPresent(titleInfo -> parseTitle(fields, titleInfo.getTitleOrSubTitleOrPartNumber()));
-
         }
 
         // The element subject can appear more than one time, that's why the keywords has to be put out of the for loop
@@ -204,7 +201,6 @@ private void parseModsGroup(Map<Field, String> fields, List<Object> modsGroup, B
         // same goes for authors and notes
         putIfListIsNotEmpty(fields, authors, StandardField.AUTHOR, " and ");
         putIfListIsNotEmpty(fields, notes, StandardField.NOTE, ", ");
-
     }
 
     private void parseTitle(Map<Field, String> fields, List<Object> titleOrSubTitleOrPartNumber) {
@@ -395,7 +391,6 @@ private void putPublisherOrEdition(Map<Field, String> fields, String elementName
     private void putDate(Map<Field, String> fields, String elementName, DateDefinition date) {
         if (date.getValue() != null) {
             switch (elementName) {
-
                 case "dateIssued":
                     // The first 4 digits of dateIssued should be the year
                     fields.put(StandardField.YEAR, date.getValue().replaceAll("[^0-9]*", "").replaceAll("\\(\\d?\\d?\\d?\\d?.*\\)", "\1"));
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/MrDLibImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/MrDLibImporter.java
index 413964a567a..5e331ca0716 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/MrDLibImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/MrDLibImporter.java
@@ -71,6 +71,7 @@ public String getDescription() {
 
     /**
      * Convert Buffered Reader response to string for JSON parsing.
+     *
      * @param input Takes a BufferedReader with a reference to the JSON document delivered by mdl server.
      * @return Returns an String containing the JSON document.
      * @throws IOException
@@ -104,8 +105,8 @@ public RankedBibEntry(BibEntry entry, Integer rank) {
 
     /**
      * Parses the input from the server to a ParserResult
+     *
      * @param input A BufferedReader with a reference to a string with the server's response
-     * @throws IOException
      */
     private void parse(BufferedReader input) throws IOException {
         // The Bibdatabase that gets returned in the ParserResult.
@@ -141,6 +142,7 @@ private void parse(BufferedReader input) throws IOException {
 
     /**
      * Parses the JSON recommendations into bib entries
+     *
      * @param recommendation JSON object of a single recommendation returned by Mr. DLib
      * @return A ranked bib entry created from the recommendation input
      */
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/MsBibImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/MsBibImporter.java
index 11e39b19f88..31863a621eb 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/MsBibImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/MsBibImporter.java
@@ -43,7 +43,6 @@ public boolean isRecognizedFormat(BufferedReader reader) throws IOException {
         try {
             DocumentBuilder dbuild = makeSafeDocBuilderFactory(DocumentBuilderFactory.newInstance()).newDocumentBuilder();
             dbuild.setErrorHandler(new ErrorHandler() {
-
                 @Override
                 public void warning(SAXParseException exception) throws SAXException {
                     // ignore warnings
@@ -93,6 +92,7 @@ public String getDescription() {
     /**
      * DocumentBuilderFactory makes a XXE safe Builder factory from dBuild. If not supported by current
      * XML then returns original builder given and logs error.
+     *
      * @param dBuild | DocumentBuilderFactory to be made XXE safe.
      * @return If supported, XXE safe DocumentBuilderFactory. Else, returns original builder given
      */
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/OvidImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/OvidImporter.java
index 6c598885209..8622d0f2efb 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/OvidImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/OvidImporter.java
@@ -67,11 +67,9 @@ public boolean isRecognizedFormat(BufferedReader reader) throws IOException {
         String str;
         int i = 0;
         while (((str = reader.readLine()) != null) && (i < MAX_ITEMS)) {
-
             if (OvidImporter.OVID_PATTERN.matcher(str).find()) {
                 return true;
             }
-
             i++;
         }
         return false;
@@ -111,7 +109,6 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
                     content = content.substring(0, content.length() - 1);
                 }
                 if (isAuthor) {
-
                     h.put(StandardField.AUTHOR, content);
                 } else if (fieldName.startsWith("Title")) {
                     content = content.replaceAll("\\[.+\\]", "").trim();
@@ -135,7 +132,6 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
                         h.put(StandardField.PAGES, matcher.group(3));
                         h.put(StandardField.YEAR, matcher.group(4));
                     } else if ((matcher = OvidImporter.OVID_SOURCE_PATTERN_2.matcher(content)).find()) {
-
                         h.put(StandardField.JOURNAL, matcher.group(1));
                         h.put(StandardField.VOLUME, matcher.group(2));
                         h.put(StandardField.ISSUE, matcher.group(3));
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/PdfContentImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/PdfContentImporter.java
index f9f6cd9ed74..c90e495ae34 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/PdfContentImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/PdfContentImporter.java
@@ -3,7 +3,6 @@
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.StringWriter;
-import java.nio.charset.Charset;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Locale;
@@ -199,9 +198,9 @@ public ParserResult importDatabase(String data) throws IOException {
     }
 
     @Override
-    public ParserResult importDatabase(Path filePath, Charset defaultEncoding) {
+    public ParserResult importDatabase(Path filePath) {
         final ArrayList<BibEntry> result = new ArrayList<>(1);
-        try (PDDocument document = XmpUtilReader.loadWithAutomaticDecryption(filePath)) {
+        try (PDDocument document = new XmpUtilReader().loadWithAutomaticDecryption(filePath)) {
             String firstPageContents = getFirstPageContents(document);
             Optional<BibEntry> entry = getEntryFromPDFContent(firstPageContents, OS.NEWLINE);
             entry.ifPresent(result::add);
@@ -217,7 +216,6 @@ public ParserResult importDatabase(Path filePath, Charset defaultEncoding) {
 
     // make this method package visible so we can test it
     Optional<BibEntry> getEntryFromPDFContent(String firstpageContents, String lineSeparator) {
-
         // idea: split[] contains the different lines
         // blocks are separated by empty lines
         // treat each block
@@ -606,5 +604,4 @@ public StandardFileType getFileType() {
     public String getDescription() {
         return "PdfContentImporter parses data of the first page of the PDF and creates a BibTeX entry. Currently, Springer and IEEE formats are supported.";
     }
-
 }
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/PdfEmbeddedBibFileImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/PdfEmbeddedBibFileImporter.java
index f6e6b0ba4f4..73eb86a0789 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/PdfEmbeddedBibFileImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/PdfEmbeddedBibFileImporter.java
@@ -2,7 +2,6 @@
 
 import java.io.BufferedReader;
 import java.io.IOException;
-import java.nio.charset.Charset;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
@@ -64,8 +63,8 @@ public ParserResult importDatabase(String data) throws IOException {
     }
 
     @Override
-    public ParserResult importDatabase(Path filePath, Charset defaultEncoding) {
-        try (PDDocument document = XmpUtilReader.loadWithAutomaticDecryption(filePath)) {
+    public ParserResult importDatabase(Path filePath) {
+        try (PDDocument document = new XmpUtilReader().loadWithAutomaticDecryption(filePath)) {
             return new ParserResult(getEmbeddedBibFileEntries(document));
         } catch (EncryptedPdfsNotSupportedException e) {
             return ParserResult.fromErrorMessage(Localization.lang("Decryption not supported."));
@@ -164,5 +163,4 @@ public StandardFileType getFileType() {
     public String getDescription() {
         return "PdfEmbeddedBibFileImporter imports an embedded Bib-File from the PDF.";
     }
-
 }
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/PdfGrobidImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/PdfGrobidImporter.java
index 6b680640d1a..bb013d58118 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/PdfGrobidImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/PdfGrobidImporter.java
@@ -2,7 +2,6 @@
 
 import java.io.BufferedReader;
 import java.io.IOException;
-import java.nio.charset.Charset;
 import java.nio.file.Path;
 import java.util.List;
 import java.util.Objects;
@@ -10,7 +9,6 @@
 
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.Importer;
-import org.jabref.logic.importer.ImporterPreferences;
 import org.jabref.logic.importer.ParserResult;
 import org.jabref.logic.importer.util.GrobidService;
 import org.jabref.logic.util.StandardFileType;
@@ -26,8 +24,8 @@ public class PdfGrobidImporter extends Importer {
     private final GrobidService grobidService;
     private final ImportFormatPreferences importFormatPreferences;
 
-    public PdfGrobidImporter(ImporterPreferences importerPreferences, ImportFormatPreferences importFormatPreferences) {
-        this.grobidService = new GrobidService(importerPreferences);
+    public PdfGrobidImporter(ImportFormatPreferences importFormatPreferences) {
+        this.grobidService = new GrobidService(importFormatPreferences.getGrobidPreferences());
         this.importFormatPreferences = importFormatPreferences;
     }
 
@@ -58,7 +56,7 @@ public ParserResult importDatabase(String data) throws IOException {
     }
 
     @Override
-    public ParserResult importDatabase(Path filePath, Charset defaultEncoding) {
+    public ParserResult importDatabase(Path filePath) {
         Objects.requireNonNull(filePath);
         try {
             List<BibEntry> result = grobidService.processPDF(filePath, importFormatPreferences);
@@ -80,7 +78,7 @@ public boolean isRecognizedFormat(BufferedReader reader) throws IOException {
      * contains at least one BibEntry.
      */
     @Override
-    public boolean isRecognizedFormat(Path filePath, Charset defaultEncoding) throws IOException {
+    public boolean isRecognizedFormat(Path filePath) throws IOException {
         Objects.requireNonNull(filePath);
         Optional<String> extension = FileHelper.getFileExtension(filePath);
         if (extension.isEmpty()) {
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/PdfMergeMetadataImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/PdfMergeMetadataImporter.java
index 9d8e62cd08a..54361405566 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/PdfMergeMetadataImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/PdfMergeMetadataImporter.java
@@ -2,7 +2,6 @@
 
 import java.io.BufferedReader;
 import java.io.IOException;
-import java.nio.charset.Charset;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
@@ -16,7 +15,6 @@
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.Importer;
-import org.jabref.logic.importer.ImporterPreferences;
 import org.jabref.logic.importer.ParserResult;
 import org.jabref.logic.importer.fetcher.DoiFetcher;
 import org.jabref.logic.importer.fetcher.IsbnFetcher;
@@ -42,13 +40,13 @@ public class PdfMergeMetadataImporter extends Importer {
     private final List<Importer> metadataImporters;
     private final ImportFormatPreferences importFormatPreferences;
 
-    public PdfMergeMetadataImporter(ImporterPreferences importerPreferences, ImportFormatPreferences importFormatPreferences) {
+    public PdfMergeMetadataImporter(ImportFormatPreferences importFormatPreferences) {
         this.importFormatPreferences = importFormatPreferences;
         this.metadataImporters = new ArrayList<>();
         this.metadataImporters.add(new PdfVerbatimBibTextImporter(importFormatPreferences));
         this.metadataImporters.add(new PdfEmbeddedBibFileImporter(importFormatPreferences));
-        if (importerPreferences.isGrobidEnabled()) {
-            this.metadataImporters.add(new PdfGrobidImporter(importerPreferences, importFormatPreferences));
+        if (importFormatPreferences.getGrobidPreferences().isGrobidEnabled()) {
+            this.metadataImporters.add(new PdfGrobidImporter(importFormatPreferences));
         }
         this.metadataImporters.add(new PdfXmpImporter(importFormatPreferences.getXmpPreferences()));
         this.metadataImporters.add(new PdfContentImporter(importFormatPreferences));
@@ -74,11 +72,11 @@ public ParserResult importDatabase(String data) throws IOException {
     }
 
     @Override
-    public ParserResult importDatabase(Path filePath, Charset defaultEncoding) throws IOException {
+    public ParserResult importDatabase(Path filePath) throws IOException {
         List<BibEntry> candidates = new ArrayList<>();
 
         for (Importer metadataImporter : metadataImporters) {
-            List<BibEntry> extractedEntries = metadataImporter.importDatabase(filePath, defaultEncoding).getDatabase().getEntries();
+            List<BibEntry> extractedEntries = metadataImporter.importDatabase(filePath).getDatabase().getEntries();
             if (extractedEntries.size() == 0) {
                 continue;
             }
@@ -149,13 +147,11 @@ public static class EntryBasedFetcherWrapper extends PdfMergeMetadataImporter im
         private static final Logger LOGGER = LoggerFactory.getLogger(DefaultInjector.class);
         private final FilePreferences filePreferences;
         private final BibDatabaseContext databaseContext;
-        private final Charset defaultEncoding;
 
-        public EntryBasedFetcherWrapper(ImporterPreferences importerPreferences, ImportFormatPreferences importFormatPreferences, FilePreferences filePreferences, BibDatabaseContext context, Charset defaultEncoding) {
-            super(importerPreferences, importFormatPreferences);
+        public EntryBasedFetcherWrapper(ImportFormatPreferences importFormatPreferences, FilePreferences filePreferences, BibDatabaseContext context) {
+            super(importFormatPreferences);
             this.filePreferences = filePreferences;
             this.databaseContext = context;
-            this.defaultEncoding = defaultEncoding;
         }
 
         @Override
@@ -164,7 +160,7 @@ public List<BibEntry> performSearch(BibEntry entry) throws FetcherException {
                 Optional<Path> filePath = file.findIn(databaseContext, filePreferences);
                 if (filePath.isPresent()) {
                     try {
-                        ParserResult result = importDatabase(filePath.get(), defaultEncoding);
+                        ParserResult result = importDatabase(filePath.get());
                         if (!result.isEmpty()) {
                             return result.getDatabase().getEntries();
                         }
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/PdfVerbatimBibTextImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/PdfVerbatimBibTextImporter.java
index 60405b76f33..aa16875ecf2 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/PdfVerbatimBibTextImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/PdfVerbatimBibTextImporter.java
@@ -3,7 +3,6 @@
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.StringWriter;
-import java.nio.charset.Charset;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
@@ -55,9 +54,9 @@ public ParserResult importDatabase(String data) throws IOException {
     }
 
     @Override
-    public ParserResult importDatabase(Path filePath, Charset defaultEncoding) {
+    public ParserResult importDatabase(Path filePath) {
         List<BibEntry> result = new ArrayList<>(1);
-        try (PDDocument document = XmpUtilReader.loadWithAutomaticDecryption(filePath)) {
+        try (PDDocument document = new XmpUtilReader().loadWithAutomaticDecryption(filePath)) {
             String firstPageContents = getFirstPageContents(document);
             BibtexParser parser = new BibtexParser(importFormatPreferences, new DummyFileUpdateMonitor());
             result = parser.parseEntries(firstPageContents);
@@ -99,5 +98,4 @@ public StandardFileType getFileType() {
     public String getDescription() {
         return "PdfVerbatimBibTextImporter imports a verbatim BibTeX entry from the first page of the PDF.";
     }
-
 }
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/PdfXmpImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/PdfXmpImporter.java
index ff653e81028..0b8fe47c3dc 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/PdfXmpImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/PdfXmpImporter.java
@@ -2,7 +2,6 @@
 
 import java.io.BufferedReader;
 import java.io.IOException;
-import java.nio.charset.Charset;
 import java.nio.file.Path;
 import java.util.Objects;
 
@@ -52,10 +51,10 @@ public ParserResult importDatabase(String data) throws IOException {
     }
 
     @Override
-    public ParserResult importDatabase(Path filePath, Charset defaultEncoding) {
+    public ParserResult importDatabase(Path filePath) {
         Objects.requireNonNull(filePath);
         try {
-            return new ParserResult(XmpUtilReader.readXmp(filePath, xmpPreferences));
+            return new ParserResult(new XmpUtilReader().readXmp(filePath, xmpPreferences));
         } catch (IOException exception) {
             return ParserResult.fromError(exception);
         }
@@ -72,7 +71,7 @@ public boolean isRecognizedFormat(BufferedReader reader) throws IOException {
      * contains at least one BibEntry.
      */
     @Override
-    public boolean isRecognizedFormat(Path filePath, Charset defaultEncoding) throws IOException {
+    public boolean isRecognizedFormat(Path filePath) throws IOException {
         Objects.requireNonNull(filePath);
         return XmpUtilShared.hasMetadata(filePath, xmpPreferences);
     }
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/RepecNepImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/RepecNepImporter.java
index f8281228e24..3e3e62f183b 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/RepecNepImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/RepecNepImporter.java
@@ -250,7 +250,6 @@ private void parseAuthors(BibEntry be, BufferedReader in) throws IOException {
         List<String> authors = new ArrayList<>();
         StringBuilder institutions = new StringBuilder();
         while ((this.lastLine != null) && !"".equals(this.lastLine) && !startsWithKeyword(RepecNepImporter.RECOGNIZED_FIELDS)) {
-
             // read single author
             String author;
             StringBuilder institution = new StringBuilder();
@@ -323,7 +322,6 @@ private void parseAdditionalFields(BibEntry be, boolean multilineUrlFieldAllowed
 
         // read other fields
         while ((this.lastLine != null) && !isStartOfWorkingPaper() && (startsWithKeyword(RepecNepImporter.RECOGNIZED_FIELDS) || "".equals(this.lastLine))) {
-
             // if multiple lines for a field are allowed and field consists of multiple lines, join them
             String keyword = "".equals(this.lastLine) ? "" : this.lastLine.substring(0, this.lastLine.indexOf(':')).trim();
             // skip keyword
@@ -379,7 +377,6 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
         try {
             readLine(reader); // skip header and editor information
             while (this.lastLine != null) {
-
                 if (this.lastLine.startsWith("-----------------------------")) {
                     this.inOverviewSection = this.preLine.startsWith("In this issue we have");
                 }
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/RisImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/RisImporter.java
index e098cd1ab96..adbf3d1bccb 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/RisImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/RisImporter.java
@@ -68,7 +68,6 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
         List<String> dateTags = Arrays.asList("Y1", "PY", "DA", "Y2");
 
         for (String entry1 : entries) {
-
             String dateTag = "";
             String dateValue = "";
             int datePriority = dateTags.size();
@@ -205,7 +204,6 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
                     } else if ("UR".equals(tag) || "L2".equals(tag) || "LK".equals(tag)) {
                         fields.put(StandardField.URL, value);
                     } else if (((tagPriority = dateTags.indexOf(tag)) != -1) && (value.length() >= 4)) {
-
                         if (tagPriority < datePriority) {
                             String year = value.substring(0, 4);
 
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/SilverPlatterImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/SilverPlatterImporter.java
index 254ba7cda3c..b570b5cc94c 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/SilverPlatterImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/SilverPlatterImporter.java
@@ -50,7 +50,6 @@ public boolean isRecognizedFormat(BufferedReader reader) throws IOException {
         // accepting the Inspec format. Then we look for the title entry.
         String str;
         while ((str = reader.readLine()) != null) {
-
             if (START_PATTERN.matcher(str).find()) {
                 return false; // This is an Inspec file, so return false.
             }
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/mods/package-info.java b/src/main/java/org/jabref/logic/importer/fileformat/mods/package-info.java
index 26a23b3e107..df69c725ce1 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/mods/package-info.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/mods/package-info.java
@@ -7,8 +7,7 @@
 
 // This needs to be in the src/main/java to ensure that the Namespace is mapped to the prefix "mods"
 // this cannot be done by a gradle task at the moment
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.loc.gov/mods/v3", xmlns = {
-        @XmlNs(prefix = "mods", namespaceURI = "http://www.loc.gov/mods/v3")}, elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://www.loc.gov/mods/v3", xmlns = {
+        @jakarta.xml.bind.annotation.XmlNs(prefix = "mods", namespaceURI = "http://www.loc.gov/mods/v3")}, elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package org.jabref.logic.importer.fileformat.mods;
 
-import javax.xml.bind.annotation.XmlNs;
diff --git a/src/main/java/org/jabref/logic/importer/util/GrobidService.java b/src/main/java/org/jabref/logic/importer/util/GrobidService.java
index f781fa71892..f824b351d4f 100644
--- a/src/main/java/org/jabref/logic/importer/util/GrobidService.java
+++ b/src/main/java/org/jabref/logic/importer/util/GrobidService.java
@@ -7,8 +7,8 @@
 import java.util.Optional;
 
 import org.jabref.logic.importer.ImportFormatPreferences;
-import org.jabref.logic.importer.ImporterPreferences;
 import org.jabref.logic.importer.ParseException;
+import org.jabref.logic.importer.fetcher.GrobidPreferences;
 import org.jabref.logic.importer.fileformat.BibtexParser;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.util.DummyFileUpdateMonitor;
@@ -30,7 +30,7 @@ public class GrobidService {
 
     public enum ConsolidateCitations {
         NO(0), WITH_METADATA(1), WITH_DOI_ONLY(2);
-        private int code;
+        private final int code;
 
         ConsolidateCitations(int code) {
             this.code = code;
@@ -41,11 +41,11 @@ public int getCode() {
         }
     }
 
-    private final ImporterPreferences importerPreferences;
+    private final GrobidPreferences grobidPreferences;
 
-    public GrobidService(ImporterPreferences importerPreferences) {
-        this.importerPreferences = importerPreferences;
-        if (!importerPreferences.isGrobidEnabled()) {
+    public GrobidService(GrobidPreferences grobidPreferences) {
+        this.grobidPreferences = grobidPreferences;
+        if (!grobidPreferences.isGrobidEnabled()) {
             throw new UnsupportedOperationException("Grobid was used but not enabled.");
         }
     }
@@ -57,7 +57,7 @@ public GrobidService(ImporterPreferences importerPreferences) {
      * @throws IOException if an I/O exception during the call occurred or no BibTeX entry could be determined
      */
     public Optional<BibEntry> processCitation(String rawCitation, ImportFormatPreferences importFormatPreferences, ConsolidateCitations consolidateCitations) throws IOException, ParseException {
-        Connection.Response response = Jsoup.connect(importerPreferences.getGrobidURL() + "/api/processCitation")
+        Connection.Response response = Jsoup.connect(grobidPreferences.getGrobidURL() + "/api/processCitation")
                 .header("Accept", MediaTypes.APPLICATION_BIBTEX)
                 .data("citations", rawCitation)
                 .data("consolidateCitations", String.valueOf(consolidateCitations.getCode()))
@@ -75,7 +75,7 @@ public Optional<BibEntry> processCitation(String rawCitation, ImportFormatPrefer
     }
 
     public List<BibEntry> processPDF(Path filePath, ImportFormatPreferences importFormatPreferences) throws IOException, ParseException {
-        Connection.Response response = Jsoup.connect(importerPreferences.getGrobidURL() + "/api/processHeaderDocument")
+        Connection.Response response = Jsoup.connect(grobidPreferences.getGrobidURL() + "/api/processHeaderDocument")
                 .header("Accept", MediaTypes.APPLICATION_BIBTEX)
                 .data("input", filePath.toString(), Files.newInputStream(filePath))
                 .method(Connection.Method.POST)
diff --git a/src/main/java/org/jabref/logic/importer/util/JsonReader.java b/src/main/java/org/jabref/logic/importer/util/JsonReader.java
index 60652696b6a..080d2994b23 100644
--- a/src/main/java/org/jabref/logic/importer/util/JsonReader.java
+++ b/src/main/java/org/jabref/logic/importer/util/JsonReader.java
@@ -6,6 +6,7 @@
 import org.jabref.logic.importer.ParseException;
 
 import com.google.common.base.Charsets;
+import kong.unirest.json.JSONArray;
 import kong.unirest.json.JSONException;
 import kong.unirest.json.JSONObject;
 
@@ -31,4 +32,16 @@ public static JSONObject toJsonObject(InputStream inputStream) throws ParseExcep
             throw new ParseException(e);
         }
     }
+
+    public static JSONArray toJsonArray(InputStream stream) throws ParseException {
+        try {
+            String inpStr = new String((stream.readAllBytes()), Charsets.UTF_8);
+            if (inpStr.isBlank()) {
+                return new JSONArray();
+            }
+            return new JSONArray(inpStr);
+        } catch (IOException | JSONException e) {
+            throw new ParseException(e);
+        }
+    }
 }
diff --git a/src/main/java/org/jabref/logic/importer/util/MetaDataParser.java b/src/main/java/org/jabref/logic/importer/util/MetaDataParser.java
index e6ac1eb1da1..5f3d5e29c52 100644
--- a/src/main/java/org/jabref/logic/importer/util/MetaDataParser.java
+++ b/src/main/java/org/jabref/logic/importer/util/MetaDataParser.java
@@ -65,6 +65,7 @@ public MetaData parse(MetaData metaData, Map<String, String> data, Character key
                 String user = entry.getKey().substring(MetaData.FILE_DIRECTORY.length() + 1);
                 metaData.setUserFileDirectory(user, getSingleItem(value));
             } else if (entry.getKey().startsWith(MetaData.SELECTOR_META_PREFIX)) {
+                // edge case, it might be one special field e.g. article from biblatex-apa, but we can't distinguish this from any other field and rather prefer to handle it as UnknownField
                 metaData.addContentSelector(ContentSelectors.parse(FieldFactory.parseField(entry.getKey().substring(MetaData.SELECTOR_META_PREFIX.length())), StringUtil.unquote(entry.getValue(), MetaData.ESCAPE_CHARACTER)));
             } else if (entry.getKey().startsWith(MetaData.FILE_DIRECTORY + "Latex-")) {
                 // The user name comes directly after "FILE_DIRECTORYLatex-"
@@ -110,6 +111,7 @@ private static Comparator<? super Map.Entry<String, String>> groupsLast() {
     /**
      * Returns the first item in the list.
      * If the specified list does not contain exactly one item, then a {@link ParseException} will be thrown.
+     *
      * @param value
      * @return
      */
diff --git a/src/main/java/org/jabref/logic/integrity/IntegrityCheck.java b/src/main/java/org/jabref/logic/integrity/IntegrityCheck.java
index 389c04b24eb..6de2d71eb4f 100644
--- a/src/main/java/org/jabref/logic/integrity/IntegrityCheck.java
+++ b/src/main/java/org/jabref/logic/integrity/IntegrityCheck.java
@@ -1,6 +1,6 @@
 package org.jabref.logic.integrity;
 
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -21,7 +21,6 @@ public class IntegrityCheck {
     public IntegrityCheck(BibDatabaseContext bibDatabaseContext,
                           FilePreferences filePreferences,
                           CitationKeyPatternPreferences citationKeyPatternPreferences,
-                          Charset defaultEncoding,
                           JournalAbbreviationRepository journalAbbreviationRepository,
                           boolean allowIntegerEdition) {
         this.bibDatabaseContext = bibDatabaseContext;
@@ -43,7 +42,7 @@ public IntegrityCheck(BibDatabaseContext bibDatabaseContext,
         if (bibDatabaseContext.isBiblatexMode()) {
             entryCheckers.addAll(List.of(
                     new JournalInAbbreviationListChecker(StandardField.JOURNALTITLE, journalAbbreviationRepository),
-                    new UTF8Checker(bibDatabaseContext.getMetaData().getEncoding().orElse(defaultEncoding))
+                    new UTF8Checker(bibDatabaseContext.getMetaData().getEncoding().orElse(StandardCharsets.UTF_8))
             ));
         } else {
             entryCheckers.addAll(List.of(
diff --git a/src/main/java/org/jabref/logic/integrity/PagesChecker.java b/src/main/java/org/jabref/logic/integrity/PagesChecker.java
index 187394f404a..d21caa310ff 100644
--- a/src/main/java/org/jabref/logic/integrity/PagesChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/PagesChecker.java
@@ -1,5 +1,6 @@
 package org.jabref.logic.integrity;
 
+import java.util.Arrays;
 import java.util.Optional;
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
@@ -12,27 +13,22 @@ public class PagesChecker implements ValueChecker {
 
     private static final String PAGES_EXP_BIBTEX = ""
             + "\\A"                 // begin String
+            + "[A-Za-z]?\\d*"       // optional prefix and number
             + "("
-            + "[A-Za-z]?\\d*"     // optional prefix and number
-            + "("
-            + "\\+|-{2}"    // separator
-            + "[A-Za-z]?\\d*" // optional prefix and number
+            + "(\\+|-{2}|\u2013)"   // separator, must contain exactly two dashes
+            + "[A-Za-z]?\\d*"       // optional prefix and number
             + ")?"
-            + ",?"                // page range separation
-            + ")*"
             + "\\z";                // end String
 
+    // See https://packages.oth-regensburg.de/ctan/macros/latex/contrib/biblatex/doc/biblatex.pdf#subsubsection.3.15.3 for valid content
     private static final String PAGES_EXP_BIBLATEX = ""
-            + "\\A"                 // begin String
-            + "("
+            + "\\A"               // begin String
             + "[A-Za-z]?\\d*"     // optional prefix and number
             + "("
-            + "\\+|-{1,2}|\u2013" // separator
-            + "[A-Za-z]?\\d*" // optional prefix and number
+            + "(\\+|-{1,2}|\u2013)" // separator
+            + "[A-Za-z]?\\d*"     // optional prefix and number
             + ")?"
-            + ",?"                // page range separation
-            + ")*"
-            + "\\z";                // end String
+            + "\\z";              // end String
 
     private final Predicate<String> isValidPageNumber;
 
@@ -59,10 +55,11 @@ public Optional<String> checkValue(String value) {
             return Optional.empty();
         }
 
-        if (!isValidPageNumber.test(value.trim())) {
+        if (Arrays.stream(value.split(","))
+                .map(String::trim)
+                .anyMatch(pageRange -> !isValidPageNumber.test(pageRange))) {
             return Optional.of(Localization.lang("should contain a valid page number range"));
         }
-
         return Optional.empty();
     }
 }
diff --git a/src/main/java/org/jabref/logic/integrity/UTF8Checker.java b/src/main/java/org/jabref/logic/integrity/UTF8Checker.java
index a5474dd0f46..534b99cd47f 100644
--- a/src/main/java/org/jabref/logic/integrity/UTF8Checker.java
+++ b/src/main/java/org/jabref/logic/integrity/UTF8Checker.java
@@ -52,6 +52,7 @@ public List<IntegrityMessage> check(BibEntry entry) {
      * Check whether a byte array is encoded in UTF-8 charset
      *
      * Use java api decoder and try&catch block to check the charset.
+     *
      * @param data the byte array used to check the encoding charset
      * @return true if is encoded in UTF-8 & false is not encoded in UTF-8
      */
diff --git a/src/main/java/org/jabref/logic/l10n/Language.java b/src/main/java/org/jabref/logic/l10n/Language.java
index 0711cd25d9e..1841d10f73e 100644
--- a/src/main/java/org/jabref/logic/l10n/Language.java
+++ b/src/main/java/org/jabref/logic/l10n/Language.java
@@ -9,7 +9,7 @@
  */
 public enum Language {
 
-    BAHASA_INDONESIA("Bahasa Indonesia", "in"),
+    BAHASA_INDONESIA("Bahasa Indonesia", "id"),
     BRAZILIAN_PORTUGUESE("Brazilian Portuguese", "pt_BR"),
     DANISH("Dansk", "da"),
     GERMAN("Deutsch", "de"),
diff --git a/src/main/java/org/jabref/logic/layout/AbstractParamLayoutFormatter.java b/src/main/java/org/jabref/logic/layout/AbstractParamLayoutFormatter.java
index 44e67a312f7..bbd1344ddf9 100644
--- a/src/main/java/org/jabref/logic/layout/AbstractParamLayoutFormatter.java
+++ b/src/main/java/org/jabref/logic/layout/AbstractParamLayoutFormatter.java
@@ -17,6 +17,7 @@ protected AbstractParamLayoutFormatter() {
     /**
      * Parse an argument string and return the parts of the argument. The parts are
      * separated by commas, and escaped commas are reduced to literal commas.
+     *
      * @param arg The argument string.
      * @return A list of strings representing the parts of the argument.
      */
diff --git a/src/main/java/org/jabref/logic/layout/LayoutEntry.java b/src/main/java/org/jabref/logic/layout/LayoutEntry.java
index 8b3c98edb8d..4b0434adb4b 100644
--- a/src/main/java/org/jabref/logic/layout/LayoutEntry.java
+++ b/src/main/java/org/jabref/logic/layout/LayoutEntry.java
@@ -304,7 +304,6 @@ private String handleFieldOrGroupStart(BibEntry bibtex, BibDatabase database) {
                         }
                     }
                 } else {
-
                     // if previous was skipped --> remove leading line
                     // breaks
                     if (previousSkipped) {
@@ -528,14 +527,12 @@ public List<String> getInvalidFormatters() {
     }
 
     public static List<List<String>> parseMethodsCalls(String calls) {
-
         List<List<String>> result = new ArrayList<>();
 
         char[] c = calls.toCharArray();
 
         int i = 0;
         while (i < c.length) {
-
             int start = i;
             if (Character.isJavaIdentifierStart(c[i])) {
                 i++;
@@ -543,7 +540,6 @@ public static List<List<String>> parseMethodsCalls(String calls) {
                     i++;
                 }
                 if ((i < c.length) && (c[i] == '(')) {
-
                     String method = calls.substring(start, i);
 
                     // Skip the brace
diff --git a/src/main/java/org/jabref/logic/layout/LayoutHelper.java b/src/main/java/org/jabref/logic/layout/LayoutHelper.java
index 1e47272b149..1d522f67eca 100644
--- a/src/main/java/org/jabref/logic/layout/LayoutHelper.java
+++ b/src/main/java/org/jabref/logic/layout/LayoutHelper.java
@@ -175,14 +175,12 @@ private void doBracketedOptionField() throws IOException {
                 }
 
                 if (start) {
-
                     // changed section begin - arudert
                     // keep the backslash so we know wether this is a fieldname or an ordinary parameter
                     // if (c != '\\') {
                     buffer.append((char) c);
                     // }
                     // changed section end - arudert
-
                 }
             }
         }
diff --git a/src/main/java/org/jabref/logic/layout/ParamLayoutFormatter.java b/src/main/java/org/jabref/logic/layout/ParamLayoutFormatter.java
index 946e7f6af81..7e439544cda 100644
--- a/src/main/java/org/jabref/logic/layout/ParamLayoutFormatter.java
+++ b/src/main/java/org/jabref/logic/layout/ParamLayoutFormatter.java
@@ -13,8 +13,8 @@ public interface ParamLayoutFormatter extends LayoutFormatter {
 
     /**
      * Method for setting the argument of this formatter.
+     *
      * @param arg A String argument.
      */
     void setArgument(String arg);
-
 }
diff --git a/src/main/java/org/jabref/logic/layout/format/AuthorAndsCommaReplacer.java b/src/main/java/org/jabref/logic/layout/format/AuthorAndsCommaReplacer.java
index cfd65eb9ea4..da698ee797d 100644
--- a/src/main/java/org/jabref/logic/layout/format/AuthorAndsCommaReplacer.java
+++ b/src/main/java/org/jabref/logic/layout/format/AuthorAndsCommaReplacer.java
@@ -9,7 +9,6 @@ public class AuthorAndsCommaReplacer implements LayoutFormatter {
 
     @Override
     public String format(String fieldText) {
-
         String[] authors = fieldText.split(" and ");
         String s;
 
diff --git a/src/main/java/org/jabref/logic/layout/format/AuthorAndsReplacer.java b/src/main/java/org/jabref/logic/layout/format/AuthorAndsReplacer.java
index 5ecdbb400bb..dfa1b9d155c 100644
--- a/src/main/java/org/jabref/logic/layout/format/AuthorAndsReplacer.java
+++ b/src/main/java/org/jabref/logic/layout/format/AuthorAndsReplacer.java
@@ -13,7 +13,6 @@ public class AuthorAndsReplacer implements LayoutFormatter {
      */
     @Override
     public String format(String fieldText) {
-
         if (fieldText == null) {
             return null;
         }
diff --git a/src/main/java/org/jabref/logic/layout/format/Authors.java b/src/main/java/org/jabref/logic/layout/format/Authors.java
index 3a7a9860ab7..5692470fac3 100644
--- a/src/main/java/org/jabref/logic/layout/format/Authors.java
+++ b/src/main/java/org/jabref/logic/layout/format/Authors.java
@@ -209,6 +209,7 @@ private void handleArgument(String key, String value) {
     /**
      * Check for case-insensitive equality between two strings after removing
      * white space at the beginning and end of the first string.
+     *
      * @param one The first string - whitespace is trimmed
      * @param two The second string
      * @return true if the strings are deemed equal
diff --git a/src/main/java/org/jabref/logic/layout/format/CreateDocBook5Authors.java b/src/main/java/org/jabref/logic/layout/format/CreateDocBook5Authors.java
index 40a42c7e064..f5b17b62987 100644
--- a/src/main/java/org/jabref/logic/layout/format/CreateDocBook5Authors.java
+++ b/src/main/java/org/jabref/logic/layout/format/CreateDocBook5Authors.java
@@ -11,7 +11,6 @@ public class CreateDocBook5Authors implements LayoutFormatter {
 
     @Override
     public String format(String fieldText) {
-
         StringBuilder sb = new StringBuilder(100);
         AuthorList al = AuthorList.parse(fieldText);
 
diff --git a/src/main/java/org/jabref/logic/layout/format/FileLink.java b/src/main/java/org/jabref/logic/layout/format/FileLink.java
index ba784043224..79a5b4b31fc 100644
--- a/src/main/java/org/jabref/logic/layout/format/FileLink.java
+++ b/src/main/java/org/jabref/logic/layout/format/FileLink.java
@@ -68,6 +68,7 @@ public String format(String field) {
     /**
      * This method is called if the layout file specifies an argument for this
      * formatter. We use it as an indicator of which file type we should look for.
+     *
      * @param arg The file type.
      */
     @Override
diff --git a/src/main/java/org/jabref/logic/layout/format/HTMLParagraphs.java b/src/main/java/org/jabref/logic/layout/format/HTMLParagraphs.java
index aaf720865d5..e14028519bd 100644
--- a/src/main/java/org/jabref/logic/layout/format/HTMLParagraphs.java
+++ b/src/main/java/org/jabref/logic/layout/format/HTMLParagraphs.java
@@ -15,7 +15,6 @@ public class HTMLParagraphs implements LayoutFormatter {
 
     @Override
     public String format(String fieldText) {
-
         if (fieldText == null) {
             return fieldText;
         }
diff --git a/src/main/java/org/jabref/logic/layout/format/NameFormatter.java b/src/main/java/org/jabref/logic/layout/format/NameFormatter.java
index 5cf34d59ba8..e8812235435 100644
--- a/src/main/java/org/jabref/logic/layout/format/NameFormatter.java
+++ b/src/main/java/org/jabref/logic/layout/format/NameFormatter.java
@@ -5,7 +5,7 @@
 import java.util.Map;
 import java.util.Objects;
 
-import org.jabref.logic.bst.BibtexNameFormatter;
+import org.jabref.logic.bst.util.BstNameFormatter;
 import org.jabref.logic.layout.LayoutFormatter;
 import org.jabref.model.entry.AuthorList;
 
@@ -79,7 +79,6 @@ public class NameFormatter implements LayoutFormatter {
     private String parameter = NameFormatter.DEFAULT_FORMAT;
 
     private static String format(String toFormat, AuthorList al, String[] formats) {
-
         StringBuilder sb = new StringBuilder();
 
         int n = al.getNumberOfAuthors();
@@ -87,7 +86,7 @@ private static String format(String toFormat, AuthorList al, String[] formats) {
         for (int i = 1; i <= al.getNumberOfAuthors(); i++) {
             for (int j = 1; j < formats.length; j += 2) {
                 if ("*".equals(formats[j])) {
-                    sb.append(BibtexNameFormatter.formatName(toFormat, i, formats[j + 1], null));
+                    sb.append(BstNameFormatter.formatName(toFormat, i, formats[j + 1]));
                     break;
                 } else {
                     String[] range = formats[j].split("\\.\\.");
@@ -113,7 +112,7 @@ private static String format(String toFormat, AuthorList al, String[] formats) {
                     }
 
                     if ((s <= i) && (i <= e)) {
-                        sb.append(BibtexNameFormatter.formatName(toFormat, i, formats[j + 1], null));
+                        sb.append(BstNameFormatter.formatName(toFormat, i, formats[j + 1]));
                         break;
                     }
                 }
diff --git a/src/main/java/org/jabref/logic/layout/format/RTFChars.java b/src/main/java/org/jabref/logic/layout/format/RTFChars.java
index 7fd229e93a4..48e30d5167e 100644
--- a/src/main/java/org/jabref/logic/layout/format/RTFChars.java
+++ b/src/main/java/org/jabref/logic/layout/format/RTFChars.java
@@ -36,7 +36,6 @@ public String format(String field) {
         boolean escaped = false;
         boolean incommand = false;
         for (int i = 0; i < field.length(); i++) {
-
             char c = field.charAt(i);
 
             if (escaped && (c == '\\')) {
diff --git a/src/main/java/org/jabref/logic/layout/format/RemoveWhitespace.java b/src/main/java/org/jabref/logic/layout/format/RemoveWhitespace.java
index 15dc444965e..5e874a6e83c 100644
--- a/src/main/java/org/jabref/logic/layout/format/RemoveWhitespace.java
+++ b/src/main/java/org/jabref/logic/layout/format/RemoveWhitespace.java
@@ -3,7 +3,7 @@
 import org.jabref.logic.layout.LayoutFormatter;
 
 /**
- * Remove non printable character formatter.
+ * Remove non-printable character formatter.
  */
 public class RemoveWhitespace implements LayoutFormatter {
 
diff --git a/src/main/java/org/jabref/logic/layout/format/WrapFileLinks.java b/src/main/java/org/jabref/logic/layout/format/WrapFileLinks.java
index 5baff04a64c..f93c3e097b3 100644
--- a/src/main/java/org/jabref/logic/layout/format/WrapFileLinks.java
+++ b/src/main/java/org/jabref/logic/layout/format/WrapFileLinks.java
@@ -172,7 +172,6 @@ public void setArgument(String arg) {
 
     @Override
     public String format(String field) {
-
         if (field == null) {
             return "";
         }
@@ -185,7 +184,6 @@ public String format(String field) {
         for (LinkedFile flEntry : fileList) {
             // Use this entry if we don't discriminate on types, or if the type fits:
             if ((fileType == null) || flEntry.getFileType().equalsIgnoreCase(fileType)) {
-
                 for (FormatEntry entry : format) {
                     switch (entry.getType()) {
                         case STRING:
diff --git a/src/main/java/org/jabref/logic/layout/format/XMLChars.java b/src/main/java/org/jabref/logic/layout/format/XMLChars.java
index 4a3ada367a7..b7c9f9136e0 100644
--- a/src/main/java/org/jabref/logic/layout/format/XMLChars.java
+++ b/src/main/java/org/jabref/logic/layout/format/XMLChars.java
@@ -25,7 +25,6 @@ public class XMLChars implements LayoutFormatter {
 
     @Override
     public String format(String fieldText) {
-
         if (fieldText == null) {
             return fieldText;
         }
@@ -53,7 +52,6 @@ private static String firstFormat(String s) {
     }
 
     private String restFormat(String toFormat) {
-
         String fieldText = toFormat.replace("}", "").replace("{", "");
 
         // now some copy-paste problems most often occuring in abstracts when
diff --git a/src/main/java/org/jabref/logic/msbib/MSBibEntry.java b/src/main/java/org/jabref/logic/msbib/MSBibEntry.java
index 5a39832fa49..2808d8a0050 100644
--- a/src/main/java/org/jabref/logic/msbib/MSBibEntry.java
+++ b/src/main/java/org/jabref/logic/msbib/MSBibEntry.java
@@ -323,7 +323,6 @@ private void addAuthor(Document document, Element allAuthors, String entryName,
             corporate.setTextContent(person.getFirstLast());
             authorTop.appendChild(corporate);
         } else {
-
             Element nameList = document.createElementNS(MSBibDatabase.NAMESPACE, MSBibDatabase.PREFIX + "NameList");
             for (MsBibAuthor name : authorsLst) {
                 Element person = document.createElementNS(MSBibDatabase.NAMESPACE, MSBibDatabase.PREFIX + "Person");
diff --git a/src/main/java/org/jabref/logic/msbib/MsBibAuthor.java b/src/main/java/org/jabref/logic/msbib/MsBibAuthor.java
index c386e304750..1c1bd488390 100644
--- a/src/main/java/org/jabref/logic/msbib/MsBibAuthor.java
+++ b/src/main/java/org/jabref/logic/msbib/MsBibAuthor.java
@@ -31,7 +31,6 @@ public MsBibAuthor(Author author, boolean isCorporate) {
     }
 
     public String getFirstName() {
-
         if (!"".equals(firstName)) {
             return firstName;
         }
diff --git a/src/main/java/org/jabref/logic/net/ProxyRegisterer.java b/src/main/java/org/jabref/logic/net/ProxyRegisterer.java
index f5e8cc86d14..344f4fd412f 100644
--- a/src/main/java/org/jabref/logic/net/ProxyRegisterer.java
+++ b/src/main/java/org/jabref/logic/net/ProxyRegisterer.java
@@ -21,10 +21,15 @@ public static void register(ProxyPreferences proxyPrefs) {
 
                 System.setProperty("https.proxyUser", proxyPrefs.getUsername());
                 System.setProperty("https.proxyPassword", proxyPrefs.getPassword());
+            } else {
+                System.clearProperty("http.proxyUser");
+                System.clearProperty("http.proxyPassword");
+
+                System.clearProperty("https.proxyUser");
+                System.clearProperty("https.proxyPassword");
             }
         } else {
-            // The following two lines signal that the system proxy settings
-            // should be used:
+            // The following two lines signal that the system proxy settings should be used:
             System.setProperty("java.net.useSystemProxies", "true");
             System.setProperty("proxySet", "true");
         }
diff --git a/src/main/java/org/jabref/logic/net/URLDownload.java b/src/main/java/org/jabref/logic/net/URLDownload.java
index d5d93bd1499..c499dcf3635 100644
--- a/src/main/java/org/jabref/logic/net/URLDownload.java
+++ b/src/main/java/org/jabref/logic/net/URLDownload.java
@@ -40,6 +40,8 @@
 import javax.net.ssl.TrustManager;
 import javax.net.ssl.X509TrustManager;
 
+import org.jabref.logic.importer.FetcherClientException;
+import org.jabref.logic.importer.FetcherServerException;
 import org.jabref.logic.util.io.FileUtil;
 import org.jabref.model.util.FileHelper;
 
@@ -86,7 +88,6 @@ public URLDownload(String source) throws MalformedURLException {
     public URLDownload(URL source) {
         this.source = source;
         this.addHeader("User-Agent", URLDownload.USER_AGENT);
-        bypassSSLVerification();
     }
 
     /**
@@ -99,13 +100,15 @@ public URLDownload(URL source) {
      * security-relevant information this is kind of OK (no, actually it is not...).
      * <p>
      * Taken from http://stackoverflow.com/a/6055903/873661 and https://stackoverflow.com/a/19542614/873661
+     *
+     * @deprecated
      */
+    @Deprecated
     public static void bypassSSLVerification() {
         LOGGER.warn("Fix SSL exceptions by accepting ALL certificates");
 
         // Create a trust manager that does not validate certificate chains
         TrustManager[] trustAllCerts = {new X509TrustManager() {
-
             @Override
             public void checkClientTrusted(X509Certificate[] chain, String authType) {
             }
@@ -325,7 +328,6 @@ public String toString() {
     private void copy(InputStream in, Writer out, Charset encoding) throws IOException {
         Reader r = new InputStreamReader(in, encoding);
         try (BufferedReader read = new BufferedReader(r)) {
-
             String line;
             while ((line = read.readLine()) != null) {
                 out.write(line);
@@ -350,21 +352,23 @@ private URLConnection openConnection() throws IOException {
         if (connection instanceof HttpURLConnection) {
             // normally, 3xx is redirect
             int status = ((HttpURLConnection) connection).getResponseCode();
-            if (status != HttpURLConnection.HTTP_OK) {
-                if ((status == HttpURLConnection.HTTP_MOVED_TEMP)
-                        || (status == HttpURLConnection.HTTP_MOVED_PERM)
-                        || (status == HttpURLConnection.HTTP_SEE_OTHER)) {
-                    // get redirect url from "location" header field
-                    String newUrl = connection.getHeaderField("location");
-                    // open the new connnection again
-                    connection = new URLDownload(newUrl).openConnection();
-                }
+
+            if ((status == HttpURLConnection.HTTP_MOVED_TEMP)
+                    || (status == HttpURLConnection.HTTP_MOVED_PERM)
+                    || (status == HttpURLConnection.HTTP_SEE_OTHER)) {
+                // get redirect url from "location" header field
+                String newUrl = connection.getHeaderField("location");
+                // open the new connection again
+                connection = new URLDownload(newUrl).openConnection();
+            }
+            if ((status >= 400) && (status < 500)) {
+                throw new IOException(new FetcherClientException("Encountered HTTP Status code " + status));
+            }
+            if (status >= 500) {
+                throw new IOException(new FetcherServerException("Encountered HTTP Status Code " + status));
             }
         }
-
         // this does network i/o: GET + read returned headers
-        connection.connect();
-
         return connection;
     }
 
diff --git a/src/main/java/org/jabref/logic/net/ssl/SSLCertificate.java b/src/main/java/org/jabref/logic/net/ssl/SSLCertificate.java
new file mode 100644
index 00000000000..deeca70f806
--- /dev/null
+++ b/src/main/java/org/jabref/logic/net/ssl/SSLCertificate.java
@@ -0,0 +1,99 @@
+package org.jabref.logic.net.ssl;
+
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.nio.file.Path;
+import java.security.cert.CertificateEncodingException;
+import java.security.cert.CertificateException;
+import java.security.cert.CertificateFactory;
+import java.security.cert.X509Certificate;
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.util.Objects;
+import java.util.Optional;
+
+import com.google.common.hash.Hashing;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class SSLCertificate {
+    private static final Logger LOGGER = LoggerFactory.getLogger(SSLCertificate.class);
+
+    private final String sha256Thumbprint;
+    private final String serialNumber;
+    private final String issuer;
+    private final LocalDate validFrom;
+    private final LocalDate validTo;
+    private final String signatureAlgorithm;
+    private final Integer version;
+
+    public SSLCertificate(byte[] encoded, String serialNumber, String issuer, LocalDate validFrom, LocalDate validTo, String signatureAlgorithm, Integer version) {
+        this.serialNumber = serialNumber;
+        this.issuer = issuer;
+        this.validFrom = validFrom;
+        this.validTo = validTo;
+        this.signatureAlgorithm = signatureAlgorithm;
+        this.version = version;
+        this.sha256Thumbprint = Hashing.sha256().hashBytes(encoded).toString();
+    }
+
+    public String getSerialNumber() {
+        return serialNumber;
+    }
+
+    public String getIssuer() {
+        return issuer;
+    }
+
+    public LocalDate getValidFrom() {
+        return validFrom;
+    }
+
+    public LocalDate getValidTo() {
+        return validTo;
+    }
+
+    public String getSignatureAlgorithm() {
+        return signatureAlgorithm;
+    }
+
+    public Integer getVersion() {
+        return version;
+    }
+
+    /**
+     * @return the SHA-256 of the <a href="https://en.wikipedia.org/wiki/X.690#DER_encoding">DER encoding</a>
+     *
+     * */
+    public String getSHA256Thumbprint() {
+        return sha256Thumbprint;
+    }
+
+    public static Optional<SSLCertificate> fromX509(X509Certificate x509Certificate) {
+        Objects.requireNonNull(x509Certificate);
+        try {
+            return Optional.of(new SSLCertificate(x509Certificate.getEncoded(), x509Certificate.getSerialNumber().toString(),
+                    x509Certificate.getIssuerX500Principal().getName(),
+                    LocalDate.ofInstant(x509Certificate.getNotBefore().toInstant(), ZoneId.systemDefault()),
+                    LocalDate.ofInstant(x509Certificate.getNotAfter().toInstant(), ZoneId.systemDefault()),
+                    x509Certificate.getSigAlgName(),
+                    x509Certificate.getVersion()));
+        } catch (CertificateEncodingException e) {
+            LOGGER.warn("Error while encoding certificate", e);
+        }
+        return Optional.empty();
+    }
+
+    public static Optional<SSLCertificate> fromPath(Path certPath) {
+        Objects.requireNonNull(certPath);
+        try {
+            CertificateFactory certificateFactory = CertificateFactory.getInstance("X509");
+            return fromX509((X509Certificate) certificateFactory.generateCertificate(new FileInputStream(certPath.toFile())));
+        } catch (CertificateException e) {
+            LOGGER.warn("Certificate doesn't follow X.509 format", e);
+        } catch (FileNotFoundException e) {
+            LOGGER.warn("Bad Certificate path: {}", certPath, e);
+        }
+        return Optional.empty();
+    }
+}
diff --git a/src/main/java/org/jabref/logic/net/ssl/SSLPreferences.java b/src/main/java/org/jabref/logic/net/ssl/SSLPreferences.java
new file mode 100644
index 00000000000..4489127f356
--- /dev/null
+++ b/src/main/java/org/jabref/logic/net/ssl/SSLPreferences.java
@@ -0,0 +1,20 @@
+package org.jabref.logic.net.ssl;
+
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+
+public class SSLPreferences {
+    private final StringProperty truststorePath;
+
+    public SSLPreferences(String truststorePath) {
+        this.truststorePath = new SimpleStringProperty(truststorePath);
+    }
+
+    public StringProperty truststorePathProperty() {
+        return truststorePath;
+    }
+
+    public String getTruststorePath() {
+        return truststorePath.getValue();
+    }
+}
diff --git a/src/main/java/org/jabref/logic/net/ssl/TrustStoreManager.java b/src/main/java/org/jabref/logic/net/ssl/TrustStoreManager.java
new file mode 100644
index 00000000000..01e71b2d30e
--- /dev/null
+++ b/src/main/java/org/jabref/logic/net/ssl/TrustStoreManager.java
@@ -0,0 +1,153 @@
+package org.jabref.logic.net.ssl;
+
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.security.KeyStore;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.security.cert.CertificateException;
+import java.security.cert.CertificateFactory;
+import java.security.cert.X509Certificate;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class TrustStoreManager {
+    private static final Logger LOGGER = LoggerFactory.getLogger(TrustStoreManager.class);
+    private static final String STORE_PASSWORD = "changeit";
+
+    private final Path storePath;
+
+    private KeyStore store;
+
+    public TrustStoreManager(Path storePath) {
+        this.storePath = storePath;
+        createTruststoreFileIfNotExist(storePath);
+        try {
+            store = KeyStore.getInstance(KeyStore.getDefaultType());
+            store.load(new FileInputStream(storePath.toFile()), STORE_PASSWORD.toCharArray());
+        } catch (CertificateException | IOException | NoSuchAlgorithmException | KeyStoreException e) {
+            LOGGER.warn("Error while loading trust store from: {}", storePath.toAbsolutePath(), e);
+        }
+    }
+
+    public void addCertificate(String alias, Path certPath) {
+        Objects.requireNonNull(alias);
+        Objects.requireNonNull(certPath);
+
+        try {
+            CertificateFactory certificateFactory = CertificateFactory.getInstance("X509");
+            store.setCertificateEntry(alias, certificateFactory.generateCertificate(new FileInputStream(certPath.toFile())));
+        } catch (KeyStoreException | CertificateException | IOException e) {
+            LOGGER.warn("Error while adding a new certificate to the truststore: {}", alias, e);
+        }
+    }
+
+    public void deleteCertificate(String alias) {
+        Objects.requireNonNull(alias);
+        try {
+            store.deleteEntry(alias);
+        } catch (KeyStoreException e) {
+            LOGGER.warn("Error while deleting certificate entry with alias: {}", alias, e);
+        }
+    }
+
+    public boolean isCertificateExist(String alias) {
+        Objects.requireNonNull(alias);
+        try {
+            return store.isCertificateEntry(alias);
+        } catch (KeyStoreException e) {
+            LOGGER.warn("Error while checking certificate existence: {}", alias, e);
+        }
+        return false;
+    }
+
+    public List<String> aliases() {
+        try {
+            return Collections.list(store.aliases());
+        } catch (KeyStoreException e) {
+            LOGGER.warn("Error while reading aliases", e);
+        }
+        return Collections.emptyList();
+    }
+
+    public int certsCount() {
+        try {
+            return store.size();
+        } catch (KeyStoreException e) {
+            LOGGER.warn("Can't count certificates", e);
+        }
+        return 0;
+    }
+
+    public void flush() {
+        try {
+            store.store(new FileOutputStream(storePath.toFile()), STORE_PASSWORD.toCharArray());
+        } catch (KeyStoreException | IOException | NoSuchAlgorithmException | CertificateException e) {
+            LOGGER.warn("Error while flushing trust store", e);
+        }
+    }
+
+    /**
+     * Custom certificates are certificates with alias that ends with {@code [custom]}
+     */
+    private Boolean isCustomCertificate(String alias) {
+        return alias.endsWith("[custom]");
+    }
+
+    /**
+     * Deletes all custom certificates, Custom certificates are certificates with alias that ends with {@code [custom]}
+     */
+    public void clearCustomCertificates() {
+        aliases().stream().filter(this::isCustomCertificate).forEach(this::deleteCertificate);
+        flush();
+    }
+
+    public List<SSLCertificate> getCustomCertificates() {
+        return aliases().stream()
+                        .filter(this::isCustomCertificate)
+                        .map(this::getCertificate)
+                        .map(SSLCertificate::fromX509)
+                        .flatMap(Optional::stream)
+                        .collect(Collectors.toList());
+    }
+
+    public X509Certificate getCertificate(String alias) {
+        try {
+            return (X509Certificate) store.getCertificate(alias);
+        } catch (KeyStoreException e) {
+            LOGGER.warn("Error while getting certificate of alias: {}", alias, e);
+        }
+        return null;
+    }
+
+    /**
+     * This method checks to see if the truststore is present in {@code storePath},
+     * and if it isn't, it copies the default JDK truststore to the specified location.
+     *
+     * @param storePath path of the truststore
+     */
+    public static void createTruststoreFileIfNotExist(Path storePath) {
+        try {
+            LOGGER.info("Trust store path: {}", storePath.toAbsolutePath());
+            Path storeResourcePath = Path.of(TrustStoreManager.class.getResource("/ssl/truststore.jks").toURI());
+            Files.createDirectories(storePath.getParent());
+            if (Files.notExists(storePath)) {
+                Files.copy(storeResourcePath, storePath);
+            }
+        } catch (IOException e) {
+            LOGGER.warn("Bad truststore path", e);
+        } catch (URISyntaxException e) {
+            LOGGER.warn("Bad resource path", e);
+        }
+    }
+}
diff --git a/src/main/java/org/jabref/logic/openoffice/NoDocumentFoundException.java b/src/main/java/org/jabref/logic/openoffice/NoDocumentFoundException.java
new file mode 100644
index 00000000000..2759a9931aa
--- /dev/null
+++ b/src/main/java/org/jabref/logic/openoffice/NoDocumentFoundException.java
@@ -0,0 +1,12 @@
+package org.jabref.logic.openoffice;
+
+public class NoDocumentFoundException extends Exception {
+
+    public NoDocumentFoundException(String message) {
+        super(message);
+    }
+
+    public NoDocumentFoundException() {
+        super("No Writer documents found");
+    }
+}
diff --git a/src/main/java/org/jabref/logic/openoffice/OOUtil.java b/src/main/java/org/jabref/logic/openoffice/OOUtil.java
deleted file mode 100644
index a5976cb3342..00000000000
--- a/src/main/java/org/jabref/logic/openoffice/OOUtil.java
+++ /dev/null
@@ -1,284 +0,0 @@
-package org.jabref.logic.openoffice;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.jabref.architecture.AllowedToUseAwt;
-import org.jabref.logic.layout.Layout;
-import org.jabref.model.database.BibDatabase;
-import org.jabref.model.entry.BibEntry;
-import org.jabref.model.entry.field.Field;
-import org.jabref.model.entry.field.UnknownField;
-
-import com.sun.star.beans.PropertyVetoException;
-import com.sun.star.beans.UnknownPropertyException;
-import com.sun.star.beans.XPropertySet;
-import com.sun.star.lang.WrappedTargetException;
-import com.sun.star.text.ControlCharacter;
-import com.sun.star.text.XParagraphCursor;
-import com.sun.star.text.XText;
-import com.sun.star.text.XTextCursor;
-import com.sun.star.uno.UnoRuntime;
-
-/**
- * Utility methods for processing OO Writer documents.
- */
-@AllowedToUseAwt("Requires AWT for changing document properties")
-public class OOUtil {
-
-    private static final String CHAR_STRIKEOUT = "CharStrikeout";
-    private static final String CHAR_UNDERLINE = "CharUnderline";
-    private static final String PARA_STYLE_NAME = "ParaStyleName";
-    private static final String CHAR_CASE_MAP = "CharCaseMap";
-    private static final String CHAR_POSTURE = "CharPosture";
-    private static final String CHAR_WEIGHT = "CharWeight";
-    private static final String CHAR_ESCAPEMENT_HEIGHT = "CharEscapementHeight";
-    private static final String CHAR_ESCAPEMENT = "CharEscapement";
-
-    public enum Formatting {
-        BOLD,
-        ITALIC,
-        SMALLCAPS,
-        SUPERSCRIPT,
-        SUBSCRIPT,
-        UNDERLINE,
-        STRIKEOUT,
-        MONOSPACE
-    }
-
-    private static final Pattern HTML_TAG = Pattern.compile("</?[a-z]+>");
-
-    private static final Field UNIQUEFIER_FIELD = new UnknownField("uniq");
-
-    private OOUtil() {
-        // Just to hide the public constructor
-    }
-
-    /**
-     * Insert a reference, formatted using a Layout, at the position of a given cursor.
-     *
-     * @param text       The text to insert in.
-     * @param cursor     The cursor giving the insert location.
-     * @param layout     The Layout to format the reference with.
-     * @param parStyle   The name of the paragraph style to use.
-     * @param entry      The entry to insert.
-     * @param database   The database the entry belongs to.
-     * @param uniquefier Uniqiefier letter, if any, to append to the entry's year.
-     */
-    public static void insertFullReferenceAtCurrentLocation(XText text, XTextCursor cursor,
-                                                            Layout layout, String parStyle, BibEntry entry, BibDatabase database, String uniquefier)
-            throws UndefinedParagraphFormatException, UnknownPropertyException, PropertyVetoException,
-            WrappedTargetException, IllegalArgumentException {
-
-        // Backup the value of the uniq field, just in case the entry already has it:
-        Optional<String> oldUniqVal = entry.getField(UNIQUEFIER_FIELD);
-
-        // Set the uniq field with the supplied uniquefier:
-        if (uniquefier == null) {
-            entry.clearField(UNIQUEFIER_FIELD);
-        } else {
-            entry.setField(UNIQUEFIER_FIELD, uniquefier);
-        }
-
-        // Do the layout for this entry:
-        String formattedText = layout.doLayout(entry, database);
-
-        // Afterwards, reset the old value:
-        if (oldUniqVal.isPresent()) {
-            entry.setField(UNIQUEFIER_FIELD, oldUniqVal.get());
-        } else {
-            entry.clearField(UNIQUEFIER_FIELD);
-        }
-
-        // Insert the formatted text:
-        OOUtil.insertOOFormattedTextAtCurrentLocation(text, cursor, formattedText, parStyle);
-    }
-
-    /**
-     * Insert a text with formatting indicated by HTML-like tags, into a text at the position given by a cursor.
-     *
-     * @param text     The text to insert in.
-     * @param cursor   The cursor giving the insert location.
-     * @param lText    The marked-up text to insert.
-     * @param parStyle The name of the paragraph style to use.
-     * @throws WrappedTargetException
-     * @throws PropertyVetoException
-     * @throws UnknownPropertyException
-     * @throws IllegalArgumentException
-     */
-    public static void insertOOFormattedTextAtCurrentLocation(XText text, XTextCursor cursor, String lText,
-                                                              String parStyle) throws UndefinedParagraphFormatException, UnknownPropertyException, PropertyVetoException,
-            WrappedTargetException, IllegalArgumentException {
-
-        XParagraphCursor parCursor = UnoRuntime.queryInterface(
-                XParagraphCursor.class, cursor);
-        XPropertySet props = UnoRuntime.queryInterface(
-                XPropertySet.class, parCursor);
-
-        try {
-            props.setPropertyValue(PARA_STYLE_NAME, parStyle);
-        } catch (com.sun.star.lang.IllegalArgumentException ex) {
-            throw new UndefinedParagraphFormatException(parStyle);
-        }
-
-        List<Formatting> formatting = new ArrayList<>();
-        // We need to extract formatting. Use a simple regexp search iteration:
-        int piv = 0;
-        Matcher matcher = OOUtil.HTML_TAG.matcher(lText);
-        while (matcher.find()) {
-            String currentSubstring = lText.substring(piv, matcher.start());
-            if (!currentSubstring.isEmpty()) {
-                OOUtil.insertTextAtCurrentLocation(text, cursor, currentSubstring, formatting);
-            }
-            String tag = matcher.group();
-            // Handle tags:
-            if ("<b>".equals(tag)) {
-                formatting.add(Formatting.BOLD);
-            } else if ("</b>".equals(tag)) {
-                formatting.remove(Formatting.BOLD);
-            } else if ("<i>".equals(tag) || "<em>".equals(tag)) {
-                formatting.add(Formatting.ITALIC);
-            } else if ("</i>".equals(tag) || "</em>".equals(tag)) {
-                formatting.remove(Formatting.ITALIC);
-            } else if ("<tt>".equals(tag)) {
-                formatting.add(Formatting.MONOSPACE);
-            } else if ("</tt>".equals(tag)) {
-                formatting.remove(Formatting.MONOSPACE);
-            } else if ("<smallcaps>".equals(tag)) {
-                formatting.add(Formatting.SMALLCAPS);
-            } else if ("</smallcaps>".equals(tag)) {
-                formatting.remove(Formatting.SMALLCAPS);
-            } else if ("<sup>".equals(tag)) {
-                formatting.add(Formatting.SUPERSCRIPT);
-            } else if ("</sup>".equals(tag)) {
-                formatting.remove(Formatting.SUPERSCRIPT);
-            } else if ("<sub>".equals(tag)) {
-                formatting.add(Formatting.SUBSCRIPT);
-            } else if ("</sub>".equals(tag)) {
-                formatting.remove(Formatting.SUBSCRIPT);
-            } else if ("<u>".equals(tag)) {
-                formatting.add(Formatting.UNDERLINE);
-            } else if ("</u>".equals(tag)) {
-                formatting.remove(Formatting.UNDERLINE);
-            } else if ("<s>".equals(tag)) {
-                formatting.add(Formatting.STRIKEOUT);
-            } else if ("</s>".equals(tag)) {
-                formatting.remove(Formatting.STRIKEOUT);
-            }
-
-            piv = matcher.end();
-        }
-
-        if (piv < lText.length()) {
-            OOUtil.insertTextAtCurrentLocation(text, cursor, lText.substring(piv), formatting);
-        }
-
-        cursor.collapseToEnd();
-    }
-
-    public static void insertParagraphBreak(XText text, XTextCursor cursor) throws IllegalArgumentException {
-        text.insertControlCharacter(cursor, ControlCharacter.PARAGRAPH_BREAK, true);
-        cursor.collapseToEnd();
-    }
-
-    public static void insertTextAtCurrentLocation(XText text, XTextCursor cursor, String string,
-                                                   List<Formatting> formatting)
-            throws UnknownPropertyException, PropertyVetoException, WrappedTargetException,
-            IllegalArgumentException {
-        text.insertString(cursor, string, true);
-        // Access the property set of the cursor, and set the currently selected text
-        // (which is the string we just inserted) to be bold
-        XPropertySet xCursorProps = UnoRuntime.queryInterface(
-                XPropertySet.class, cursor);
-        if (formatting.contains(Formatting.BOLD)) {
-            xCursorProps.setPropertyValue(CHAR_WEIGHT,
-                    com.sun.star.awt.FontWeight.BOLD);
-        } else {
-            xCursorProps.setPropertyValue(CHAR_WEIGHT,
-                    com.sun.star.awt.FontWeight.NORMAL);
-        }
-
-        if (formatting.contains(Formatting.ITALIC)) {
-            xCursorProps.setPropertyValue(CHAR_POSTURE,
-                    com.sun.star.awt.FontSlant.ITALIC);
-        } else {
-            xCursorProps.setPropertyValue(CHAR_POSTURE,
-                    com.sun.star.awt.FontSlant.NONE);
-        }
-
-        if (formatting.contains(Formatting.SMALLCAPS)) {
-            xCursorProps.setPropertyValue(CHAR_CASE_MAP,
-                    com.sun.star.style.CaseMap.SMALLCAPS);
-        } else {
-            xCursorProps.setPropertyValue(CHAR_CASE_MAP,
-                    com.sun.star.style.CaseMap.NONE);
-        }
-
-        // TODO: the <monospace> tag doesn't work
-        /*
-        if (formatting.contains(Formatting.MONOSPACE)) {
-            xCursorProps.setPropertyValue("CharFontPitch",
-                            com.sun.star.awt.FontPitch.FIXED);
-        }
-        else {
-            xCursorProps.setPropertyValue("CharFontPitch",
-                            com.sun.star.awt.FontPitch.VARIABLE);
-        } */
-        if (formatting.contains(Formatting.SUBSCRIPT)) {
-            xCursorProps.setPropertyValue(CHAR_ESCAPEMENT,
-                    (byte) -101);
-            xCursorProps.setPropertyValue(CHAR_ESCAPEMENT_HEIGHT,
-                    (byte) 58);
-        } else if (formatting.contains(Formatting.SUPERSCRIPT)) {
-            xCursorProps.setPropertyValue(CHAR_ESCAPEMENT,
-                    (byte) 101);
-            xCursorProps.setPropertyValue(CHAR_ESCAPEMENT_HEIGHT,
-                    (byte) 58);
-        } else {
-            xCursorProps.setPropertyValue(CHAR_ESCAPEMENT,
-                    (byte) 0);
-            xCursorProps.setPropertyValue(CHAR_ESCAPEMENT_HEIGHT,
-                    (byte) 100);
-        }
-
-        if (formatting.contains(Formatting.UNDERLINE)) {
-            xCursorProps.setPropertyValue(CHAR_UNDERLINE, com.sun.star.awt.FontUnderline.SINGLE);
-        } else {
-            xCursorProps.setPropertyValue(CHAR_UNDERLINE, com.sun.star.awt.FontUnderline.NONE);
-        }
-
-        if (formatting.contains(Formatting.STRIKEOUT)) {
-            xCursorProps.setPropertyValue(CHAR_STRIKEOUT, com.sun.star.awt.FontStrikeout.SINGLE);
-        } else {
-            xCursorProps.setPropertyValue(CHAR_STRIKEOUT, com.sun.star.awt.FontStrikeout.NONE);
-        }
-        cursor.collapseToEnd();
-    }
-
-    public static void insertTextAtCurrentLocation(XText text, XTextCursor cursor, String string, String parStyle)
-            throws WrappedTargetException, PropertyVetoException, UnknownPropertyException,
-            UndefinedParagraphFormatException {
-        text.insertString(cursor, string, true);
-        XParagraphCursor parCursor = UnoRuntime.queryInterface(
-                XParagraphCursor.class, cursor);
-        // Access the property set of the cursor, and set the currently selected text
-        // (which is the string we just inserted) to be bold
-        XPropertySet props = UnoRuntime.queryInterface(
-                XPropertySet.class, parCursor);
-        try {
-            props.setPropertyValue(PARA_STYLE_NAME, parStyle);
-        } catch (IllegalArgumentException ex) {
-            throw new UndefinedParagraphFormatException(parStyle);
-        }
-        cursor.collapseToEnd();
-    }
-
-    public static Object getProperty(Object object, String property)
-            throws UnknownPropertyException, WrappedTargetException {
-        XPropertySet props = UnoRuntime.queryInterface(XPropertySet.class, object);
-        return props.getPropertyValue(property);
-    }
-}
diff --git a/src/main/java/org/jabref/logic/openoffice/OpenOfficeFileSearch.java b/src/main/java/org/jabref/logic/openoffice/OpenOfficeFileSearch.java
index 309096b08cf..c20124f943d 100644
--- a/src/main/java/org/jabref/logic/openoffice/OpenOfficeFileSearch.java
+++ b/src/main/java/org/jabref/logic/openoffice/OpenOfficeFileSearch.java
@@ -42,9 +42,9 @@ public static List<Path> detectInstallations() {
     }
 
     private static List<Path> findOpenOfficeDirectories(List<Path> programDirectories) {
-
-        BiPredicate<Path, BasicFileAttributes> filePredicate = (path, attr) -> attr.isDirectory() && (path.toString().toLowerCase(Locale.ROOT).contains("openoffice")
-                                                                               || path.toString().toLowerCase(Locale.ROOT).contains("libreoffice"));
+        BiPredicate<Path, BasicFileAttributes> filePredicate = (path, attr) ->
+                attr.isDirectory() && (path.toString().toLowerCase(Locale.ROOT).contains("openoffice")
+                        || path.toString().toLowerCase(Locale.ROOT).contains("libreoffice"));
 
         return programDirectories.stream().flatMap(dirs -> {
             try {
diff --git a/src/main/java/org/jabref/logic/openoffice/UndefinedBibtexEntry.java b/src/main/java/org/jabref/logic/openoffice/UndefinedBibtexEntry.java
deleted file mode 100644
index 8a1a7cf5e8f..00000000000
--- a/src/main/java/org/jabref/logic/openoffice/UndefinedBibtexEntry.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.jabref.logic.openoffice;
-
-import org.jabref.logic.openoffice.style.OOBibStyle;
-import org.jabref.model.entry.BibEntry;
-import org.jabref.model.entry.field.StandardField;
-
-/**
- * Subclass of BibEntry for representing entries referenced in a document that can't be found in JabRef's current database.
- */
-public class UndefinedBibtexEntry extends BibEntry {
-
-    private final String key;
-
-    public UndefinedBibtexEntry(String key) {
-        this.key = key;
-        setField(StandardField.AUTHOR, OOBibStyle.UNDEFINED_CITATION_MARKER);
-    }
-
-    public String getKey() {
-        return key;
-    }
-}
diff --git a/src/main/java/org/jabref/logic/openoffice/UndefinedParagraphFormatException.java b/src/main/java/org/jabref/logic/openoffice/UndefinedParagraphFormatException.java
deleted file mode 100644
index 361f8d44f54..00000000000
--- a/src/main/java/org/jabref/logic/openoffice/UndefinedParagraphFormatException.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.jabref.logic.openoffice;
-
-/**
- * Exception used to indicate that the plugin attempted to set a paragraph format that is not defined in the current OpenOffice document.
- */
-public class UndefinedParagraphFormatException extends Exception {
-
-    private final String formatName;
-
-    public UndefinedParagraphFormatException(String formatName) {
-        super();
-        this.formatName = formatName;
-    }
-
-    public String getFormatName() {
-        return formatName;
-    }
-}
diff --git a/src/main/java/org/jabref/logic/openoffice/action/EditInsert.java b/src/main/java/org/jabref/logic/openoffice/action/EditInsert.java
index 0004d3fe6db..9c171553a4b 100644
--- a/src/main/java/org/jabref/logic/openoffice/action/EditInsert.java
+++ b/src/main/java/org/jabref/logic/openoffice/action/EditInsert.java
@@ -32,17 +32,14 @@
 public class EditInsert {
 
     private EditInsert() {
-        /**/
     }
 
     /**
      * In insertEntry we receive BibEntry values from the GUI.
-     *
+     * <p>
      * In the document we store citations by their citation key.
-     *
-     * If the citation key is missing, the best we can do is to notify the user. Or the programmer,
-     * that we cannot accept such input.
-     *
+     * <p>
+     * If the citation key is missing, the best we can do is to notify the user. Or the programmer, that we cannot accept such input.
      */
     private static String insertEntryGetCitationKey(BibEntry entry) {
         Optional<String> key = entry.getCitationKey();
@@ -53,7 +50,7 @@ private static String insertEntryGetCitationKey(BibEntry entry) {
     }
 
     /**
-     * @param cursor Where to insert.
+     * @param cursor   Where to insert.
      * @param pageInfo A single pageInfo for a list of entries. This is what we get from the GUI.
      */
     public static void insertCitationGroup(XTextDocument doc,
@@ -64,13 +61,13 @@ public static void insertCitationGroup(XTextDocument doc,
                                            OOBibStyle style,
                                            CitationType citationType,
                                            String pageInfo)
-        throws
-        NoDocumentException,
-        NotRemoveableException,
-        WrappedTargetException,
-        PropertyVetoException,
-        CreationException,
-        IllegalTypeException {
+            throws
+            NoDocumentException,
+            NotRemoveableException,
+            WrappedTargetException,
+            PropertyVetoException,
+            CreationException,
+            IllegalTypeException {
 
         List<String> citationKeys = OOListUtil.map(entries, EditInsert::insertEntryGetCitationKey);
 
@@ -86,13 +83,13 @@ public static void insertCitationGroup(XTextDocument doc,
         }
 
         // The text we insert
-        OOText citeText = null;
+        OOText citeText;
         if (style.isNumberEntries()) {
             citeText = OOText.fromString("[-]"); // A dash only. Only refresh later.
         } else {
             citeText = style.createCitationMarker(citations,
-                                                  citationType.inParenthesis(),
-                                                  NonUniqueCitationMarker.FORGIVEN);
+                    citationType.inParenthesis(),
+                    NonUniqueCitationMarker.FORGIVEN);
         }
 
         if (StringUtil.isBlank(OOText.toString(citeText))) {
@@ -102,17 +99,16 @@ public static void insertCitationGroup(XTextDocument doc,
         try {
             UnoScreenRefresh.lockControllers(doc);
             UpdateCitationMarkers.createAndFillCitationGroup(frontend,
-                                                             doc,
-                                                             citationKeys,
-                                                             pageInfos,
-                                                             citationType,
-                                                             citeText,
-                                                             cursor,
-                                                             style,
-                                                             true /* insertSpaceAfter */);
+                    doc,
+                    citationKeys,
+                    pageInfos,
+                    citationType,
+                    citeText,
+                    cursor,
+                    style,
+                    true /* insertSpaceAfter */);
         } finally {
             UnoScreenRefresh.unlockControllers(doc);
         }
-
     }
 }
diff --git a/src/main/java/org/jabref/logic/openoffice/action/EditMerge.java b/src/main/java/org/jabref/logic/openoffice/action/EditMerge.java
index f91e8aec93d..eebdf65d4f5 100644
--- a/src/main/java/org/jabref/logic/openoffice/action/EditMerge.java
+++ b/src/main/java/org/jabref/logic/openoffice/action/EditMerge.java
@@ -34,21 +34,20 @@ public class EditMerge {
     private static final Logger LOGGER = LoggerFactory.getLogger(EditMerge.class);
 
     private EditMerge() {
-        // hide constructor
     }
 
-    /*
+    /**
      * @return true if modified document
      */
     public static boolean mergeCitationGroups(XTextDocument doc, OOFrontend frontend, OOBibStyle style)
-        throws
-        CreationException,
-        IllegalArgumentException,
-        IllegalTypeException,
-        NoDocumentException,
-        NotRemoveableException,
-        PropertyVetoException,
-        WrappedTargetException {
+            throws
+            CreationException,
+            IllegalArgumentException,
+            IllegalTypeException,
+            NoDocumentException,
+            NotRemoveableException,
+            PropertyVetoException,
+            WrappedTargetException {
 
         boolean madeModifications;
 
@@ -58,12 +57,11 @@ public static boolean mergeCitationGroups(XTextDocument doc, OOFrontend frontend
             List<JoinableGroupData> joinableGroups = EditMerge.scan(doc, frontend);
 
             for (JoinableGroupData joinableGroupData : joinableGroups) {
-
                 List<CitationGroup> groups = joinableGroupData.group;
 
                 List<Citation> newCitations = (groups.stream()
-                                               .flatMap(group -> group.citationsInStorageOrder.stream())
-                                               .collect(Collectors.toList()));
+                                                     .flatMap(group -> group.citationsInStorageOrder.stream())
+                                                     .collect(Collectors.toList()));
 
                 CitationType citationType = groups.get(0).citationType;
                 List<Optional<OOText>> pageInfos = frontend.backend.combinePageInfos(groups);
@@ -77,18 +75,17 @@ public static boolean mergeCitationGroups(XTextDocument doc, OOFrontend frontend
                 /* insertSpaceAfter: no, it is already there (or could be) */
                 boolean insertSpaceAfter = false;
                 UpdateCitationMarkers.createAndFillCitationGroup(frontend,
-                                                                 doc,
-                                                                 citationKeys,
-                                                                 pageInfos,
-                                                                 citationType,
-                                                                 OOText.fromString("tmp"),
-                                                                 textCursor,
-                                                                 style,
-                                                                 insertSpaceAfter);
+                        doc,
+                        citationKeys,
+                        pageInfos,
+                        citationType,
+                        OOText.fromString("tmp"),
+                        textCursor,
+                        style,
+                        insertSpaceAfter);
             }
 
             madeModifications = !joinableGroups.isEmpty();
-
         } finally {
             UnoScreenRefresh.unlockControllers(doc);
         }
@@ -97,10 +94,14 @@ public static boolean mergeCitationGroups(XTextDocument doc, OOFrontend frontend
     }
 
     private static class JoinableGroupData {
-        /** A list of consecutive citation groups only separated by spaces. */
+        /**
+         * A list of consecutive citation groups only separated by spaces.
+         */
         List<CitationGroup> group;
 
-        /** A cursor covering the XTextRange of each entry in group (and the spaces between them) */
+        /**
+         * A cursor covering the XTextRange of each entry in group (and the spaces between them)
+         */
         XTextCursor groupCursor;
 
         JoinableGroupData(List<CitationGroup> group, XTextCursor groupCursor) {
@@ -119,8 +120,8 @@ private static class ScanState {
         // null if currentGroup.isEmpty()
         XTextCursor currentGroupCursor;
 
-        // A cursor starting at the end of the last CitationGroup in
-        // currentGroup. null if currentGroup.isEmpty()
+        // A cursor starting at the end of the last CitationGroup in currentGroup.
+        // null if currentGroup.isEmpty()
         XTextCursor cursorBetween;
 
         // The last element of currentGroup.
@@ -147,14 +148,11 @@ void reset() {
     /**
      * Decide if group could be added to state.currentGroup
      *
-     * @param group The CitationGroup to test
+     * @param group        The CitationGroup to test
      * @param currentRange The XTextRange corresponding to group.
-     *
-     * @return false if cannot add, true if can.  If returned true, then state.cursorBetween and
-     *  state.currentGroupCursor are expanded to end at the start of currentRange.
+     * @return false if cannot add, true if can.  If returned true, then state.cursorBetween and state.currentGroupCursor are expanded to end at the start of currentRange.
      */
     private static boolean checkAddToGroup(ScanState state, CitationGroup group, XTextRange currentRange) {
-
         if (state.currentGroup.isEmpty()) {
             return false;
         }
@@ -170,7 +168,6 @@ private static boolean checkAddToGroup(ScanState state, CitationGroup group, XTe
         }
 
         if (state.prev != null) {
-
             // Even if we combine AUTHORYEAR_INTEXT citations, we would not mix them with AUTHORYEAR_PAR
             if (group.citationType != state.prev.citationType) {
                 return false;
@@ -184,14 +181,14 @@ private static boolean checkAddToGroup(ScanState state, CitationGroup group, XTe
             int textOrder = UnoTextRange.compareStarts(state.prevRange, currentRange);
             if (textOrder != (-1)) {
                 String msg =
-                    String.format("MergeCitationGroups:"
-                                  + " \"%s\" supposed to be followed by \"%s\","
-                                  + " but %s",
-                                  state.prevRange.getString(),
-                                  currentRange.getString(),
-                                  ((textOrder == 0)
-                                   ? "they start at the same position"
-                                   : "the start of the latter precedes the start of the first"));
+                        String.format("MergeCitationGroups:"
+                                        + " \"%s\" supposed to be followed by \"%s\","
+                                        + " but %s",
+                                state.prevRange.getString(),
+                                currentRange.getString(),
+                                ((textOrder == 0)
+                                        ? "they start at the same position"
+                                        : "the start of the latter precedes the start of the first"));
                 LOGGER.warn(msg);
                 return false;
             }
@@ -217,7 +214,7 @@ private static boolean checkAddToGroup(ScanState state, CitationGroup group, XTe
         XTextRange rangeStart = currentRange.getStart();
         boolean couldExpand = true;
         XTextCursor thisCharCursor =
-            (currentRange.getText().createTextCursorByRange(state.cursorBetween.getEnd()));
+                (currentRange.getText().createTextCursorByRange(state.cursorBetween.getEnd()));
 
         while (couldExpand && (UnoTextRange.compareEnds(state.cursorBetween, rangeStart) < 0)) {
             //
@@ -247,10 +244,7 @@ private static boolean checkAddToGroup(ScanState state, CitationGroup group, XTe
     }
 
     /**
-     * Add group to state.currentGroup
-     * Set state.cursorBetween to start at currentRange.getEnd()
-     * Expand state.currentGroupCursor to also cover currentRange
-     * Set state.prev to group, state.prevRange to currentRange
+     * Add group to state.currentGroup Set state.cursorBetween to start at currentRange.getEnd() Expand state.currentGroupCursor to also cover currentRange Set state.prev to group, state.prevRange to currentRange
      */
     private static void addToCurrentGroup(ScanState state, CitationGroup group, XTextRange currentRange) {
         final boolean isNewGroup = state.currentGroup.isEmpty();
@@ -271,7 +265,7 @@ private static void addToCurrentGroup(ScanState state, CitationGroup group, XTex
         // If new group, create currentGroupCursor
         if (isNewGroup) {
             state.currentGroupCursor = (currentRange.getText()
-                                        .createTextCursorByRange(currentRange.getStart()));
+                                                    .createTextCursorByRange(currentRange.getStart()));
         }
 
         // include currentRange in currentGroupCursor
@@ -288,12 +282,12 @@ private static void addToCurrentGroup(ScanState state, CitationGroup group, XTex
     }
 
     /**
-     *  Scan the document for joinable groups. Return those found.
+     * Scan the document for joinable groups. Return those found.
      */
     private static List<JoinableGroupData> scan(XTextDocument doc, OOFrontend frontend)
-        throws
-        NoDocumentException,
-        WrappedTargetException {
+            throws
+            NoDocumentException,
+            WrappedTargetException {
         List<JoinableGroupData> result = new ArrayList<>();
 
         List<CitationGroup> groups = frontend.getCitationGroupsSortedWithinPartitions(doc, false /* mapFootnotesToFootnoteMarks */);
@@ -304,9 +298,8 @@ private static List<JoinableGroupData> scan(XTextDocument doc, OOFrontend fronte
         ScanState state = new ScanState();
 
         for (CitationGroup group : groups) {
-
             XTextRange currentRange = (frontend.getMarkRange(doc, group)
-                                       .orElseThrow(IllegalStateException::new));
+                                               .orElseThrow(IllegalStateException::new));
 
             /*
              * Decide if we add group to the group. False when the group is empty.
@@ -340,5 +333,4 @@ private static List<JoinableGroupData> scan(XTextDocument doc, OOFrontend fronte
         }
         return result;
     }
-
 }
diff --git a/src/main/java/org/jabref/logic/openoffice/action/EditSeparate.java b/src/main/java/org/jabref/logic/openoffice/action/EditSeparate.java
index 66630a6f8d0..ffe6c59dc0c 100644
--- a/src/main/java/org/jabref/logic/openoffice/action/EditSeparate.java
+++ b/src/main/java/org/jabref/logic/openoffice/action/EditSeparate.java
@@ -25,21 +25,20 @@
 public class EditSeparate {
 
     private EditSeparate() {
-        /**/
     }
 
     public static boolean separateCitations(XTextDocument doc,
                                             OOFrontend frontend,
                                             List<BibDatabase> databases,
                                             OOBibStyle style)
-        throws
-        CreationException,
-        IllegalTypeException,
-        NoDocumentException,
-        NotRemoveableException,
-        PropertyVetoException,
-        WrappedTargetException,
-        com.sun.star.lang.IllegalArgumentException {
+            throws
+            CreationException,
+            IllegalTypeException,
+            NoDocumentException,
+            NotRemoveableException,
+            PropertyVetoException,
+            WrappedTargetException,
+            com.sun.star.lang.IllegalArgumentException {
 
         boolean madeModifications = false;
 
@@ -56,10 +55,9 @@ public static boolean separateCitations(XTextDocument doc,
             UnoScreenRefresh.lockControllers(doc);
 
             for (CitationGroup group : groups) {
-
                 XTextRange range1 = (frontend
-                                     .getMarkRange(doc, group)
-                                     .orElseThrow(IllegalStateException::new));
+                        .getMarkRange(doc, group)
+                        .orElseThrow(IllegalStateException::new));
                 XTextCursor textCursor = range1.getText().createTextCursorByRange(range1);
 
                 List<Citation> citations = group.citationsInStorageOrder;
@@ -77,14 +75,14 @@ public static boolean separateCitations(XTextDocument doc,
                     Citation citation = citations.get(i);
 
                     UpdateCitationMarkers.createAndFillCitationGroup(frontend,
-                                                                     doc,
-                                                                     List.of(citation.citationKey),
-                                                                     List.of(citation.getPageInfo()),
-                                                                     group.citationType,
-                                                                     OOText.fromString(citation.citationKey),
-                                                                     textCursor,
-                                                                     style,
-                                                                     insertSpaceAfter);
+                            doc,
+                            List.of(citation.citationKey),
+                            List.of(citation.getPageInfo()),
+                            group.citationType,
+                            OOText.fromString(citation.citationKey),
+                            textCursor,
+                            style,
+                            insertSpaceAfter);
 
                     textCursor.collapseToEnd();
                 }
diff --git a/src/main/java/org/jabref/logic/openoffice/action/ExportCited.java b/src/main/java/org/jabref/logic/openoffice/action/ExportCited.java
index c38cd4fd4cc..4bdc11a7f71 100644
--- a/src/main/java/org/jabref/logic/openoffice/action/ExportCited.java
+++ b/src/main/java/org/jabref/logic/openoffice/action/ExportCited.java
@@ -19,7 +19,6 @@
 public class ExportCited {
 
     private ExportCited() {
-        /**/
     }
 
     public static class GenerateDatabaseResult {
@@ -36,20 +35,16 @@ public static class GenerateDatabaseResult {
     }
 
     /**
-     *
      * @param databases The databases to look up the citation keys in the document from.
      * @return A new database, with cloned entries.
-     *
      * If a key is not found, it is added to result.unresolvedKeys
-     *
-     * Cross references (in StandardField.CROSSREF) are followed (not recursively):
-     * If the referenced entry is found, it is included in the result.
-     * If it is not found, it is silently ignored.
+     * <p>
+     * Cross references (in StandardField.CROSSREF) are followed (not recursively): If the referenced entry is found, it is included in the result. If it is not found, it is silently ignored.
      */
     public static GenerateDatabaseResult generateDatabase(XTextDocument doc, List<BibDatabase> databases)
-        throws
-        NoDocumentException,
-        WrappedTargetException {
+            throws
+            NoDocumentException,
+            WrappedTargetException {
 
         OOFrontend frontend = new OOFrontend(doc);
         CitedKeys citationKeys = frontend.citationGroups.getCitedKeysUnordered();
@@ -64,7 +59,6 @@ public static GenerateDatabaseResult generateDatabase(XTextDocument doc, List<Bi
         for (CitedKey citation : citationKeys.values()) {
             if (citation.getLookupResult().isEmpty()) {
                 unresolvedKeys.add(citation.citationKey);
-                continue;
             } else {
                 BibEntry entry = citation.getLookupResult().get().entry;
                 BibDatabase loopDatabase = citation.getLookupResult().get().database;
@@ -77,14 +71,14 @@ public static GenerateDatabaseResult generateDatabase(XTextDocument doc, List<Bi
 
                 // Check if the cloned entry has a cross-reference field
                 clonedEntry
-                    .getField(StandardField.CROSSREF)
-                    .ifPresent(crossReference -> {
+                        .getField(StandardField.CROSSREF)
+                        .ifPresent(crossReference -> {
                             boolean isNew = !seen.contains(crossReference);
                             if (isNew) {
                                 // Add it if it is in the current library
                                 loopDatabase
-                                    .getEntryByCitationKey(crossReference)
-                                    .ifPresent(entriesToInsert::add);
+                                        .getEntryByCitationKey(crossReference)
+                                        .ifPresent(entriesToInsert::add);
                                 seen.add(crossReference);
                             }
                         });
@@ -94,5 +88,4 @@ public static GenerateDatabaseResult generateDatabase(XTextDocument doc, List<Bi
         resultDatabase.insertEntries(entriesToInsert);
         return new GenerateDatabaseResult(unresolvedKeys, resultDatabase);
     }
-
 }
diff --git a/src/main/java/org/jabref/logic/openoffice/action/ManageCitations.java b/src/main/java/org/jabref/logic/openoffice/action/ManageCitations.java
index c8234df9ca0..ccb5eef1e47 100644
--- a/src/main/java/org/jabref/logic/openoffice/action/ManageCitations.java
+++ b/src/main/java/org/jabref/logic/openoffice/action/ManageCitations.java
@@ -14,24 +14,23 @@
 public class ManageCitations {
 
     private ManageCitations() {
-        /**/
     }
 
     public static List<CitationEntry> getCitationEntries(XTextDocument doc)
-        throws
-        NoDocumentException,
-        WrappedTargetException {
+            throws
+            NoDocumentException,
+            WrappedTargetException {
         OOFrontend frontend = new OOFrontend(doc);
         return frontend.getCitationEntries(doc);
     }
 
     public static void applyCitationEntries(XTextDocument doc, List<CitationEntry> citationEntries)
-        throws
-        NoDocumentException,
-        PropertyVetoException,
-        IllegalTypeException,
-        WrappedTargetException,
-        IllegalArgumentException {
+            throws
+            NoDocumentException,
+            PropertyVetoException,
+            IllegalTypeException,
+            WrappedTargetException,
+            IllegalArgumentException {
         OOFrontend frontend = new OOFrontend(doc);
         frontend.applyCitationEntries(doc, citationEntries);
     }
diff --git a/src/main/java/org/jabref/logic/openoffice/action/Update.java b/src/main/java/org/jabref/logic/openoffice/action/Update.java
index 80263833aec..f5222c47ec0 100644
--- a/src/main/java/org/jabref/logic/openoffice/action/Update.java
+++ b/src/main/java/org/jabref/logic/openoffice/action/Update.java
@@ -21,10 +21,7 @@
  */
 public class Update {
 
-    static final boolean USE_LOCK_CONTROLLERS = true;
-    
     private Update() {
-        /**/
     }
 
     /**
@@ -37,17 +34,19 @@ private static List<String> updateDocument(XTextDocument doc,
                                                FunctionalTextViewCursor fcursor,
                                                boolean doUpdateBibliography,
                                                boolean alwaysAddCitedOnPages)
-        throws
-        CreationException,
-        NoDocumentException,
-        WrappedTargetException,
-        com.sun.star.lang.IllegalArgumentException {
+            throws
+            CreationException,
+            NoDocumentException,
+            WrappedTargetException,
+            com.sun.star.lang.IllegalArgumentException {
+
+        final boolean useLockControllers = true;
 
         frontend.imposeGlobalOrder(doc, fcursor);
         OOProcess.produceCitationMarkers(frontend.citationGroups, databases, style);
 
         try {
-            if (USE_LOCK_CONTROLLERS) {
+            if (useLockControllers) {
                 UnoScreenRefresh.lockControllers(doc);
             }
 
@@ -55,15 +54,15 @@ private static List<String> updateDocument(XTextDocument doc,
 
             if (doUpdateBibliography) {
                 UpdateBibliography.rebuildBibTextSection(doc,
-                                                         frontend,
-                                                         frontend.citationGroups.getBibliography().get(),
-                                                         style,
-                                                         alwaysAddCitedOnPages);
+                        frontend,
+                        frontend.citationGroups.getBibliography().get(),
+                        style,
+                        alwaysAddCitedOnPages);
             }
 
             return frontend.citationGroups.getUnresolvedKeys();
         } finally {
-            if (USE_LOCK_CONTROLLERS && UnoScreenRefresh.hasControllersLocked(doc)) {
+            if (useLockControllers && UnoScreenRefresh.hasControllersLocked(doc)) {
                 UnoScreenRefresh.unlockControllers(doc);
             }
         }
@@ -97,37 +96,36 @@ public static List<String> synchronizeDocument(XTextDocument doc,
                                                    OOBibStyle style,
                                                    FunctionalTextViewCursor fcursor,
                                                    SyncOptions syncOptions)
-        throws
-        CreationException,
-        NoDocumentException,
-        WrappedTargetException,
-        com.sun.star.lang.IllegalArgumentException {
+            throws
+            CreationException,
+            NoDocumentException,
+            WrappedTargetException,
+            com.sun.star.lang.IllegalArgumentException {
 
         return Update.updateDocument(doc,
-                                     frontend,
-                                     syncOptions.databases,
-                                     style,
-                                     fcursor,
-                                     syncOptions.updateBibliography,
-                                     syncOptions.alwaysAddCitedOnPages);
+                frontend,
+                syncOptions.databases,
+                style,
+                fcursor,
+                syncOptions.updateBibliography,
+                syncOptions.alwaysAddCitedOnPages);
     }
 
-    /*
+    /**
      * Reread document before sync
      */
     public static List<String> resyncDocument(XTextDocument doc,
                                               OOBibStyle style,
                                               FunctionalTextViewCursor fcursor,
                                               SyncOptions syncOptions)
-        throws
-        CreationException,
-        NoDocumentException,
-        WrappedTargetException,
-        com.sun.star.lang.IllegalArgumentException {
+            throws
+            CreationException,
+            NoDocumentException,
+            WrappedTargetException,
+            com.sun.star.lang.IllegalArgumentException {
 
         OOFrontend frontend = new OOFrontend(doc);
 
         return Update.synchronizeDocument(doc, frontend, style, fcursor, syncOptions);
     }
-
 }
diff --git a/src/main/java/org/jabref/logic/openoffice/backend/Backend52.java b/src/main/java/org/jabref/logic/openoffice/backend/Backend52.java
index 4a0d8d05e0e..e433d18e72f 100644
--- a/src/main/java/org/jabref/logic/openoffice/backend/Backend52.java
+++ b/src/main/java/org/jabref/logic/openoffice/backend/Backend52.java
@@ -37,9 +37,7 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * Backend52, Codec52 and OODataModel.JabRef52 refer to the mode of storage, encoding and
- * what-is-stored in the document under JabRef version 5.2. These basically did not change up to
- * JabRef 5.4.
+ * Backend52, Codec52 and OODataModel.JabRef52 refer to the mode of storage, encoding and what-is-stored in the document under JabRef version 5.2. These basically did not change up to JabRef 5.4.
  */
 public class Backend52 {
     private static final Logger LOGGER = LoggerFactory.getLogger(Backend52.class);
@@ -55,25 +53,21 @@ public Backend52() {
     }
 
     /**
-     * Get reference mark names from the document matching the pattern
-     * used for JabRef reference mark names.
-     *
+     * Get reference mark names from the document matching the pattern used for JabRef reference mark names.
+     * <p>
      * Note: the names returned are in arbitrary order.
-     *
      */
     public List<String> getJabRefReferenceMarkNames(XTextDocument doc)
-        throws
-        NoDocumentException {
+            throws
+            NoDocumentException {
         List<String> allNames = this.citationStorageManager.getUsedNames(doc);
         return Codec52.filterIsJabRefReferenceMarkName(allNames);
     }
 
     /**
-     * Names of custom properties belonging to us, but without a corresponding reference mark.
-     * These can be deleted.
+     * Names of custom properties belonging to us, but without a corresponding reference mark. These can be deleted.
      *
      * @param citationGroupNames These are the names that are used.
-     *
      */
     private List<String> findUnusedJabrefPropertyNames(XTextDocument doc,
                                                        List<String> citationGroupNames) {
@@ -82,10 +76,10 @@ private List<String> findUnusedJabrefPropertyNames(XTextDocument doc,
 
         List<String> pageInfoThrash = new ArrayList<>();
         List<String> jabrefPropertyNames =
-            UnoUserDefinedProperty.getListOfNames(doc)
-            .stream()
-            .filter(Codec52::isJabRefReferenceMarkName)
-            .collect(Collectors.toList());
+                UnoUserDefinedProperty.getListOfNames(doc)
+                                      .stream()
+                                      .filter(Codec52::isJabRefReferenceMarkName)
+                                      .toList();
         for (String pn : jabrefPropertyNames) {
             if (!citationGroupNamesSet.contains(pn)) {
                 pageInfoThrash.add(pn);
@@ -95,21 +89,21 @@ private List<String> findUnusedJabrefPropertyNames(XTextDocument doc,
     }
 
     /**
-     *  @return Optional.empty if all is OK, message text otherwise.
+     * @return Optional.empty if all is OK, message text otherwise.
      */
     public Optional<String> healthReport(XTextDocument doc)
-        throws
-        NoDocumentException {
+            throws
+            NoDocumentException {
         List<String> pageInfoThrash =
-            this.findUnusedJabrefPropertyNames(doc, this.getJabRefReferenceMarkNames(doc));
+                this.findUnusedJabrefPropertyNames(doc, this.getJabRefReferenceMarkNames(doc));
         if (pageInfoThrash.isEmpty()) {
             return Optional.empty();
         }
 
-        StringBuilder msg = new StringBuilder("Backend52: found unused pageInfo data, with names listed below.\n");
-        msg.append("In LibreOffice you may remove these in [File]/[Properties]/[Custom Properties]\n");
-        msg.append(String.join("\n", pageInfoThrash));
-        return Optional.of(msg.toString());
+        String msg = "Backend52: found unused pageInfo data, with names listed below.\n"
+                + "In LibreOffice you may remove these in [File]/[Properties]/[Custom Properties]\n"
+                + String.join("\n", pageInfoThrash);
+        return Optional.of(msg);
     }
 
     private static void setPageInfoInDataInitial(List<Citation> citations, Optional<OOText> pageInfo) {
@@ -131,51 +125,44 @@ private static Optional<OOText> getPageInfoFromData(CitationGroup group) {
      * @param markName Reference mark name
      */
     public CitationGroup readCitationGroupFromDocumentOrThrow(XTextDocument doc, String markName)
-        throws
-        WrappedTargetException,
-        NoDocumentException {
+            throws
+            WrappedTargetException,
+            NoDocumentException {
 
         Codec52.ParsedMarkName parsed = Codec52.parseMarkName(markName).orElseThrow(IllegalArgumentException::new);
 
         List<Citation> citations = (parsed.citationKeys.stream()
-                                    .map(Citation::new)
-                                    .collect(Collectors.toList()));
+                                                       .map(Citation::new)
+                                                       .collect(Collectors.toList()));
 
         Optional<OOText> pageInfo = (UnoUserDefinedProperty.getStringValue(doc, markName)
-                                     .map(OOText::fromString));
+                                                           .map(OOText::fromString));
         pageInfo = PageInfo.normalizePageInfo(pageInfo);
 
         setPageInfoInDataInitial(citations, pageInfo);
 
         NamedRange namedRange = (citationStorageManager.getNamedRangeFromDocument(doc, markName)
-                                 .orElseThrow(IllegalArgumentException::new));
+                                                       .orElseThrow(IllegalArgumentException::new));
 
         CitationGroupId groupId = new CitationGroupId(markName);
         CitationGroup group = new CitationGroup(OODataModel.JabRef52,
-                                                groupId,
-                                                parsed.citationType,
-                                                citations,
-                                                Optional.of(markName));
+                groupId,
+                parsed.citationType,
+                citations,
+                Optional.of(markName));
         this.cgidToNamedRange.put(groupId, namedRange);
         return group;
     }
 
     /**
-     *  Create a reference mark at the end of {@code position} in the document.
-     *
-     *  On return {@code position} is collapsed, and is after the inserted space, or at the end of
-     *  the reference mark.
+     * Create a reference mark at the end of {@code position} in the document.
+     * <p>
+     * On return {@code position} is collapsed, and is after the inserted space, or at the end of the reference mark.
      *
-     *  @param citationKeys Keys to be cited.
-     *
-     *  @param pageInfos An optional pageInfo for each citation key.
-     *                   Backend52 only uses and stores the last pageInfo,
-     *                   all others should be Optional.empty()
-     *
-     *  @param position Collapsed to its end.
-     *
-     *  @param insertSpaceAfter We insert a space after the mark, that carries on format of
-     *                          characters from the original position.
+     * @param citationKeys     Keys to be cited.
+     * @param pageInfos        An optional pageInfo for each citation key. Backend52 only uses and stores the last pageInfo, all others should be Optional.empty()
+     * @param position         Collapsed to its end.
+     * @param insertSpaceAfter We insert a space after the mark, that carries on format of characters from the original position.
      */
     public CitationGroup createCitationGroup(XTextDocument doc,
                                              List<String> citationKeys,
@@ -183,13 +170,13 @@ public CitationGroup createCitationGroup(XTextDocument doc,
                                              CitationType citationType,
                                              XTextCursor position,
                                              boolean insertSpaceAfter)
-        throws
-        CreationException,
-        NoDocumentException,
-        WrappedTargetException,
-        NotRemoveableException,
-        PropertyVetoException,
-        IllegalTypeException {
+            throws
+            CreationException,
+            NoDocumentException,
+            WrappedTargetException,
+            NotRemoveableException,
+            PropertyVetoException,
+            IllegalTypeException {
 
         Objects.requireNonNull(pageInfos);
         if (pageInfos.size() != citationKeys.size()) {
@@ -213,7 +200,7 @@ public CitationGroup createCitationGroup(XTextDocument doc,
                     } else {
                         if (pageInfo.isPresent()) {
                             LOGGER.warn("dataModel JabRef52"
-                                        + " only supports pageInfo for the last citation of a group");
+                                    + " only supports pageInfo for the last citation of a group");
                         }
                     }
                     break;
@@ -231,8 +218,8 @@ public CitationGroup createCitationGroup(XTextDocument doc,
          * has to be unique in the document.
          */
         final String markName = Codec52.getUniqueMarkName(new HashSet<>(citationStorageManager.getUsedNames(doc)),
-                                                          citationKeys,
-                                                          citationType);
+                citationKeys,
+                citationType);
 
         final CitationGroupId groupId = new CitationGroupId(markName);
 
@@ -241,10 +228,10 @@ public CitationGroup createCitationGroup(XTextDocument doc,
          */
         boolean withoutBrackets = (citationType == CitationType.INVISIBLE_CIT);
         NamedRange namedRange = this.citationStorageManager.createNamedRange(doc,
-                                                                             markName,
-                                                                             position,
-                                                                             insertSpaceAfter,
-                                                                             withoutBrackets);
+                markName,
+                position,
+                insertSpaceAfter,
+                withoutBrackets);
 
         switch (dataModel) {
             case JabRef52:
@@ -258,9 +245,9 @@ public CitationGroup createCitationGroup(XTextDocument doc,
                     UnoUserDefinedProperty.removeIfExists(doc, markName);
                 }
                 CitationGroup group = new CitationGroup(OODataModel.JabRef52,
-                                                        groupId,
-                                                        citationType, citations,
-                                                        Optional.of(markName));
+                        groupId,
+                        citationType, citations,
+                        Optional.of(markName));
                 this.cgidToNamedRange.put(groupId, namedRange);
                 return group;
             case JabRef60:
@@ -272,8 +259,7 @@ public CitationGroup createCitationGroup(XTextDocument doc,
 
     /**
      * @return A list with a nullable pageInfo entry for each citation in joinableGroups.
-     *
-     *  TODO: JabRef52 combinePageInfos is not reversible. Should warn user to check the result. Or
+     * TODO: JabRef52 combinePageInfos is not reversible. Should warn user to check the result. Or
      *        ask what to do.
      */
     public static List<Optional<OOText>>
@@ -282,18 +268,18 @@ public CitationGroup createCitationGroup(XTextDocument doc,
             case JabRef52:
                 // collect to pageInfos
                 List<Optional<OOText>> pageInfos = OOListUtil.map(joinableGroup,
-                                                                  Backend52::getPageInfoFromData);
+                        Backend52::getPageInfoFromData);
 
                 // Try to do something of the pageInfos.
                 String singlePageInfo = (pageInfos.stream()
-                                         .filter(Optional::isPresent)
-                                         .map(pi -> OOText.toString(pi.get()))
-                                         .distinct()
-                                         .collect(Collectors.joining("; ")));
+                                                  .filter(Optional::isPresent)
+                                                  .map(pi -> OOText.toString(pi.get()))
+                                                  .distinct()
+                                                  .collect(Collectors.joining("; ")));
 
                 int totalCitations = (joinableGroup.stream()
-                                      .map(CitationGroup::numberOfCitations)
-                                      .mapToInt(Integer::intValue).sum());
+                                                   .map(CitationGroup::numberOfCitations)
+                                                   .mapToInt(Integer::intValue).sum());
                 if ("".equals(singlePageInfo)) {
                     singlePageInfo = null;
                 }
@@ -301,17 +287,14 @@ public CitationGroup createCitationGroup(XTextDocument doc,
 
             case JabRef60:
                 return (joinableGroup.stream()
-                        .flatMap(group -> (group.citationsInStorageOrder.stream()
-                                           .map(Citation::getPageInfo)))
-                        .collect(Collectors.toList()));
+                                     .flatMap(group -> (group.citationsInStorageOrder.stream()
+                                                                                     .map(Citation::getPageInfo)))
+                                     .collect(Collectors.toList()));
             default:
                 throw new IllegalArgumentException("unhandled dataModel here");
         }
     }
 
-    /**
-     *
-     */
     public List<Optional<OOText>> combinePageInfos(List<CitationGroup> joinableGroup) {
         return combinePageInfosCommon(this.dataModel, joinableGroup);
     }
@@ -325,10 +308,10 @@ private NamedRange getNamedRangeOrThrow(CitationGroup group) {
     }
 
     public void removeCitationGroup(CitationGroup group, XTextDocument doc)
-        throws
-        WrappedTargetException,
-        NoDocumentException,
-        NotRemoveableException {
+            throws
+            WrappedTargetException,
+            NoDocumentException,
+            NotRemoveableException {
         NamedRange namedRange = getNamedRangeOrThrow(group);
         String refMarkName = namedRange.getRangeName();
         namedRange.removeFromDocument(doc);
@@ -340,22 +323,21 @@ public void removeCitationGroup(CitationGroup group, XTextDocument doc)
      * @return Optional.empty if the reference mark is missing.
      */
     public Optional<XTextRange> getMarkRange(CitationGroup group, XTextDocument doc)
-        throws
-        NoDocumentException,
-        WrappedTargetException {
+            throws
+            NoDocumentException,
+            WrappedTargetException {
 
         NamedRange namedRange = getNamedRangeOrThrow(group);
         return namedRange.getMarkRange(doc);
     }
 
     /**
-     * Cursor for the reference marks as is: not prepared for filling, but does not need
-     * cleanFillCursorForCitationGroup either.
+     * Cursor for the reference marks as is: not prepared for filling, but does not need cleanFillCursorForCitationGroup either.
      */
     public Optional<XTextCursor> getRawCursorForCitationGroup(CitationGroup group, XTextDocument doc)
-        throws
-        NoDocumentException,
-        WrappedTargetException {
+            throws
+            NoDocumentException,
+            WrappedTargetException {
         NamedRange namedRange = getNamedRangeOrThrow(group);
         return namedRange.getRawCursor(doc);
     }
@@ -364,44 +346,46 @@ public Optional<XTextCursor> getRawCursorForCitationGroup(CitationGroup group, X
      * Must be followed by call to cleanFillCursorForCitationGroup
      */
     public XTextCursor getFillCursorForCitationGroup(CitationGroup group, XTextDocument doc)
-        throws
-        NoDocumentException,
-        WrappedTargetException,
-        CreationException {
+            throws
+            NoDocumentException,
+            WrappedTargetException,
+            CreationException {
 
         NamedRange namedRange = getNamedRangeOrThrow(group);
         return namedRange.getFillCursor(doc);
     }
 
-    /** To be called after getFillCursorForCitationGroup */
+    /**
+     * To be called after getFillCursorForCitationGroup
+     */
     public void cleanFillCursorForCitationGroup(CitationGroup group, XTextDocument doc)
-        throws
-        NoDocumentException,
-        WrappedTargetException {
+            throws
+            NoDocumentException,
+            WrappedTargetException {
         NamedRange namedRange = getNamedRangeOrThrow(group);
         namedRange.cleanFillCursor(doc);
     }
 
-    public List<CitationEntry> getCitationEntries(XTextDocument doc, CitationGroups cgs)
-        throws
-        WrappedTargetException,
-        NoDocumentException {
+    public List<CitationEntry> getCitationEntries(XTextDocument doc, CitationGroups citationGroups)
+            throws
+            WrappedTargetException,
+            NoDocumentException {
 
         switch (dataModel) {
             case JabRef52:
                 // One context per CitationGroup: Backend52 (DataModel.JabRef52)
                 // For DataModel.JabRef60 (Backend60) we need one context per Citation
-                List<CitationEntry> citations = new ArrayList<>(cgs.numberOfCitationGroups());
-                for (CitationGroup group : cgs.getCitationGroupsUnordered()) {
+                List<CitationEntry> citations = new ArrayList<>(citationGroups.numberOfCitationGroups());
+                for (CitationGroup group : citationGroups.getCitationGroupsUnordered()) {
                     String name = group.groupId.citationGroupIdAsString();
                     XTextCursor cursor = (this
-                                          .getRawCursorForCitationGroup(group, doc)
-                                          .orElseThrow(IllegalStateException::new));
+                            .getRawCursorForCitationGroup(group, doc)
+                            .orElseThrow(IllegalStateException::new));
                     String context = GetContext.getCursorStringWithContext(cursor, 30, 30, true);
                     Optional<String> pageInfo = (group.numberOfCitations() > 0
-                                                 ? (getPageInfoFromData(group)
-                                                    .map(e -> OOText.toString(e)))
-                                                 : Optional.empty());
+                            ? (getPageInfoFromData(group)
+                            .map(e -> OOText.toString(e)))
+                            : Optional.empty());
                     CitationEntry entry = new CitationEntry(name, context, pageInfo);
                     citations.add(entry);
                 }
@@ -414,15 +398,15 @@ public List<CitationEntry> getCitationEntries(XTextDocument doc, CitationGroups
         }
     }
 
-    /*
+    /**
      * Only applies to storage. Citation markers are not changed.
      */
     public void applyCitationEntries(XTextDocument doc, List<CitationEntry> citationEntries)
-        throws
-        PropertyVetoException,
-        IllegalTypeException,
-        IllegalArgumentException,
-        WrappedTargetException {
+            throws
+            PropertyVetoException,
+            IllegalTypeException,
+            IllegalArgumentException,
+            WrappedTargetException {
 
         switch (dataModel) {
             case JabRef52:
@@ -436,12 +420,11 @@ public void applyCitationEntries(XTextDocument doc, List<CitationEntry> citation
                 }
                 break;
             case JabRef60:
-                // xx
+                // ToDo: Implement
                 throw new IllegalStateException("applyCitationEntries for JabRef60 is not implemented yet");
             default:
                 throw new IllegalStateException("applyCitationEntries: unhandled dataModel ");
         }
     }
-
 }
 
diff --git a/src/main/java/org/jabref/logic/openoffice/backend/Codec52.java b/src/main/java/org/jabref/logic/openoffice/backend/Codec52.java
index 45f3bd3ca04..af131fa5300 100644
--- a/src/main/java/org/jabref/logic/openoffice/backend/Codec52.java
+++ b/src/main/java/org/jabref/logic/openoffice/backend/Codec52.java
@@ -12,30 +12,35 @@
 import org.jabref.model.openoffice.style.CitationType;
 
 /**
- *  How and what is encoded in reference mark names under JabRef 5.2.
- *
- *  - pageInfo does not appear here. It is not encoded in the mark name.
+ * How and what is encoded in reference mark names under JabRef 5.2.
+ * <p>
+ * - pageInfo does not appear here. It is not encoded in the mark name.
  */
 class Codec52 {
     private static final String BIB_CITATION = "JR_cite";
     private static final Pattern CITE_PATTERN =
-        // Pattern.compile(BIB_CITATION + "(\\d*)_(\\d*)_(.*)");
-        // citationType is always "1" "2" or "3"
-        Pattern.compile(BIB_CITATION + "(\\d*)_([123])_(.*)");
+            // Pattern.compile(BIB_CITATION + "(\\d*)_(\\d*)_(.*)");
+            // citationType is always "1" "2" or "3"
+            Pattern.compile(BIB_CITATION + "(\\d*)_([123])_(.*)");
 
     private Codec52() {
-        /**/
     }
 
     /**
      * This is what we get back from parsing a refMarkName.
      */
     public static class ParsedMarkName {
-        /**  "", "0", "1" ... */
+        /**
+         * "", "0", "1" ...
+         */
         public final String index;
-        /** in-text-citation type */
+        /**
+         * in-text-citation type
+         */
         public final CitationType citationType;
-        /** Citation keys embedded in the reference mark. */
+        /**
+         * Citation keys embedded in the reference mark.
+         */
         public final List<String> citationKeys;
 
         ParsedMarkName(String index, CitationType citationType, List<String> citationKeys) {
@@ -64,21 +69,19 @@ private static int citationTypeToInt(CitationType type) {
             case AUTHORYEAR_PAR -> 1;
             case AUTHORYEAR_INTEXT -> 2;
             case INVISIBLE_CIT -> 3;
-            default -> throw new IllegalArgumentException("Invalid CitationType");
         };
     }
 
     /**
-     * Produce a reference mark name for JabRef for the given citationType and list citation keys that
-     * does not yet appear among the reference marks of the document.
+     * Produce a reference mark name for JabRef for the given citationType and list citation keys that does not yet appear among the reference marks of the document.
      *
      * @param usedNames    Reference mark names already in use.
      * @param citationKeys Identifies the cited sources.
      * @param citationType Encodes the effect of withText and inParenthesis options.
-     *
-     * The first occurrence of citationKeys gets no serial number, the second gets 0, the third 1 ...
-     *
-     * Or the first unused in this series, after removals.
+     *                     <p>
+     *                     The first occurrence of citationKeys gets no serial number, the second gets 0, the third 1 ...
+     *                     <p>
+     *                     Or the first unused in this series, after removals.
      */
     public static String getUniqueMarkName(Set<String> usedNames,
                                            List<String> citationKeys,
@@ -100,10 +103,8 @@ public static String getUniqueMarkName(Set<String> usedNames,
      * Parse a JabRef (reference) mark name.
      *
      * @return Optional.empty() on failure.
-     *
      */
     public static Optional<ParsedMarkName> parseMarkName(String refMarkName) {
-
         Matcher citeMatcher = CITE_PATTERN.matcher(refMarkName);
         if (!citeMatcher.find()) {
             return Optional.empty();
@@ -117,8 +118,7 @@ public static Optional<ParsedMarkName> parseMarkName(String refMarkName) {
     }
 
     /**
-     * @return true if name matches the pattern used for JabRef
-     * reference mark names.
+     * @return true if name matches the pattern used for JabRef reference mark names.
      */
     public static boolean isJabRefReferenceMarkName(String name) {
         return (CITE_PATTERN.matcher(name).find());
diff --git a/src/main/java/org/jabref/logic/openoffice/backend/GetContext.java b/src/main/java/org/jabref/logic/openoffice/backend/GetContext.java
index ffce5b9553e..865682f0ccc 100644
--- a/src/main/java/org/jabref/logic/openoffice/backend/GetContext.java
+++ b/src/main/java/org/jabref/logic/openoffice/backend/GetContext.java
@@ -12,21 +12,17 @@ public class GetContext {
     private static final Logger LOGGER = LoggerFactory.getLogger(GetContext.class);
 
     private GetContext() {
-        // Just to hide the public constructor
     }
 
     /**
-     *  Get the text belonging to cursor with up to
-     *  charBefore and charAfter characters of context.
-     *
-     *  The actual context may be smaller than requested.
-     *
-     *  @param cursor
-     *  @param charBefore Number of characters requested.
-     *  @param charAfter  Number of characters requested.
-     *  @param htmlMarkup If true, the text belonging to the reference mark is surrounded by bold
-     *                    html tag.
+     * Get the text belonging to cursor with up to charBefore and charAfter characters of context.
+     * <p>
+     * The actual context may be smaller than requested.
      *
+     * @param cursor
+     * @param charBefore Number of characters requested.
+     * @param charAfter  Number of characters requested.
+     * @param htmlMarkup If true, the text belonging to the reference mark is surrounded by bold html tag.
      */
     public static String getCursorStringWithContext(XTextCursor cursor,
                                                     int charBefore,
@@ -43,7 +39,7 @@ public static String getCursorStringWithContext(XTextCursor cursor,
                 // If we are close to charBefore and see a space, then cut here. Might avoid cutting
                 // a word in half.
                 if ((i >= (charBefore - flex))
-                    && Character.isWhitespace(cursor.getString().charAt(0))) {
+                        && Character.isWhitespace(cursor.getString().charAt(0))) {
                     break;
                 }
             } catch (IndexOutOfBoundsException ex) {
@@ -72,10 +68,9 @@ public static String getCursorStringWithContext(XTextCursor cursor,
         String result = cursor.getString();
         if (htmlMarkup) {
             result = (result.substring(0, addedBefore)
-                      + "<b>" + citPart + "</b>"
-                      + result.substring(lengthWithBefore));
+                    + "<b>" + citPart + "</b>"
+                    + result.substring(lengthWithBefore));
         }
         return result.trim();
     }
-
 }
diff --git a/src/main/java/org/jabref/logic/openoffice/backend/NamedRangeManagerReferenceMark.java b/src/main/java/org/jabref/logic/openoffice/backend/NamedRangeManagerReferenceMark.java
index 93ad6d12908..fead1169b8e 100644
--- a/src/main/java/org/jabref/logic/openoffice/backend/NamedRangeManagerReferenceMark.java
+++ b/src/main/java/org/jabref/logic/openoffice/backend/NamedRangeManagerReferenceMark.java
@@ -21,23 +21,23 @@ public NamedRange createNamedRange(XTextDocument doc,
                                        XTextCursor position,
                                        boolean insertSpaceAfter,
                                        boolean withoutBrackets)
-        throws
-        CreationException {
+            throws
+            CreationException {
         return NamedRangeReferenceMark.create(doc, refMarkName, position, insertSpaceAfter, withoutBrackets);
     }
 
     @Override
     public List<String> getUsedNames(XTextDocument doc)
-        throws
-        NoDocumentException {
+            throws
+            NoDocumentException {
         return UnoReferenceMark.getListOfNames(doc);
     }
 
     @Override
     public Optional<NamedRange> getNamedRangeFromDocument(XTextDocument doc, String refMarkName)
-        throws
-        NoDocumentException,
-        WrappedTargetException {
+            throws
+            NoDocumentException,
+            WrappedTargetException {
         return (NamedRangeReferenceMark
                 .getFromDocument(doc, refMarkName)
                 .map(x -> x));
diff --git a/src/main/java/org/jabref/logic/openoffice/backend/NamedRangeReferenceMark.java b/src/main/java/org/jabref/logic/openoffice/backend/NamedRangeReferenceMark.java
index 324b984377c..e816b3bfa97 100644
--- a/src/main/java/org/jabref/logic/openoffice/backend/NamedRangeReferenceMark.java
+++ b/src/main/java/org/jabref/logic/openoffice/backend/NamedRangeReferenceMark.java
@@ -17,25 +17,26 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-// was StorageBaseRefMark
-
 class NamedRangeReferenceMark implements NamedRange {
 
     private static final String ZERO_WIDTH_SPACE = "\u200b";
 
     // for debugging we may want visible bracket
     private static final boolean
-    REFERENCE_MARK_USE_INVISIBLE_BRACKETS = true; // !debug;
+            REFERENCE_MARK_USE_INVISIBLE_BRACKETS = true; // !debug;
 
     public static final String
-    REFERENCE_MARK_LEFT_BRACKET = REFERENCE_MARK_USE_INVISIBLE_BRACKETS ? ZERO_WIDTH_SPACE : "<";
+            REFERENCE_MARK_LEFT_BRACKET = REFERENCE_MARK_USE_INVISIBLE_BRACKETS ? ZERO_WIDTH_SPACE : "<";
 
     public static final String
-    REFERENCE_MARK_RIGHT_BRACKET = REFERENCE_MARK_USE_INVISIBLE_BRACKETS ? ZERO_WIDTH_SPACE : ">";
+            REFERENCE_MARK_RIGHT_BRACKET = REFERENCE_MARK_USE_INVISIBLE_BRACKETS ? ZERO_WIDTH_SPACE : ">";
 
     private static final Logger LOGGER = LoggerFactory.getLogger(NamedRangeReferenceMark.class);
 
-    private String rangeId; /* reference mark name */
+    /**
+     * reference mark name
+     */
+    private final String rangeId;
 
     private NamedRangeReferenceMark(String rangeId) {
         this.rangeId = rangeId;
@@ -46,20 +47,15 @@ String getId() {
     }
 
     /**
-     *  Insert {@code n} spaces in a way that reference marks just before or just after the cursor
-     *  are not affected.
-     *
-     *  This is based on the observation, that starting two new paragraphs separates us from
-     *  reference marks on either side.
-     *
-     *  The pattern used is:
-     *  {@code safeInsertSpaces(n): para, para, left, space(n), right-delete, left(n), left-delete}
-     *
-     *  @param position Where to insert (at position.getStart())
-     *  @param numSpaces  Number of spaces to insert.
-     *
-     *  @return a new cursor, covering the just-inserted spaces.
+     * Insert {@code n} spaces in a way that reference marks just before or just after the cursor are not affected.
+     * <p>
+     * This is based on the observation, that starting two new paragraphs separates us from reference marks on either side.
+     * <p>
+     * The pattern used is: {@code safeInsertSpaces(n): para, para, left, space(n), right-delete, left(n), left-delete}
      *
+     * @param position  Where to insert (at position.getStart())
+     * @param numSpaces Number of spaces to insert.
+     * @return a new cursor, covering the just-inserted spaces.
      */
     private static XTextCursor safeInsertSpacesBetweenReferenceMarks(XTextRange position, int numSpaces) {
         // Start with an empty cursor at position.getStart();
@@ -82,8 +78,8 @@ private static void createReprInDocument(XTextDocument doc,
                                              XTextCursor position,
                                              boolean insertSpaceAfter,
                                              boolean withoutBrackets)
-        throws
-        CreationException {
+            throws
+            CreationException {
 
         // The cursor we received: we push it before us.
         position.collapseToEnd();
@@ -101,8 +97,8 @@ private static void createReprInDocument(XTextDocument doc,
         final String left = NamedRangeReferenceMark.REFERENCE_MARK_LEFT_BRACKET;
         final String right = NamedRangeReferenceMark.REFERENCE_MARK_RIGHT_BRACKET;
         String bracketedContent = (withoutBrackets
-                                   ? ""
-                                   : left + right);
+                ? ""
+                : left + right);
 
         cursor.getText().insertString(cursor, bracketedContent, true);
 
@@ -123,8 +119,8 @@ static NamedRangeReferenceMark create(XTextDocument doc,
                                           XTextCursor position,
                                           boolean insertSpaceAfter,
                                           boolean withoutBrackets)
-        throws
-        CreationException {
+            throws
+            CreationException {
 
         createReprInDocument(doc, refMarkName, position, insertSpaceAfter, withoutBrackets);
         return new NamedRangeReferenceMark(refMarkName);
@@ -134,23 +130,23 @@ static NamedRangeReferenceMark create(XTextDocument doc,
      * @return Optional.empty if there is no corresponding range.
      */
     static Optional<NamedRangeReferenceMark> getFromDocument(XTextDocument doc, String refMarkName)
-        throws
-        NoDocumentException,
-        WrappedTargetException {
+            throws
+            NoDocumentException,
+            WrappedTargetException {
         return (UnoReferenceMark.getAnchor(doc, refMarkName)
-                .map(e -> new NamedRangeReferenceMark(refMarkName)));
+                                .map(e -> new NamedRangeReferenceMark(refMarkName)));
     }
 
     /**
      * Remove it from the document.
-     *
+     * <p>
      * See: removeCitationGroups
      */
     @Override
     public void removeFromDocument(XTextDocument doc)
-        throws
-        WrappedTargetException,
-        NoDocumentException {
+            throws
+            WrappedTargetException,
+            NoDocumentException {
         UnoReferenceMark.removeIfExists(doc, this.getRangeName());
     }
 
@@ -160,34 +156,27 @@ public String getRangeName() {
     }
 
     /**
-     *
-     * @return Optional.empty if the reference mark is missing.
-     *
-     * See: UnoReferenceMark.getAnchor
+     * @return Optional.empty if the reference mark is missing. See: UnoReferenceMark.getAnchor
      */
     @Override
     public Optional<XTextRange> getMarkRange(XTextDocument doc)
-        throws
-        NoDocumentException,
-        WrappedTargetException {
+            throws
+            NoDocumentException,
+            WrappedTargetException {
         String name = this.getRangeName();
         return UnoReferenceMark.getAnchor(doc, name);
     }
 
     /**
-     * Cursor for the reference marks as is, not prepared for filling, but does not need
-     * cleanFillCursor either.
-     *
-     * @return Optional.empty() if reference mark is missing from the document,
-     *                          otherwise an XTextCursor for getMarkRange
+     * Cursor for the reference marks as is, not prepared for filling, but does not need cleanFillCursor either.
      *
-     * See: getRawCursorForCitationGroup
+     * @return Optional.empty() if reference mark is missing from the document, otherwise an XTextCursor for getMarkRange See: getRawCursorForCitationGroup
      */
     @Override
     public Optional<XTextCursor> getRawCursor(XTextDocument doc)
-        throws
-        NoDocumentException,
-        WrappedTargetException {
+            throws
+            NoDocumentException,
+            WrappedTargetException {
 
         String name = this.getRangeName();
 
@@ -210,10 +199,10 @@ public Optional<XTextCursor> getRawCursor(XTextDocument doc)
      */
     @Override
     public XTextCursor getFillCursor(XTextDocument doc)
-        throws
-        NoDocumentException,
-        WrappedTargetException,
-        CreationException {
+            throws
+            NoDocumentException,
+            WrappedTargetException,
+            CreationException {
 
         String name = this.getRangeName();
 
@@ -357,8 +346,8 @@ public static void checkFillCursor(XTextCursor cursor) {
             alpha.goLeft(leftLength, true);
             if (!left.equals(alpha.getString())) {
                 String msg = String.format("checkFillCursor:"
-                                           + " ('%s') is not prefixed with REFERENCE_MARK_LEFT_BRACKET, has '%s'",
-                                           cursor.getString(), alpha.getString());
+                                + " ('%s') is not prefixed with REFERENCE_MARK_LEFT_BRACKET, has '%s'",
+                        cursor.getString(), alpha.getString());
                 throw new IllegalStateException(msg);
             }
         }
@@ -369,24 +358,23 @@ public static void checkFillCursor(XTextCursor cursor) {
             omega.goRight(rightLength, true);
             if (!right.equals(omega.getString())) {
                 String msg = String.format("checkFillCursor:"
-                                           + " ('%s') is not followed by REFERENCE_MARK_RIGHT_BRACKET, has '%s'",
-                                           cursor.getString(), omega.getString());
+                                + " ('%s') is not followed by REFERENCE_MARK_RIGHT_BRACKET, has '%s'",
+                        cursor.getString(), omega.getString());
                 throw new IllegalStateException(msg);
             }
         }
     }
 
     /**
-     * Remove brackets, but if the result would become empty, leave them; if the result would be a
-     * single characer, leave the left bracket.
-     *
+     * Remove brackets, but if the result would become empty, leave them; if the result would be a single characer, leave the left bracket.
+     * <p>
      * See: cleanFillCursorForCitationGroup
      */
     @Override
     public void cleanFillCursor(XTextDocument doc)
-        throws
-        NoDocumentException,
-        WrappedTargetException {
+            throws
+            NoDocumentException,
+            WrappedTargetException {
 
         // alwaysRemoveBrackets : full compatibility with JabRef 5.2: brackets are temporary, only
         // exist between getFillCursor and cleanFillCursor.
@@ -422,12 +410,12 @@ public void cleanFillCursor(XTextDocument doc)
         }
 
         boolean removeRight = ((contentLength >= 1)
-                               || ((contentLength == 0) && removeBracketsFromEmpty)
-                               || alwaysRemoveBrackets);
+                || ((contentLength == 0) && removeBracketsFromEmpty)
+                || alwaysRemoveBrackets);
 
         boolean removeLeft = ((contentLength >= 2)
-                              || ((contentLength == 0) && removeBracketsFromEmpty)
-                              || alwaysRemoveBrackets);
+                || ((contentLength == 0) && removeBracketsFromEmpty)
+                || alwaysRemoveBrackets);
 
         if (removeRight) {
             XTextCursor omega = full.getText().createTextCursorByRange(full);
diff --git a/src/main/java/org/jabref/logic/openoffice/frontend/OOFrontend.java b/src/main/java/org/jabref/logic/openoffice/frontend/OOFrontend.java
index 58057c382e7..492124242c7 100644
--- a/src/main/java/org/jabref/logic/openoffice/frontend/OOFrontend.java
+++ b/src/main/java/org/jabref/logic/openoffice/frontend/OOFrontend.java
@@ -47,9 +47,9 @@ public class OOFrontend {
     public final CitationGroups citationGroups;
 
     public OOFrontend(XTextDocument doc)
-        throws
-        NoDocumentException,
-        WrappedTargetException {
+            throws
+            NoDocumentException,
+            WrappedTargetException {
 
         // TODO: dataModel should come from looking at the document and preferences.
         this.backend = new Backend52();
@@ -58,7 +58,7 @@ public OOFrontend(XTextDocument doc)
         List<String> citationGroupNames = this.backend.getJabRefReferenceMarkNames(doc);
 
         Map<CitationGroupId, CitationGroup> citationGroups =
-            readCitationGroupsFromDocument(this.backend, doc, citationGroupNames);
+                readCitationGroupsFromDocument(this.backend, doc, citationGroupNames);
         this.citationGroups = new CitationGroups(citationGroups);
     }
 
@@ -67,8 +67,8 @@ public OODataModel getDataModel() {
     }
 
     public Optional<String> healthReport(XTextDocument doc)
-        throws
-        NoDocumentException {
+            throws
+            NoDocumentException {
         return backend.healthReport(doc);
     }
 
@@ -76,9 +76,9 @@ public Optional<String> healthReport(XTextDocument doc)
     readCitationGroupsFromDocument(Backend52 backend,
                                    XTextDocument doc,
                                    List<String> citationGroupNames)
-        throws
-        WrappedTargetException,
-        NoDocumentException {
+            throws
+            WrappedTargetException,
+            NoDocumentException {
 
         Map<CitationGroupId, CitationGroup> citationGroups = new HashMap<>();
         for (String name : citationGroupNames) {
@@ -89,32 +89,27 @@ public Optional<String> healthReport(XTextDocument doc)
     }
 
     /**
-     * Creates a list of {@code RangeSortable<CitationGroup>} values for our {@code CitationGroup}
-     * values. Originally designed to be passed to {@code visualSort}.
-     *
+     * Creates a list of {@code RangeSortable<CitationGroup>} values for our {@code CitationGroup} values. Originally designed to be passed to {@code visualSort}.
+     * <p>
      * The elements of the returned list are actually of type {@code RangeSortEntry<CitationGroup>}.
+     * <p>
+     * The result is sorted within {@code XTextRange.getText()} partitions of the citation groups according to their {@code XTextRange} (before mapping to footnote marks).
+     * <p>
+     * In the result, RangeSortable.getIndexInPosition() contains unique indexes within the original partition (not after mapFootnotesToFootnoteMarks).
      *
-     * The result is sorted within {@code XTextRange.getText()} partitions of the citation groups
-     * according to their {@code XTextRange} (before mapping to footnote marks).
-     *
-     * In the result, RangeSortable.getIndexInPosition() contains unique indexes within the original
-     * partition (not after mapFootnotesToFootnoteMarks).
-     *
-     * @param mapFootnotesToFootnoteMarks If true, replace ranges in footnotes with the range of the
-     *        corresponding footnote mark. This is used for numbering the citations.
-     *
+     * @param mapFootnotesToFootnoteMarks If true, replace ranges in footnotes with the range of the corresponding footnote mark. This is used for numbering the citations.
      */
-    private List<RangeSortable<CitationGroup>>
-    createVisualSortInput(XTextDocument doc, boolean mapFootnotesToFootnoteMarks)
-        throws
-        NoDocumentException,
-        WrappedTargetException {
+    private List<RangeSortable<CitationGroup>> createVisualSortInput(XTextDocument doc,
+                                                                     boolean mapFootnotesToFootnoteMarks)
+            throws
+            NoDocumentException,
+            WrappedTargetException {
 
         List<RangeSortEntry<CitationGroup>> sortables = new ArrayList<>();
         for (CitationGroup group : citationGroups.getCitationGroupsUnordered()) {
             XTextRange range = (this
-                                .getMarkRange(doc, group)
-                                .orElseThrow(IllegalStateException::new));
+                    .getMarkRange(doc, group)
+                    .orElseThrow(IllegalStateException::new));
             sortables.add(new RangeSortEntry<>(range, 0, group));
         }
 
@@ -137,86 +132,74 @@ public Optional<String> healthReport(XTextDocument doc)
 
         // Sort within partitions
         RangeSort.RangePartitions<RangeSortEntry<CitationGroup>> partitions =
-            RangeSort.partitionAndSortRanges(sortables);
+                RangeSort.partitionAndSortRanges(sortables);
 
         // build final list
         List<RangeSortEntry<CitationGroup>> result = new ArrayList<>();
         for (List<RangeSortEntry<CitationGroup>> partition : partitions.getPartitions()) {
-
             int indexInPartition = 0;
             for (RangeSortEntry<CitationGroup> sortable : partition) {
                 sortable.setIndexInPosition(indexInPartition++);
                 if (mapFootnotesToFootnoteMarks) {
                     Optional<XTextRange> footnoteMarkRange =
-                        UnoTextRange.getFootnoteMarkRange(sortable.getRange());
+                            UnoTextRange.getFootnoteMarkRange(sortable.getRange());
                     // Adjust range if we are inside a footnote:
-                    if (footnoteMarkRange.isPresent()) {
-                        sortable.setRange(footnoteMarkRange.get());
-                    }
+                    footnoteMarkRange.ifPresent(sortable::setRange);
                 }
                 result.add(sortable);
             }
         }
-        return result.stream().map(e -> e).collect(Collectors.toList());
+        return new ArrayList<>(result);
     }
 
     /**
-     *  @param mapFootnotesToFootnoteMarks If true, sort reference marks in footnotes as if they
-     *         appeared at the corresponding footnote mark.
-     *
-     *  @return citation groups sorted by their visual positions.
-     *
-     *  Limitation: for two column layout visual (top-down, left-right) order does not match the
-     *        expected (textual) order.
-     *
+     * @param mapFootnotesToFootnoteMarks If true, sort reference marks in footnotes as if they appeared at the corresponding footnote mark.
+     * @return citation groups sorted by their visual positions. Limitation: for two column layout visual (top-down, left-right) order does not match the expected (textual) order.
      */
     private List<CitationGroup> getVisuallySortedCitationGroups(XTextDocument doc,
                                                                 boolean mapFootnotesToFootnoteMarks,
                                                                 FunctionalTextViewCursor fcursor)
-        throws
-        WrappedTargetException,
-        NoDocumentException {
+            throws
+            WrappedTargetException,
+            NoDocumentException {
 
         List<RangeSortable<CitationGroup>> sortables = createVisualSortInput(doc, mapFootnotesToFootnoteMarks);
 
         List<RangeSortable<CitationGroup>> sorted = RangeSortVisual.visualSort(sortables, doc, fcursor);
 
         return (sorted.stream()
-                .map(RangeSortable<CitationGroup>::getContent)
-                .collect(Collectors.toList()));
+                      .map(RangeSortable::getContent)
+                      .collect(Collectors.toList()));
     }
 
     /**
      * Return citation groups in visual order within (but not across) XText partitions.
-     *
-     * This is (1) sufficient for combineCiteMarkers which looks for consecutive XTextRanges within
-     * each XText, (2) not confused by multicolumn layout or multipage display.
+     * <p>
+     * This is (1) sufficient for combineCiteMarkers which looks for consecutive XTextRanges within each XText, (2) not confused by multicolumn layout or multipage display.
      */
     public List<CitationGroup>
     getCitationGroupsSortedWithinPartitions(XTextDocument doc, boolean mapFootnotesToFootnoteMarks)
-        throws
-        NoDocumentException,
-        WrappedTargetException {
+            throws
+            NoDocumentException,
+            WrappedTargetException {
         // This is like getVisuallySortedCitationGroups,
         // but we skip the visualSort part.
         List<RangeSortable<CitationGroup>> sortables =
-            createVisualSortInput(doc, mapFootnotesToFootnoteMarks);
+                createVisualSortInput(doc, mapFootnotesToFootnoteMarks);
 
-        return (sortables.stream().map(e -> e.getContent()).collect(Collectors.toList()));
+        return (sortables.stream().map(RangeSortable::getContent).collect(Collectors.toList()));
     }
 
     /**
-     *  Create a citation group for the given citation keys, at the end of position.
+     * Create a citation group for the given citation keys, at the end of position.
+     * <p>
+     * On return {@code position} is collapsed, and is after the inserted space, or at the end of the reference mark.
      *
-     *  On return {@code position} is collapsed, and is after the inserted space, or at the end of
-     *  the reference mark.
-     *
-     * @param citationKeys In storage order
-     * @param pageInfos In storage order
+     * @param citationKeys     In storage order
+     * @param pageInfos        In storage order
      * @param citationType
-     * @param position Collapsed to its end.
-     * @param insertSpaceAfter If true, we insert a space after the mark, that carries on format of
-     *                         characters from the original position.
+     * @param position         Collapsed to its end.
+     * @param insertSpaceAfter If true, we insert a space after the mark, that carries on format of characters from the original position.
      */
     public CitationGroup createCitationGroup(XTextDocument doc,
                                              List<String> citationKeys,
@@ -224,24 +207,24 @@ public CitationGroup createCitationGroup(XTextDocument doc,
                                              CitationType citationType,
                                              XTextCursor position,
                                              boolean insertSpaceAfter)
-        throws
-        CreationException,
-        NoDocumentException,
-        WrappedTargetException,
-        NotRemoveableException,
-        PropertyVetoException,
-        IllegalTypeException {
+            throws
+            CreationException,
+            NoDocumentException,
+            WrappedTargetException,
+            NotRemoveableException,
+            PropertyVetoException,
+            IllegalTypeException {
 
         Objects.requireNonNull(pageInfos);
         if (pageInfos.size() != citationKeys.size()) {
             throw new IllegalArgumentException("pageInfos.size != citationKeys.size");
         }
         CitationGroup group = backend.createCitationGroup(doc,
-                                                          citationKeys,
-                                                          pageInfos,
-                                                          citationType,
-                                                          position,
-                                                          insertSpaceAfter);
+                citationKeys,
+                pageInfos,
+                citationType,
+                position,
+                insertSpaceAfter);
 
         this.citationGroups.afterCreateCitationGroup(group);
         return group;
@@ -251,22 +234,22 @@ public CitationGroup createCitationGroup(XTextDocument doc,
      * Remove {@code group} both from the document and notify {@code citationGroups}
      */
     public void removeCitationGroup(CitationGroup group, XTextDocument doc)
-        throws
-        WrappedTargetException,
-        NoDocumentException,
-        NotRemoveableException {
+            throws
+            WrappedTargetException,
+            NoDocumentException,
+            NotRemoveableException {
 
         backend.removeCitationGroup(group, doc);
         this.citationGroups.afterRemoveCitationGroup(group);
     }
 
-    public void removeCitationGroups(List<CitationGroup> cgs, XTextDocument doc)
-        throws
-        WrappedTargetException,
-        NoDocumentException,
-        NotRemoveableException {
+    public void removeCitationGroups(List<CitationGroup> citationGroups, XTextDocument doc)
+            throws
+            WrappedTargetException,
+            NoDocumentException,
+            NotRemoveableException {
 
-        for (CitationGroup group : cgs) {
+        for (CitationGroup group : citationGroups) {
             removeCitationGroup(group, doc);
         }
     }
@@ -275,20 +258,19 @@ public void removeCitationGroups(List<CitationGroup> cgs, XTextDocument doc)
      * ranges controlled by citation groups should not overlap with each other.
      *
      * @return Optional.empty() if the reference mark is missing.
-     *
      */
     public Optional<XTextRange> getMarkRange(XTextDocument doc, CitationGroup group)
-        throws
-        NoDocumentException,
-        WrappedTargetException {
+            throws
+            NoDocumentException,
+            WrappedTargetException {
         return backend.getMarkRange(group, doc);
     }
 
     public XTextCursor getFillCursorForCitationGroup(XTextDocument doc, CitationGroup group)
-        throws
-        NoDocumentException,
-        WrappedTargetException,
-        CreationException {
+            throws
+            NoDocumentException,
+            WrappedTargetException,
+            CreationException {
         return backend.getFillCursorForCitationGroup(group, doc);
     }
 
@@ -296,41 +278,39 @@ public XTextCursor getFillCursorForCitationGroup(XTextDocument doc, CitationGrou
      * Remove brackets added by getFillCursorForCitationGroup.
      */
     public void cleanFillCursorForCitationGroup(XTextDocument doc, CitationGroup group)
-        throws
-        NoDocumentException,
-        WrappedTargetException {
+            throws
+            NoDocumentException,
+            WrappedTargetException {
 
         backend.cleanFillCursorForCitationGroup(group, doc);
     }
 
     /**
-     * @return A RangeForOverlapCheck for each citation group.
-     *
-     *  result.size() == nRefMarks
+     * @return A RangeForOverlapCheck for each citation group. result.size() == nRefMarks
      */
     public List<RangeForOverlapCheck<CitationGroupId>> citationRanges(XTextDocument doc)
-        throws
-        NoDocumentException,
-        WrappedTargetException {
+            throws
+            NoDocumentException,
+            WrappedTargetException {
 
         List<RangeForOverlapCheck<CitationGroupId>> result =
-            new ArrayList<>(citationGroups.numberOfCitationGroups());
+                new ArrayList<>(citationGroups.numberOfCitationGroups());
 
         for (CitationGroup group : citationGroups.getCitationGroupsUnordered()) {
             XTextRange range = this.getMarkRange(doc, group).orElseThrow(IllegalStateException::new);
             String description = group.groupId.citationGroupIdAsString();
             result.add(new RangeForOverlapCheck<>(range,
-                                                  group.groupId,
-                                                  RangeForOverlapCheck.REFERENCE_MARK_KIND,
-                                                  description));
+                    group.groupId,
+                    RangeForOverlapCheck.REFERENCE_MARK_KIND,
+                    description));
         }
         return result;
     }
 
     public List<RangeForOverlapCheck<CitationGroupId>> bibliographyRanges(XTextDocument doc)
-        throws
-        NoDocumentException,
-        WrappedTargetException {
+            throws
+            NoDocumentException,
+            WrappedTargetException {
 
         List<RangeForOverlapCheck<CitationGroupId>> result = new ArrayList<>();
 
@@ -338,48 +318,40 @@ public List<RangeForOverlapCheck<CitationGroupId>> bibliographyRanges(XTextDocum
         if (range.isPresent()) {
             String description = "bibliography";
             result.add(new RangeForOverlapCheck<>(range.get(),
-                                                  new CitationGroupId("bibliography"),
-                                                  RangeForOverlapCheck.BIBLIOGRAPHY_MARK_KIND,
-                                                  description));
+                    new CitationGroupId("bibliography"),
+                    RangeForOverlapCheck.BIBLIOGRAPHY_MARK_KIND,
+                    description));
         }
         return result;
     }
 
     public List<RangeForOverlapCheck<CitationGroupId>> viewCursorRanges(XTextDocument doc) {
-
         List<RangeForOverlapCheck<CitationGroupId>> result = new ArrayList<>();
 
         Optional<XTextRange> range = UnoCursor.getViewCursor(doc).map(e -> e);
         if (range.isPresent()) {
             String description = "cursor";
             result.add(new RangeForOverlapCheck<>(range.get(),
-                                                  new CitationGroupId("cursor"),
-                                                  RangeForOverlapCheck.CURSOR_MARK_KIND,
-                                                  description));
+                    new CitationGroupId("cursor"),
+                    RangeForOverlapCheck.CURSOR_MARK_KIND,
+                    description));
         }
         return result;
     }
 
     /**
-     * @return A range for each footnote mark where the footnote contains at least one citation group.
-     *
-     *  Purpose: We do not want markers of footnotes containing reference marks to overlap with
-     *  reference marks. Overwriting these footnote marks might kill our reference marks in the
-     *  footnote.
-     *
-     *  Note: Here we directly communicate to the document, not through the backend. This is because
-     *        mapping ranges to footnote marks does not depend on how do we mark or structure those
-     *        ranges.
+     * @return A range for each footnote mark where the footnote contains at least one citation group. Purpose: We do not want markers of footnotes containing reference marks to overlap with reference marks. Overwriting these footnote marks might kill our reference marks in the footnote.
+     * <p>
+     * Note: Here we directly communicate to the document, not through the backend. This is because mapping ranges to footnote marks does not depend on how do we mark or structure those ranges.
      */
     public List<RangeForOverlapCheck<CitationGroupId>>
     footnoteMarkRanges(XTextDocument doc, List<RangeForOverlapCheck<CitationGroupId>> citationRanges) {
-
         // We partition by XText and use a single range from
         // each partition to get at the corresponding footnotemark range.
 
         List<RangeForOverlapCheck<CitationGroupId>> result = new ArrayList<>();
         RangeSort.RangePartitions<RangeForOverlapCheck<CitationGroupId>> partitions =
-            RangeSort.partitionRanges(citationRanges);
+                RangeSort.partitionRanges(citationRanges);
 
         // Each partition corresponds to an XText, and each footnote has a single XText.
         // (This latter ignores the possibility of XTextContents inserted into footnotes.)
@@ -398,15 +370,14 @@ public List<RangeForOverlapCheck<CitationGroupId>> viewCursorRanges(XTextDocumen
             }
 
             result.add(new RangeForOverlapCheck<>(footnoteMarkRange.get(),
-                                                  citationRange.idWithinKind,
-                                                  RangeForOverlapCheck.FOOTNOTE_MARK_KIND,
-                                                  "FootnoteMark for " + citationRange.format()));
+                    citationRange.idWithinKind,
+                    RangeForOverlapCheck.FOOTNOTE_MARK_KIND,
+                    "FootnoteMark for " + citationRange.format()));
         }
         return result;
     }
 
     static String rangeOverlapsToMessage(List<RangeOverlap<RangeForOverlapCheck<CitationGroupId>>> overlaps) {
-
         if (overlaps.isEmpty()) {
             return "(*no overlaps*)";
         }
@@ -414,14 +385,14 @@ static String rangeOverlapsToMessage(List<RangeOverlap<RangeForOverlapCheck<Cita
         StringBuilder msg = new StringBuilder();
         for (RangeOverlap<RangeForOverlapCheck<CitationGroupId>> overlap : overlaps) {
             String listOfRanges = (overlap.valuesForOverlappingRanges.stream()
-                                   .map(v -> String.format("'%s'", v.format()))
-                                   .collect(Collectors.joining(", ")));
+                                                                     .map(v -> String.format("'%s'", v.format()))
+                                                                     .collect(Collectors.joining(", ")));
             msg.append(
-                switch (overlap.kind) {
-                    case EQUAL_RANGE -> Localization.lang("Found identical ranges");
-                    case OVERLAP -> Localization.lang("Found overlapping ranges");
-                    case TOUCH -> Localization.lang("Found touching ranges");
-                });
+                    switch (overlap.kind) {
+                        case EQUAL_RANGE -> Localization.lang("Found identical ranges");
+                        case OVERLAP -> Localization.lang("Found overlapping ranges");
+                        case TOUCH -> Localization.lang("Found touching ranges");
+                    });
             msg.append(": ");
             msg.append(listOfRanges);
             msg.append("\n");
@@ -431,18 +402,18 @@ static String rangeOverlapsToMessage(List<RangeOverlap<RangeForOverlapCheck<Cita
 
     /**
      * Check for any overlap between userRanges and protected ranges.
-     *
+     * <p>
      * Assume userRanges is small (usually 1 elements for checking the cursor)
-     *
+     * <p>
      * Returns on first problem found.
      */
     public OOVoidResult<JabRefException>
     checkRangeOverlapsWithCursor(XTextDocument doc,
                                  List<RangeForOverlapCheck<CitationGroupId>> userRanges,
                                  boolean requireSeparation)
-        throws
-        NoDocumentException,
-        WrappedTargetException {
+            throws
+            NoDocumentException,
+            WrappedTargetException {
 
         List<RangeForOverlapCheck<CitationGroupId>> citationRanges = citationRanges(doc);
         List<RangeForOverlapCheck<CitationGroupId>> ranges = new ArrayList<>();
@@ -453,30 +424,29 @@ static String rangeOverlapsToMessage(List<RangeOverlap<RangeForOverlapCheck<Cita
         ranges.addAll(footnoteMarkRanges(doc, citationRanges));
 
         List<RangeOverlap<RangeForOverlapCheck<CitationGroupId>>> overlaps =
-            RangeOverlapBetween.findFirst(doc,
-                                          userRanges,
-                                          ranges,
-                                          requireSeparation);
+                RangeOverlapBetween.findFirst(doc,
+                        userRanges,
+                        ranges,
+                        requireSeparation);
 
         if (overlaps.isEmpty()) {
             return OOVoidResult.ok();
         }
         return OOVoidResult.error(new JabRefException("Found overlapping or touching ranges",
-                                                      rangeOverlapsToMessage(overlaps)));
+                rangeOverlapsToMessage(overlaps)));
     }
 
     /**
      * @param requireSeparation Report range pairs that only share a boundary.
-     * @param reportAtMost Limit number of overlaps reported (0 for no limit)
-     *
+     * @param reportAtMost      Limit number of overlaps reported (0 for no limit)
      */
     public OOVoidResult<JabRefException> checkRangeOverlaps(XTextDocument doc,
                                                             List<RangeForOverlapCheck<CitationGroupId>> userRanges,
                                                             boolean requireSeparation,
                                                             int reportAtMost)
-        throws
-        NoDocumentException,
-        WrappedTargetException {
+            throws
+            NoDocumentException,
+            WrappedTargetException {
 
         List<RangeForOverlapCheck<CitationGroupId>> citationRanges = citationRanges(doc);
         List<RangeForOverlapCheck<CitationGroupId>> ranges = new ArrayList<>();
@@ -486,69 +456,56 @@ public OOVoidResult<JabRefException> checkRangeOverlaps(XTextDocument doc,
         ranges.addAll(footnoteMarkRanges(doc, citationRanges));
 
         List<RangeOverlap<RangeForOverlapCheck<CitationGroupId>>> overlaps =
-            RangeOverlapWithin.findOverlappingRanges(doc, ranges, requireSeparation, reportAtMost);
+                RangeOverlapWithin.findOverlappingRanges(doc, ranges, requireSeparation, reportAtMost);
 
         if (overlaps.isEmpty()) {
             return OOVoidResult.ok();
         }
         return OOVoidResult.error(new JabRefException("Found overlapping or touching ranges",
-                                                      rangeOverlapsToMessage(overlaps)));
+                rangeOverlapsToMessage(overlaps)));
     }
 
     /**
-     * GUI: Get a list of CitationEntry objects corresponding to citations
-     * in the document.
-     *
+     * GUI: Get a list of CitationEntry objects corresponding to citations in the document.
+     * <p>
      * Called from: ManageCitationsDialogViewModel constructor.
      *
-     * @return A list with entries corresponding to citations in the text, in arbitrary order (same
-     *         order as from getJabRefReferenceMarkNames).
-     *
-     *               Note: visual or alphabetic order could be more manageable for the user. We
-     *               could provide these here, but switching between them needs change on GUI
-     *               (adding a toggle or selector).
-     *
-     *               Note: CitationEntry implements Comparable, where compareTo() and equals() are
-     *                     based on refMarkName.  The order used in the "Manage citations" dialog
-     *                     does not seem to use that.
-     *
-     *                     The 1st is labeled "Citation" (show citation in bold, and some context
-     *                     around it).
-     *
-     *                     The columns can be sorted by clicking on the column title.  For the
-     *                     "Citation" column, the sorting is based on the content, (the context
-     *                     before the citation), not on the citation itself.
-     *
-     *                     In the "Extra information ..." column some visual indication of the
-     *                     editable part could be helpful.
-     *
-     *         Wish: selecting an entry (or a button in the line) in the GUI could move the cursor
-     *               in the document to the entry.
+     * @return A list with entries corresponding to citations in the text, in arbitrary order (same order as from getJabRefReferenceMarkNames). Note: visual or alphabetic order could be more manageable for the user. We could provide these here, but switching between them needs change on GUI (adding a toggle or selector).
+     * <p>
+     * Note: CitationEntry implements Comparable, where compareTo() and equals() are based on refMarkName.  The order used in the "Manage citations" dialog does not seem to use that.
+     * <p>
+     * The 1st is labeled "Citation" (show citation in bold, and some context around it).
+     * <p>
+     * The columns can be sorted by clicking on the column title.  For the "Citation" column, the sorting is based on the content, (the context before the citation), not on the citation itself.
+     * <p>
+     * In the "Extra information ..." column some visual indication of the editable part could be helpful.
+     * <p>
+     * Wish: selecting an entry (or a button in the line) in the GUI could move the cursor in the document to the entry.
      */
     public List<CitationEntry> getCitationEntries(XTextDocument doc)
-        throws
-        WrappedTargetException,
-        NoDocumentException {
+            throws
+            WrappedTargetException,
+            NoDocumentException {
         return this.backend.getCitationEntries(doc, citationGroups);
     }
 
     public void applyCitationEntries(XTextDocument doc, List<CitationEntry> citationEntries)
-        throws
-        PropertyVetoException,
-        IllegalTypeException,
-        IllegalArgumentException,
-        WrappedTargetException {
+            throws
+            PropertyVetoException,
+            IllegalTypeException,
+            IllegalArgumentException,
+            WrappedTargetException {
         this.backend.applyCitationEntries(doc, citationEntries);
     }
 
     public void imposeGlobalOrder(XTextDocument doc, FunctionalTextViewCursor fcursor)
-        throws
-        WrappedTargetException,
-        NoDocumentException {
+            throws
+            WrappedTargetException,
+            NoDocumentException {
 
         boolean mapFootnotesToFootnoteMarks = true;
         List<CitationGroup> sortedCitationGroups =
-            getVisuallySortedCitationGroups(doc, mapFootnotesToFootnoteMarks, fcursor);
+                getVisuallySortedCitationGroups(doc, mapFootnotesToFootnoteMarks, fcursor);
         List<CitationGroupId> sortedCitationGroupIds = OOListUtil.map(sortedCitationGroups, group -> group.groupId);
         citationGroups.setGlobalOrder(sortedCitationGroupIds);
     }
diff --git a/src/main/java/org/jabref/logic/openoffice/frontend/RangeForOverlapCheck.java b/src/main/java/org/jabref/logic/openoffice/frontend/RangeForOverlapCheck.java
index 6cbf560ec62..914195bd243 100644
--- a/src/main/java/org/jabref/logic/openoffice/frontend/RangeForOverlapCheck.java
+++ b/src/main/java/org/jabref/logic/openoffice/frontend/RangeForOverlapCheck.java
@@ -6,17 +6,10 @@
 
 /**
  * Describe a protected range for overlap checking and reporting.
- *
- * To check that our protected ranges do not overlap, we collect
- * these ranges. To check for overlaps between these, we need the
- * {@code range} itself. To report the results of overlap
- * checking, we need a {@code description} that can be understood
- * by the user.
- *
- * To be able to refer back to more extended data, we might need to
- * identify its {@code kind}, and its index in the corresponding
- * tables or other identifier within its kind ({@code idWithinKind})
- *
+ * <p>
+ * To check that our protected ranges do not overlap, we collect these ranges. To check for overlaps between these, we need the {@code range} itself. To report the results of overlap checking, we need a {@code description} that can be understood by the user.
+ * <p>
+ * To be able to refer back to more extended data, we might need to identify its {@code kind}, and its index in the corresponding tables or other identifier within its kind ({@code idWithinKind})
  */
 public class RangeForOverlapCheck<T> implements RangeHolder {
 
diff --git a/src/main/java/org/jabref/logic/openoffice/frontend/UpdateBibliography.java b/src/main/java/org/jabref/logic/openoffice/frontend/UpdateBibliography.java
index ebda8359ba5..99e71e13725 100644
--- a/src/main/java/org/jabref/logic/openoffice/frontend/UpdateBibliography.java
+++ b/src/main/java/org/jabref/logic/openoffice/frontend/UpdateBibliography.java
@@ -17,22 +17,18 @@
 import com.sun.star.text.XTextDocument;
 import com.sun.star.text.XTextRange;
 
-/*
- * Update document: citation marks and bibliography
- */
 public class UpdateBibliography {
 
     private static final String BIB_SECTION_NAME = "JR_bib";
     private static final String BIB_SECTION_END_NAME = "JR_bib_end";
 
     private UpdateBibliography() {
-        /**/
     }
 
     public static Optional<XTextRange> getBibliographyRange(XTextDocument doc)
-        throws
-        NoDocumentException,
-        WrappedTargetException {
+            throws
+            NoDocumentException,
+            WrappedTargetException {
         return UnoTextSection.getAnchor(doc, BIB_SECTION_NAME);
     }
 
@@ -44,28 +40,28 @@ public static void rebuildBibTextSection(XTextDocument doc,
                                              CitedKeys bibliography,
                                              OOBibStyle style,
                                              boolean alwaysAddCitedOnPages)
-        throws
-        WrappedTargetException,
-        CreationException,
-        NoDocumentException {
+            throws
+            WrappedTargetException,
+            CreationException,
+            NoDocumentException {
 
         clearBibTextSectionContent2(doc);
 
         populateBibTextSection(doc,
-                               frontend,
-                               bibliography,
-                               style,
-                               alwaysAddCitedOnPages);
+                frontend,
+                bibliography,
+                style,
+                alwaysAddCitedOnPages);
     }
 
     /**
      * Insert a paragraph break and create a text section for the bibliography.
-     *
+     * <p>
      * Only called from `clearBibTextSectionContent2`
      */
     private static void createBibTextSection2(XTextDocument doc)
-        throws
-        CreationException {
+            throws
+            CreationException {
 
         // Always creating at the end of the document.
         // Alternatively, we could receive a cursor.
@@ -75,23 +71,20 @@ private static void createBibTextSection2(XTextDocument doc)
     }
 
     /**
-     *  Find and clear the text section BIB_SECTION_NAME to "",
-     *  or create it.
-     *
+     * Find and clear the text section BIB_SECTION_NAME to "", or create it.
+     * <p>
      * Only called from: `rebuildBibTextSection`
-     *
      */
     private static void clearBibTextSectionContent2(XTextDocument doc)
-        throws
-        CreationException,
-        NoDocumentException,
-        WrappedTargetException {
+            throws
+            CreationException,
+            NoDocumentException,
+            WrappedTargetException {
 
         // Optional<XTextRange> sectionRange = UnoTextSection.getAnchor(doc, BIB_SECTION_NAME);
         Optional<XTextRange> sectionRange = getBibliographyRange(doc);
         if (sectionRange.isEmpty()) {
             createBibTextSection2(doc);
-            return;
         } else {
             // Clear it
             XTextCursor cursor = doc.getText().createTextCursorByRange(sectionRange.get());
@@ -101,7 +94,7 @@ private static void clearBibTextSectionContent2(XTextDocument doc)
 
     /**
      * Only called from: `rebuildBibTextSection`
-     *
+     * <p>
      * Assumes the section named BIB_SECTION_NAME exists.
      */
     private static void populateBibTextSection(XTextDocument doc,
@@ -109,11 +102,11 @@ private static void populateBibTextSection(XTextDocument doc,
                                                CitedKeys bibliography,
                                                OOBibStyle style,
                                                boolean alwaysAddCitedOnPages)
-        throws
-        CreationException,
-        IllegalArgumentException,
-        NoDocumentException,
-        WrappedTargetException {
+            throws
+            CreationException,
+            IllegalArgumentException,
+            NoDocumentException,
+            WrappedTargetException {
 
         XTextRange sectionRange = getBibliographyRange(doc).orElseThrow(IllegalStateException::new);
 
@@ -122,9 +115,9 @@ private static void populateBibTextSection(XTextDocument doc,
         // emit the title of the bibliography
         OOTextIntoOO.removeDirectFormatting(cursor);
         OOText bibliographyText = OOFormatBibliography.formatBibliography(frontend.citationGroups,
-                                                                          bibliography,
-                                                                          style,
-                                                                          alwaysAddCitedOnPages);
+                bibliography,
+                style,
+                alwaysAddCitedOnPages);
         OOTextIntoOO.write(doc, cursor, bibliographyText);
         cursor.collapseToEnd();
 
@@ -140,5 +133,4 @@ private static void populateBibTextSection(XTextDocument doc,
 
         cursor.collapseToEnd();
     }
-
 }
diff --git a/src/main/java/org/jabref/logic/openoffice/frontend/UpdateCitationMarkers.java b/src/main/java/org/jabref/logic/openoffice/frontend/UpdateCitationMarkers.java
index 834fce1d0ce..d43734cb0f4 100644
--- a/src/main/java/org/jabref/logic/openoffice/frontend/UpdateCitationMarkers.java
+++ b/src/main/java/org/jabref/logic/openoffice/frontend/UpdateCitationMarkers.java
@@ -22,57 +22,44 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-/*
- * Update document: citation marks and bibliography
- */
 public class UpdateCitationMarkers {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(UpdateCitationMarkers.class);
 
     private UpdateCitationMarkers() {
-        /**/
     }
 
     /**
-     * Visit each reference mark in referenceMarkNames, overwrite its
-     * text content.
-     *
-     * After each fillCitationMarkInCursor call check if we lost the
-     * BIB_SECTION_NAME bookmark and recreate it if we did.
+     * Visit each reference mark in referenceMarkNames, overwrite its text content.
+     * <p>
+     * After each fillCitationMarkInCursor call check if we lost the BIB_SECTION_NAME bookmark and recreate it if we did.
      *
      * @param frontend
-     *
-     * @param style Bibliography style to use.
-     *
+     * @param style    Bibliography style to use.
      */
     public static void applyNewCitationMarkers(XTextDocument doc, OOFrontend frontend, OOBibStyle style)
-        throws
-        NoDocumentException,
-        CreationException,
-        WrappedTargetException {
+            throws
+            NoDocumentException,
+            CreationException,
+            WrappedTargetException {
 
         CitationGroups citationGroups = frontend.citationGroups;
 
         for (CitationGroup group : citationGroups.getCitationGroupsUnordered()) {
-
             boolean withText = (group.citationType != CitationType.INVISIBLE_CIT);
             Optional<OOText> marker = group.getCitationMarker();
 
-            if (!marker.isPresent()) {
+            if (marker.isEmpty()) {
                 LOGGER.warn("applyNewCitationMarkers: no marker for {}",
-                            group.groupId.citationGroupIdAsString());
+                        group.groupId.citationGroupIdAsString());
                 continue;
             }
 
             if (withText && marker.isPresent()) {
-
                 XTextCursor cursor = frontend.getFillCursorForCitationGroup(doc, group);
-
                 fillCitationMarkInCursor(doc, cursor, marker.get(), withText, style);
-
                 frontend.cleanFillCursorForCitationGroup(doc, group);
             }
-
         }
     }
 
@@ -81,10 +68,10 @@ public static void fillCitationMarkInCursor(XTextDocument doc,
                                                 OOText citationText,
                                                 boolean withText,
                                                 OOBibStyle style)
-        throws
-        WrappedTargetException,
-        CreationException,
-        IllegalArgumentException {
+            throws
+            WrappedTargetException,
+            CreationException,
+            IllegalArgumentException {
 
         Objects.requireNonNull(cursor);
         Objects.requireNonNull(citationText);
@@ -102,21 +89,15 @@ public static void fillCitationMarkInCursor(XTextDocument doc,
     }
 
     /**
-     *  Inserts a citation group in the document: creates and fills it.
+     * Inserts a citation group in the document: creates and fills it.
      *
-     * @param citationKeys BibTeX keys of
+     * @param citationKeys     BibTeX keys of
      * @param pageInfos
      * @param citationType
-     *
-     * @param citationText Text for the citation. A citation mark or
-     *             placeholder if not yet available.
-     *
-     * @param position Location to insert at.
+     * @param citationText     Text for the citation. A citation mark or placeholder if not yet available.
+     * @param position         Location to insert at.
      * @param style
-     * @param insertSpaceAfter A space inserted after the reference
-     *             mark makes it easier to separate from the text
-     *             coming after. But is not wanted when we recreate a
-     *             reference mark.
+     * @param insertSpaceAfter A space inserted after the reference mark makes it easier to separate from the text coming after. But is not wanted when we recreate a reference mark.
      */
     public static void createAndFillCitationGroup(OOFrontend frontend,
                                                   XTextDocument doc,
@@ -127,25 +108,25 @@ public static void createAndFillCitationGroup(OOFrontend frontend,
                                                   XTextCursor position,
                                                   OOBibStyle style,
                                                   boolean insertSpaceAfter)
-        throws
-        NotRemoveableException,
-        WrappedTargetException,
-        PropertyVetoException,
-        IllegalArgumentException,
-        CreationException,
-        NoDocumentException,
-        IllegalTypeException {
+            throws
+            NotRemoveableException,
+            WrappedTargetException,
+            PropertyVetoException,
+            IllegalArgumentException,
+            CreationException,
+            NoDocumentException,
+            IllegalTypeException {
 
         Objects.requireNonNull(pageInfos);
         if (pageInfos.size() != citationKeys.size()) {
             throw new IllegalArgumentException("pageInfos.size != citationKeys.size");
         }
         CitationGroup group = frontend.createCitationGroup(doc,
-                                                           citationKeys,
-                                                           pageInfos,
-                                                           citationType,
-                                                           position,
-                                                           insertSpaceAfter);
+                citationKeys,
+                pageInfos,
+                citationType,
+                position,
+                insertSpaceAfter);
 
         final boolean withText = citationType.withText();
 
@@ -158,5 +139,4 @@ public static void createAndFillCitationGroup(OOFrontend frontend,
         }
         position.collapseToEnd();
     }
-
 }
diff --git a/src/main/java/org/jabref/logic/openoffice/style/OOBibStyle.java b/src/main/java/org/jabref/logic/openoffice/style/OOBibStyle.java
index 5108c94c8b3..1d14af0f6ea 100644
--- a/src/main/java/org/jabref/logic/openoffice/style/OOBibStyle.java
+++ b/src/main/java/org/jabref/logic/openoffice/style/OOBibStyle.java
@@ -1,15 +1,13 @@
 package org.jabref.logic.openoffice.style;
 
-import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
 import java.io.StringReader;
-import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -25,11 +23,6 @@
 import org.jabref.logic.layout.LayoutFormatter;
 import org.jabref.logic.layout.LayoutFormatterPreferences;
 import org.jabref.logic.layout.LayoutHelper;
-import org.jabref.model.database.BibDatabase;
-import org.jabref.model.entry.Author;
-import org.jabref.model.entry.AuthorList;
-import org.jabref.model.entry.BibEntry;
-import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.FieldFactory;
 import org.jabref.model.entry.field.OrFields;
 import org.jabref.model.entry.field.StandardField;
@@ -42,7 +35,6 @@
 import org.jabref.model.openoffice.style.CitationMarkerNumericBibEntry;
 import org.jabref.model.openoffice.style.CitationMarkerNumericEntry;
 import org.jabref.model.openoffice.style.NonUniqueCitationMarker;
-import org.jabref.model.strings.StringUtil;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -138,31 +130,27 @@ public class OOBibStyle implements Comparable<OOBibStyle> {
     private final Map<String, Object> citProperties = new HashMap<>();
     private final boolean fromResource;
     private final String path;
-    private final Charset encoding;
     private final LayoutFormatterPreferences prefs;
     private String name = "";
     private Layout defaultBibLayout;
     private boolean valid;
-    private File styleFile;
+    private Path styleFile;
     private long styleFileModificationTime = Long.MIN_VALUE;
     private String localCopy;
     private boolean isDefaultLayoutPresent;
 
-    public OOBibStyle(File styleFile, LayoutFormatterPreferences prefs,
-                      Charset encoding) throws IOException {
+    public OOBibStyle(Path styleFile, LayoutFormatterPreferences prefs) throws IOException {
         this.prefs = Objects.requireNonNull(prefs);
         this.styleFile = Objects.requireNonNull(styleFile);
-        this.encoding = Objects.requireNonNull(encoding);
         setDefaultProperties();
         reload();
         fromResource = false;
-        path = styleFile.getPath();
+        path = styleFile.toAbsolutePath().toString();
     }
 
     public OOBibStyle(String resourcePath, LayoutFormatterPreferences prefs) throws IOException {
         this.prefs = Objects.requireNonNull(prefs);
         Objects.requireNonNull(resourcePath);
-        this.encoding = StandardCharsets.UTF_8;
         setDefaultProperties();
         initialize(OOBibStyle.class.getResourceAsStream(resourcePath));
         fromResource = true;
@@ -234,7 +222,7 @@ public String getPath() {
         return path;
     }
 
-    public File getFile() {
+    public Path getFile() {
         return styleFile;
     }
 
@@ -245,7 +233,7 @@ public Set<String> getJournals() {
     private void initialize(InputStream stream) throws IOException {
         Objects.requireNonNull(stream);
 
-        try (Reader reader = new InputStreamReader(stream, encoding)) {
+        try (Reader reader = new InputStreamReader(stream, StandardCharsets.UTF_8)) {
             readFormatFile(reader);
         }
     }
@@ -270,8 +258,8 @@ public void ensureUpToDate() throws IOException {
      */
     private void reload() throws IOException {
         if (styleFile != null) {
-            this.styleFileModificationTime = styleFile.lastModified();
-            try (InputStream stream = new FileInputStream(styleFile)) {
+            this.styleFileModificationTime = Files.getLastModifiedTime(styleFile).toMillis();
+            try (InputStream stream = Files.newInputStream(styleFile)) {
                 initialize(stream);
             }
         }
@@ -287,7 +275,11 @@ private boolean isUpToDate() {
         if (styleFile == null) {
             return true;
         } else {
-            return styleFile.lastModified() == this.styleFileModificationTime;
+            try {
+                return Files.getLastModifiedTime(styleFile).toMillis() == this.styleFileModificationTime;
+            } catch (IOException e) {
+                return false;
+            }
         }
     }
 
@@ -384,7 +376,6 @@ public boolean isValid() {
     private void handleStructureLine(String line) {
         int index = line.indexOf('=');
         if ((index > 0) && (index < (line.length() - 1))) {
-
             try {
                 final String typeName = line.substring(0, index);
                 final String formatString = line.substring(index + 1);
@@ -446,351 +437,6 @@ public Layout getReferenceFormat(EntryType type) {
         }
     }
 
-    /* begin_old */
-    /**
-     * Format a number-based citation marker for the given number.
-     *
-     * @param number The citation numbers.
-     * @return The text for the citation.
-     */
-    public String getNumCitationMarker(List<Integer> number, int minGroupingCount, boolean inList) {
-        String bracketBefore = getStringCitProperty(BRACKET_BEFORE);
-        if (inList && (citProperties.containsKey(BRACKET_BEFORE_IN_LIST))) {
-            bracketBefore = getStringCitProperty(BRACKET_BEFORE_IN_LIST);
-        }
-        String bracketAfter = getStringCitProperty(BRACKET_AFTER);
-        if (inList && (citProperties.containsKey(BRACKET_AFTER_IN_LIST))) {
-            bracketAfter = getStringCitProperty(BRACKET_AFTER_IN_LIST);
-        }
-        // Sort the numbers:
-        List<Integer> lNum = new ArrayList<>(number);
-        Collections.sort(lNum);
-        StringBuilder stringBuilder = new StringBuilder(bracketBefore);
-        int combineFrom = -1;
-        int written = 0;
-        for (int i = 0; i < lNum.size(); i++) {
-            int i1 = lNum.get(i);
-            if (combineFrom < 0) {
-                // Check if next entry is the next in the ref list:
-                if ((i < (lNum.size() - 1)) && (lNum.get(i + 1) == (i1 + 1)) && (i1 > 0)) {
-                    combineFrom = i1;
-                } else {
-                    // Add single entry:
-                    if (i > 0) {
-                        stringBuilder.append(getStringCitProperty(CITATION_SEPARATOR));
-                    }
-                    stringBuilder.append(lNum.get(i) > 0 ? String.valueOf(lNum.get(i)) : OOBibStyle.UNDEFINED_CITATION_MARKER);
-                    written++;
-                }
-            } else {
-                // We are building a list of combined entries.
-                // Check if it ends here:
-                if ((i == (lNum.size() - 1)) || (lNum.get(i + 1) != (i1 + 1))) {
-                    if (written > 0) {
-                        stringBuilder.append(getStringCitProperty(CITATION_SEPARATOR));
-                    }
-                    if ((minGroupingCount > 0) && (((i1 + 1) - combineFrom) >= minGroupingCount)) {
-                        stringBuilder.append(combineFrom);
-                        stringBuilder.append(getStringCitProperty(GROUPED_NUMBERS_SEPARATOR));
-                        stringBuilder.append(i1);
-                        written++;
-                    } else {
-                        // Either we should never group, or there aren't enough
-                        // entries in this case to group. Output all:
-                        for (int jj = combineFrom; jj <= i1; jj++) {
-                            stringBuilder.append(jj);
-                            if (jj < i1) {
-                                stringBuilder.append(getStringCitProperty(CITATION_SEPARATOR));
-                            }
-                            written++;
-                        }
-                    }
-                    combineFrom = -1;
-                }
-                // If it doesn't end here, just keep iterating.
-            }
-        }
-        stringBuilder.append(bracketAfter);
-        return stringBuilder.toString();
-    }
-    /* end_old */
-
-    /* begin_old */
-    public String getCitationMarker(List<BibEntry> entries, Map<BibEntry, BibDatabase> database, boolean inParenthesis,
-                                    String[] uniquefiers, int[] unlimAuthors) {
-        // Look for groups of uniquefied entries that should be combined in the output.
-        // E.g. (Olsen, 2005a, b) should be output instead of (Olsen, 2005a; Olsen, 2005b).
-        int piv = -1;
-        String tmpMarker = null;
-        if (uniquefiers != null) {
-            for (int i = 0; i < uniquefiers.length; i++) {
-
-                if ((uniquefiers[i] == null) || uniquefiers[i].isEmpty()) {
-                    // This entry has no uniquefier.
-                    // Check if we just passed a group of more than one entry with uniquefier:
-                    if ((piv > -1) && (i > (piv + 1))) {
-                        // Do the grouping:
-                        group(entries, uniquefiers, piv, i - 1);
-                    }
-
-                    piv = -1;
-                } else {
-                    BibEntry currentEntry = entries.get(i);
-                    if (piv == -1) {
-                        piv = i;
-                        tmpMarker = getAuthorYearParenthesisMarker(Collections.singletonList(currentEntry), database,
-                                null, unlimAuthors);
-                    } else {
-                        // See if this entry can go into a group with the previous one:
-                        String thisMarker = getAuthorYearParenthesisMarker(Collections.singletonList(currentEntry),
-                                database, null, unlimAuthors);
-
-                        String authorField = getStringCitProperty(AUTHOR_FIELD);
-                        int maxAuthors = getIntCitProperty(MAX_AUTHORS);
-                        String author = getCitationMarkerField(currentEntry, database.get(currentEntry),
-                                authorField);
-                        AuthorList al = AuthorList.parse(author);
-                        int prevALim = unlimAuthors[i - 1]; // i always at least 1 here
-                        if (!thisMarker.equals(tmpMarker)
-                                || ((al.getNumberOfAuthors() > maxAuthors) && (unlimAuthors[i] != prevALim))) {
-                            // No match. Update piv to exclude the previous entry. But first check if the
-                            // previous entry was part of a group:
-                            if ((piv > -1) && (i > (piv + 1))) {
-                                // Do the grouping:
-                                group(entries, uniquefiers, piv, i - 1);
-                            }
-                            tmpMarker = thisMarker;
-                            piv = i;
-                        }
-                    }
-                }
-
-            }
-            // Finished with the loop. See if the last entries form a group:
-            if (piv >= 0) {
-                // Do the grouping:
-                group(entries, uniquefiers, piv, uniquefiers.length - 1);
-            }
-        }
-
-        if (inParenthesis) {
-            return getAuthorYearParenthesisMarker(entries, database, uniquefiers, unlimAuthors);
-        } else {
-            return getAuthorYearInTextMarker(entries, database, uniquefiers, unlimAuthors);
-        }
-    }
-    /* end_old */
-
-    /* begin_old */
-    /**
-     * Modify entry and uniquefier arrays to facilitate a grouped presentation of uniquefied entries.
-     *
-     * @param entries     The entry array.
-     * @param uniquefiers The uniquefier array.
-     * @param from        The first index to group (inclusive)
-     * @param to          The last index to group (inclusive)
-     */
-    private void group(List<BibEntry> entries, String[] uniquefiers, int from, int to) {
-        String separator = getStringCitProperty(UNIQUEFIER_SEPARATOR);
-        StringBuilder stringBuilder = new StringBuilder(uniquefiers[from]);
-        for (int i = from + 1; i <= to; i++) {
-            stringBuilder.append(separator);
-            stringBuilder.append(uniquefiers[i]);
-            entries.set(i, null);
-        }
-        uniquefiers[from] = stringBuilder.toString();
-    }
-    /* end_old */
-
-    /* begin_old */
-    /**
-     * This method produces (Author, year) style citation strings in many different forms.
-     *
-     * @param entries           The list of BibEntry to get fields from.
-     * @param database          A map of BibEntry-BibDatabase pairs.
-     * @param uniquifiers       Optional parameter to separate similar citations. Elements can be null if not needed.
-     * @return The formatted citation.
-     */
-    private String getAuthorYearParenthesisMarker(List<BibEntry> entries, Map<BibEntry, BibDatabase> database,
-                                                  String[] uniquifiers, int[] unlimAuthors) {
-
-        String authorField = getStringCitProperty(AUTHOR_FIELD); // The bibtex field providing author names, e.g. "author" or "editor".
-        int maxA = getIntCitProperty(MAX_AUTHORS); // The maximum number of authors to write out in full without using etal. Set to
-                                                   // -1 to always write out all authors.
-        String yearSep = getStringCitProperty(YEAR_SEPARATOR); // The String to separate authors from year, e.g. "; ".
-        String startBrace = getStringCitProperty(BRACKET_BEFORE); // The opening parenthesis.
-        String endBrace = getStringCitProperty(BRACKET_AFTER); // The closing parenthesis.
-        String citationSeparator = getStringCitProperty(CITATION_SEPARATOR); // The String to separate citations from each other.
-        String yearField = getStringCitProperty(YEAR_FIELD); // The bibtex field providing the year, e.g. "year".
-        String andString = getStringCitProperty(AUTHOR_LAST_SEPARATOR); // The String to add between the two last author names, e.g. " & ".
-        StringBuilder stringBuilder = new StringBuilder(startBrace);
-        for (int j = 0; j < entries.size(); j++) {
-            BibEntry currentEntry = entries.get(j);
-
-            // Check if this entry has been nulled due to grouping with the previous entry(ies):
-            if (currentEntry == null) {
-                continue;
-            }
-
-            if (j > 0) {
-                stringBuilder.append(citationSeparator);
-            }
-
-            BibDatabase currentDatabase = database.get(currentEntry);
-            int unlimA = unlimAuthors == null ? -1 : unlimAuthors[j];
-            int maxAuthors = unlimA > 0 ? unlimA : maxA;
-
-            String author = getCitationMarkerField(currentEntry, currentDatabase, authorField);
-            String authorString = createAuthorList(author, maxAuthors, andString, yearSep);
-            stringBuilder.append(authorString);
-            String year = getCitationMarkerField(currentEntry, currentDatabase, yearField);
-            if (year != null) {
-                stringBuilder.append(year);
-            }
-            if ((uniquifiers != null) && (uniquifiers[j] != null)) {
-                stringBuilder.append(uniquifiers[j]);
-            }
-        }
-        stringBuilder.append(endBrace);
-        return stringBuilder.toString();
-    }
-    /* end_old */
-
-    /* begin_old */
-    /**
-     * This method produces "Author (year)" style citation strings in many different forms.
-     *
-     * @param entries     The list of BibEntry to get fields from.
-     * @param database    A map of BibEntry-BibDatabase pairs.
-     * @param uniquefiers Optional parameters to separate similar citations. Can be null if not needed.
-     * @return The formatted citation.
-     */
-    private String getAuthorYearInTextMarker(List<BibEntry> entries, Map<BibEntry, BibDatabase> database,
-                                             String[] uniquefiers,
-                                             int[] unlimAuthors) {
-        String authorField = getStringCitProperty(AUTHOR_FIELD); // The bibtex field providing author names, e.g. "author" or "editor".
-        int maxA = getIntCitProperty(MAX_AUTHORS); // The maximum number of authors to write out in full without using etal. Set to
-                                                   // -1 to always write out all authors.
-        String yearSep = getStringCitProperty(IN_TEXT_YEAR_SEPARATOR); // The String to separate authors from year, e.g. "; ".
-        String startBrace = getStringCitProperty(BRACKET_BEFORE); // The opening parenthesis.
-        String endBrace = getStringCitProperty(BRACKET_AFTER); // The closing parenthesis.
-        String citationSeparator = getStringCitProperty(CITATION_SEPARATOR); // The String to separate citations from each other.
-        String yearField = getStringCitProperty(YEAR_FIELD); // The bibtex field providing the year, e.g. "year".
-        String andString = getStringCitProperty(AUTHOR_LAST_SEPARATOR_IN_TEXT); // The String to add between the two last author names, e.g. " & ".
-
-        if (andString == null) {
-            // Use the default one if no explicit separator for text is defined
-            andString = getStringCitProperty(AUTHOR_LAST_SEPARATOR);
-        }
-        StringBuilder stringBuilder = new StringBuilder();
-        for (int i = 0; i < entries.size(); i++) {
-            BibEntry currentEntry = entries.get(i);
-
-            // Check if this entry has been nulled due to grouping with the previous entry(ies):
-            if (currentEntry == null) {
-                continue;
-            }
-
-            BibDatabase currentDatabase = database.get(currentEntry);
-            int unlimA = unlimAuthors == null ? -1 : unlimAuthors[i];
-            int maxAuthors = unlimA > 0 ? unlimA : maxA;
-
-            if (i > 0) {
-                stringBuilder.append(citationSeparator);
-            }
-            String author = getCitationMarkerField(currentEntry, currentDatabase, authorField);
-            String authorString = createAuthorList(author, maxAuthors, andString, yearSep);
-            stringBuilder.append(authorString);
-            stringBuilder.append(startBrace);
-            String year = getCitationMarkerField(currentEntry, currentDatabase, yearField);
-            if (year != null) {
-                stringBuilder.append(year);
-            }
-            if ((uniquefiers != null) && (uniquefiers[i] != null)) {
-                stringBuilder.append(uniquefiers[i]);
-            }
-            stringBuilder.append(endBrace);
-        }
-        return stringBuilder.toString();
-
-    }
-    /* end_old */
-
-    /* begin_old */
-    /* moved to OOBibStyleGetCitationMarker */
-    /**
-     * This method looks up a field for an entry in a database. Any number of backup fields can be used
-     * if the primary field is empty.
-     *
-     * @param entry    The entry.
-     * @param database The database the entry belongs to.
-     * @param fields   The field, or succession of fields, to look up. If backup fields are needed, separate
-     *                 field names by /. E.g. to use "author" with "editor" as backup, specify StandardField.orFields(StandardField.AUTHOR, StandardField.EDITOR).
-     * @return The resolved field content, or an empty string if the field(s) were empty.
-     */
-    private String getCitationMarkerField(BibEntry entry, BibDatabase database, String fields) {
-        Objects.requireNonNull(entry, "Entry cannot be null");
-        Objects.requireNonNull(database, "database cannot be null");
-
-        Set<Field> authorFields = FieldFactory.parseOrFields(getStringCitProperty(AUTHOR_FIELD));
-        for (Field field : FieldFactory.parseOrFields(fields)) {
-            Optional<String> content = entry.getResolvedFieldOrAlias(field, database);
-
-            if ((content.isPresent()) && !content.get().trim().isEmpty()) {
-                if (authorFields.contains(field) && StringUtil.isInCurlyBrackets(content.get())) {
-                    return "{" + fieldFormatter.format(content.get()) + "}";
-                }
-                return fieldFormatter.format(content.get());
-            }
-        }
-        // No luck? Return an empty string:
-        return "";
-    }
-    /* end_old */
-
-    /* begin_old */
-    /* moved to OOBibStyleGetCitationMarker */
-    /**
-     * Look up the nth author and return the proper last name for citation markers.
-     *
-     * @param al     The author list.
-     * @param number The number of the author to return.
-     * @return The author name, or an empty String if inapplicable.
-     */
-    private String getAuthorLastName(AuthorList al, int number) {
-        StringBuilder stringBuilder = new StringBuilder();
-
-        if (al.getNumberOfAuthors() > number) {
-            Author a = al.getAuthor(number);
-            a.getVon().filter(von -> !von.isEmpty()).ifPresent(von -> stringBuilder.append(von).append(' '));
-            stringBuilder.append(a.getLast().orElse(""));
-        }
-
-        return stringBuilder.toString();
-    }
-    /* end_old */
-
-    /* begin_old */
-    /* to be removed */
-    /**
-     * Take a finished citation and insert a string at the end (but inside the end bracket)
-     * separated by "PageInfoSeparator"
-     *
-     * @param citation
-     * @param pageInfo
-     * @return
-     */
-    public String insertPageInfo(String citation, String pageInfo) {
-        String bracketAfter = getStringCitProperty(BRACKET_AFTER);
-        if (citation.endsWith(bracketAfter)) {
-            String first = citation.substring(0, citation.length() - bracketAfter.length());
-            return first + getStringCitProperty(PAGE_INFO_SEPARATOR) + pageInfo + bracketAfter;
-        } else {
-            return citation + getStringCitProperty(PAGE_INFO_SEPARATOR) + pageInfo;
-        }
-    }
-    /* end_old */
-
     /**
      * Convenience method for checking the property for whether we use number citations or
      * author-year citations.
@@ -916,39 +562,6 @@ public int hashCode() {
         return Objects.hash(path, name, citProperties, properties);
     }
 
-    /* begin_old */
-    /* moved to OOBibStyleGetCitationMarker as formatAuthorList */
-    private String createAuthorList(String author, int maxAuthors, String andString,
-                                    String yearSep) {
-        Objects.requireNonNull(author);
-        String etAlString = getStringCitProperty(ET_AL_STRING); //  The String to represent authors that are not mentioned, e.g. " et al."
-        String authorSep = getStringCitProperty(AUTHOR_SEPARATOR); // The String to add between author names except the last two, e.g. ", ".
-        String oxfordComma = getStringCitProperty(OXFORD_COMMA); // The String to put after the second to last author in case of three or more authors
-        StringBuilder stringBuilder = new StringBuilder();
-        AuthorList al = AuthorList.parse(author);
-        if (!al.isEmpty()) {
-            stringBuilder.append(getAuthorLastName(al, 0));
-        }
-        if ((al.getNumberOfAuthors() > 1) && ((al.getNumberOfAuthors() <= maxAuthors) || (maxAuthors < 0))) {
-            int j = 1;
-            while (j < (al.getNumberOfAuthors() - 1)) {
-                stringBuilder.append(authorSep);
-                stringBuilder.append(getAuthorLastName(al, j));
-                j++;
-            }
-            if (al.getNumberOfAuthors() > 2) {
-                stringBuilder.append(oxfordComma);
-            }
-            stringBuilder.append(andString);
-            stringBuilder.append(getAuthorLastName(al, al.getNumberOfAuthors() - 1));
-        } else if (al.getNumberOfAuthors() > maxAuthors) {
-            stringBuilder.append(etAlString);
-        }
-        stringBuilder.append(yearSep);
-        return stringBuilder.toString();
-    }
-    /* end_old */
-
     enum BibStyleMode {
         NONE,
         LAYOUT,
@@ -1309,5 +922,4 @@ public OOText getFormattedBibliographyTitle() {
                 ? OOFormat.paragraph(title)
                 : OOFormat.paragraph(title, parStyle));
     }
-
 }
diff --git a/src/main/java/org/jabref/logic/openoffice/style/OOBibStyleGetCitationMarker.java b/src/main/java/org/jabref/logic/openoffice/style/OOBibStyleGetCitationMarker.java
index 2e5227d080e..21fe8454d57 100644
--- a/src/main/java/org/jabref/logic/openoffice/style/OOBibStyleGetCitationMarker.java
+++ b/src/main/java/org/jabref/logic/openoffice/style/OOBibStyleGetCitationMarker.java
@@ -23,7 +23,6 @@
 class OOBibStyleGetCitationMarker {
 
     private OOBibStyleGetCitationMarker() {
-        /**/
     }
 
     /**
@@ -157,7 +156,6 @@ private static String formatAuthorList(OOBibStyle style,
         }
 
         if (nAuthors >= 2) {
-
             if (emitAllAuthors) {
                 // Emit last names, except for the last author
                 int j = 1;
@@ -175,7 +173,6 @@ private static String formatAuthorList(OOBibStyle style,
                 stringBuilder.append(andString);
                 String name = getAuthorLastName(authorList, nAuthors - 1);
                 stringBuilder.append(markupAuthorName(style, name));
-
             } else {
                 // Emit last names up to nAuthorsToEmit.
                 //
@@ -294,7 +291,6 @@ private static String getCitationMarkerField(OOBibStyle style,
     }
 
     private static AuthorList getAuthorList(OOBibStyle style, CitationLookupResult db) {
-
         // The bibtex fields providing author names, e.g. "author" or
         // "editor".
         OrFields authorFieldNames = style.getAuthorFieldNames();
@@ -316,7 +312,6 @@ private enum AuthorYearMarkerPurpose {
      * If entry is unresolved, return 0.
      */
     private static int calculateNAuthorsToEmit(OOBibStyle style, CitationMarkerEntry entry) {
-
         if (entry.getLookupResult().isEmpty()) {
             // unresolved
             return 0;
@@ -454,7 +449,6 @@ private static OOText getAuthorYearParenthesisMarker2(OOBibStyle style,
                     stringBuilder.append(pageInfoPart);
                 }
             } else {
-
                 CitationLookupResult db = entry.getLookupResult().get();
 
                 int maxAuthors = (purpose == AuthorYearMarkerPurpose.NORMALIZED
diff --git a/src/main/java/org/jabref/logic/openoffice/style/OOBibStyleGetNumCitationMarker.java b/src/main/java/org/jabref/logic/openoffice/style/OOBibStyleGetNumCitationMarker.java
index 60b5222cf5b..5f7ac121750 100644
--- a/src/main/java/org/jabref/logic/openoffice/style/OOBibStyleGetNumCitationMarker.java
+++ b/src/main/java/org/jabref/logic/openoffice/style/OOBibStyleGetNumCitationMarker.java
@@ -12,13 +12,10 @@
 
 class OOBibStyleGetNumCitationMarker {
 
-    /*
-     * The number encoding "this entry is unresolved"
-     */
+    // The number encoding "this entry is unresolved"
     public final static int UNRESOLVED_ENTRY_NUMBER = 0;
 
     private OOBibStyleGetNumCitationMarker() {
-        /**/
     }
 
     /**
@@ -115,7 +112,6 @@ private static void emitBlock(List<CitationMarkerNumericEntry> block,
         }
 
         if (blockSize >= 2) {
-
             /*
              * Check assumptions
              */
@@ -150,7 +146,6 @@ private static void emitBlock(List<CitationMarkerNumericEntry> block,
                 stringBuilder.append(style.getGroupedNumbersSeparator());
                 stringBuilder.append(last);
             } else {
-
                 // Emit: first, first+1,..., last
                 for (int j = 0; j < blockSize; j++) {
                     if (j > 0) {
@@ -159,7 +154,6 @@ private static void emitBlock(List<CitationMarkerNumericEntry> block,
                     stringBuilder.append(block.get(j).getNumber().get());
                 }
             }
-            return;
         }
     }
 
@@ -221,7 +215,6 @@ public static OOText getNumCitationMarker2(OOBibStyle style,
         List<CitationMarkerNumericEntry> nextBlock = new ArrayList<>();
 
         for (int i = 0; i < nCitations; i++) {
-
             final CitationMarkerNumericEntry current = sorted.get(i);
             if (current.getNumber().isPresent() && current.getNumber().get() < 0) {
                 throw new IllegalArgumentException("getNumCitationMarker2: found negative number");
@@ -258,7 +251,6 @@ public static OOText getNumCitationMarker2(OOBibStyle style,
                 currentBlock = nextBlock;
                 nextBlock = new ArrayList<>();
             }
-
         }
 
         if (!nextBlock.isEmpty()) {
@@ -277,5 +269,4 @@ public static OOText getNumCitationMarker2(OOBibStyle style,
         stringBuilder.append(bracketAfter);
         return OOText.fromString(stringBuilder.toString());
     }
-
 }
diff --git a/src/main/java/org/jabref/logic/openoffice/style/OOFormatBibliography.java b/src/main/java/org/jabref/logic/openoffice/style/OOFormatBibliography.java
index ea311193068..5ae0f4be7be 100644
--- a/src/main/java/org/jabref/logic/openoffice/style/OOFormatBibliography.java
+++ b/src/main/java/org/jabref/logic/openoffice/style/OOFormatBibliography.java
@@ -29,20 +29,20 @@ private OOFormatBibliography() {
     /**
      * @return The formatted bibliography, including its title.
      */
-    public static OOText formatBibliography(CitationGroups cgs,
+    public static OOText formatBibliography(CitationGroups citationGroups,
                                             CitedKeys bibliography,
                                             OOBibStyle style,
                                             boolean alwaysAddCitedOnPages) {
 
         OOText title = style.getFormattedBibliographyTitle();
-        OOText body = formatBibliographyBody(cgs, bibliography, style, alwaysAddCitedOnPages);
+        OOText body = formatBibliographyBody(citationGroups, bibliography, style, alwaysAddCitedOnPages);
         return OOText.fromString(title.toString() + body.toString());
     }
 
     /**
      * @return Formatted body of the bibliography. Excludes the title.
      */
-    public static OOText formatBibliographyBody(CitationGroups cgs,
+    public static OOText formatBibliographyBody(CitationGroups citationGroups,
                                                 CitedKeys bibliography,
                                                 OOBibStyle style,
                                                 boolean alwaysAddCitedOnPages) {
@@ -50,7 +50,7 @@ public static OOText formatBibliographyBody(CitationGroups cgs,
         StringBuilder stringBuilder = new StringBuilder();
 
         for (CitedKey citedKey : bibliography.values()) {
-            OOText entryText = formatBibliographyEntry(cgs, citedKey, style, alwaysAddCitedOnPages);
+            OOText entryText = formatBibliographyEntry(citationGroups, citedKey, style, alwaysAddCitedOnPages);
             stringBuilder.append(entryText.toString());
         }
 
@@ -60,7 +60,7 @@ public static OOText formatBibliographyBody(CitationGroups cgs,
     /**
      * @return A paragraph. Includes label and "Cited on pages".
      */
-    public static OOText formatBibliographyEntry(CitationGroups cgs,
+    public static OOText formatBibliographyEntry(CitationGroups citationGroups,
                                                  CitedKey citedKey,
                                                  OOBibStyle style,
                                                  boolean alwaysAddCitedOnPages) {
@@ -79,7 +79,7 @@ public static OOText formatBibliographyEntry(CitationGroups cgs,
 
         // Add "Cited on pages"
         if (citedKey.getLookupResult().isEmpty() || alwaysAddCitedOnPages) {
-            stringBuilder.append(formatCitedOnPages(cgs, citedKey).toString());
+            stringBuilder.append(formatCitedOnPages(citationGroups, citedKey).toString());
         }
 
         // Add paragraph
@@ -154,9 +154,8 @@ private static OOText formatFullReferenceOfBibEntry(Layout layout,
      * - The links are created as references that show page numbers of the reference marks.
      *   - We do not control the text shown, that is provided by OpenOffice.
      */
-    private static OOText formatCitedOnPages(CitationGroups cgs, CitedKey citedKey) {
-
-        if (!cgs.citationGroupsProvideReferenceMarkNameForLinking()) {
+    private static OOText formatCitedOnPages(CitationGroups citationGroups, CitedKey citedKey) {
+        if (!citationGroups.citationGroupsProvideReferenceMarkNameForLinking()) {
             return OOText.fromString("");
         }
 
@@ -166,25 +165,25 @@ private static OOText formatCitedOnPages(CitationGroups cgs, CitedKey citedKey)
         final String suffix = ")";
         stringBuilder.append(prefix);
 
-        List<CitationGroup> citationGroups = new ArrayList<>();
-        for (CitationPath p : citedKey.getCitationPaths()) {
-            CitationGroupId groupId = p.group;
-            Optional<CitationGroup> group = cgs.getCitationGroup(groupId);
+        List<CitationGroup> filteredList = new ArrayList<>();
+        for (CitationPath path : citedKey.getCitationPaths()) {
+            CitationGroupId groupId = path.group;
+            Optional<CitationGroup> group = citationGroups.getCitationGroup(groupId);
             if (group.isEmpty()) {
                 throw new IllegalStateException();
             }
-            citationGroups.add(group.get());
+            filteredList.add(group.get());
         }
 
         // sort the citationGroups according to their indexInGlobalOrder
-        citationGroups.sort((a, b) -> {
+        filteredList.sort((a, b) -> {
                 Integer aa = a.getIndexInGlobalOrder().orElseThrow(IllegalStateException::new);
                 Integer bb = b.getIndexInGlobalOrder().orElseThrow(IllegalStateException::new);
                 return (aa.compareTo(bb));
             });
 
         int index = 0;
-        for (CitationGroup group : citationGroups) {
+        for (CitationGroup group : filteredList) {
             if (index > 0) {
                 stringBuilder.append(", ");
             }
@@ -196,5 +195,4 @@ private static OOText formatCitedOnPages(CitationGroups cgs, CitedKey citedKey)
         stringBuilder.append(suffix);
         return OOText.fromString(stringBuilder.toString());
     }
-
 }
diff --git a/src/main/java/org/jabref/logic/openoffice/style/OOPreFormatter.java b/src/main/java/org/jabref/logic/openoffice/style/OOPreFormatter.java
index dc02daf6ee9..caeaf8cce2a 100644
--- a/src/main/java/org/jabref/logic/openoffice/style/OOPreFormatter.java
+++ b/src/main/java/org/jabref/logic/openoffice/style/OOPreFormatter.java
@@ -8,8 +8,7 @@
 import org.jabref.model.strings.StringUtil;
 
 /**
- * This formatter preprocesses JabRef fields before they are run through the layout of the
- * bibliography style. It handles translation of LaTeX italic/bold commands into HTML tags.
+ * This formatter preprocesses JabRef fields before they are run through the layout of the bibliography style. It handles translation of LaTeX italic/bold commands into HTML tags.
  */
 public class OOPreFormatter implements LayoutFormatter {
 
@@ -46,7 +45,6 @@ public String format(String field) {
                 currentCommand = new StringBuilder();
             } else if (!incommand && ((c == '{') || (c == '}'))) {
                 // Swallow braces, necessary for replacing encoded characters
-
             } else if (Character.isLetter(c) || (c == '%')
                     || StringUtil.SPECIAL_COMMAND_CHARS.contains(String.valueOf(c))) {
                 escaped = false;
@@ -88,10 +86,7 @@ public String format(String field) {
                         if ((i + 1) == finalResult.length()) {
                             String command = currentCommand.toString();
                             String result = OOPreFormatter.CHARS.get(command);
-                            /* If found, then use translated version. If not,
-                             * then keep
-                             * the text of the parameter intact.
-                             */
+                            // If found, then use translated version. If not, then keep the text of the parameter intact.
                             sb.append(Objects.requireNonNullElse(result, command));
                         }
                     }
@@ -104,9 +99,7 @@ public String format(String field) {
                 } else if (Character.isWhitespace(c) || (c == '{') || (c == '}')) {
                     String command = currentCommand.toString();
 
-                    // Test if we are dealing with a formatting
-                    // command.
-                    // If so, handle.
+                    // Test if we are dealing with a formatting command. If so, handle.
                     String tag = getHTMLTag(command);
                     if (!tag.isEmpty()) {
                         String part = StringUtil.getPart(finalResult, i, true);
@@ -118,14 +111,11 @@ public String format(String field) {
                         argument = part;
                         // handle common case of general latex command
                         String result = OOPreFormatter.CHARS.get(command + argument);
-                        // If found, then use translated version. If not, then keep
-                        // the
-                        // text of the parameter intact.
+                        // If found, then use translated version. If not, then keep the text of the parameter intact.
                         sb.append(Objects.requireNonNullElse(result, argument));
                     } else if (c == '}') {
-                        // This end brace terminates a command. This can be the case in
-                        // constructs like {\aa}. The correct behaviour should be to
-                        // substitute the evaluated command and swallow the brace:
+                        // This end brace terminates a command. This can be the case in constructs like {\aa}. The
+                        // correct behaviour should be to substitute the evaluated command and swallow the brace:
                         String result = OOPreFormatter.CHARS.get(command);
                         // If the command is unknown, just print it:
                         sb.append(Objects.requireNonNullElse(result, command));
@@ -139,13 +129,10 @@ public String format(String field) {
                     // argument = "";
                 } else {
                     /*
-                     * TODO: this point is reached, apparently, if a command is
-                     * terminated in a strange way, such as with "$\omega$".
-                     * Also, the command "\&" causes us to get here. The former
-                     * issue is maybe a little difficult to address, since it
-                     * involves the LaTeX math mode. We don't have a complete
-                     * LaTeX parser, so maybe it's better to ignore these
-                     * commands?
+                     * TODO: this point is reached, apparently, if a command is terminated in a strange way, such as
+                     *  with "$\omega$". Also, the command "\&" causes us to get here. The former issue is maybe a
+                     *  little difficult to address, since it involves the LaTeX math mode. We don't have a complete
+                     *  LaTeX parser, so maybe it's better to ignore these commands?
                      */
                 }
 
@@ -160,44 +147,17 @@ public String format(String field) {
     private String getHTMLTag(String latexCommand) {
         String result = "";
         switch (latexCommand) {
-            // Italic
-            case "textit":
-            case "it":
-            case "emph": // Should really separate between emphasized and italic but since in later stages both are converted to italic...
-            case "em":
-                result = "i";
-                break;
-            // Bold font
-            case "textbf":
-            case "bf":
-                result = "b";
-                break;
-            // Small capitals
-            case "textsc":
-                result = "smallcaps"; // Not a proper HTML tag, but used here for convenience
-                break;
-            // Underline
-            case "underline":
-                result = "u";
-                break;
-            // Strikeout, sout is the "standard" command, although it is actually based on the package ulem
-            case "sout":
-                result = "s";
-                break;
-            // Monospace font
-            case "texttt":
-                result = "tt";
-                break;
-            // Superscript
-            case "textsuperscript":
-                result = "sup";
-                break;
-            // Subscript
-            case "textsubscript":
-                result = "sub";
-                break;
-            default:
-                break;
+            // Should really separate between emphasized and italic but since in later stages both are converted to italic...
+            case "textit", "it", "emph", "em" -> result = "i";  // Italic
+            case "textbf", "bf" -> result = "b";                // Bold font
+            case "textsc" -> result = "smallcaps";              // Small caps
+                                                                // Not a proper HTML tag, but used here for convenience
+            case "underline" -> result = "u";                   // Underline
+            case "sout" -> result = "s";                        // Strikeout
+                                                                // sout is the "standard" command, although it is actually based on the package ulem
+            case "texttt" -> result = "tt";                     // Monospace font
+            case "textsuperscript" -> result = "sup";           // Superscript
+            case "textsubscript" -> result = "sub";             // Subscript
         }
         return result;
     }
diff --git a/src/main/java/org/jabref/logic/openoffice/style/OOProcess.java b/src/main/java/org/jabref/logic/openoffice/style/OOProcess.java
index f8f7de6c7b7..6e64bdbc8bf 100644
--- a/src/main/java/org/jabref/logic/openoffice/style/OOProcess.java
+++ b/src/main/java/org/jabref/logic/openoffice/style/OOProcess.java
@@ -16,7 +16,6 @@ public class OOProcess {
     static final Comparator<BibEntry> YEAR_AUTHOR_TITLE_COMPARATOR = makeYearAuthorTitleComparator();
 
     private OOProcess() {
-        /**/
     }
 
     private static Comparator<BibEntry> makeAuthorYearTitleComparator() {
@@ -51,26 +50,24 @@ public static Comparator<BibEntry> comparatorForMulticite(OOBibStyle style) {
     }
 
     /**
-     *  Fill cgs.bibliography and cgs.citationGroupsUnordered//CitationMarker
+     *  Fill citationGroups.bibliography and cgs.citationGroupsUnordered//CitationMarker
      *  according to style.
      */
-    public static void produceCitationMarkers(CitationGroups cgs, List<BibDatabase> databases, OOBibStyle style) {
-
-        if (!cgs.hasGlobalOrder()) {
-            throw new IllegalStateException("produceCitationMarkers: globalOrder is misssing in cgs");
+    public static void produceCitationMarkers(CitationGroups citationGroups, List<BibDatabase> databases, OOBibStyle style) {
+        if (!citationGroups.hasGlobalOrder()) {
+            throw new IllegalStateException("produceCitationMarkers: globalOrder is misssing in citationGroups");
         }
 
-        cgs.lookupCitations(databases);
-        cgs.imposeLocalOrder(comparatorForMulticite(style));
+        citationGroups.lookupCitations(databases);
+        citationGroups.imposeLocalOrder(comparatorForMulticite(style));
 
         // fill CitationGroup.citationMarker
         if (style.isCitationKeyCiteMarkers()) {
-            OOProcessCitationKeyMarkers.produceCitationMarkers(cgs, style);
+            OOProcessCitationKeyMarkers.produceCitationMarkers(citationGroups, style);
         } else if (style.isNumberEntries()) {
-            OOProcessNumericMarkers.produceCitationMarkers(cgs, style);
+            OOProcessNumericMarkers.produceCitationMarkers(citationGroups, style);
         } else {
-            OOProcessAuthorYearMarkers.produceCitationMarkers(cgs, style);
+            OOProcessAuthorYearMarkers.produceCitationMarkers(citationGroups, style);
         }
     }
-
 }
diff --git a/src/main/java/org/jabref/logic/openoffice/style/OOProcessAuthorYearMarkers.java b/src/main/java/org/jabref/logic/openoffice/style/OOProcessAuthorYearMarkers.java
index affbc7584ae..c09bedbb2ba 100644
--- a/src/main/java/org/jabref/logic/openoffice/style/OOProcessAuthorYearMarkers.java
+++ b/src/main/java/org/jabref/logic/openoffice/style/OOProcessAuthorYearMarkers.java
@@ -22,14 +22,12 @@
 class OOProcessAuthorYearMarkers {
 
     private OOProcessAuthorYearMarkers() {
-        /**/
     }
 
     /**
      *  Fills {@code sortedCitedKeys//normCitMarker}
      */
     private static void createNormalizedCitationMarkers(CitedKeys sortedCitedKeys, OOBibStyle style) {
-
         for (CitedKey ck : sortedCitedKeys.values()) {
             ck.setNormalizedCitationMarker(Optional.of(style.getNormalizedCitationMarker(ck)));
         }
@@ -46,12 +44,11 @@ private static void createNormalizedCitationMarkers(CitedKeys sortedCitedKeys, O
      * Clears uniqueLetters before filling.
      *
      * On return: Each citedKey in sortedCitedKeys has uniqueLetter set as needed.
-     *            The same values are copied to the corresponding citations in cgs.
+     *            The same values are copied to the corresponding citations in citationGroups.
      *
      *  Depends on: style, citations and their order.
      */
-    private static void createUniqueLetters(CitedKeys sortedCitedKeys, CitationGroups cgs) {
-
+    private static void createUniqueLetters(CitedKeys sortedCitedKeys, CitationGroups citationGroups) {
         // The entries in the clashingKeys lists preserve
         // firstAppearance order from sortedCitedKeys.values().
         //
@@ -93,7 +90,7 @@ private static void createUniqueLetters(CitedKeys sortedCitedKeys, CitationGroup
                 nextUniqueLetter++;
             }
         }
-        sortedCitedKeys.distributeUniqueLetters(cgs);
+        sortedCitedKeys.distributeUniqueLetters(citationGroups);
     }
 
     /* ***************************************
@@ -108,9 +105,9 @@ private static void createUniqueLetters(CitedKeys sortedCitedKeys, CitationGroup
      *
      * Preconditions: globalOrder, localOrder
      */
-    private static void setIsFirstAppearanceOfSourceInCitations(CitationGroups cgs) {
+    private static void setIsFirstAppearanceOfSourceInCitations(CitationGroups citationGroups) {
         Set<String> seenBefore = new HashSet<>();
-        for (CitationGroup group : cgs.getCitationGroupsInGlobalOrder()) {
+        for (CitationGroup group : citationGroups.getCitationGroupsInGlobalOrder()) {
             for (Citation cit : group.getCitationsInLocalOrder()) {
                 String currentKey = cit.citationKey;
                 if (!seenBefore.contains(currentKey)) {
@@ -127,26 +124,24 @@ private static void setIsFirstAppearanceOfSourceInCitations(CitationGroups cgs)
      * Produce citMarkers for normal
      * (!isCitationKeyCiteMarkers &amp;&amp; !isNumberEntries) styles.
      *
-     * @param cgs
+     * @param citationGroups
      * @param style              Bibliography style.
      */
-    static void produceCitationMarkers(CitationGroups cgs, OOBibStyle style) {
-
+    static void produceCitationMarkers(CitationGroups citationGroups, OOBibStyle style) {
         assert !style.isCitationKeyCiteMarkers();
         assert !style.isNumberEntries();
         // Citations in (Au1, Au2 2000) form
 
-        CitedKeys citedKeys = cgs.getCitedKeysSortedInOrderOfAppearance();
+        CitedKeys citedKeys = citationGroups.getCitedKeysSortedInOrderOfAppearance();
 
         createNormalizedCitationMarkers(citedKeys, style);
-        createUniqueLetters(citedKeys, cgs);
-        cgs.createPlainBibliographySortedByComparator(OOProcess.AUTHOR_YEAR_TITLE_COMPARATOR);
+        createUniqueLetters(citedKeys, citationGroups);
+        citationGroups.createPlainBibliographySortedByComparator(OOProcess.AUTHOR_YEAR_TITLE_COMPARATOR);
 
         // Mark first appearance of each citationKey
-        setIsFirstAppearanceOfSourceInCitations(cgs);
-
-        for (CitationGroup group : cgs.getCitationGroupsInGlobalOrder()) {
+        setIsFirstAppearanceOfSourceInCitations(citationGroups);
 
+        for (CitationGroup group : citationGroups.getCitationGroupsInGlobalOrder()) {
             final boolean inParenthesis = (group.citationType == CitationType.AUTHORYEAR_PAR);
             final NonUniqueCitationMarker strictlyUnique = NonUniqueCitationMarker.THROWS;
 
@@ -158,5 +153,4 @@ static void produceCitationMarkers(CitationGroups cgs, OOBibStyle style) {
             group.setCitationMarker(Optional.of(citMarker));
         }
     }
-
 }
diff --git a/src/main/java/org/jabref/logic/openoffice/style/OOProcessCitationKeyMarkers.java b/src/main/java/org/jabref/logic/openoffice/style/OOProcessCitationKeyMarkers.java
index 5329d9ca021..df4454f2a0c 100644
--- a/src/main/java/org/jabref/logic/openoffice/style/OOProcessCitationKeyMarkers.java
+++ b/src/main/java/org/jabref/logic/openoffice/style/OOProcessCitationKeyMarkers.java
@@ -11,20 +11,18 @@
 class OOProcessCitationKeyMarkers {
 
     private OOProcessCitationKeyMarkers() {
-        /**/
     }
 
     /**
      *  Produce citation markers for the case when the citation
      *  markers are the citation keys themselves, separated by commas.
      */
-    static void produceCitationMarkers(CitationGroups cgs, OOBibStyle style) {
-
+    static void produceCitationMarkers(CitationGroups citationGroups, OOBibStyle style) {
         assert style.isCitationKeyCiteMarkers();
 
-        cgs.createPlainBibliographySortedByComparator(OOProcess.AUTHOR_YEAR_TITLE_COMPARATOR);
+        citationGroups.createPlainBibliographySortedByComparator(OOProcess.AUTHOR_YEAR_TITLE_COMPARATOR);
 
-        for (CitationGroup group : cgs.getCitationGroupsInGlobalOrder()) {
+        for (CitationGroup group : citationGroups.getCitationGroupsInGlobalOrder()) {
             String citMarker =
                 style.getCitationGroupMarkupBefore()
                 + String.join(",", OOListUtil.map(group.getCitationsInLocalOrder(), Citation::getCitationKey))
diff --git a/src/main/java/org/jabref/logic/openoffice/style/OOProcessNumericMarkers.java b/src/main/java/org/jabref/logic/openoffice/style/OOProcessNumericMarkers.java
index deddab66cca..a60b184030e 100644
--- a/src/main/java/org/jabref/logic/openoffice/style/OOProcessNumericMarkers.java
+++ b/src/main/java/org/jabref/logic/openoffice/style/OOProcessNumericMarkers.java
@@ -12,7 +12,6 @@
 class OOProcessNumericMarkers {
 
     private OOProcessNumericMarkers() {
-        /**/
     }
 
     /**
@@ -23,25 +22,23 @@ private OOProcessNumericMarkers() {
      * Numbering is according to first appearance.
      * Assumes global order and local order are already applied.
      *
-     * @param cgs
+     * @param citationGroups
      * @param style
      *
      */
-    static void produceCitationMarkers(CitationGroups cgs, OOBibStyle style) {
-
+    static void produceCitationMarkers(CitationGroups citationGroups, OOBibStyle style) {
         assert style.isNumberEntries();
 
         if (style.isSortByPosition()) {
-            cgs.createNumberedBibliographySortedInOrderOfAppearance();
+            citationGroups.createNumberedBibliographySortedInOrderOfAppearance();
         } else {
-            cgs.createNumberedBibliographySortedByComparator(OOProcess.AUTHOR_YEAR_TITLE_COMPARATOR);
+            citationGroups.createNumberedBibliographySortedByComparator(OOProcess.AUTHOR_YEAR_TITLE_COMPARATOR);
         }
 
-        for (CitationGroup group : cgs.getCitationGroupsInGlobalOrder()) {
+        for (CitationGroup group : citationGroups.getCitationGroupsInGlobalOrder()) {
             List<CitationMarkerNumericEntry> cits = OOListUtil.map(group.getCitationsInLocalOrder(), e -> e);
             OOText citMarker = style.getNumCitationMarker2(cits);
             group.setCitationMarker(Optional.of(citMarker));
         }
     }
-
 }
diff --git a/src/main/java/org/jabref/logic/openoffice/style/StyleLoader.java b/src/main/java/org/jabref/logic/openoffice/style/StyleLoader.java
index 3098e06233c..90e1bc50158 100644
--- a/src/main/java/org/jabref/logic/openoffice/style/StyleLoader.java
+++ b/src/main/java/org/jabref/logic/openoffice/style/StyleLoader.java
@@ -1,9 +1,8 @@
 package org.jabref.logic.openoffice.style;
 
-import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.nio.charset.Charset;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -28,18 +27,15 @@ public class StyleLoader {
 
     private final OpenOfficePreferences openOfficePreferences;
     private final LayoutFormatterPreferences layoutFormatterPreferences;
-    private final Charset encoding;
 
     // Lists of the internal
     // and external styles
     private final List<OOBibStyle> internalStyles = new ArrayList<>();
     private final List<OOBibStyle> externalStyles = new ArrayList<>();
 
-    public StyleLoader(OpenOfficePreferences openOfficePreferences, LayoutFormatterPreferences formatterPreferences,
-                       Charset encoding) {
+    public StyleLoader(OpenOfficePreferences openOfficePreferences, LayoutFormatterPreferences formatterPreferences) {
         this.openOfficePreferences = Objects.requireNonNull(openOfficePreferences);
         this.layoutFormatterPreferences = Objects.requireNonNull(formatterPreferences);
-        this.encoding = Objects.requireNonNull(encoding);
         loadInternalStyles();
         loadExternalStyles();
     }
@@ -59,7 +55,7 @@ public List<OOBibStyle> getStyles() {
     public boolean addStyleIfValid(String filename) {
         Objects.requireNonNull(filename);
         try {
-            OOBibStyle newStyle = new OOBibStyle(new File(filename), layoutFormatterPreferences, encoding);
+            OOBibStyle newStyle = new OOBibStyle(Path.of(filename), layoutFormatterPreferences);
             if (externalStyles.contains(newStyle)) {
                 LOGGER.info("External style file {} already existing.", filename);
             } else if (newStyle.isValid()) {
@@ -84,7 +80,7 @@ private void loadExternalStyles() {
         List<String> lists = openOfficePreferences.getExternalStyles();
         for (String filename : lists) {
             try {
-                OOBibStyle style = new OOBibStyle(new File(filename), layoutFormatterPreferences, encoding);
+                OOBibStyle style = new OOBibStyle(Path.of(filename), layoutFormatterPreferences);
                 if (style.isValid()) { // Problem!
                     externalStyles.add(style);
                 } else {
diff --git a/src/main/java/org/jabref/logic/pdf/FileAnnotationCache.java b/src/main/java/org/jabref/logic/pdf/FileAnnotationCache.java
index b62c5cf691d..51904e45e92 100644
--- a/src/main/java/org/jabref/logic/pdf/FileAnnotationCache.java
+++ b/src/main/java/org/jabref/logic/pdf/FileAnnotationCache.java
@@ -29,7 +29,6 @@ public class FileAnnotationCache {
      * hitting the bug https://github.com/AdamBien/afterburner.fx/issues/71 .
      */
     public FileAnnotationCache() {
-
     }
 
     public FileAnnotationCache(BibDatabaseContext context, FilePreferences filePreferences) {
diff --git a/src/main/java/org/jabref/logic/pdf/PdfAnnotationImporter.java b/src/main/java/org/jabref/logic/pdf/PdfAnnotationImporter.java
index eef7c2a55a2..b5ed05dd896 100644
--- a/src/main/java/org/jabref/logic/pdf/PdfAnnotationImporter.java
+++ b/src/main/java/org/jabref/logic/pdf/PdfAnnotationImporter.java
@@ -14,6 +14,7 @@
 import org.jabref.model.pdf.FileAnnotation;
 import org.jabref.model.pdf.FileAnnotationType;
 
+import org.apache.pdfbox.Loader;
 import org.apache.pdfbox.cos.COSArray;
 import org.apache.pdfbox.cos.COSName;
 import org.apache.pdfbox.pdmodel.PDDocument;
@@ -35,14 +36,13 @@ public class PdfAnnotationImporter implements AnnotationImporter {
      */
     @Override
     public List<FileAnnotation> importAnnotations(final Path path) {
-
         if (!validatePath(path)) {
             // Path could not be validated, return default result
             return Collections.emptyList();
         }
 
         List<FileAnnotation> annotationsList = new LinkedList<>();
-        try (PDDocument document = PDDocument.load(path.toFile())) {
+        try (PDDocument document = Loader.loadPDF(path.toFile())) {
             PDPageTree pdfPages = document.getDocumentCatalog().getPages();
             for (int pageIndex = 0; pageIndex < pdfPages.getCount(); pageIndex++) {
                 PDPage page = pdfPages.get(pageIndex);
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 8650ff0899f..89db6837ce9 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
@@ -22,6 +22,7 @@
 import org.apache.lucene.document.Field;
 import org.apache.lucene.document.StringField;
 import org.apache.lucene.document.TextField;
+import org.apache.pdfbox.Loader;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
 import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotation;
@@ -94,7 +95,7 @@ public List<Document> readLinkedPdfs(BibDatabaseContext databaseContext) {
     }
 
     private List<Document> readPdfContents(LinkedFile pdf, Path resolvedPdfPath) throws IOException {
-        try (PDDocument pdfDocument = PDDocument.load(resolvedPdfPath.toFile())) {
+        try (PDDocument pdfDocument = Loader.loadPDF(resolvedPdfPath.toFile())) {
             List<Document> pages = new ArrayList<>();
 
             for (int pageNumber = 0; pageNumber < pdfDocument.getNumberOfPages(); pageNumber++) {
diff --git a/src/main/java/org/jabref/logic/pdf/search/indexing/IndexingTaskManager.java b/src/main/java/org/jabref/logic/pdf/search/indexing/IndexingTaskManager.java
index 3144cd07384..8ebc6bddd04 100644
--- a/src/main/java/org/jabref/logic/pdf/search/indexing/IndexingTaskManager.java
+++ b/src/main/java/org/jabref/logic/pdf/search/indexing/IndexingTaskManager.java
@@ -2,6 +2,7 @@
 
 import java.util.List;
 import java.util.Queue;
+import java.util.Set;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
 import org.jabref.gui.util.BackgroundTask;
@@ -28,6 +29,7 @@ public class IndexingTaskManager extends BackgroundTask<Void> {
     public IndexingTaskManager(TaskExecutor taskExecutor) {
         this.taskExecutor = taskExecutor;
         showToUser(true);
+        willBeRecoveredAutomatically(true);
         DefaultTaskExecutor.runInJavaFXThread(() -> {
             this.updateProgress(1, 1);
             this.titleProperty().set(Localization.lang("Indexing pdf files"));
@@ -87,12 +89,17 @@ public void createIndex(PdfIndexer indexer) {
         enqueueTask(() -> indexer.createIndex());
     }
 
-    public void addToIndex(PdfIndexer indexer, BibDatabaseContext databaseContext) {
+    public void updateIndex(PdfIndexer indexer, BibDatabaseContext databaseContext) {
+        Set<String> pathsToRemove = indexer.getListOfFilePaths();
         for (BibEntry entry : databaseContext.getEntries()) {
             for (LinkedFile file : entry.getFiles()) {
                 enqueueTask(() -> indexer.addToIndex(entry, file, databaseContext));
+                pathsToRemove.remove(file.getLink());
             }
         }
+        for (String pathToRemove : pathsToRemove) {
+            enqueueTask(() -> indexer.removeFromIndex(pathToRemove));
+        }
     }
 
     public void addToIndex(PdfIndexer indexer, BibEntry entry, BibDatabaseContext databaseContext) {
@@ -107,7 +114,7 @@ public void addToIndex(PdfIndexer indexer, BibEntry entry, List<LinkedFile> link
 
     public void removeFromIndex(PdfIndexer indexer, BibEntry entry, List<LinkedFile> linkedFiles) {
         for (LinkedFile file : linkedFiles) {
-            enqueueTask(() -> indexer.removeFromIndex(entry, file));
+            enqueueTask(() -> indexer.removeFromIndex(file.getLink()));
         }
     }
 
diff --git a/src/main/java/org/jabref/logic/pdf/search/indexing/PdfIndexer.java b/src/main/java/org/jabref/logic/pdf/search/indexing/PdfIndexer.java
index c750de78b21..975cf83b1ec 100644
--- a/src/main/java/org/jabref/logic/pdf/search/indexing/PdfIndexer.java
+++ b/src/main/java/org/jabref/logic/pdf/search/indexing/PdfIndexer.java
@@ -4,8 +4,10 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.attribute.BasicFileAttributes;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Optional;
+import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
 import org.jabref.gui.LibraryTab;
@@ -25,6 +27,8 @@
 import org.apache.lucene.index.IndexWriterConfig;
 import org.apache.lucene.index.Term;
 import org.apache.lucene.search.IndexSearcher;
+import org.apache.lucene.search.MatchAllDocsQuery;
+import org.apache.lucene.search.ScoreDoc;
 import org.apache.lucene.search.TermQuery;
 import org.apache.lucene.search.TopDocs;
 import org.apache.lucene.store.Directory;
@@ -110,18 +114,16 @@ public void addToIndex(BibEntry entry, LinkedFile linkedFile, BibDatabaseContext
     }
 
     /**
-     * Removes a pdf file linked to one entry in the database from the index
-     * @param entry the entry the file is linked to
-     * @param linkedFile the link to the file to be removed
+     * Removes a pdf file identified by its path from the index
+     *
+     * @param linkedFilePath the path to the file to be removed
      */
-    public void removeFromIndex(BibEntry entry, LinkedFile linkedFile) {
+    public void removeFromIndex(String linkedFilePath) {
         try (IndexWriter indexWriter = new IndexWriter(
                 directoryToIndex,
                 new IndexWriterConfig(
                         new EnglishStemAnalyzer()).setOpenMode(IndexWriterConfig.OpenMode.CREATE_OR_APPEND))) {
-            if (!entry.getFiles().isEmpty()) {
-                indexWriter.deleteDocuments(new Term(SearchFieldConstants.PATH, linkedFile.getLink()));
-            }
+            indexWriter.deleteDocuments(new Term(SearchFieldConstants.PATH, linkedFilePath));
             indexWriter.commit();
         } catch (IOException e) {
             LOGGER.warn("Could not initialize the IndexWriter!", e);
@@ -130,6 +132,7 @@ public void removeFromIndex(BibEntry entry, LinkedFile linkedFile) {
 
     /**
      * Removes  all files linked to a bib-entry from the index
+     *
      * @param entry the entry documents are linked to
      */
     public void removeFromIndex(BibEntry entry) {
@@ -138,11 +141,12 @@ public void removeFromIndex(BibEntry entry) {
 
     /**
      * Removes a list of files linked to a bib-entry from the index
+     *
      * @param entry the entry documents are linked to
      */
     public void removeFromIndex(BibEntry entry, List<LinkedFile> linkedFiles) {
         for (LinkedFile linkedFile : linkedFiles) {
-            removeFromIndex(entry, linkedFile);
+            removeFromIndex(linkedFile.getLink());
         }
     }
 
@@ -162,6 +166,7 @@ public void flushIndex() {
     /**
      * Writes all files linked to an entry to the index if the files are not yet in the index or the files on the fs are
      * newer than the one in the index.
+     *
      * @param entry the entry associated with the file
      */
     private void writeToIndex(BibEntry entry) {
@@ -173,6 +178,7 @@ private void writeToIndex(BibEntry entry) {
     /**
      * Writes the file to the index if the file is not yet in the index or the file on the fs is newer than the one in
      * the index.
+     *
      * @param entry the entry associated with the file
      * @param linkedFile the file to write to the index
      */
@@ -219,4 +225,25 @@ private void writeToIndex(BibEntry entry, LinkedFile linkedFile) {
             LOGGER.warn("Could not add the document {} to the index!", linkedFile.getLink(), e);
         }
     }
+
+    /**
+     * Lists the paths of all the files that are stored in the index
+     *
+     * @return all file paths
+     */
+    public Set<String> getListOfFilePaths() {
+        Set<String> paths = new HashSet<>();
+        try (IndexReader reader = DirectoryReader.open(directoryToIndex)) {
+            IndexSearcher searcher = new IndexSearcher(reader);
+            MatchAllDocsQuery query = new MatchAllDocsQuery();
+            TopDocs allDocs = searcher.search(query, Integer.MAX_VALUE);
+            for (ScoreDoc scoreDoc : allDocs.scoreDocs) {
+                Document doc = reader.document(scoreDoc.doc);
+                paths.add(doc.getField(SearchFieldConstants.PATH).stringValue());
+            }
+        } catch (IOException e) {
+            return paths;
+        }
+        return paths;
+    }
 }
diff --git a/src/main/java/org/jabref/logic/preferences/FetcherApiKey.java b/src/main/java/org/jabref/logic/preferences/FetcherApiKey.java
new file mode 100644
index 00000000000..e982dd0e58f
--- /dev/null
+++ b/src/main/java/org/jabref/logic/preferences/FetcherApiKey.java
@@ -0,0 +1,46 @@
+package org.jabref.logic.preferences;
+
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+
+public class FetcherApiKey {
+    private final StringProperty name;
+    private final BooleanProperty use;
+    private final StringProperty key;
+
+    public FetcherApiKey(String name, boolean use, String key) {
+        this.name = new SimpleStringProperty(name);
+        this.use = new SimpleBooleanProperty(use);
+        this.key = new SimpleStringProperty(key);
+    }
+
+    public String getName() {
+        return name.getValue();
+    }
+
+    public boolean shouldUse() {
+        return use.getValue();
+    }
+
+    public BooleanProperty useProperty() {
+        return use;
+    }
+
+    public void setUse(boolean useCustom) {
+        this.use.setValue(useCustom);
+    }
+
+    public String getKey() {
+        return key.getValue();
+    }
+
+    public StringProperty keyProperty() {
+        return key;
+    }
+
+    public void setKey(String key) {
+        this.key.setValue(key);
+    }
+}
diff --git a/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsPreferences.java b/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsPreferences.java
index b15fee9b9ed..0efc19a524c 100644
--- a/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsPreferences.java
+++ b/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsPreferences.java
@@ -23,19 +23,19 @@ public ProtectedTermsPreferences(List<String> enabledInternalTermLists,
     }
 
     public ObservableList<String> getEnabledInternalTermLists() {
-        return FXCollections.unmodifiableObservableList(enabledInternalTermLists);
+        return enabledInternalTermLists;
     }
 
     public ObservableList<String> getEnabledExternalTermLists() {
-        return FXCollections.unmodifiableObservableList(enabledExternalTermLists);
+        return enabledExternalTermLists;
     }
 
     public ObservableList<String> getDisabledInternalTermLists() {
-        return FXCollections.unmodifiableObservableList(disabledInternalTermLists);
+        return disabledInternalTermLists;
     }
 
     public ObservableList<String> getDisabledExternalTermLists() {
-        return FXCollections.unmodifiableObservableList(disabledExternalTermLists);
+        return disabledExternalTermLists;
     }
 
     public void setEnabledInternalTermLists(List<String> list) {
diff --git a/src/main/java/org/jabref/logic/remote/client/RemoteClient.java b/src/main/java/org/jabref/logic/remote/client/RemoteClient.java
index 6942a902522..8090a73b9d5 100644
--- a/src/main/java/org/jabref/logic/remote/client/RemoteClient.java
+++ b/src/main/java/org/jabref/logic/remote/client/RemoteClient.java
@@ -18,7 +18,7 @@ public class RemoteClient {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(RemoteClient.class);
 
-    private static final int TIMEOUT = 200;
+    private static final int TIMEOUT = 1000;
     private final int port;
 
     public RemoteClient(int port) {
diff --git a/src/main/java/org/jabref/logic/remote/server/RemoteListenerServerLifecycle.java b/src/main/java/org/jabref/logic/remote/server/RemoteListenerServerLifecycle.java
index 2f148bfdad4..e1ee48cbf75 100644
--- a/src/main/java/org/jabref/logic/remote/server/RemoteListenerServerLifecycle.java
+++ b/src/main/java/org/jabref/logic/remote/server/RemoteListenerServerLifecycle.java
@@ -43,7 +43,8 @@ public void open(MessageHandler messageHandler, int port, PreferencesService pre
         try {
             result = new RemoteListenerServerThread(messageHandler, port, preferencesService);
         } catch (BindException e) {
-            LOGGER.warn("Port is blocked", e);
+            LOGGER.warn("There was an error opening the configured network port {}. Please ensure there isn't another" +
+                    " application already using that port.", port);
             result = null;
         } catch (IOException e) {
             result = null;
diff --git a/src/main/java/org/jabref/logic/search/SearchQuery.java b/src/main/java/org/jabref/logic/search/SearchQuery.java
index 883830c3eab..4dc9fd40a58 100644
--- a/src/main/java/org/jabref/logic/search/SearchQuery.java
+++ b/src/main/java/org/jabref/logic/search/SearchQuery.java
@@ -12,7 +12,7 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.search.SearchMatcher;
-import org.jabref.model.search.rules.ContainBasedSearchRule;
+import org.jabref.model.search.rules.ContainsBasedSearchRule;
 import org.jabref.model.search.rules.GrammarBasedSearchRule;
 import org.jabref.model.search.rules.SearchRule;
 import org.jabref.model.search.rules.SearchRules;
@@ -82,7 +82,7 @@ public boolean isValid() {
     }
 
     public boolean isContainsBasedSearch() {
-        return rule instanceof ContainBasedSearchRule;
+        return rule instanceof ContainsBasedSearchRule;
     }
 
     private String getCaseSensitiveDescription() {
diff --git a/src/main/java/org/jabref/logic/shared/DBMSProcessor.java b/src/main/java/org/jabref/logic/shared/DBMSProcessor.java
index 32a437fa93d..7cd59847aab 100644
--- a/src/main/java/org/jabref/logic/shared/DBMSProcessor.java
+++ b/src/main/java/org/jabref/logic/shared/DBMSProcessor.java
@@ -26,6 +26,7 @@
 import org.jabref.model.entry.field.FieldFactory;
 import org.jabref.model.entry.types.EntryTypeFactory;
 
+import com.google.common.collect.Lists;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -199,7 +200,6 @@ protected void insertIntoEntryTable(List<BibEntry> bibEntries) {
      * @return <code>true</code> if existent, else <code>false</code>
      */
     private List<BibEntry> getNotYetExistingEntries(List<BibEntry> bibEntries) {
-
         List<Integer> remoteIds = new ArrayList<>();
         List<Integer> localIds = bibEntries.stream()
                                            .map(BibEntry::getSharedBibEntryData)
@@ -305,7 +305,6 @@ public synchronized void updateEntry(BibEntry localBibEntry) throws OfflineLockE
             // update only if local version is higher or the entries are equal
             if ((localBibEntry.getSharedBibEntryData().getVersion() >= sharedBibEntry.getSharedBibEntryData()
                                                                                      .getVersion()) || localBibEntry.equals(sharedBibEntry)) {
-
                 insertOrUpdateFields(localBibEntry);
 
                 // updating entry type
@@ -479,6 +478,22 @@ public Optional<BibEntry> getSharedEntry(int sharedID) {
         }
     }
 
+    /**
+     * Queries the database for shared entries in 500 element batches.
+     * Optionally, they are filtered by the given list of sharedIds
+     *
+     * @param sharedIDs the list of Ids to filter. If list is empty, then no filter is applied
+     */
+    public List<BibEntry> partitionAndGetSharedEntries(List<Integer> sharedIDs) {
+        List<List<Integer>> partitions = Lists.partition(sharedIDs, 500);
+        List<BibEntry> result = new ArrayList<>();
+
+        for (List<Integer> sublist : partitions) {
+            result.addAll(getSharedEntries(sublist));
+        }
+        return result;
+    }
+
     /**
      * Queries the database for shared entries. Optionally, they are filtered by the given list of sharedIds
      *
diff --git a/src/main/java/org/jabref/logic/shared/DBMSSynchronizer.java b/src/main/java/org/jabref/logic/shared/DBMSSynchronizer.java
index 6917da02ac4..807577ce033 100644
--- a/src/main/java/org/jabref/logic/shared/DBMSSynchronizer.java
+++ b/src/main/java/org/jabref/logic/shared/DBMSSynchronizer.java
@@ -245,7 +245,7 @@ public synchronized void synchronizeLocalDatabase() {
 
             taskExecutor.runInFXThread( () -> bibDatabase.insertEntries(dbmsProcessor.getSharedEntries(entriesToInsertIntoLocalDatabase), EntriesEventSource.SHARED));
             // in case entries should be added into the local database, insert them
-         //   bibDatabase.insertEntries(dbmsProcessor.getSharedEntries(entriesToInsertIntoLocalDatabase), EntriesEventSource.SHARED);
+            bibDatabase.insertEntries(dbmsProcessor.partitionAndGetSharedEntries(entriesToInsertIntoLocalDatabase), EntriesEventSource.SHARED);
         }
     }
 
diff --git a/src/main/java/org/jabref/logic/shared/OracleProcessor.java b/src/main/java/org/jabref/logic/shared/OracleProcessor.java
index 9c4a8401525..b4a0e471915 100644
--- a/src/main/java/org/jabref/logic/shared/OracleProcessor.java
+++ b/src/main/java/org/jabref/logic/shared/OracleProcessor.java
@@ -72,7 +72,6 @@ String escape(String expression) {
 
     @Override
     public void startNotificationListener(DBMSSynchronizer dbmsSynchronizer) {
-
         this.listener = new OracleNotificationListener(dbmsSynchronizer);
 
         try {
diff --git a/src/main/java/org/jabref/logic/shared/prefs/SharedDatabasePreferences.java b/src/main/java/org/jabref/logic/shared/prefs/SharedDatabasePreferences.java
index 260ec297c24..4b1a14fe1c9 100644
--- a/src/main/java/org/jabref/logic/shared/prefs/SharedDatabasePreferences.java
+++ b/src/main/java/org/jabref/logic/shared/prefs/SharedDatabasePreferences.java
@@ -25,6 +25,8 @@ public class SharedDatabasePreferences {
     private static final String SHARED_DATABASE_NAME = "sharedDatabaseName";
     private static final String SHARED_DATABASE_USER = "sharedDatabaseUser";
     private static final String SHARED_DATABASE_PASSWORD = "sharedDatabasePassword";
+    private static final String SHARED_DATABASE_FOLDER = "sharedDatabaseFolder";
+    private static final String SHARED_DATABASE_AUTOSAVE = "sharedDatabaseAutosave";
     private static final String SHARED_DATABASE_REMEMBER_PASSWORD = "sharedDatabaseRememberPassword";
     private static final String SHARED_DATABASE_USE_SSL = "sharedDatabaseUseSSL";
     private static final String SHARED_DATABASE_KEYSTORE_FILE = "sharedDatabaseKeyStoreFile";
@@ -77,6 +79,14 @@ public boolean getRememberPassword() {
         return internalPrefs.getBoolean(SHARED_DATABASE_REMEMBER_PASSWORD, false);
     }
 
+    public Optional<String> getFolder() {
+        return getOptionalValue(SHARED_DATABASE_FOLDER);
+    }
+
+    public boolean getAutosave() {
+        return internalPrefs.getBoolean(SHARED_DATABASE_AUTOSAVE, false);
+    }
+
     public boolean isUseSSL() {
         return internalPrefs.getBoolean(SHARED_DATABASE_USE_SSL, false);
     }
@@ -109,6 +119,14 @@ public void setRememberPassword(boolean rememberPassword) {
         internalPrefs.putBoolean(SHARED_DATABASE_REMEMBER_PASSWORD, rememberPassword);
     }
 
+    public void setFolder(String folder) {
+        internalPrefs.put(SHARED_DATABASE_FOLDER, folder);
+    }
+
+    public void setAutosave(boolean autosave) {
+        internalPrefs.putBoolean(SHARED_DATABASE_AUTOSAVE, autosave);
+    }
+
     public void setUseSSL(boolean useSSL) {
         internalPrefs.putBoolean(SHARED_DATABASE_USE_SSL, useSSL);
     }
diff --git a/src/main/java/org/jabref/logic/texparser/TexBibEntriesResolver.java b/src/main/java/org/jabref/logic/texparser/TexBibEntriesResolver.java
index 84322da6ece..75a30c14491 100644
--- a/src/main/java/org/jabref/logic/texparser/TexBibEntriesResolver.java
+++ b/src/main/java/org/jabref/logic/texparser/TexBibEntriesResolver.java
@@ -48,7 +48,7 @@ public LatexBibEntriesResolverResult resolve(LatexParserResult latexParserResult
         Map<Path, BibDatabase> bibDatabases = resolverResult.getBibFiles().values().stream().distinct().collect(Collectors.toMap(
                 Function.identity(), path -> {
                     try {
-                        return OpenDatabase.loadDatabase(path, generalPreferences, importFormatPreferences, fileMonitor).getDatabase();
+                        return OpenDatabase.loadDatabase(path, importFormatPreferences, fileMonitor).getDatabase();
                     } catch (IOException e) {
                         LOGGER.error("Error opening file '{}'", path, e);
                         return ParserResult.fromError(e).getDatabase();
diff --git a/src/main/java/org/jabref/logic/util/BackupFileType.java b/src/main/java/org/jabref/logic/util/BackupFileType.java
new file mode 100644
index 00000000000..b24cc3faeb8
--- /dev/null
+++ b/src/main/java/org/jabref/logic/util/BackupFileType.java
@@ -0,0 +1,32 @@
+package org.jabref.logic.util;
+
+import java.util.Collections;
+import java.util.List;
+
+public enum BackupFileType implements FileType {
+
+    // Used at BackupManager
+    BACKUP("Backup", "bak"),
+
+    // Used when writing the .bib file. See {@link org.jabref.logic.exporter.AtomicFileWriter}
+    // Used for copying the .bib away before overwriting on save.
+    SAVE("AutoSaveFile", "sav");
+
+    private final List<String> extensions;
+    private final String name;
+
+    BackupFileType(String name, String extension) {
+        this.extensions = Collections.singletonList(extension);
+        this.name = name;
+    }
+
+    @Override
+    public List<String> getExtensions() {
+        return extensions;
+    }
+
+    @Override
+    public String getName() {
+        return this.name;
+    }
+}
diff --git a/src/main/java/org/jabref/logic/util/BuildInfo.java b/src/main/java/org/jabref/logic/util/BuildInfo.java
index 47ef962f21a..375fc0d0bdb 100644
--- a/src/main/java/org/jabref/logic/util/BuildInfo.java
+++ b/src/main/java/org/jabref/logic/util/BuildInfo.java
@@ -16,8 +16,6 @@ public final class BuildInfo {
     public static final String OS_VERSION = System.getProperty("os.version", UNKNOWN_VERSION).toLowerCase(Locale.ROOT);
     public static final String OS_ARCH = System.getProperty("os.arch", UNKNOWN_VERSION).toLowerCase(Locale.ROOT);
     public static final String JAVA_VERSION = System.getProperty("java.version", UNKNOWN_VERSION).toLowerCase(Locale.ROOT);
-    public static final String JAVAFX_VERSION = System.getProperty("javafx.runtime.version", UNKNOWN_VERSION).toLowerCase(Locale.ROOT);
-
 
     public final Version version;
     public final String maintainers;
@@ -29,6 +27,7 @@ public final class BuildInfo {
     public final String scienceDirectApiKey;
     public final String minRequiredJavaVersion;
     public final boolean allowJava9;
+    public final String biodiversityHeritageApiKey;
 
     public BuildInfo() {
         this("/build.properties");
@@ -57,6 +56,7 @@ public BuildInfo(String path) {
         scienceDirectApiKey = BuildInfo.getValue(properties, "scienceDirectApiKey", "fb82f2e692b3c72dafe5f4f1fa0ac00b");
         minRequiredJavaVersion = properties.getProperty("minRequiredJavaVersion", "1.8");
         allowJava9 = "true".equals(properties.getProperty("allowJava9", "true"));
+        biodiversityHeritageApiKey = BuildInfo.getValue(properties, "biodiversityHeritageApiKey", "36b910b6-2eb3-46f2-b64c-9abc149925ba");
     }
 
     private static String getValue(Properties properties, String key, String defaultValue) {
diff --git a/src/main/java/org/jabref/logic/util/CoarseChangeFilter.java b/src/main/java/org/jabref/logic/util/CoarseChangeFilter.java
index ed3ef873aaa..9c50dad6aae 100644
--- a/src/main/java/org/jabref/logic/util/CoarseChangeFilter.java
+++ b/src/main/java/org/jabref/logic/util/CoarseChangeFilter.java
@@ -34,7 +34,6 @@ public CoarseChangeFilter(BibDatabaseContext bibDatabaseContext) {
 
     @Subscribe
     public synchronized void listen(BibDatabaseContextChangedEvent event) {
-
         if (event instanceof FieldChangedEvent) {
             // Only relay event if the field changes are more than one character or a new field is edited
             FieldChangedEvent fieldChange = (FieldChangedEvent) event;
diff --git a/src/main/java/org/jabref/logic/util/DelayTaskThrottler.java b/src/main/java/org/jabref/logic/util/DelayTaskThrottler.java
index 6ce6c35094a..4a5e7422edb 100644
--- a/src/main/java/org/jabref/logic/util/DelayTaskThrottler.java
+++ b/src/main/java/org/jabref/logic/util/DelayTaskThrottler.java
@@ -15,7 +15,6 @@
  * This class allows to throttle a list of tasks.
  * Use case: you have an event that occurs often, and every time you want to invoke the same task.
  * However, if a lot of events happen in a relatively short time span, then only one task should be invoked.
- * @param <T>
  *
  * @implNote Once {@link #schedule(Runnable)} is called, the task is delayed for a given time span.
  *         If during this time, {@link #schedule(Runnable)} is called again, then the original task is canceled and the new one scheduled.
@@ -52,17 +51,6 @@ public ScheduledFuture<?> schedule(Runnable command) {
         return scheduledTask;
     }
 
-    // Execute scheduled Runnable early
-    public void execute(Runnable command) {
-        delay = 0;
-        schedule(command);
-    }
-
-    // Cancel scheduled Runnable gracefully
-    public void cancel() {
-        scheduledTask.cancel(false);
-    }
-
     public <T> ScheduledFuture<?> scheduleTask(Callable<?> command) {
         if (scheduledTask != null) {
             cancel();
@@ -75,6 +63,17 @@ public <T> ScheduledFuture<?> scheduleTask(Callable<?> command) {
         return scheduledTask;
     }
 
+    // Execute scheduled Runnable early
+    public void execute(Runnable command) {
+        delay = 0;
+        schedule(command);
+    }
+
+    // Cancel scheduled Runnable gracefully
+    public void cancel() {
+        scheduledTask.cancel(false);
+    }
+
     /**
      * Shuts everything down. Upon termination, this method returns.
      */
diff --git a/src/main/java/org/jabref/logic/util/FileType.java b/src/main/java/org/jabref/logic/util/FileType.java
index 7e4ba2199ec..c054d54d7bc 100644
--- a/src/main/java/org/jabref/logic/util/FileType.java
+++ b/src/main/java/org/jabref/logic/util/FileType.java
@@ -8,7 +8,7 @@
  */
 public interface FileType {
 
-    default List<String> getExtensionsWithDot() {
+    default List<String> getExtensionsWithAsteriskAndDot() {
         return getExtensions().stream()
                               .map(extension -> "*." + extension)
                               .collect(Collectors.toList());
diff --git a/src/main/java/org/jabref/logic/util/OS.java b/src/main/java/org/jabref/logic/util/OS.java
index d56a8a41363..fabbadbd2c9 100644
--- a/src/main/java/org/jabref/logic/util/OS.java
+++ b/src/main/java/org/jabref/logic/util/OS.java
@@ -8,6 +8,9 @@
 public class OS {
     public static final String NEWLINE = System.lineSeparator();
 
+    public static final String APP_DIR_APP_NAME = "JabRef";
+    public static final String APP_DIR_APP_AUTHOR = "org.jabref";
+
     // File separator obtained from system
     private static final String FILE_SEPARATOR = System.getProperty("file.separator");
 
diff --git a/src/main/java/org/jabref/logic/util/StandardFileType.java b/src/main/java/org/jabref/logic/util/StandardFileType.java
index 17b207a5145..aadae024051 100644
--- a/src/main/java/org/jabref/logic/util/StandardFileType.java
+++ b/src/main/java/org/jabref/logic/util/StandardFileType.java
@@ -43,7 +43,11 @@ public enum StandardFileType implements FileType {
     CSS("CSS Styleshet", "css"),
     YAML("YAML Markup", "yaml"),
     CFF("CFF", "cff"),
-    ANY_FILE("Any", "*");
+    ANY_FILE("Any", "*"),
+    CER("SSL Certificate", "cer"),
+    CITAVI("Citavi", "ctv6bak", "ctv5bak");
+
+
 
     private final List<String> extensions;
     private final String name;
diff --git a/src/main/java/org/jabref/logic/util/TestEntry.java b/src/main/java/org/jabref/logic/util/TestEntry.java
index ce969371bbe..a7f80218992 100644
--- a/src/main/java/org/jabref/logic/util/TestEntry.java
+++ b/src/main/java/org/jabref/logic/util/TestEntry.java
@@ -12,7 +12,6 @@ private TestEntry() {
     }
 
     public static BibEntry getTestEntry() {
-
         BibEntry entry = new BibEntry(StandardEntryType.Article);
         entry.setCitationKey("Smith2016");
         entry.setField(StandardField.AUTHOR, "Smith, Bill and Jones, Bob and Williams, Jeff");
diff --git a/src/main/java/org/jabref/logic/util/UpdateField.java b/src/main/java/org/jabref/logic/util/UpdateField.java
index 02ba49370bd..80f9633e543 100644
--- a/src/main/java/org/jabref/logic/util/UpdateField.java
+++ b/src/main/java/org/jabref/logic/util/UpdateField.java
@@ -99,7 +99,6 @@ public static void setAutomaticFields(BibEntry entry, boolean overwriteOwner, bo
     }
 
     private static void setAutomaticFields(BibEntry entry, boolean setOwner, String owner, boolean setTimeStamp, String timeStamp) {
-
         // Set owner field if this option is enabled:
         if (setOwner) {
             // Set owner field to default value
diff --git a/src/main/java/org/jabref/logic/util/Version.java b/src/main/java/org/jabref/logic/util/Version.java
index 567fdbb8403..f94472fc17c 100644
--- a/src/main/java/org/jabref/logic/util/Version.java
+++ b/src/main/java/org/jabref/logic/util/Version.java
@@ -23,11 +23,10 @@
 public class Version {
 
     public static final String JABREF_DOWNLOAD_URL = "https://downloads.jabref.org";
-    private static final Logger LOGGER = LoggerFactory.getLogger(Version.class);
 
     private static final Version UNKNOWN_VERSION = new Version();
 
-    private final static Pattern VERSION_PATTERN = Pattern.compile("(?<major>\\d+)(\\.(?<minor>\\d+))?(\\.(?<patch>\\d+))?(?<stage>-alpha|-beta)?(?<dev>-?dev)?.*");
+    private final static Pattern VERSION_PATTERN = Pattern.compile("(?<major>\\d+)(\\.(?<minor>\\d+))?(\\.(?<patch>\\d+))?(?<stage>-alpha|-beta)?(?<num>\\d+)?(?<dev>-?dev)?.*");
     private final static Pattern CI_SUFFIX_PATTERN = Pattern.compile("-ci\\.\\d+");
 
     private static final String JABREF_GITHUB_RELEASES = "https://api.github.com/repos/JabRef/JabRef/releases";
@@ -37,6 +36,7 @@ public class Version {
     private int minor = -1;
     private int patch = -1;
     private DevelopmentStage developmentStage = DevelopmentStage.UNKNOWN;
+    private int developmentNum = -1;
     private boolean isDevelopmentVersion;
 
     /**
@@ -45,6 +45,14 @@ public class Version {
     private Version() {
     }
 
+    /**
+     * Tinylog does not allow for altering existing loging configuraitons after the logger was initialized .
+     * Lazy initialization to enable tinylog writing to a file (and also still enabling loggin in this class)
+     */
+    private static Logger getLogger() {
+        return LoggerFactory.getLogger(Version.class);
+    }
+
     /**
      * @param version must be in form of following pattern: {@code (\d+)(\.(\d+))?(\.(\d+))?(-alpha|-beta)?(-?dev)?} (e.g., 3.3; 3.4-dev)
      * @return the parsed version or {@link Version#UNKNOWN_VERSION} if an error occurred
@@ -75,16 +83,20 @@ public static Version parse(String version) {
 
                 String versionStageString = matcher.group("stage");
                 parsedVersion.developmentStage = versionStageString == null ? DevelopmentStage.STABLE : DevelopmentStage.parse(versionStageString);
+
+                String stageNumString = matcher.group("num");
+                parsedVersion.developmentNum = stageNumString == null ? 0 : Integer.parseInt(stageNumString);
+
                 parsedVersion.isDevelopmentVersion = matcher.group("dev") != null;
             } catch (NumberFormatException e) {
-                LOGGER.warn("Invalid version string used: " + version, e);
+                getLogger().warn("Invalid version string used: {}", version, e);
                 return UNKNOWN_VERSION;
             } catch (IllegalArgumentException e) {
-                LOGGER.warn("Invalid version pattern is used", e);
+                getLogger().warn("Invalid version pattern is used", e);
                 return UNKNOWN_VERSION;
             }
         } else {
-            LOGGER.warn("Version could not be recognized by the pattern");
+            getLogger().warn("Version could not be recognized by the pattern");
             return UNKNOWN_VERSION;
         }
         return parsedVersion;
@@ -138,8 +150,13 @@ public boolean isNewerThan(Version otherVersion) {
                     if (this.developmentStage.isMoreStableThan(otherVersion.developmentStage)) {
                         return true;
                     } else if (this.developmentStage == otherVersion.developmentStage) {
-                        // if the stage is equal check if this version is in development and the other is not
-                        return !this.isDevelopmentVersion && otherVersion.isDevelopmentVersion;
+                        // if the development stage are equal compare the development number
+                        if (this.getDevelopmentNum() > otherVersion.getDevelopmentNum()) {
+                            return true;
+                        } else if (this.getDevelopmentNum() == otherVersion.getDevelopmentNum()) {
+                            // if the stage is equal check if this version is in development and the other is not
+                            return !this.isDevelopmentVersion && otherVersion.isDevelopmentVersion;
+                        }
                     }
                 }
             }
@@ -148,8 +165,7 @@ public boolean isNewerThan(Version otherVersion) {
     }
 
     /**
-     * Checks if this version should be updated to one of the given ones.
-     * Ignoring the other Version if this one is Stable and the other one is not.
+     * Checks if this version should be updated to one of the given ones. Ignoring the other Version if this one is Stable and the other one is not.
      *
      * @return The version this one should be updated to, or an empty Optional
      */
@@ -165,8 +181,7 @@ public Optional<Version> shouldBeUpdatedTo(List<Version> availableVersions) {
     }
 
     /**
-     * Checks if this version should be updated to the given one.
-     * Ignoring the other Version if this one is Stable and the other one is not.
+     * Checks if this version should be updated to the given one. Ignoring the other Version if this one is Stable and the other one is not.
      *
      * @return True if this version should be updated to the given one
      */
@@ -197,6 +212,10 @@ public int getPatch() {
         return patch;
     }
 
+    public int getDevelopmentNum() {
+        return developmentNum;
+    }
+
     public boolean isDevelopmentVersion() {
         return isDevelopmentVersion;
     }
@@ -206,7 +225,7 @@ public boolean isDevelopmentVersion() {
      */
     public String getChangelogUrl() {
         if (isDevelopmentVersion) {
-            return "https://github.com/JabRef/jabref/blob/master/CHANGELOG.md#unreleased";
+            return "https://github.com/JabRef/jabref/blob/main/CHANGELOG.md#unreleased";
         } else {
             StringBuilder changelogLink = new StringBuilder()
                     .append("https://github.com/JabRef/jabref/blob/v")
@@ -221,8 +240,14 @@ public String getChangelogUrl() {
             }
 
             changelogLink
-                    .append(this.developmentStage.stage)
-                    .append("/CHANGELOG.md");
+                    .append(this.developmentStage.stage);
+
+            if (this.getDevelopmentNum() != 0) {
+                changelogLink
+                        .append(this.getDevelopmentNum());
+            }
+
+            changelogLink.append("/CHANGELOG.md");
 
             return changelogLink.toString();
         }
@@ -270,7 +295,7 @@ public enum DevelopmentStage {
 
         public static DevelopmentStage parse(String stage) {
             if (stage == null) {
-                LOGGER.warn("The stage cannot be null");
+                getLogger().warn("The stage cannot be null");
                 return UNKNOWN;
             } else if (stage.equals(STABLE.stage)) {
                 return STABLE;
@@ -279,7 +304,7 @@ public static DevelopmentStage parse(String stage) {
             } else if (stage.equals(BETA.stage)) {
                 return BETA;
             }
-            LOGGER.warn("Unknown development stage: {}", stage);
+            getLogger().warn("Unknown development stage: {}", stage);
             return UNKNOWN;
         }
 
diff --git a/src/main/java/org/jabref/logic/util/WebViewStore.java b/src/main/java/org/jabref/logic/util/WebViewStore.java
new file mode 100644
index 00000000000..9015196ee73
--- /dev/null
+++ b/src/main/java/org/jabref/logic/util/WebViewStore.java
@@ -0,0 +1,93 @@
+package org.jabref.logic.util;
+
+import java.util.ArrayDeque;
+import java.util.Queue;
+
+import javafx.application.Platform;
+import javafx.scene.web.WebView;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * A dynamic web view store. This is used primarily to prevent UI freezes while constructing web view instances.
+ */
+public class WebViewStore {
+    private static final Logger LOGGER = LoggerFactory.getLogger(WebViewStore.class);
+    private final static Queue<WebView> WEB_VIEWS = new ArrayDeque<>();
+    private static boolean isInitialized = false;
+    private static Configuration config;
+
+    /**
+     * Initialize {@code WebViewStore} and preload web view instances.
+     * <p> Note that this method must be called at application startup. </p>
+     */
+    public static void init(Configuration config) {
+        WebViewStore.config = config;
+        for (int i = 0; i < config.getNumberOfPreloadedInstances(); i++) {
+            addWebViewLater();
+        }
+        isInitialized = true;
+    }
+
+    /**
+     * Initialize {@code WebViewStore} and preload web view instance.
+     * <p> Note that this method must be called at application startup. </p>
+     */
+    public static void init() {
+        init(new Configuration(4, 2));
+    }
+
+    /**
+     * Returns a preloaded web view instance if available; And it will create a new one if not.
+     *
+     * @return {@code WebView} instance
+     * @throws IllegalStateException if the webViewStore has not been initialized
+     */
+    public static WebView get() {
+        if (!isInitialized) {
+            throw new IllegalStateException("WebViewStore is uninitialized");
+        }
+        if (WEB_VIEWS.size() <= config.getMinimumNumberOfInstances()) {
+            addWebViewLater();
+        }
+        if (hasMore()) {
+            return WEB_VIEWS.poll();
+        } else {
+            return new WebView();
+        }
+    }
+
+    private static void addWebViewLater() {
+        Platform.runLater(() -> {
+            WEB_VIEWS.add(new WebView());
+            LOGGER.debug("Cached Web views: {}", WEB_VIEWS.size());
+        });
+    }
+
+    /**
+     * @return {@code true} if the store has at least one web view instance available; {@code false} otherwise
+     */
+    public static boolean hasMore() {
+        return !WEB_VIEWS.isEmpty();
+    }
+
+    public record Configuration(
+            int numberOfPreloadedInstances,
+            int minimumNumberOfInstances) {
+
+        /**
+         * @return The number of web view instances to be loaded at application startup
+         */
+        public int getNumberOfPreloadedInstances() {
+            return numberOfPreloadedInstances;
+        }
+
+        /**
+         * @return The minimum number of web views the store can reach. The store needs to load more instances once it reaches this threshold
+         */
+        public int getMinimumNumberOfInstances() {
+            return minimumNumberOfInstances;
+        }
+    }
+}
diff --git a/src/main/java/org/jabref/logic/util/io/BackupFileUtil.java b/src/main/java/org/jabref/logic/util/io/BackupFileUtil.java
new file mode 100644
index 00000000000..34fd3810990
--- /dev/null
+++ b/src/main/java/org/jabref/logic/util/io/BackupFileUtil.java
@@ -0,0 +1,123 @@
+package org.jabref.logic.util.io;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.HexFormat;
+import java.util.Optional;
+
+import org.jabref.logic.util.BackupFileType;
+import org.jabref.logic.util.BuildInfo;
+import org.jabref.logic.util.OS;
+
+import net.harawata.appdirs.AppDirsFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class BackupFileUtil {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(BackupFileUtil.class);
+
+    private BackupFileUtil() {
+    }
+
+    public static Path getAppDataBackupDir() {
+        Path directory = Path.of(AppDirsFactory.getInstance().getUserDataDir(
+                                     OS.APP_DIR_APP_NAME,
+                                     new BuildInfo().version.toString(),
+                                     OS.APP_DIR_APP_AUTHOR))
+                             .resolve("backups");
+        return directory;
+    }
+
+    /**
+     * Determines the path of the backup file (using the given extension)
+     *
+     * <p>
+     *     As default, a directory inside the user temporary dir is used.<br>
+     *     In case a AUTOSAVE backup is requested, a timestamp is added
+     * </p>
+     * <p>
+     *     <em>SIDE EFFECT</em>: Creates the directory.
+     *     In case that fails, the return path of the .bak file is set to be next to the .bib file
+     * </p>
+     * <p>
+     *     Note that this backup is different from the <code>.sav</code> file generated by {@link org.jabref.logic.autosaveandbackup.BackupManager}
+     *     (and configured in the preferences as "make backups")
+     * </p>
+     */
+    public static Path getPathForNewBackupFileAndCreateDirectory(Path targetFile, BackupFileType fileType) {
+        String extension = "." + fileType.getExtensions().get(0);
+        String timeSuffix = ZonedDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd--HH.mm.ss"));
+
+        // We choose the data directory, because a ".bak" file should survive cache cleanups
+        Path directory = getAppDataBackupDir();
+        try {
+            Files.createDirectories(directory);
+        } catch (IOException e) {
+            Path result = FileUtil.addExtension(targetFile, extension);
+            LOGGER.warn("Could not create bib writing directory {}, using {} as file", directory, result, e);
+            return result;
+        }
+        String baseFileName = getUniqueFilePrefix(targetFile) + "--" + targetFile.getFileName() + "--" + timeSuffix;
+        Path fileName = FileUtil.addExtension(Path.of(baseFileName), extension);
+        return directory.resolve(fileName);
+    }
+
+    /**
+     * Finds the latest backup (.sav). If it does not exist, an empty optional is returned
+     */
+    public static Optional<Path> getPathOfLatestExisingBackupFile(Path targetFile, BackupFileType fileType) {
+        // The code is similar to "getPathForNewBackupFileAndCreateDirectory"
+
+        String extension = "." + fileType.getExtensions().get(0);
+
+        Path directory = getAppDataBackupDir();
+        if (Files.notExists(directory)) {
+            // In case there is no app directory, we search in the directory of the bib file
+            Path result = FileUtil.addExtension(targetFile, extension);
+            if (Files.exists(result)) {
+                return Optional.of(result);
+            } else {
+                return Optional.empty();
+            }
+        }
+
+        // Search the directory for the latest file
+        final String prefix = getUniqueFilePrefix(targetFile) + "--" + targetFile.getFileName();
+        Optional<Path> mostRecentFile;
+        try {
+            mostRecentFile = Files.list(directory)
+                                         // just list the .sav belonging to the given targetFile
+                                         .filter(p -> p.getFileName().toString().startsWith(prefix))
+                                         .sorted()
+                                         .reduce((first, second) -> second);
+        } catch (IOException e) {
+            LOGGER.error("Could not determine most recent file", e);
+            return Optional.empty();
+        }
+        return mostRecentFile;
+    }
+
+    /**
+     * <p>
+     * Determines a unique file prefix.
+     * </p>
+     * <p>
+     *     When creating a backup file, the backup file should belong to the original file.
+     *     Just adding ".bak" suffix to the filename, does not work in all cases:
+     *     It may be possible that the user has opened "paper.bib" twice.
+     *     Thus, we need to create a unique prefix to distinguish these files.
+     * </p>
+     */
+    public static String getUniqueFilePrefix(Path targetFile) {
+        // Idea: use the hash code and convert it to hex
+        // Thereby, use positive values only and use length 4
+        int positiveCode = Math.abs(targetFile.hashCode());
+        byte[] array = ByteBuffer.allocate(4).putInt(positiveCode).array();
+        return HexFormat.of().formatHex(array);
+    }
+}
diff --git a/src/main/java/org/jabref/logic/util/io/FileNameCleaner.java b/src/main/java/org/jabref/logic/util/io/FileNameCleaner.java
index 33733a3a900..83d764509e7 100644
--- a/src/main/java/org/jabref/logic/util/io/FileNameCleaner.java
+++ b/src/main/java/org/jabref/logic/util/io/FileNameCleaner.java
@@ -1,6 +1,6 @@
 package org.jabref.logic.util.io;
 
-import java.util.Arrays;
+import org.jabref.model.util.FileHelper;
 
 /**
  * This class is based on http://stackoverflow.com/a/5626340/873282
@@ -9,22 +9,6 @@
  */
 public class FileNameCleaner {
 
-    /**
-     * MUST ALWAYS BE A SORTED ARRAY because it is used in a binary search
-     */
-    // @formatter:off
-    private static final int[] ILLEGAL_CHARS = {
-            0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
-            10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
-            20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
-            30, 31, 34,
-            42,
-            58,
-            60, 62, 63,
-            123, 124, 125
-    };
-    // @formatter:on
-
     private FileNameCleaner() {
     }
 
@@ -38,7 +22,7 @@ public static String cleanFileName(String badFileName) {
         StringBuilder cleanName = new StringBuilder(badFileName.length());
         for (int i = 0; i < badFileName.length(); i++) {
             char c = badFileName.charAt(i);
-            if (FileNameCleaner.isCharLegal(c) && (c != '/') && (c != '\\')) {
+            if (FileHelper.isCharLegal(c) && (c != '/') && (c != '\\')) {
                 cleanName.append(c);
             } else {
                 cleanName.append('_');
@@ -58,7 +42,7 @@ public static String cleanDirectoryName(String badFileName) {
         StringBuilder cleanName = new StringBuilder(badFileName.length());
         for (int i = 0; i < badFileName.length(); i++) {
             char c = badFileName.charAt(i);
-            if (FileNameCleaner.isCharLegal(c)) {
+            if (FileHelper.isCharLegal(c)) {
                 cleanName.append(c);
             } else {
                 cleanName.append('_');
@@ -66,8 +50,4 @@ public static String cleanDirectoryName(String badFileName) {
         }
         return cleanName.toString().trim();
     }
-
-    private static boolean isCharLegal(char c) {
-        return Arrays.binarySearch(FileNameCleaner.ILLEGAL_CHARS, c) < 0;
-    }
 }
diff --git a/src/main/java/org/jabref/logic/util/io/FileNameUniqueness.java b/src/main/java/org/jabref/logic/util/io/FileNameUniqueness.java
index 39b99b1f1de..12d1831ab5e 100644
--- a/src/main/java/org/jabref/logic/util/io/FileNameUniqueness.java
+++ b/src/main/java/org/jabref/logic/util/io/FileNameUniqueness.java
@@ -22,7 +22,6 @@ public class FileNameUniqueness {
      * @return a file name such that it does not match any existing files in targetDirectory
      */
     public static String getNonOverWritingFileName(Path targetDirectory, String fileName) {
-
         Optional<String> extensionOptional = FileUtil.getFileExtension(fileName);
 
         // the suffix include the '.' , if extension is present Eg: ".pdf"
diff --git a/src/main/java/org/jabref/logic/util/io/FileUtil.java b/src/main/java/org/jabref/logic/util/io/FileUtil.java
index c015f54e2d4..379d2318c80 100644
--- a/src/main/java/org/jabref/logic/util/io/FileUtil.java
+++ b/src/main/java/org/jabref/logic/util/io/FileUtil.java
@@ -26,15 +26,25 @@
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
+import org.jabref.model.util.FileHelper;
 import org.jabref.model.util.OptionalUtil;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+/**
+ * The idea of this class is to add general functionality that could possibly even in the
+ * <a href="https://en.wikipedia.org/wiki/Non-blocking_I/O_(Java)">Java NIO package</a>,
+ * such as getting/adding file extension etc.
+ *
+ * This class is the "successor" of {@link FileHelper}. In case you miss something here,
+ * please look at {@link FileHelper} and migrate the functionality to here.
+ */
 public class FileUtil {
 
-    public static final boolean IS_POSIX_COMPILANT = FileSystems.getDefault().supportedFileAttributeViews().contains("posix");
+    public static final boolean IS_POSIX_COMPLIANT = FileSystems.getDefault().supportedFileAttributeViews().contains("posix");
     public static final int MAXIMUM_FILE_NAME_LENGTH = 255;
+
     private static final Logger LOGGER = LoggerFactory.getLogger(FileUtil.class);
 
     private FileUtil() {
@@ -99,6 +109,8 @@ public static String getValidFileName(String fileName) {
      * Adds an extension to the given file name. The original extension is not replaced. That means, "demo.bib", ".sav"
      * gets "demo.bib.sav" and not "demo.sav"
      *
+     * <emph>Warning! If "ext" is passed, this is literally added. Thus addExtension("tmp.txt", "ext") leads to "tmp.txtext"</emph>
+     *
      * @param path      the path to add the extension to
      * @param extension the extension to add
      * @return the with the modified file name
@@ -108,7 +120,6 @@ public static Path addExtension(Path path, String extension) {
     }
 
     public static Optional<String> getUniquePathFragment(List<String> paths, Path databasePath) {
-
         String fileName = databasePath.getFileName().toString();
 
         List<String> uniquePathParts = uniquePathSubstrings(paths);
@@ -194,7 +205,7 @@ public static boolean copyFile(Path pathToSourceFile, Path pathToDestinationFile
      *
      * @param fromFile The source filename to rename
      * @param toFile   The target fileName
-     * @return True if the rename was successful, false if an exception occurred
+     * @return True if rename was successful, false if an exception occurred
      */
     public static boolean renameFile(Path fromFile, Path toFile) {
         return renameFile(fromFile, toFile, false);
@@ -205,8 +216,8 @@ public static boolean renameFile(Path fromFile, Path toFile) {
      *
      * @param fromFile        The source filename to rename
      * @param toFile          The target fileName
-     * @param replaceExisting Wether to replace existing files or not
-     * @return True if the rename was successful, false if an exception occurred
+     * @param replaceExisting Whether to replace existing files or not
+     * @return True if rename was successful, false if an exception occurred
      * @deprecated Use {@link Files#move(Path, Path, CopyOption...)} instead and handle exception properly
      */
     @Deprecated
diff --git a/src/main/java/org/jabref/logic/util/io/XMLUtil.java b/src/main/java/org/jabref/logic/util/io/XMLUtil.java
index 3bff65dbb34..b6126914de3 100644
--- a/src/main/java/org/jabref/logic/util/io/XMLUtil.java
+++ b/src/main/java/org/jabref/logic/util/io/XMLUtil.java
@@ -14,6 +14,8 @@
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 
+import org.jabref.architecture.AllowedToUseStandardStreams;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
@@ -25,6 +27,7 @@
 /**
  * Currently used for debugging only
  */
+@AllowedToUseStandardStreams("Used for debugging only")
 public class XMLUtil {
     private static final Logger LOGGER = LoggerFactory.getLogger(XMLUtil.class);
 
diff --git a/src/main/java/org/jabref/logic/util/strings/HTMLUnicodeConversionMaps.java b/src/main/java/org/jabref/logic/util/strings/HTMLUnicodeConversionMaps.java
index f26952c9e0a..587f7197218 100644
--- a/src/main/java/org/jabref/logic/util/strings/HTMLUnicodeConversionMaps.java
+++ b/src/main/java/org/jabref/logic/util/strings/HTMLUnicodeConversionMaps.java
@@ -762,7 +762,6 @@ public class HTMLUnicodeConversionMaps {
             {"119978", "Oscr", "$\\mathcal{O}$"}, // script capital O -- possibly use \mathscr
             {"119984", "Uscr", "$\\mathcal{U}$"}, // script capital U -- possibly use \mathscr
             {"120598", "", "$\\epsilon$"}, // mathematical italic epsilon U+1D716 -- requires amsmath
-
     };
 
     // List of combining accents
diff --git a/src/main/java/org/jabref/logic/util/strings/StringManipulator.java b/src/main/java/org/jabref/logic/util/strings/StringManipulator.java
index cb1972de5e1..bdde7c1fd49 100644
--- a/src/main/java/org/jabref/logic/util/strings/StringManipulator.java
+++ b/src/main/java/org/jabref/logic/util/strings/StringManipulator.java
@@ -78,7 +78,8 @@ static ResultingStringState deleteUntilWordBoundary(int caretPosition, String te
 
     /**
      * Utility method to find the next whitespace position in string after text
-     * @param caretPosition The current caret Position
+     *
+     * @param caretPosition The current caret position
      * @param text          The string to search in
      * @param direction     The direction to move through string
      *
diff --git a/src/main/java/org/jabref/logic/xmp/DocumentInformationExtractor.java b/src/main/java/org/jabref/logic/xmp/DocumentInformationExtractor.java
index 4d700f2bc98..3f0c81ae592 100644
--- a/src/main/java/org/jabref/logic/xmp/DocumentInformationExtractor.java
+++ b/src/main/java/org/jabref/logic/xmp/DocumentInformationExtractor.java
@@ -85,7 +85,6 @@ private void extractOtherFields() {
      * @return The bibtex entry found in the document information.
      */
     public Optional<BibEntry> extractBibtexEntry() {
-
         bibEntry.setType(BibEntry.DEFAULT_TYPE);
 
         this.extractAuthor();
diff --git a/src/main/java/org/jabref/logic/xmp/DublinCoreExtractor.java b/src/main/java/org/jabref/logic/xmp/DublinCoreExtractor.java
index 9097badfecf..dc70cc048b9 100644
--- a/src/main/java/org/jabref/logic/xmp/DublinCoreExtractor.java
+++ b/src/main/java/org/jabref/logic/xmp/DublinCoreExtractor.java
@@ -1,21 +1,22 @@
 package org.jabref.logic.xmp;
 
-import java.io.IOException;
-import java.util.Calendar;
+import java.util.Arrays;
 import java.util.Comparator;
 import java.util.List;
-import java.util.Map.Entry;
 import java.util.Optional;
-import java.util.Set;
+import java.util.SortedSet;
 import java.util.TreeSet;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 
 import org.jabref.logic.TypedBibEntry;
+import org.jabref.logic.formatter.casechanger.UnprotectTermsFormatter;
+import org.jabref.model.database.BibDatabase;
 import org.jabref.model.database.BibDatabaseMode;
 import org.jabref.model.entry.Author;
 import org.jabref.model.entry.AuthorList;
 import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.Date;
 import org.jabref.model.entry.Month;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.FieldFactory;
@@ -24,16 +25,30 @@
 import org.jabref.model.entry.types.EntryTypeFactory;
 import org.jabref.model.strings.StringUtil;
 
-import org.apache.xmpbox.DateConverter;
+import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.xmpbox.schema.DublinCoreSchema;
+import org.apache.xmpbox.type.BadFieldValueException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+/**
+ * This class is used for <em>both</em> conversion from Dublin Core to BibTeX and conversion form BibTeX to Dublin Core
+ */
 public class DublinCoreExtractor {
 
+    public static final String DC_COVERAGE = "coverage";
+    public static final String DC_RIGHTS = "rights";
+    public static final String DC_SOURCE = "source";
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(DublinCoreExtractor.class);
+
     private final DublinCoreSchema dcSchema;
     private final XmpPreferences xmpPreferences;
 
     private final BibEntry bibEntry;
 
+    private final UnprotectTermsFormatter unprotectTermsFormatter = new UnprotectTermsFormatter();
+
     /**
      * @param dcSchema      Metadata in DublinCore format.
      * @param resolvedEntry The BibEntry object, which is filled during metadata extraction.
@@ -41,12 +56,11 @@ public class DublinCoreExtractor {
     public DublinCoreExtractor(DublinCoreSchema dcSchema, XmpPreferences xmpPreferences, BibEntry resolvedEntry) {
         this.dcSchema = dcSchema;
         this.xmpPreferences = xmpPreferences;
-
         this.bibEntry = resolvedEntry;
     }
 
     /**
-     * Editor in BibTex - Contributor in DublinCore
+     * Editor in BibTeX - Contributor in DublinCore
      */
     private void extractEditor() {
         List<String> contributors = dcSchema.getContributors();
@@ -56,7 +70,7 @@ private void extractEditor() {
     }
 
     /**
-     * Author in BibTex - Creator in DublinCore
+     * Author in BibTeX - Creator in DublinCore
      */
     private void extractAuthor() {
         List<String> creators = dcSchema.getCreators();
@@ -66,47 +80,38 @@ private void extractAuthor() {
     }
 
     /**
-     * Year in BibTex - Date in DublinCore is only the year information, because dc interprets empty months as January.
-     * Tries to extract the month as well. In JabRef the bibtex/month/value is prioritized. <br/> The problem is the
-     * default value of the calendar, which is always January, also if there is no month information in the xmp metdata.
-     * The idea is, to reject all information with YYYY-01-01. In cases, where xmp is written with JabRef the month
-     * property filled with jan will override this behavior and no data is lost. In the cases, where xmp is written by
-     * another service, the assumption is, that the 1st January is not a publication date at all.
+     * BibTeX-Fields : year, [month], [day] - 'dc:date' in DublinCore
      */
-    private void extractYearAndMonth() {
+    private void extractDate() {
         List<String> dates = dcSchema.getUnqualifiedSequenceValueList("date");
         if ((dates != null) && !dates.isEmpty()) {
             String date = dates.get(0).trim();
-            Calendar calender = null;
-            try {
-                calender = DateConverter.toCalendar(date);
-            } catch (IOException ignored) {
-                // Ignored
-            }
-            if (calender != null) {
-                bibEntry.setField(StandardField.YEAR, String.valueOf(calender.get(Calendar.YEAR)));
-                int monthNumber = calender.get(Calendar.MONTH) + 1;
-                // not the 1st of January
-                if (!((monthNumber == 1) && (calender.get(Calendar.DAY_OF_MONTH) == 1))) {
-                    Month.getMonthByNumber(monthNumber)
-                         .ifPresent(month -> bibEntry.setMonth(month));
-                }
-            }
+            Date.parse(date)
+                    .ifPresent(dateValue -> {
+                        dateValue.getDay().ifPresent(day -> bibEntry.setField(StandardField.DAY, Integer.toString(day)));
+                        dateValue.getMonth().ifPresent(bibEntry::setMonth);
+                        dateValue.getYear().ifPresent(year -> bibEntry.setField(StandardField.YEAR, Integer.toString(year)));
+                    });
         }
     }
 
     /**
-     * Abstract in BibTex - Description in DublinCore
+     * Abstract in BibTeX - Description in DublinCore
      */
     private void extractAbstract() {
-        String description = dcSchema.getDescription();
+        String description = null;
+        try {
+            description = dcSchema.getDescription();
+        } catch (BadFieldValueException e) {
+            LOGGER.warn("Could not get abstract", e);
+        }
         if (!StringUtil.isNullOrEmpty(description)) {
             bibEntry.setField(StandardField.ABSTRACT, description);
         }
     }
 
     /**
-     * DOI in BibTex - Identifier in DublinCore
+     * DOI in BibTeX - Identifier in DublinCore
      */
     private void extractDOI() {
         String identifier = dcSchema.getIdentifier();
@@ -116,7 +121,7 @@ private void extractDOI() {
     }
 
     /**
-     * Publisher are equivalent in both formats (BibTex and DublinCore)
+     * Publisher are equivalent in both formats (BibTeX and DublinCore)
      */
     private void extractPublisher() {
         List<String> publishers = dcSchema.getPublishers();
@@ -129,7 +134,7 @@ private void extractPublisher() {
      * This method sets all fields, which are custom in BibTeX and therefore supported by JabRef, but which are not
      * included in the DublinCore format.
      * <p>
-     * The relation attribute of DublinCore is abused to insert these custom fields.
+     * The relation attribute of DublinCore is abused to store these custom fields. The prefix <code>bibtex</code> is used.
      */
     private void extractBibTexFields() {
         Predicate<String> isBibTeXElement = s -> s.startsWith("bibtex/");
@@ -162,27 +167,32 @@ private void extractBibTexFields() {
     }
 
     /**
-     * Rights are equivalent in both formats (BibTex and DublinCore)
+     * Rights are equivalent in both formats (BibTeX and DublinCore)
      */
     private void extractRights() {
-        String rights = dcSchema.getRights();
+        String rights = null;
+        try {
+            rights = dcSchema.getRights();
+        } catch (BadFieldValueException e) {
+           LOGGER.warn("Could not extract rights", e);
+        }
         if (!StringUtil.isNullOrEmpty(rights)) {
-            bibEntry.setField(new UnknownField("rights"), rights);
+            bibEntry.setField(new UnknownField(DC_RIGHTS), rights);
         }
     }
 
     /**
-     * Source is equivalent in both formats (BibTex and DublinCore)
+     * Source is equivalent in both formats (BibTeX and DublinCore)
      */
     private void extractSource() {
         String source = dcSchema.getSource();
         if (!StringUtil.isNullOrEmpty(source)) {
-            bibEntry.setField(new UnknownField("source"), source);
+            bibEntry.setField(new UnknownField(DC_SOURCE), source);
         }
     }
 
     /**
-     * Keywords in BibTex - Subjects in DublinCore
+     * Keywords in BibTeX - Subjects in DublinCore
      */
     private void extractSubject() {
         List<String> subjects = dcSchema.getSubjects();
@@ -192,17 +202,23 @@ private void extractSubject() {
     }
 
     /**
-     * Title is equivalent in both formats (BibTex and DublinCore)
+     * Title is equivalent in both formats (BibTeX and DublinCore)
      */
     private void extractTitle() {
-        String title = dcSchema.getTitle();
+        String title = null;
+        try {
+            title = dcSchema.getTitle();
+        } catch (BadFieldValueException e) {
+            LOGGER.warn("Could not extract title", e);
+        }
         if (!StringUtil.isNullOrEmpty(title)) {
             bibEntry.setField(StandardField.TITLE, title);
         }
     }
 
     /**
-     * Type is equivalent in both formats (BibTex and DublinCore)
+     * Type is equivalent in both formats (BibTeX and DublinCore)
+     * <p>Opposite method: {@link DublinCoreExtractor#fillType()}
      */
     private void extractType() {
         List<String> types = dcSchema.getTypes();
@@ -214,6 +230,29 @@ private void extractType() {
         }
     }
 
+    /**
+     * No Equivalent in BibTeX. Will create an Unknown "Coverage" Field
+     */
+    private void extractCoverage() {
+        String coverage = dcSchema.getCoverage();
+        if (!StringUtil.isNullOrEmpty(coverage)) {
+            bibEntry.setField(FieldFactory.parseField(DC_COVERAGE), coverage);
+        }
+    }
+
+    /**
+     *  Language is equivalent in both formats (BibTeX and DublinCore)
+     */
+    private void extractLanguages() {
+        StringBuilder builder = new StringBuilder();
+
+        List<String> languages = dcSchema.getLanguages();
+        if ((languages != null) && !languages.isEmpty()) {
+            languages.forEach(language -> builder.append(",").append(language));
+            bibEntry.setField(StandardField.LANGUAGE, builder.substring(1));
+        }
+    }
+
     /**
      * Helper function for retrieving a BibEntry from the DublinCore metadata in a PDF file.
      * <p>
@@ -222,6 +261,9 @@ private void extractType() {
      * The BibEntry is build by mapping individual fields in the dublin core (like creator, title, subject) to fields in
      * a bibtex bibEntry. In case special "bibtex/" entries are contained, the normal dublin core fields take
      * precedence. For instance, the dublin core date takes precedence over bibtex/month.
+     * <p>
+     * The opposite method is {@link DublinCoreExtractor#fillDublinCoreSchema()}
+     * </p>
      *
      * @return The bibEntry extracted from the document information.
      */
@@ -230,9 +272,10 @@ public Optional<BibEntry> extractBibtexEntry() {
         this.extractBibTexFields();
 
         // then extract all "standard" dublin core entries
+        this.extractType();
         this.extractEditor();
         this.extractAuthor();
-        this.extractYearAndMonth();
+        this.extractDate();
         this.extractAbstract();
         this.extractDOI();
         this.extractPublisher();
@@ -240,7 +283,8 @@ public Optional<BibEntry> extractBibtexEntry() {
         this.extractSource();
         this.extractSubject();
         this.extractTitle();
-        this.extractType();
+        this.extractCoverage();
+        this.extractLanguages();
 
         // we pass a new BibEntry in the constructor which is never empty as it already consists of "@misc"
         if (bibEntry.getFieldMap().isEmpty()) {
@@ -250,9 +294,7 @@ public Optional<BibEntry> extractBibtexEntry() {
     }
 
     /**
-     * Bibtex-Fields used: editor, Field: 'dc:contributor'
-     *
-     * @param authors
+     * BibTeX: editor; DC: 'dc:contributor'
      */
     private void fillContributor(String authors) {
         AuthorList list = AuthorList.parse(authors);
@@ -262,20 +304,17 @@ private void fillContributor(String authors) {
     }
 
     /**
-     * Bibtex-Fields used: author, Field: 'dc:creator'
-     *
-     * @param creators
+     * BibTeX: author; DC: 'dc:creator'
      */
     private void fillCreator(String creators) {
         AuthorList list = AuthorList.parse(creators);
-
         for (Author author : list.getAuthors()) {
             dcSchema.addCreator(author.getFirstLast(false));
         }
     }
 
     /**
-     * Bibtex-Fields used: year, month, Field: 'dc:date'
+     * BibTeX: year, month; DC: 'dc:date'
      */
     private void fillDate() {
         bibEntry.getFieldOrAlias(StandardField.DATE)
@@ -283,102 +322,161 @@ private void fillDate() {
     }
 
     /**
-     * Bibtex-Fields used: abstract, Field: 'dc:description'
-     *
-     * @param description
+     * BibTeX: abstract; DC: 'dc:description'
      */
     private void fillDescription(String description) {
         dcSchema.setDescription(description);
     }
 
     /**
-     * Bibtex-Fields used: doi, Field: 'dc:identifier'
-     *
-     * @param identifier
+     * BibTeX:doi; DC: 'dc:identifier'
      */
     private void fillIdentifier(String identifier) {
         dcSchema.setIdentifier(identifier);
     }
 
     /**
-     * Bibtex-Fields used: publisher, Field: dc:publisher
-     *
-     * @param publisher
+     * BibTeX: publisher, DC: dc:publisher
      */
     private void fillPublisher(String publisher) {
         dcSchema.addPublisher(publisher);
     }
 
     /**
-     * Bibtex-Fields used: keywords, Field: 'dc:subject'
-     *
-     * @param value
+     * BibTeX: keywords; DC: 'dc:subject'
      */
     private void fillKeywords(String value) {
-        String[] keywords = value.split(",");
+        String[] keywords = value.split(xmpPreferences.getKeywordSeparator().toString());
         for (String keyword : keywords) {
             dcSchema.addSubject(keyword.trim());
         }
     }
 
     /**
-     * Bibtex-Fields used: title, Field: 'dc:title'
-     *
-     * @param title
+     * BibTeX: title; DC: 'dc:title'
      */
     private void fillTitle(String title) {
         dcSchema.setTitle(title);
     }
 
     /**
-     * All others (+ citation key) get packaged in the relation attribute
-     *
-     * @param field Key of the metadata attribute
-     * @param value Value of the metadata attribute
+     * BibTeX: Coverage (Custom Field); DC Field : Coverage
+     */
+    private void fillCoverage(String coverage) {
+        dcSchema.setCoverage(coverage);
+    }
+
+    /**
+     * BibTeX: language; DC: dc:language
+     */
+    private void fillLanguages(String languages) {
+        Arrays.stream(languages.split(","))
+                .forEach(dcSchema::addLanguage);
+    }
+
+    /**
+     * BibTeX: Rights (Custom Field); DC: dc:rights
+     */
+    private void fillRights(String rights) {
+        dcSchema.addRights(null, rights.split(",")[0]);
+    }
+
+    /**
+     * BibTeX: Source (Custom Field); DC: Source
+     */
+    private void fillSource(String source) {
+        dcSchema.setSource(source);
+    }
+
+    /**
+     * All others (+ citation key) get packaged in the dc:relation attribute with <code>bibtex/</code> prefix in the content.
+     * The value of the given field is fetched from the class variable {@link DublinCoreExtractor#bibEntry}.
      */
-    private void fillCustomField(Field field, String value) {
+    private void fillCustomField(Field field) {
+        // We write the plain content of the field, because this is a custom DC field content with the semantics that
+        // BibTeX data is stored. Thus, we do not need to get rid of BibTeX, but can keep it.
+        String value = bibEntry.getField(field).get();
         dcSchema.addRelation("bibtex/" + field.getName() + '/' + value);
     }
 
+    /**
+     * Opposite method: {@link DublinCoreExtractor#extractType()}
+     */
+    private void fillType() {
+        // BibTeX: entry type; DC: 'dc:type'
+        TypedBibEntry typedEntry = new TypedBibEntry(bibEntry, BibDatabaseMode.BIBTEX);
+        String typeForDisplay = typedEntry.getTypeForDisplay();
+        if (!typeForDisplay.isEmpty()) {
+            dcSchema.addType(typeForDisplay);
+        }
+    }
+
+    /**
+     * Converts the content of the bibEntry to dublin core.
+     * <p>
+     * The opposite method is {@link DublinCoreExtractor#extractBibtexEntry()}.
+     * <p>
+     *     A similar method for writing the DocumentInformationItem (DII) is {@link XmpUtilWriter#writeDocumentInformation(PDDocument, BibEntry, BibDatabase, XmpPreferences)}
+     * </p>
+     */
     public void fillDublinCoreSchema() {
         // Query privacy filter settings
         boolean useXmpPrivacyFilter = xmpPreferences.shouldUseXmpPrivacyFilter();
 
-        Set<Entry<Field, String>> fieldValues = new TreeSet<>(Comparator.comparing(fieldStringEntry -> fieldStringEntry.getKey().getName()));
-        fieldValues.addAll(bibEntry.getFieldMap().entrySet());
-        for (Entry<Field, String> field : fieldValues) {
-            if (useXmpPrivacyFilter && xmpPreferences.getXmpPrivacyFilter().contains(field.getKey())) {
+        SortedSet<Field> fields = new TreeSet<>(Comparator.comparing(field -> field.getName()));
+        fields.addAll(bibEntry.getFields());
+        for (Field field : fields) {
+            if (useXmpPrivacyFilter && xmpPreferences.getXmpPrivacyFilter().contains(field)) {
                 continue;
             }
 
-            if (StandardField.EDITOR.equals(field.getKey())) {
-                this.fillContributor(field.getValue());
-            } else if (StandardField.AUTHOR.equals(field.getKey())) {
-                this.fillCreator(field.getValue());
-            } else if (StandardField.YEAR.equals(field.getKey())) {
-                this.fillDate();
-            } else if (StandardField.ABSTRACT.equals(field.getKey())) {
-                this.fillDescription(field.getValue());
-            } else if (StandardField.DOI.equals(field.getKey())) {
-                this.fillIdentifier(field.getValue());
-            } else if (StandardField.PUBLISHER.equals(field.getKey())) {
-                this.fillPublisher(field.getValue());
-            } else if (StandardField.KEYWORDS.equals(field.getKey())) {
-                this.fillKeywords(field.getValue());
-            } else if (StandardField.TITLE.equals(field.getKey())) {
-                this.fillTitle(field.getValue());
+            String value = unprotectTermsFormatter.format(bibEntry.getField(field).get());
+            if (field instanceof StandardField standardField) {
+                switch (standardField) {
+                    case EDITOR ->
+                            this.fillContributor(value);
+                    case AUTHOR ->
+                            this.fillCreator(value);
+                    case YEAR ->
+                            this.fillDate();
+                    case ABSTRACT ->
+                            this.fillDescription(value);
+                    case DOI ->
+                            this.fillIdentifier(value);
+                    case PUBLISHER ->
+                            this.fillPublisher(value);
+                    case KEYWORDS ->
+                            this.fillKeywords(value);
+                    case TITLE ->
+                            this.fillTitle(value);
+                    case LANGUAGE ->
+                            this.fillLanguages(value);
+                    case FILE -> {
+                        // we do not write the "file" field, because the file is the PDF itself
+                    }
+                    case DAY, MONTH -> {
+                        // we do not write day and month separately if dc:year can be used
+                        if (!bibEntry.hasField(StandardField.YEAR)) {
+                            this.fillCustomField(field);
+                        }
+                    }
+                    default ->
+                            this.fillCustomField(field);
+                }
             } else {
-                this.fillCustomField(field.getKey(), field.getValue());
+                if (DC_COVERAGE.equals(field.getName())) {
+                    this.fillCoverage(value);
+                } else if (DC_RIGHTS.equals(field.getName())) {
+                    this.fillRights(value);
+                } else if (DC_SOURCE.equals(field.getName())) {
+                    this.fillSource(value);
+                } else {
+                    this.fillCustomField(field);
+                }
             }
         }
 
         dcSchema.setFormat("application/pdf");
-
-        // Bibtex-Fields used: entrytype, Field: 'dc:type'
-        TypedBibEntry typedEntry = new TypedBibEntry(bibEntry, BibDatabaseMode.BIBTEX);
-        String o = typedEntry.getTypeForDisplay();
-        if (!o.isEmpty()) {
-            dcSchema.addType(o);
-        }
+        fillType();
     }
 }
diff --git a/src/main/java/org/jabref/logic/xmp/XmpUtilReader.java b/src/main/java/org/jabref/logic/xmp/XmpUtilReader.java
index cacf837155e..a5e4d009d32 100644
--- a/src/main/java/org/jabref/logic/xmp/XmpUtilReader.java
+++ b/src/main/java/org/jabref/logic/xmp/XmpUtilReader.java
@@ -10,7 +10,9 @@
 
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.LinkedFile;
+import org.jabref.model.schema.DublinCoreSchemaCustom;
 
+import org.apache.pdfbox.Loader;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDDocumentCatalog;
 import org.apache.pdfbox.pdmodel.PDDocumentInformation;
@@ -27,7 +29,7 @@ public class XmpUtilReader {
     private static final String START_TAG = "<rdf:Description";
     private static final String END_TAG = "</rdf:Description>";
 
-    private XmpUtilReader() {
+    public XmpUtilReader() {
         // See: https://pdfbox.apache.org/2.0/getting-started.html
         System.setProperty("sun.java2d.cmm", "sun.java2d.cmm.kcms.KcmsServiceProvider"); // To get higher rendering speed on java 8 oder 9 for images
     }
@@ -38,22 +40,12 @@ private XmpUtilReader() {
      * @param path The path to read the XMPMetadata from.
      * @return The XMPMetadata object found in the file
      */
-    public static List<XMPMetadata> readRawXmp(Path path) throws IOException {
-        try (PDDocument document = XmpUtilReader.loadWithAutomaticDecryption(path)) {
-            return XmpUtilReader.getXmpMetadata(document);
+    public List<XMPMetadata> readRawXmp(Path path) throws IOException {
+        try (PDDocument document = loadWithAutomaticDecryption(path)) {
+            return getXmpMetadata(document);
         }
     }
 
-    /**
-     * Convenience method for readXMP(File).
-     *
-     * @param filename The filename from which to open the file.
-     * @return BibtexEntryies found in the PDF or an empty list
-     */
-    public static List<BibEntry> readXmp(String filename, XmpPreferences xmpPreferences) throws IOException {
-        return XmpUtilReader.readXmp(Path.of(filename), xmpPreferences);
-    }
-
     /**
      * Try to read the given BibTexEntry from the XMP-stream of the given
      * inputstream containing a PDF-file.
@@ -65,26 +57,22 @@ public static List<BibEntry> readXmp(String filename, XmpPreferences xmpPreferen
      * @throws IOException Throws an IOException if the file cannot be read, so the user than remove a lock or cancel
      *                     the operation.
      */
-    public static List<BibEntry> readXmp(Path path, XmpPreferences xmpPreferences)
+    public List<BibEntry> readXmp(Path path, XmpPreferences xmpPreferences)
             throws IOException {
 
         List<BibEntry> result = new LinkedList<>();
 
         try (PDDocument document = loadWithAutomaticDecryption(path)) {
-            List<XMPMetadata> xmpMetaList = XmpUtilReader.getXmpMetadata(document);
+            List<XMPMetadata> xmpMetaList = getXmpMetadata(document);
 
             if (!xmpMetaList.isEmpty()) {
                 // Only support Dublin Core since JabRef 4.2
                 for (XMPMetadata xmpMeta : xmpMetaList) {
-                    DublinCoreSchema dcSchema = xmpMeta.getDublinCoreSchema();
-
+                    DublinCoreSchema dcSchema = DublinCoreSchemaCustom.copyDublinCoreSchema(xmpMeta.getDublinCoreSchema());
                     if (dcSchema != null) {
                         DublinCoreExtractor dcExtractor = new DublinCoreExtractor(dcSchema, xmpPreferences, new BibEntry());
                         Optional<BibEntry> entry = dcExtractor.extractBibtexEntry();
-
-                        if (entry.isPresent()) {
-                            result.add(entry.get());
-                        }
+                        entry.ifPresent(result::add);
                     }
                 }
             }
@@ -110,7 +98,7 @@ public static List<BibEntry> readXmp(Path path, XmpPreferences xmpPreferences)
      *
      * @return empty List if no metadata has been found, or cannot properly find start or end tag in metadata
      */
-    private static List<XMPMetadata> getXmpMetadata(PDDocument document) throws IOException {
+    private List<XMPMetadata> getXmpMetadata(PDDocument document) {
         PDDocumentCatalog catalog = document.getDocumentCatalog();
         PDMetadata metaRaw = catalog.getMetadata();
         List<XMPMetadata> metaList = new ArrayList<>();
@@ -141,7 +129,7 @@ private static List<XMPMetadata> getXmpMetadata(PDDocument document) throws IOEx
             try {
                 metaList.add(XmpUtilShared.parseXmpMetadata(new ByteArrayInputStream(xmpMetaString.getBytes())));
             } catch (IOException ex) {
-                LOGGER.error("Problem parsing XMP schema. Continuing with other schemas.", ex);
+                LOGGER.warn("Problem parsing XMP schema. Continuing with other schemas.", ex);
             }
         }
         return metaList;
@@ -153,10 +141,9 @@ private static List<XMPMetadata> getXmpMetadata(PDDocument document) throws IOEx
      * @param path The path to load.
      * @throws IOException from the underlying @link PDDocument#load(File)
      */
-    public static PDDocument loadWithAutomaticDecryption(Path path) throws IOException {
+    public PDDocument loadWithAutomaticDecryption(Path path) throws IOException {
         // try to load the document
         // also uses an empty string as default password
-        PDDocument doc = PDDocument.load(path.toFile());
-        return doc;
+        return Loader.loadPDF(path.toFile());
     }
 }
diff --git a/src/main/java/org/jabref/logic/xmp/XmpUtilShared.java b/src/main/java/org/jabref/logic/xmp/XmpUtilShared.java
index 5b741ec9d5f..7aa607917ed 100644
--- a/src/main/java/org/jabref/logic/xmp/XmpUtilShared.java
+++ b/src/main/java/org/jabref/logic/xmp/XmpUtilShared.java
@@ -25,7 +25,7 @@ private XmpUtilShared() {
     }
 
     protected static XMPMetadata parseXmpMetadata(InputStream is) throws IOException {
-        XMPMetadata meta = null;
+        XMPMetadata meta;
         try {
             DomXmpParser parser = new DomXmpParser();
             meta = parser.parse(is);
@@ -47,13 +47,13 @@ protected static XMPMetadata parseXmpMetadata(InputStream is) throws IOException
      */
     public static boolean hasMetadata(Path path, XmpPreferences xmpPreferences) {
         try {
-            List<BibEntry> bibEntries = XmpUtilReader.readXmp(path, xmpPreferences);
+            List<BibEntry> bibEntries = new XmpUtilReader().readXmp(path, xmpPreferences);
             return !bibEntries.isEmpty();
         } catch (EncryptedPdfsNotSupportedException ex) {
             LOGGER.info("Encryption not supported by XMPUtil");
             return false;
         } catch (IOException e) {
-            XmpUtilShared.LOGGER.debug("No metadata was found. Path: " + path.toString());
+            XmpUtilShared.LOGGER.debug("No metadata was found. Path: {}", path.toString());
             return false;
         }
     }
diff --git a/src/main/java/org/jabref/logic/xmp/XmpUtilWriter.java b/src/main/java/org/jabref/logic/xmp/XmpUtilWriter.java
index 0ea00dba569..7bd3c607990 100644
--- a/src/main/java/org/jabref/logic/xmp/XmpUtilWriter.java
+++ b/src/main/java/org/jabref/logic/xmp/XmpUtilWriter.java
@@ -5,21 +5,25 @@
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.Map.Entry;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
 import javax.xml.transform.TransformerException;
 
+import org.jabref.logic.exporter.EmbeddedBibFilePdfExporter;
+import org.jabref.logic.formatter.casechanger.UnprotectTermsFormatter;
+import org.jabref.logic.util.io.FileUtil;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.StandardField;
+import org.jabref.model.schema.DublinCoreSchemaCustom;
 
+import org.apache.pdfbox.Loader;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDDocumentCatalog;
 import org.apache.pdfbox.pdmodel.PDDocumentInformation;
@@ -30,34 +34,23 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+/**
+ * Writes given BibEntries into the XMP part of a PDF file.
+ *
+ * The conversion of a BibEntry to the XMP data (using Dublin Core) is done at
+ * {@link DublinCoreExtractor#fillDublinCoreSchema()}
+ */
 public class XmpUtilWriter {
 
     private static final String XMP_BEGIN_END_TAG = "?xpacket";
 
     private static final Logger LOGGER = LoggerFactory.getLogger(XmpUtilWriter.class);
 
-    /**
-     * Try to write the given BibTexEntry in the XMP-stream of the given
-     * PDF-file.
-     *
-     * Throws an IOException if the file cannot be read or written, so the user
-     * can remove a lock or cancel the operation.
-     *
-     * The method will overwrite existing BibTeX-XMP-data, but keep other
-     * existing metadata.
-     *
-     * This is a convenience method for writeXMP(File, BibEntry).
-     *
-     * @param fileName The filename from which to open the file.
-     * @param entry    The entry to write.
-     * @param database maybenull An optional database which the given bibtex entries belong to, which will be used to
-     *                 resolve strings. If the database is null the strings will not be resolved.
-     * @throws TransformerException If the entry was malformed or unsupported.
-     * @throws IOException          If the file could not be written to or could not be found.
-     */
-    public static void writeXmp(String fileName, BibEntry entry,
-                                BibDatabase database, XmpPreferences xmpPreferences) throws IOException, TransformerException {
-        XmpUtilWriter.writeXmp(Path.of(fileName), entry, database, xmpPreferences);
+    private final UnprotectTermsFormatter unprotectTermsFormatter = new UnprotectTermsFormatter();
+    private final XmpPreferences xmpPreferences;
+
+    public XmpUtilWriter(XmpPreferences xmpPreferences) {
+        this.xmpPreferences = xmpPreferences;
     }
 
     /**
@@ -74,16 +67,16 @@ public static void writeXmp(String fileName, BibEntry entry,
      *
      * @param file     The path to write to.
      * @param entry    The entry to write.
-     * @param database maybenull An optional database which the given bibtex entries belong to, which will be used to
+     * @param database An optional database which the given bibtex entries belong to, which will be used to
      *                 resolve strings. If the database is null the strings will not be resolved.
      * @throws TransformerException If the entry was malformed or unsupported.
      * @throws IOException          If the file could not be written to or could not be found.
      */
-    public static void writeXmp(Path file, BibEntry entry,
-                                BibDatabase database, XmpPreferences xmpPreferences) throws IOException, TransformerException {
-        List<BibEntry> bibEntryList = new ArrayList<>();
-        bibEntryList.add(entry);
-        XmpUtilWriter.writeXmp(file, bibEntryList, database, xmpPreferences);
+    public void writeXmp(Path file,
+                         BibEntry entry,
+                         BibDatabase database)
+        throws IOException, TransformerException {
+        writeXmp(file, List.of(entry), database);
     }
 
     /**
@@ -92,27 +85,24 @@ public static void writeXmp(Path file, BibEntry entry,
      *
      * @param dcSchema  Dublin core schema, which is filled with the bib entry.
      * @param entry     The entry, which is added to the dublin core metadata.
-     * @param database  maybenull An optional database which the given bibtex entries belong to, which will be used to
+     * @param database  An optional database which the given bibtex entries belong to, which will be used to
      *                  resolve strings. If the database is null the strings will not be resolved.
-     * @param xmpPreferences    The user's xmp preferences.
      */
-    private static void writeToDCSchema(DublinCoreSchema dcSchema, BibEntry entry, BibDatabase database,
-                                        XmpPreferences xmpPreferences) {
-
-        BibEntry resolvedEntry = XmpUtilWriter.getDefaultOrDatabaseEntry(entry, database);
-
-        writeToDCSchema(dcSchema, resolvedEntry, xmpPreferences);
+    private void writeToDCSchema(DublinCoreSchema dcSchema,
+                                 BibEntry entry,
+                                 BibDatabase database) {
+        BibEntry resolvedEntry = getDefaultOrDatabaseEntry(entry, database);
+        writeToDCSchema(dcSchema, resolvedEntry);
     }
 
     /**
-     * Writes the information of the bib entry to the dublin core schema using
-     * a custom extractor.
+     * Writes the information of the bib entry to the dublin core schema using a custom extractor.
      *
      * @param dcSchema  Dublin core schema, which is filled with the bib entry.
      * @param entry     The entry, which is added to the dublin core metadata.
-     * @param xmpPreferences    The user's xmp preferences.
      */
-    private static void writeToDCSchema(DublinCoreSchema dcSchema, BibEntry entry, XmpPreferences xmpPreferences) {
+    private void writeToDCSchema(DublinCoreSchema dcSchema,
+                                 BibEntry entry) {
         DublinCoreExtractor dcExtractor = new DublinCoreExtractor(dcSchema, xmpPreferences, entry);
         dcExtractor.fillDublinCoreSchema();
     }
@@ -124,12 +114,13 @@ private static void writeToDCSchema(DublinCoreSchema dcSchema, BibEntry entry, X
      *
      * @param document The pdf document to write to.
      * @param entries  The BibTeX entries that are written as schemas
-     * @param database maybenull An optional database which the given BibTeX entries belong to, which will be used to
+     * @param database An optional database which the given BibTeX entries belong to, which will be used to
      *                 resolve strings. If the database is null the strings will not be resolved.
      */
-    private static void writeDublinCore(PDDocument document,
-            List<BibEntry> entries, BibDatabase database, XmpPreferences xmpPreferences)
-            throws IOException, TransformerException {
+    private void writeDublinCore(PDDocument document,
+                                 List<BibEntry> entries,
+                                 BibDatabase database)
+        throws IOException, TransformerException {
 
         List<BibEntry> resolvedEntries;
         if (database == null) {
@@ -159,8 +150,8 @@ private static void writeDublinCore(PDDocument document,
         meta.removeSchema(meta.getDublinCoreSchema());
 
         for (BibEntry entry : resolvedEntries) {
-            DublinCoreSchema dcSchema = meta.createAndAddDublinCoreSchema();
-            XmpUtilWriter.writeToDCSchema(dcSchema, entry, null, xmpPreferences);
+            DublinCoreSchema dcSchema = DublinCoreSchemaCustom.copyDublinCoreSchema(meta.createAndAddDublinCoreSchema());
+            writeToDCSchema(dcSchema, entry, null);
         }
 
         // Save to stream and then input that stream to the PDF
@@ -174,19 +165,17 @@ private static void writeDublinCore(PDDocument document,
 
     /**
      * This method generates an xmp metadata string in dublin core format.
-     * <br/>
      *
      * @param entries   A list of entries, which are added to the dublin core metadata.
-     * @param xmpPreferences    The user's xmp preferences.
      *
      * @return  If something goes wrong (e.g. an exception is thrown), the method returns an empty string,
      *          otherwise it returns the xmp metadata as a string in dublin core format.
      */
-    private static String generateXmpStringWithXmpDeclaration(List<BibEntry> entries, XmpPreferences xmpPreferences) {
+    private String generateXmpStringWithXmpDeclaration(List<BibEntry> entries) {
         XMPMetadata meta = XMPMetadata.createXMPMetadata();
         for (BibEntry entry : entries) {
             DublinCoreSchema dcSchema = meta.createAndAddDublinCoreSchema();
-            XmpUtilWriter.writeToDCSchema(dcSchema, entry, xmpPreferences);
+            writeToDCSchema(dcSchema, entry);
         }
         try (ByteArrayOutputStream os = new ByteArrayOutputStream()) {
             XmpSerializer serializer = new XmpSerializer();
@@ -210,13 +199,12 @@ private static String generateXmpStringWithXmpDeclaration(List<BibEntry> entries
      * <br/>
      *
      * @param entries   A list of entries, which are added to the dublin core metadata.
-     * @param xmpPreferences    The user's xmp preferences.
      *
      * @return  If something goes wrong (e.g. an exception is thrown), the method returns an empty string,
      *          otherwise it returns the xmp metadata without metadata description as a string in dublin core format.
      */
-    public static String generateXmpStringWithoutXmpDeclaration(List<BibEntry> entries, XmpPreferences xmpPreferences) {
-        String xmpContent = XmpUtilWriter.generateXmpStringWithXmpDeclaration(entries, xmpPreferences);
+    public String generateXmpStringWithoutXmpDeclaration(List<BibEntry> entries) {
+        String xmpContent = generateXmpStringWithXmpDeclaration(entries);
         // remove the <?xpacket *> tags to enable the usage of the CTAN package xmpincl
         Predicate<String> isBeginOrEndTag = s -> s.contains(XMP_BEGIN_END_TAG);
 
@@ -228,30 +216,25 @@ public static String generateXmpStringWithoutXmpDeclaration(List<BibEntry> entri
     /**
      * Try to write the given BibTexEntry in the Document Information (the
      * properties of the pdf).
-     *
-     * Existing fields values are overriden if the bibtex entry has the
+     * <p>
+     * Existing fields values are overridden if the bibtex entry has the
      * corresponding value set.
+     * <p>
+     * The method to write DublineCore is {@link DublinCoreExtractor#fillDublinCoreSchema()}
      *
      * @param document The pdf document to write to.
      * @param entry    The Bibtex entry that is written into the PDF properties. *
-     * @param database maybenull An optional database which the given bibtex entries belong to, which will be used to
+     * @param database An optional database which the given bibtex entries belong to, which will be used to
      *                 resolve strings. If the database is null the strings will not be resolved.
      */
-    private static void writeDocumentInformation(PDDocument document,
-                                                 BibEntry entry, BibDatabase database, XmpPreferences xmpPreferences) {
-
+    private void writeDocumentInformation(PDDocument document,
+                                          BibEntry entry,
+                                          BibDatabase database) {
         PDDocumentInformation di = document.getDocumentInformation();
+        BibEntry resolvedEntry = getDefaultOrDatabaseEntry(entry, database);
 
-        BibEntry resolvedEntry = XmpUtilWriter.getDefaultOrDatabaseEntry(entry, database);
-
-        // Query privacy filter settings
         boolean useXmpPrivacyFilter = xmpPreferences.shouldUseXmpPrivacyFilter();
-
-        // Set all the values including key and entryType
-        for (Entry<Field, String> fieldValuePair : resolvedEntry.getFieldMap().entrySet()) {
-            Field field = fieldValuePair.getKey();
-            String fieldContent = fieldValuePair.getValue();
-
+        for (Field field : resolvedEntry.getFields()) {
             if (useXmpPrivacyFilter && xmpPreferences.getXmpPrivacyFilter().contains(field)) {
                 // erase field instead of adding it
                 if (StandardField.AUTHOR.equals(field)) {
@@ -268,16 +251,20 @@ private static void writeDocumentInformation(PDDocument document,
                 continue;
             }
 
+            // LaTeX content is removed from the string for "standard" fields in the PDF
+            String value = unprotectTermsFormatter.format(resolvedEntry.getField(field).get());
+
             if (StandardField.AUTHOR.equals(field)) {
-                di.setAuthor(fieldContent);
+                di.setAuthor(value);
             } else if (StandardField.TITLE.equals(field)) {
-                di.setTitle(fieldContent);
+                di.setTitle(value);
             } else if (StandardField.KEYWORDS.equals(field)) {
-                di.setKeywords(fieldContent);
+                di.setKeywords(value);
             } else if (StandardField.ABSTRACT.equals(field)) {
-                di.setSubject(fieldContent);
+                di.setSubject(value);
             } else {
-                di.setCustomMetadataValue("bibtex/" + field, fieldContent);
+                // We hit the case of an PDF-unsupported field --> write it directly
+                di.setCustomMetadataValue("bibtex/" + field, resolvedEntry.getField(field).get());
             }
         }
         di.setCustomMetadataValue("bibtex/entrytype", resolvedEntry.getType().getDisplayName());
@@ -293,18 +280,19 @@ private static void writeDocumentInformation(PDDocument document,
      * The method will overwrite existing BibTeX-XMP-data, but keep other
      * existing metadata.
      *
+     * The code for using PDFBox is also used at {@link EmbeddedBibFilePdfExporter#embedBibTex(java.lang.String, java.nio.file.Path)}.
+     *
      * @param path          The file to write the entries to.
      * @param bibtexEntries The entries to write to the file. *
-     * @param database      maybenull An optional database which the given bibtex entries belong to, which will be used
+     * @param database      An optional database which the given bibtex entries belong to, which will be used
      *                      to resolve strings. If the database is null the strings will not be resolved.
-     * @param xmpPreferences  Write information also in PDF document properties
      * @throws TransformerException If the entry was malformed or unsupported.
      * @throws IOException          If the file could not be written to or could not be found.
      */
-    public static void writeXmp(Path path,
-                                List<BibEntry> bibtexEntries, BibDatabase database,
-                                XmpPreferences xmpPreferences) throws IOException, TransformerException {
-
+    public void writeXmp(Path path,
+                         List<BibEntry> bibtexEntries,
+                         BibDatabase database)
+        throws IOException, TransformerException {
         List<BibEntry> resolvedEntries;
         if (database == null) {
             resolvedEntries = bibtexEntries;
@@ -312,29 +300,34 @@ public static void writeXmp(Path path,
             resolvedEntries = database.resolveForStrings(bibtexEntries, false);
         }
 
-        try (PDDocument document = PDDocument.load(path.toFile())) {
-
+        // Read from another file
+        // Reason: Apache PDFBox does not support writing while the file is opened
+        // See https://issues.apache.org/jira/browse/PDFBOX-4028
+        Path newFile = Files.createTempFile("JabRef", "pdf");
+        try (PDDocument document = Loader.loadPDF(path.toFile())) {
             if (document.isEncrypted()) {
                 throw new EncryptedPdfsNotSupportedException();
             }
 
             // Write schemas (PDDocumentInformation and DublinCoreSchema) to the document metadata
             if (resolvedEntries.size() > 0) {
-                XmpUtilWriter.writeDocumentInformation(document, resolvedEntries.get(0), null, xmpPreferences);
-                XmpUtilWriter.writeDublinCore(document, resolvedEntries, null, xmpPreferences);
+                writeDocumentInformation(document, resolvedEntries.get(0), null);
+                writeDublinCore(document, resolvedEntries, null);
             }
 
-            // Save
+            // Save updates to original file
             try {
-                document.save(path.toFile());
+                document.save(newFile.toFile());
+                FileUtil.copyFile(newFile, path, true);
             } catch (IOException e) {
                 LOGGER.debug("Could not write XMP metadata", e);
                 throw new TransformerException("Could not write XMP metadata: " + e.getLocalizedMessage(), e);
             }
         }
+        Files.delete(newFile);
     }
 
-    private static BibEntry getDefaultOrDatabaseEntry(BibEntry defaultEntry, BibDatabase database) {
+    private BibEntry getDefaultOrDatabaseEntry(BibEntry defaultEntry, BibDatabase database) {
         if (database == null) {
             return defaultEntry;
         } else {
diff --git a/src/main/java/org/jabref/migrations/MergeReviewIntoCommentMigration.java b/src/main/java/org/jabref/migrations/MergeReviewIntoCommentMigration.java
index 19c9563fbfc..10f8c3fb5a8 100644
--- a/src/main/java/org/jabref/migrations/MergeReviewIntoCommentMigration.java
+++ b/src/main/java/org/jabref/migrations/MergeReviewIntoCommentMigration.java
@@ -13,7 +13,7 @@
 import org.slf4j.LoggerFactory;
 
 public class MergeReviewIntoCommentMigration {
-    public static final Logger LOGGER = LoggerFactory.getLogger(MergeReviewIntoCommentMigration.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(MergeReviewIntoCommentMigration.class);
 
     public static boolean needsMigration(ParserResult parserResult) {
         return parserResult.getDatabase().getEntries().stream()
diff --git a/src/main/java/org/jabref/migrations/PreferencesMigrations.java b/src/main/java/org/jabref/migrations/PreferencesMigrations.java
index 6ff137d6d0f..9939653389b 100644
--- a/src/main/java/org/jabref/migrations/PreferencesMigrations.java
+++ b/src/main/java/org/jabref/migrations/PreferencesMigrations.java
@@ -136,7 +136,6 @@ private static void upgradeFaultyEncodingStrings(JabRefPreferences prefs) {
      * exist
      */
     private static void upgradeSortOrder(JabRefPreferences prefs) {
-
         if (prefs.get(JabRefPreferences.EXPORT_IN_SPECIFIED_ORDER, null) == null) {
             if (prefs.getBoolean("exportInStandardOrder", false)) {
                 prefs.putBoolean(JabRefPreferences.EXPORT_IN_SPECIFIED_ORDER, true);
@@ -163,7 +162,6 @@ private static void upgradeSortOrder(JabRefPreferences prefs) {
      * Migrate all customized entry types from versions <=3.7
      */
     private static void upgradeStoredBibEntryTypes(JabRefPreferences prefs, Preferences mainPrefsNode) {
-
         try {
             if (mainPrefsNode.nodeExists(JabRefPreferences.CUSTOMIZED_BIBTEX_TYPES) ||
                     mainPrefsNode.nodeExists(JabRefPreferences.CUSTOMIZED_BIBLATEX_TYPES)) {
@@ -181,7 +179,6 @@ private static void upgradeStoredBibEntryTypes(JabRefPreferences prefs, Preferen
      * Migrate LabelPattern configuration from versions <=3.5 to new CitationKeyPatterns
      */
     private static void upgradeLabelPatternToCitationKeyPattern(JabRefPreferences prefs) {
-
         try {
             Preferences mainPrefsNode = Preferences.userRoot().node("/org/jabref");
 
@@ -242,11 +239,9 @@ private static void migrateFileImportPattern(String oldStylePattern, String newS
     }
 
     static void upgradeImportFileAndDirePatterns(JabRefPreferences prefs, Preferences mainPrefsNode) {
-
         // Migrate Import patterns
         // Check for prefs node for Version <= 4.0
         if (mainPrefsNode.get(JabRefPreferences.IMPORT_FILENAMEPATTERN, null) != null) {
-
             String[] oldStylePatterns = new String[]{
                     "\\bibtexkey",
                     "\\bibtexkey\\begin{title} - \\format[RemoveBrackets]{\\title}\\end{title}"};
diff --git a/src/main/java/org/jabref/model/TreeNode.java b/src/main/java/org/jabref/model/TreeNode.java
index 5491a53c3ad..634882d0f73 100644
--- a/src/main/java/org/jabref/model/TreeNode.java
+++ b/src/main/java/org/jabref/model/TreeNode.java
@@ -590,6 +590,7 @@ public T copySubtree() {
      *  - addChild (new parent)
      *  - removeChild (old parent)
      *  - move (old parent and new parent)
+     *
      * @param subscriber function to be invoked upon a change
      */
     public void subscribeToDescendantChanged(Consumer<T> subscriber) {
diff --git a/src/main/java/org/jabref/model/database/BibDatabase.java b/src/main/java/org/jabref/model/database/BibDatabase.java
index 14193a0d14e..820b8dcc107 100644
--- a/src/main/java/org/jabref/model/database/BibDatabase.java
+++ b/src/main/java/org/jabref/model/database/BibDatabase.java
@@ -293,6 +293,7 @@ public synchronized void addString(BibtexString string) throws KeyCollisionExcep
     /**
      * Replaces the existing lists of BibTexString with the given one
      * Duplicates throw KeyCollisionException
+     *
      * @param stringsToAdd The collection of strings to set
      */
     public void setStrings(List<BibtexString> stringsToAdd) {
@@ -437,7 +438,6 @@ public List<BibEntry> resolveForStrings(Collection<BibEntry> entriesToResolve, b
      * given BibtexEntries is modified.
      */
     public BibEntry resolveForStrings(BibEntry entry, boolean inPlace) {
-
         BibEntry resultingEntry;
         if (inPlace) {
             resultingEntry = entry;
@@ -504,7 +504,6 @@ private String resolveContent(String result, Set<String> usedIds, Set<String> al
             int piv = 0;
             int next;
             while ((next = res.indexOf(FieldWriter.BIBTEX_STRING_START_END_SYMBOL, piv)) >= 0) {
-
                 // We found the next string ref. Append the text
                 // up to it.
                 if (next > 0) {
@@ -553,7 +552,7 @@ public void setEpilog(String epilog) {
     }
 
     /**
-     * Registers an listener object (subscriber) to the internal event bus.
+     * Registers a listener object (subscriber) to the internal event bus.
      * The following events are posted:
      *
      * - {@link EntriesAddedEvent}
@@ -634,6 +633,7 @@ public boolean isDuplicateCitationKeyExisting(String key) {
 
     /**
      * Set the newline separator.
+     *
      * @param newLineSeparator
      */
     public void setNewLineSeparator(String newLineSeparator) {
@@ -646,5 +646,4 @@ public void setNewLineSeparator(String newLineSeparator) {
     public String getNewLineSeparator() {
         return newLineSeparator;
     }
-
 }
diff --git a/src/main/java/org/jabref/model/database/BibDatabaseContext.java b/src/main/java/org/jabref/model/database/BibDatabaseContext.java
index 23e5d04e188..662a1ecde36 100644
--- a/src/main/java/org/jabref/model/database/BibDatabaseContext.java
+++ b/src/main/java/org/jabref/model/database/BibDatabaseContext.java
@@ -13,6 +13,7 @@
 import org.jabref.logic.shared.DatabaseLocation;
 import org.jabref.logic.shared.DatabaseSynchronizer;
 import org.jabref.logic.util.CoarseChangeFilter;
+import org.jabref.logic.util.OS;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.metadata.MetaData;
 import org.jabref.model.pdf.search.SearchFieldConstants;
@@ -29,8 +30,6 @@
 @AllowedToUseLogic("because it needs access to shared database features")
 public class BibDatabaseContext {
 
-    public static final String SEARCH_INDEX_BASE_PATH = "JabRef";
-
     private static final Logger LOGGER = LoggerFactory.getLogger(LibraryTab.class);
 
     private final BibDatabase database;
@@ -215,14 +214,15 @@ public List<BibEntry> getEntries() {
 
     /**
      * check if the database has any empty entries
+     *
      * @return true if the database has any empty entries; otherwise false
      */
     public boolean hasEmptyEntries() {
-        return this.getEntries().stream().anyMatch(entry->entry.getFields().isEmpty());
+        return this.getEntries().stream().anyMatch(entry -> entry.getFields().isEmpty());
     }
 
     public static Path getFulltextIndexBasePath() {
-        return Path.of(AppDirsFactory.getInstance().getUserDataDir(SEARCH_INDEX_BASE_PATH, SearchFieldConstants.VERSION, "org.jabref"));
+        return Path.of(AppDirsFactory.getInstance().getUserDataDir(OS.APP_DIR_APP_NAME, SearchFieldConstants.VERSION, OS.APP_DIR_APP_AUTHOR));
     }
 
     public Path getFulltextIndexPath() {
diff --git a/src/main/java/org/jabref/model/database/event/BibDatabaseContextChangedEvent.java b/src/main/java/org/jabref/model/database/event/BibDatabaseContextChangedEvent.java
index d0c993f6e42..9db98e10dbf 100644
--- a/src/main/java/org/jabref/model/database/event/BibDatabaseContextChangedEvent.java
+++ b/src/main/java/org/jabref/model/database/event/BibDatabaseContextChangedEvent.java
@@ -5,9 +5,10 @@
 import org.jabref.model.metadata.event.MetaDataChangedEvent;
 
 /**
- * This Event is automatically fired at the same time as {@link EntriesEvent}, {@link GroupUpdatedEvent} or {@link MetaDataChangedEvent}.
+ * This event is automatically fired at the same time as {@link EntriesEvent}, {@link GroupUpdatedEvent}, or {@link MetaDataChangedEvent},
+ * because all three inherit from this class.
  */
-public class BibDatabaseContextChangedEvent {
+public abstract class BibDatabaseContextChangedEvent {
     // If the event has been filtered out
     private boolean filteredOut;
 
diff --git a/src/main/java/org/jabref/model/entry/BibEntry.java b/src/main/java/org/jabref/model/entry/BibEntry.java
index 546afc1916c..2643e777c84 100644
--- a/src/main/java/org/jabref/model/entry/BibEntry.java
+++ b/src/main/java/org/jabref/model/entry/BibEntry.java
@@ -469,7 +469,7 @@ private Optional<String> genericGetFieldOrAlias(Field field, BiFunction<BibEntry
                 }
             } else {
                 // Date field not in valid format
-                LOGGER.debug("Could not parse date " + date.get());
+                LOGGER.debug("Could not parse date {}", date.get());
                 return Optional.empty();
             }
         }
@@ -597,7 +597,7 @@ public Optional<FieldChange> clearField(Field field) {
      */
     public Optional<FieldChange> clearField(Field field, EntriesEventSource eventSource) {
         Optional<String> oldValue = getField(field);
-        if (!oldValue.isPresent()) {
+        if (oldValue.isEmpty()) {
             return Optional.empty();
         }
 
@@ -777,7 +777,8 @@ public Optional<FieldChange> removeKeywords(KeywordList keywordsToRemove, Charac
         return putKeywords(keywordList, keywordDelimiter);
     }
 
-    public Optional<FieldChange> replaceKeywords(KeywordList keywordsToReplace, Keyword newValue,
+    public Optional<FieldChange> replaceKeywords(KeywordList keywordsToReplace,
+                                                 Keyword newValue,
                                                  Character keywordDelimiter) {
         KeywordList keywordList = getKeywords(keywordDelimiter);
         keywordList.replaceAll(keywordsToReplace, newValue);
@@ -835,6 +836,18 @@ public BibEntry withField(Field field, String value) {
         return this;
     }
 
+    public BibEntry withDate(Date date) {
+        setDate(date);
+        this.setChanged(false);
+        return this;
+    }
+
+    public BibEntry withMonth(Month parsedMonth) {
+        setMonth(parsedMonth);
+        this.setChanged(false);
+        return this;
+    }
+
     /*
      * Returns user comments (arbitrary text before the entry), if they exist. If not, returns the empty String
      */
@@ -1007,5 +1020,4 @@ public void addLinkedFile(BibEntry entry, LinkedFile linkedFile, LinkedFile newL
         }
         entry.setFiles(linkedFiles);
     }
-
 }
diff --git a/src/main/java/org/jabref/model/entry/BibEntryType.java b/src/main/java/org/jabref/model/entry/BibEntryType.java
index 2f59f62cbb2..f2f03f871c0 100644
--- a/src/main/java/org/jabref/model/entry/BibEntryType.java
+++ b/src/main/java/org/jabref/model/entry/BibEntryType.java
@@ -124,7 +124,6 @@ public boolean equals(Object o) {
         return type.equals(that.type) &&
                Objects.equals(requiredFields, that.requiredFields) &&
                Objects.equals(fields, that.fields);
-
     }
 
     @Override
diff --git a/src/main/java/org/jabref/model/entry/BibEntryTypesManager.java b/src/main/java/org/jabref/model/entry/BibEntryTypesManager.java
index b737596abd6..836cd39dac8 100644
--- a/src/main/java/org/jabref/model/entry/BibEntryTypesManager.java
+++ b/src/main/java/org/jabref/model/entry/BibEntryTypesManager.java
@@ -11,6 +11,7 @@
 import org.jabref.model.database.BibDatabaseMode;
 import org.jabref.model.entry.field.BibField;
 import org.jabref.model.entry.field.FieldFactory;
+import org.jabref.model.entry.types.BiblatexAPAEntryTypeDefinitions;
 import org.jabref.model.entry.types.BiblatexEntryTypeDefinitions;
 import org.jabref.model.entry.types.BiblatexSoftwareEntryTypeDefinitions;
 import org.jabref.model.entry.types.BibtexEntryTypeDefinitions;
@@ -21,7 +22,7 @@
 public class BibEntryTypesManager {
     public static final String ENTRYTYPE_FLAG = "jabref-entrytype: ";
     private final InternalEntryTypes BIBTEX = new InternalEntryTypes(Stream.concat(BibtexEntryTypeDefinitions.ALL.stream(), IEEETranEntryTypeDefinitions.ALL.stream()).collect(Collectors.toList()));
-    private final InternalEntryTypes BIBLATEX = new InternalEntryTypes(Stream.concat(BiblatexEntryTypeDefinitions.ALL.stream(), BiblatexSoftwareEntryTypeDefinitions.ALL.stream()).collect(Collectors.toList()));
+    private final InternalEntryTypes BIBLATEX = new InternalEntryTypes(Stream.concat(BiblatexEntryTypeDefinitions.ALL.stream(), Stream.concat(BiblatexSoftwareEntryTypeDefinitions.ALL.stream(), BiblatexAPAEntryTypeDefinitions.ALL.stream())).collect(Collectors.toList()));
 
     public BibEntryTypesManager() {
     }
@@ -99,6 +100,7 @@ public List<BibEntryType> getAllCustomTypes(BibDatabaseMode mode) {
             return customizedTypes.stream()
                                   .filter(entryType -> BiblatexEntryTypeDefinitions.ALL.stream().noneMatch(biblatexType -> biblatexType.getType().equals(entryType.getType())))
                                   .filter(entryType -> BiblatexSoftwareEntryTypeDefinitions.ALL.stream().noneMatch(biblatexSoftware -> biblatexSoftware.getType().equals(entryType.getType())))
+                                  .filter(entryType -> BiblatexAPAEntryTypeDefinitions.ALL.stream().noneMatch(biblatexAPA -> biblatexAPA.getType().equals(entryType.getType())))
                                   .collect(Collectors.toList());
         }
     }
diff --git a/src/main/java/org/jabref/model/entry/BibtexString.java b/src/main/java/org/jabref/model/entry/BibtexString.java
index 6b7bd2c289b..9b833849d23 100644
--- a/src/main/java/org/jabref/model/entry/BibtexString.java
+++ b/src/main/java/org/jabref/model/entry/BibtexString.java
@@ -178,7 +178,8 @@ public boolean equals(Object o) {
             return false;
         }
         BibtexString that = (BibtexString) o;
-        return (Objects.equals(hasChanged, that.hasChanged) &&
+        return (
+                Objects.equals(hasChanged, that.hasChanged) &&
                 Objects.equals(name, that.name) &&
                 Objects.equals(content, that.content) &&
                 Objects.equals(type, that.type) &&
@@ -187,6 +188,6 @@ public boolean equals(Object o) {
 
     @Override
     public int hashCode() {
-        return Objects.hash(name, content, id, type, parsedSerialization, hasChanged);
+        return Objects.hash(hasChanged, name, content, type, parsedSerialization);
     }
 }
diff --git a/src/main/java/org/jabref/model/entry/CanonicalBibEntry.java b/src/main/java/org/jabref/model/entry/CanonicalBibEntry.java
index 60df4478b09..6e0b8f19a80 100644
--- a/src/main/java/org/jabref/model/entry/CanonicalBibEntry.java
+++ b/src/main/java/org/jabref/model/entry/CanonicalBibEntry.java
@@ -17,12 +17,16 @@ private CanonicalBibEntry() {
     }
 
     /**
-     * This returns a canonical BibTeX serialization. Serializes all fields, even the JabRef internal ones. Does NOT
-     * serialize "KEY_FIELD" as field, but as key
+     * This returns a canonical BibTeX serialization.
+     * The result is close to BibTeX, but not a valid BibTeX representation in all cases
      *
      * <ul>
-     *     <li>Special characters such as "{" or "&" are NOT escaped, but written as</li>
-     *     <li>String constants are not handled. That means, <code>month = apr</code> in a bib file gets <code>month = {#apr#}</code>. This indicates that the month field is correctly stored</li>
+     *     <li>Serializes all fields, even the JabRef internal ones.</li>
+     *     <li>Does NOT serialize "KEY_FIELD" as field, but as key.</li>
+     *     <li>Special characters such as "{" or "&" are NOT escaped, but written as is.</li>
+     *     <li>New lines are written as is.</li>
+     *     <li>String constants are not handled. That means, <code>month = apr</code> in a bib file gets <code>month = {#apr#}</code>.
+     *         This indicates that the month field is correctly stored.</li>
      * </ul>
      */
     public static String getCanonicalRepresentation(BibEntry entry) {
@@ -53,7 +57,7 @@ public static String getCanonicalRepresentation(BibEntry entry) {
         // generate field entries
         StringJoiner sj = new StringJoiner(",\n", "", "\n");
         for (String fieldName : sortedFields) {
-            String line = String.format("  %s = {%s}", fieldName, String.valueOf(mapFieldToValue.get(fieldName)).replaceAll("\\r\\n", "\n"));
+            String line = String.format("  %s = {%s}", fieldName, mapFieldToValue.get(fieldName));
             sj.add(line);
         }
 
diff --git a/src/main/java/org/jabref/model/entry/Date.java b/src/main/java/org/jabref/model/entry/Date.java
index b63b78c7781..d133a80fb85 100644
--- a/src/main/java/org/jabref/model/entry/Date.java
+++ b/src/main/java/org/jabref/model/entry/Date.java
@@ -18,20 +18,27 @@ public class Date {
 
     private static final DateTimeFormatter NORMALIZED_DATE_FORMATTER = DateTimeFormatter.ofPattern("uuuu[-MM][-dd]");
     private static final DateTimeFormatter SIMPLE_DATE_FORMATS;
+
     static {
         List<String> formatStrings = Arrays.asList(
-                "uuuu-M-d",     // covers 2009-1-15
-                "uuuu-M",       // covers 2009-11
-                "d-M-uuuu",     // covers 15-1-2012
-                "M-uuuu",       // covers 1-2012
-                "M/uuuu",       // covers 9/2015 and 09/2015
-                "M/uu",         // covers 9/15
-                "MMMM d, uuuu", // covers September 1, 2015
-                "MMMM, uuuu",   // covers September, 2015
-                "d.M.uuuu",     // covers 15.1.2015
-                "uuuu.M.d",     // covers 2015.1.15
-                "uuuu",         // covers 2015
-                "MMM, uuuu");   // covers Jan, 2020
+                "uuuu-MM-dd'T'HH:mm[:ss][xxx][xx][X]",  // covers 2018-10-03T07:24:14+03:00
+                "uuuu-MM-dd'T'HH:m[:ss][xxx][xx][X]",   // covers 2018-10-03T17:2
+                "uuuu-MM-dd'T'H:mm[:ss][xxx][xx][X]",   // covers 2018-10-03T7:24
+                "uuuu-MM-dd'T'H:m[:ss][xxx][xx][X]",    // covers 2018-10-03T7:7
+                "uuuu-MM-dd'T'HH[:ss][xxx][xx][X]",     // covers 2018-10-03T07
+                "uuuu-MM-dd'T'H[:ss][xxx][xx][X]",      // covers 2018-10-03T7
+                "uuuu-M-d",                             // covers 2009-1-15
+                "uuuu-M",                               // covers 2009-11
+                "d-M-uuuu",                             // covers 15-1-2012
+                "M-uuuu",                               // covers 1-2012
+                "M/uuuu",                               // covers 9/2015 and 09/2015
+                "M/uu",                                 // covers 9/15
+                "MMMM d, uuuu",                         // covers September 1, 2015
+                "MMMM, uuuu",                           // covers September, 2015
+                "d.M.uuuu",                             // covers 15.1.2015
+                "uuuu.M.d",                             // covers 2015.1.15
+                "uuuu",                                 // covers 2015
+                "MMM, uuuu");                           // covers Jan, 2020
 
         SIMPLE_DATE_FORMATS = formatStrings.stream()
                                            .map(DateTimeFormatter::ofPattern)
@@ -95,7 +102,6 @@ public static Optional<Date> parse(String dateString) {
             } catch (DateTimeParseException ignored) {
                 return Optional.empty();
             }
-
         }
 
         try {
@@ -106,7 +112,8 @@ public static Optional<Date> parse(String dateString) {
         }
     }
 
-    public static Optional<Date> parse(Optional<String> yearValue, Optional<String> monthValue,
+    public static Optional<Date> parse(Optional<String> yearValue,
+                                       Optional<String> monthValue,
                                        Optional<String> dayValue) {
         Optional<Year> year = yearValue.flatMap(Date::convertToInt).map(Year::of);
         Optional<Month> month = monthValue.flatMap(Month::parse);
@@ -175,15 +182,28 @@ public boolean equals(Object o) {
             return false;
         }
         Date date1 = (Date) o;
+
         return Objects.equals(getYear(), date1.getYear()) &&
                 Objects.equals(getMonth(), date1.getMonth()) &&
-                Objects.equals(getDay(), date1.getDay());
+                Objects.equals(getDay(), date1.getDay()) &&
+                Objects.equals(get(ChronoField.HOUR_OF_DAY), date1.get(ChronoField.HOUR_OF_DAY)) &&
+                Objects.equals(get(ChronoField.MINUTE_OF_HOUR), date1.get(ChronoField.MINUTE_OF_HOUR)) &&
+                Objects.equals(get(ChronoField.SECOND_OF_DAY), date1.get(ChronoField.SECOND_OF_DAY)) &&
+                Objects.equals(get(ChronoField.OFFSET_SECONDS), date1.get(ChronoField.OFFSET_SECONDS));
     }
 
     @Override
     public String toString() {
+        String formattedDate;
+        if (date.isSupported(ChronoField.OFFSET_SECONDS)) {
+            formattedDate = DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(date);
+        } else if (date.isSupported(ChronoField.HOUR_OF_DAY)) {
+            formattedDate = DateTimeFormatter.ISO_DATE_TIME.format(date);
+        } else {
+            formattedDate = DateTimeFormatter.ISO_DATE.format(date);
+        }
         return "Date{" +
-                "date=" + date +
+                "date=" + formattedDate +
                 '}';
     }
 
diff --git a/src/main/java/org/jabref/model/entry/KeywordList.java b/src/main/java/org/jabref/model/entry/KeywordList.java
index 87f9b256f17..d54de57f977 100644
--- a/src/main/java/org/jabref/model/entry/KeywordList.java
+++ b/src/main/java/org/jabref/model/entry/KeywordList.java
@@ -3,6 +3,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Objects;
@@ -72,6 +73,13 @@ public static KeywordList parse(String keywordString, Character delimiter) {
         return parse(keywordString, delimiter, Keyword.DEFAULT_HIERARCHICAL_DELIMITER);
     }
 
+    public static KeywordList merge(String keywordStringA, String keywordStringB, Character delimiter) {
+        KeywordList keywordListA = parse(keywordStringA, delimiter);
+        KeywordList keywordListB = parse(keywordStringB, delimiter);
+        List<Keyword> distinctKeywords = Stream.concat(keywordListA.stream(), keywordListB.stream()).distinct().toList();
+        return new KeywordList(distinctKeywords);
+    }
+
     public KeywordList createClone() {
         return new KeywordList(this.keywordChains);
     }
@@ -186,7 +194,7 @@ public boolean equals(Object o) {
             return false;
         }
         KeywordList keywords1 = (KeywordList) o;
-        return Objects.equals(keywordChains, keywords1.keywordChains);
+        return Objects.equals(new HashSet<>(keywordChains), new HashSet<>(keywords1.keywordChains));
     }
 
     @Override
diff --git a/src/main/java/org/jabref/model/entry/LinkedFile.java b/src/main/java/org/jabref/model/entry/LinkedFile.java
index 63907ee01a5..158336c7a53 100644
--- a/src/main/java/org/jabref/model/entry/LinkedFile.java
+++ b/src/main/java/org/jabref/model/entry/LinkedFile.java
@@ -11,6 +11,7 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.regex.Pattern;
 
 import javafx.beans.Observable;
 import javafx.beans.property.SimpleStringProperty;
@@ -26,6 +27,9 @@
  */
 public class LinkedFile implements Serializable {
 
+    private static final String REGEX_URL = "^((?:https?\\:\\/\\/|www\\.)(?:[-a-z0-9]+\\.)*[-a-z0-9]+.*)";
+    private static final Pattern URL_PATTERN = Pattern.compile(REGEX_URL);
+
     private static final LinkedFile NULL_OBJECT = new LinkedFile("", Path.of(""), "");
 
     // We have to mark these properties as transient because they can't be serialized directly
@@ -145,7 +149,7 @@ private void readObject(ObjectInputStream in) throws IOException {
      */
     public static boolean isOnlineLink(String toCheck) {
         String normalizedFilePath = toCheck.trim().toLowerCase();
-        return normalizedFilePath.startsWith("http://") || normalizedFilePath.startsWith("https://") || normalizedFilePath.contains("www.");
+        return URL_PATTERN.matcher(normalizedFilePath).matches();
     }
 
     @Override
diff --git a/src/main/java/org/jabref/model/entry/event/FieldChangedEvent.java b/src/main/java/org/jabref/model/entry/event/FieldChangedEvent.java
index 3f4eda3838e..9165aa13f15 100644
--- a/src/main/java/org/jabref/model/entry/event/FieldChangedEvent.java
+++ b/src/main/java/org/jabref/model/entry/event/FieldChangedEvent.java
@@ -19,7 +19,7 @@ public class FieldChangedEvent extends EntryChangedEvent {
      * @param field    Name of field which has been changed
      * @param oldValue old field value
      * @param newValue new field value
-     * @param location location Location affected by this event
+     * @param location Location affected by this event
      */
     public FieldChangedEvent(BibEntry bibEntry, Field field, String newValue, String oldValue,
                              EntriesEventSource location) {
@@ -44,7 +44,7 @@ public FieldChangedEvent(BibEntry bibEntry, Field field, String newValue, String
     }
 
     /**
-     * @param location location Location affected by this event
+     * @param location Location affected by this event
      */
     public FieldChangedEvent(FieldChange fieldChange, EntriesEventSource location) {
         super(fieldChange.getEntry(), location);
diff --git a/src/main/java/org/jabref/model/entry/field/BiblatexApaField.java b/src/main/java/org/jabref/model/entry/field/BiblatexApaField.java
new file mode 100644
index 00000000000..b2938963efe
--- /dev/null
+++ b/src/main/java/org/jabref/model/entry/field/BiblatexApaField.java
@@ -0,0 +1,82 @@
+package org.jabref.model.entry.field;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.Optional;
+import java.util.Set;
+
+import org.jabref.model.entry.types.BiblatexApaEntryType;
+
+public enum BiblatexApaField implements Field {
+
+    AMENDMENT("amendment"),
+    ARTICLE("article"),
+    CITATION("citation"),
+    CITATION_CITEORG("citation_citeorg"),
+    CITATION_CITEDATE("citation_citedate", FieldProperty.DATE),
+    CITATION_CITEINFO("citation_citeinfo"),
+    SECTION("section", FieldProperty.NUMERIC),
+    SOURCE("source");
+
+    private final String name;
+    private final String displayName;
+    private final Set<FieldProperty> properties;
+
+    BiblatexApaField(String name) {
+        this.name = name;
+        this.displayName = null;
+        this.properties = EnumSet.noneOf(FieldProperty.class);
+    }
+
+    BiblatexApaField(String name, String displayName) {
+        this.name = name;
+        this.displayName = displayName;
+        this.properties = EnumSet.noneOf(FieldProperty.class);
+    }
+
+    BiblatexApaField(String name, String displayName, FieldProperty first, FieldProperty... rest) {
+        this.name = name;
+        this.displayName = displayName;
+        this.properties = EnumSet.of(first, rest);
+    }
+
+    BiblatexApaField(String name, FieldProperty first, FieldProperty... rest) {
+        this.name = name;
+        this.displayName = null;
+        this.properties = EnumSet.of(first, rest);
+    }
+
+    public static <T> Optional<BiblatexApaField> fromName(T type, String name) {
+        if (!(type instanceof BiblatexApaEntryType)) {
+            return Optional.empty();
+        }
+        return Arrays.stream(BiblatexApaField.values())
+                     .filter(field -> field.getName().equalsIgnoreCase(name))
+                     .findAny();
+    }
+
+    @Override
+    public Set<FieldProperty> getProperties() {
+        return Collections.unmodifiableSet(properties);
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public boolean isStandardField() {
+        return false;
+    }
+
+    @Override
+    public String getDisplayName() {
+        if (displayName == null) {
+            return Field.super.getDisplayName();
+        } else {
+            return displayName;
+        }
+    }
+}
diff --git a/src/main/java/org/jabref/model/entry/field/BiblatexSoftwareField.java b/src/main/java/org/jabref/model/entry/field/BiblatexSoftwareField.java
new file mode 100644
index 00000000000..fc3bb4dcc48
--- /dev/null
+++ b/src/main/java/org/jabref/model/entry/field/BiblatexSoftwareField.java
@@ -0,0 +1,82 @@
+package org.jabref.model.entry.field;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.Optional;
+import java.util.Set;
+
+import org.jabref.model.entry.types.BiblatexSoftwareEntryType;
+
+public enum BiblatexSoftwareField implements Field {
+
+    HALID("hal_id"),
+    HALVERSION("hal_version"),
+    INTRODUCEDIN("introducedin"),
+    LICENSE("license"),
+    RELATEDTYPE("relatedtype"),
+    RELATEDSTRING("relatedstring"),
+    REPOSITORY("repository"),
+    SWHID("swhid");
+
+    private final String name;
+    private final String displayName;
+    private final Set<FieldProperty> properties;
+
+    BiblatexSoftwareField(String name) {
+        this.name = name;
+        this.displayName = null;
+        this.properties = EnumSet.noneOf(FieldProperty.class);
+    }
+
+    BiblatexSoftwareField(String name, String displayName) {
+        this.name = name;
+        this.displayName = displayName;
+        this.properties = EnumSet.noneOf(FieldProperty.class);
+    }
+
+    BiblatexSoftwareField(String name, String displayName, FieldProperty first, FieldProperty... rest) {
+        this.name = name;
+        this.displayName = displayName;
+        this.properties = EnumSet.of(first, rest);
+    }
+
+    BiblatexSoftwareField(String name, FieldProperty first, FieldProperty... rest) {
+        this.name = name;
+        this.displayName = null;
+        this.properties = EnumSet.of(first, rest);
+    }
+
+    public static <T> Optional<BiblatexSoftwareField> fromName(T type, String name) {
+        if (!(type instanceof BiblatexSoftwareEntryType)) {
+            return Optional.empty();
+        }
+        return Arrays.stream(BiblatexSoftwareField.values())
+                     .filter(field -> field.getName().equalsIgnoreCase(name))
+                     .findAny();
+    }
+
+    @Override
+    public Set<FieldProperty> getProperties() {
+        return Collections.unmodifiableSet(properties);
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public boolean isStandardField() {
+        return false;
+    }
+
+    @Override
+    public String getDisplayName() {
+        if (displayName == null) {
+            return Field.super.getDisplayName();
+        } else {
+            return displayName;
+        }
+    }
+}
diff --git a/src/main/java/org/jabref/model/entry/field/FieldFactory.java b/src/main/java/org/jabref/model/entry/field/FieldFactory.java
index b1c2f3b99b9..07a34b039d3 100644
--- a/src/main/java/org/jabref/model/entry/field/FieldFactory.java
+++ b/src/main/java/org/jabref/model/entry/field/FieldFactory.java
@@ -73,13 +73,23 @@ public static String serializeFieldsList(Collection<Field> fields) {
                      .collect(Collectors.joining(DELIMITER));
     }
 
+    public static <T> Field parseField(T type, String fieldName) {
+        return OptionalUtil.<Field>orElse(
+              OptionalUtil.<Field>orElse(
+               OptionalUtil.<Field>orElse(
+                OptionalUtil.<Field>orElse(
+                 OptionalUtil.<Field>orElse(
+              InternalField.fromName(fieldName),
+              StandardField.fromName(fieldName)),
+              SpecialField.fromName(fieldName)),
+              IEEEField.fromName(fieldName)),
+              BiblatexSoftwareField.fromName(type, fieldName)),
+              BiblatexApaField.fromName(type, fieldName))
+              .orElse(new UnknownField(fieldName));
+    }
+
     public static Field parseField(String fieldName) {
-        return OptionalUtil.<Field>orElse(OptionalUtil.<Field>orElse(OptionalUtil.<Field>orElse(
-                InternalField.fromName(fieldName),
-                StandardField.fromName(fieldName)),
-                SpecialField.fromName(fieldName)),
-                IEEEField.fromName(fieldName))
-                .orElse(new UnknownField(fieldName));
+        return parseField(null, fieldName);
     }
 
     public static Set<Field> getKeyFields() {
@@ -138,6 +148,8 @@ private static Set<Field> getFieldsFiltered(Predicate<Field> selector) {
 
     private static Set<Field> getAllFields() {
         Set<Field> fields = new HashSet<>();
+        fields.addAll(EnumSet.allOf(BiblatexApaField.class));
+        fields.addAll(EnumSet.allOf(BiblatexSoftwareField.class));
         fields.addAll(EnumSet.allOf(IEEEField.class));
         fields.addAll(EnumSet.allOf(InternalField.class));
         fields.addAll(EnumSet.allOf(SpecialField.class));
diff --git a/src/main/java/org/jabref/model/entry/field/IEEEField.java b/src/main/java/org/jabref/model/entry/field/IEEEField.java
index d00bec02eee..f56ce79ea99 100644
--- a/src/main/java/org/jabref/model/entry/field/IEEEField.java
+++ b/src/main/java/org/jabref/model/entry/field/IEEEField.java
@@ -31,7 +31,7 @@ public enum IEEEField implements Field {
         this.properties = EnumSet.of(first, rest);
     }
 
-    public static Optional<IEEEField> fromName(String name) {
+    public static <T> Optional<IEEEField> fromName(String name) {
         return Arrays.stream(IEEEField.values())
                      .filter(field -> field.getName().equalsIgnoreCase(name))
                      .findAny();
diff --git a/src/main/java/org/jabref/model/entry/field/SpecialFieldValue.java b/src/main/java/org/jabref/model/entry/field/SpecialFieldValue.java
index d4c1f8df7d5..6c3337b41f6 100644
--- a/src/main/java/org/jabref/model/entry/field/SpecialFieldValue.java
+++ b/src/main/java/org/jabref/model/entry/field/SpecialFieldValue.java
@@ -39,6 +39,7 @@ public enum SpecialFieldValue {
 
     public static SpecialFieldValue getRating(int ranking) {
         return switch (ranking) {
+            case 0 -> CLEAR_RANK;
             case 1 -> RANK_1;
             case 2 -> RANK_2;
             case 3 -> RANK_3;
@@ -58,6 +59,7 @@ public Optional<String> getFieldValue() {
 
     public int toRating() {
         return switch (this) {
+            case CLEAR_RANK -> 0;
             case RANK_1 -> 1;
             case RANK_2 -> 2;
             case RANK_3 -> 3;
diff --git a/src/main/java/org/jabref/model/entry/field/StandardField.java b/src/main/java/org/jabref/model/entry/field/StandardField.java
index 8b11e02dd8d..bcf9b710b7d 100644
--- a/src/main/java/org/jabref/model/entry/field/StandardField.java
+++ b/src/main/java/org/jabref/model/entry/field/StandardField.java
@@ -59,14 +59,11 @@ public enum StandardField implements Field {
     FOREWORD("foreword", FieldProperty.PERSON_NAMES),
     FOLDER("folder"),
     GENDER("gender", FieldProperty.GENDER),
-    HALID("hal_id"),
-    HALVERSION("hal_version"),
     HOLDER("holder", FieldProperty.PERSON_NAMES),
     HOWPUBLISHED("howpublished"),
     IDS("ids", FieldProperty.MULTIPLE_ENTRY_LINK),
     INSTITUTION("institution"),
     INTRODUCTION("introduction", FieldProperty.PERSON_NAMES),
-    INTRODUCEDIN("introducedin"),
     ISBN("isbn", "ISBN", FieldProperty.ISBN),
     ISRN("isrn", "ISRN"),
     ISSN("issn", "ISSN"),
@@ -81,7 +78,6 @@ public enum StandardField implements Field {
     LANGUAGE("language", FieldProperty.LANGUAGE),
     LABEL("label"),
     LIBRARY("library"),
-    LICENSE("license"),
     LOCATION("location"),
     MAINSUBTITLE("mainsubtitle", FieldProperty.BOOK_NAME),
     MAINTITLE("maintitle", FieldProperty.BOOK_NAME),
@@ -106,10 +102,7 @@ public enum StandardField implements Field {
     PUBSTATE("pubstate", FieldProperty.PUBLICATION_STATE),
     PRIMARYCLASS("primaryclass"),
     RELATED("related", FieldProperty.MULTIPLE_ENTRY_LINK),
-    RELATEDTYPE("relatedtype"),
-    RELATEDSTRING("relatedstring"),
     REPORTNO("reportno"),
-    REPOSITORY("repository"),
     REVIEW("review"),
     REVISION("revision"),
     SCHOOL("school"),
@@ -120,7 +113,6 @@ public enum StandardField implements Field {
     SORTKEY("sortkey"),
     SORTNAME("sortname", FieldProperty.PERSON_NAMES),
     SUBTITLE("subtitle"),
-    SWHID("swhid"),
     TITLE("title"),
     TITLEADDON("titleaddon"),
     TRANSLATOR("translator", FieldProperty.PERSON_NAMES),
@@ -135,7 +127,7 @@ public enum StandardField implements Field {
     YEAR("year", FieldProperty.NUMERIC),
     YEARFILED("yearfiled"),
     MR_NUMBER("mrnumber"),
-    ZBL_NUMBER("zbl"),
+    ZBL_NUMBER("zbl"), // needed for fetcher
     XDATA("xdata", FieldProperty.MULTIPLE_ENTRY_LINK),
     XREF("xref", FieldProperty.SINGLE_ENTRY_LINK),
 
@@ -146,7 +138,6 @@ public enum StandardField implements Field {
     CREATIONDATE("creationdate", FieldProperty.DATE),
     MODIFICATIONDATE("modificationdate", FieldProperty.DATE);
 
-
     private final String name;
     private final String displayName;
     private final Set<FieldProperty> properties;
diff --git a/src/main/java/org/jabref/model/entry/identifier/DOI.java b/src/main/java/org/jabref/model/entry/identifier/DOI.java
index f8285d6dc93..dc30c25dde4 100644
--- a/src/main/java/org/jabref/model/entry/identifier/DOI.java
+++ b/src/main/java/org/jabref/model/entry/identifier/DOI.java
@@ -2,12 +2,16 @@
 
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
 import java.util.Locale;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import org.jabref.architecture.AllowedToUseLogic;
+import org.jabref.logic.layout.format.LatexToUnicodeFormatter;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.StandardField;
 
@@ -17,6 +21,7 @@
 /**
  * Class for working with <a href="https://en.wikipedia.org/wiki/Digital_object_identifier">Digital object identifiers (DOIs)</a> and <a href="http://shortdoi.org">Short DOIs</a>
  */
+@AllowedToUseLogic("because we want to have this class 'smart' an be able to parse obscure DOIs, too. For this, we need the LatexToUnicodeformatter.")
 public class DOI implements Identifier {
 
     public static final URI AGENCY_RESOLVER = URI.create("https://doi.org/doiRA");
@@ -93,8 +98,8 @@ public class DOI implements Identifier {
     // See https://stackoverflow.com/questions/3203190/regex-any-ascii-character for the regexp that includes ASCII characters only
     // Another reference for regexp for ASCII characters: https://howtodoinjava.com/java/regex/java-clean-ascii-text-non-printable-chars/
     private static final String CHARS_TO_REMOVE = "[\\s+" // remove white space characters, i.e, \t, \n, \x0B, \f, \r . + is a greedy quantifier
-                                                + "[^\\x00-\\x7F]" // strips off all non-ASCII characters
-                                                + "]";
+            + "[^\\x00-\\x7F]" // strips off all non-ASCII characters
+            + "]";
 
     // DOI
     private final String doi;
@@ -159,9 +164,16 @@ public DOI(String doi) {
      */
     public static Optional<DOI> parse(String doi) {
         try {
+            LatexToUnicodeFormatter formatter = new LatexToUnicodeFormatter();
             String cleanedDOI = doi;
+            cleanedDOI = URLDecoder.decode(cleanedDOI, StandardCharsets.UTF_8);
+            cleanedDOI = formatter.format(cleanedDOI);
             cleanedDOI = cleanedDOI.replaceAll(CHARS_TO_REMOVE, "");
 
+            if (cleanedDOI.startsWith("_") && cleanedDOI.endsWith("_")) {
+                cleanedDOI = cleanedDOI.substring(1, cleanedDOI.length() - 1);
+            }
+
             return Optional.of(new DOI(cleanedDOI));
         } catch (IllegalArgumentException | NullPointerException e) {
             return Optional.empty();
diff --git a/src/main/java/org/jabref/model/entry/types/BiblatexAPAEntryTypeDefinitions.java b/src/main/java/org/jabref/model/entry/types/BiblatexAPAEntryTypeDefinitions.java
new file mode 100644
index 00000000000..f5c0b89b0be
--- /dev/null
+++ b/src/main/java/org/jabref/model/entry/types/BiblatexAPAEntryTypeDefinitions.java
@@ -0,0 +1,43 @@
+package org.jabref.model.entry.types;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.jabref.model.entry.BibEntryType;
+import org.jabref.model.entry.BibEntryTypeBuilder;
+import org.jabref.model.entry.field.BiblatexApaField;
+import org.jabref.model.entry.field.StandardField;
+
+public class BiblatexAPAEntryTypeDefinitions {
+
+    private static final BibEntryType JURISDICTION = new BibEntryTypeBuilder()
+            .withType(BiblatexApaEntryType.Jurisdiction)
+            .withImportantFields(StandardField.ORGANIZATION, BiblatexApaField.CITATION_CITEORG, BiblatexApaField.CITATION_CITEDATE, BiblatexApaField.CITATION_CITEDATE, StandardField.ORIGDATE)
+            .withRequiredFields(StandardField.TITLE, BiblatexApaField.CITATION, BiblatexApaField.CITATION_CITEINFO, StandardField.URL, StandardField.DATE)
+            .build();
+
+    private static final BibEntryType LEGISLATION = new BibEntryTypeBuilder()
+            .withType(BiblatexApaEntryType.Legislation)
+            .withImportantFields(StandardField.TITLEADDON, StandardField.ORIGDATE)
+            .withRequiredFields(StandardField.TITLE, StandardField.LOCATION, StandardField.URL, StandardField.DATE)
+            .build();
+
+    private static final BibEntryType LEGADMINMATERIAL = new BibEntryTypeBuilder()
+            .withType(BiblatexApaEntryType.Legadminmaterial)
+            .withImportantFields(StandardField.NUMBER, StandardField.SHORTTITLE, StandardField.NOTE, StandardField.KEYWORDS)
+            .withRequiredFields(StandardField.TITLE, BiblatexApaField.CITATION, StandardField.URL, StandardField.DATE)
+            .build();
+
+    private static final BibEntryType CONSTITUTION = new BibEntryTypeBuilder()
+            .withType(BiblatexApaEntryType.Constitution)
+            .withImportantFields(BiblatexApaField.ARTICLE, BiblatexApaField.AMENDMENT, StandardField.EVENTDATE, StandardField.KEYWORDS, StandardField.PART, BiblatexApaField.SECTION)
+            .withRequiredFields(BiblatexApaField.SOURCE, StandardField.TYPE)
+            .build();
+
+    private static final BibEntryType LEGAL = new BibEntryTypeBuilder()
+        .withType(BiblatexApaEntryType.Legal)
+        .withRequiredFields(StandardField.TITLE, StandardField.DATE, StandardField.URI, StandardField.KEYWORDS, StandardField.PART, BiblatexApaField.SECTION)
+        .build();
+
+    public static final List<BibEntryType> ALL = Arrays.asList(JURISDICTION, LEGISLATION, LEGADMINMATERIAL, CONSTITUTION, LEGAL);
+}
diff --git a/src/main/java/org/jabref/model/entry/types/BiblatexApaEntryType.java b/src/main/java/org/jabref/model/entry/types/BiblatexApaEntryType.java
new file mode 100644
index 00000000000..6a1d8d3abe2
--- /dev/null
+++ b/src/main/java/org/jabref/model/entry/types/BiblatexApaEntryType.java
@@ -0,0 +1,36 @@
+package org.jabref.model.entry.types;
+
+import java.util.Arrays;
+import java.util.Locale;
+import java.util.Optional;
+
+public enum BiblatexApaEntryType implements EntryType {
+
+    Legislation("Legislation"),
+    Legadminmaterial("Legadminmaterial"),
+    Jurisdiction("Jurisdiction"),
+    Constitution("Constitution"),
+    Legal("Legal");
+
+    private final String displayName;
+
+    BiblatexApaEntryType(String displayName) {
+        this.displayName = displayName;
+    }
+
+    @Override
+    public String getName() {
+        return displayName.toLowerCase(Locale.ENGLISH);
+    }
+
+    @Override
+    public String getDisplayName() {
+        return displayName;
+    }
+
+    public static Optional<BiblatexApaEntryType> fromName(String name) {
+        return Arrays.stream(BiblatexApaEntryType.values())
+                     .filter(field -> field.getName().equalsIgnoreCase(name))
+                     .findAny();
+    }
+}
diff --git a/src/main/java/org/jabref/model/entry/types/BiblatexSoftwareEntryType.java b/src/main/java/org/jabref/model/entry/types/BiblatexSoftwareEntryType.java
new file mode 100644
index 00000000000..041c48e592a
--- /dev/null
+++ b/src/main/java/org/jabref/model/entry/types/BiblatexSoftwareEntryType.java
@@ -0,0 +1,35 @@
+package org.jabref.model.entry.types;
+
+import java.util.Arrays;
+import java.util.Locale;
+import java.util.Optional;
+
+public enum BiblatexSoftwareEntryType implements EntryType {
+
+    Dataset("Dataset"),
+    SoftwareVersion("SoftwareVersion"),
+    SoftwareModule("SoftwareModule"),
+    CodeFragment("CodeFragment");
+
+    private final String displayName;
+
+    BiblatexSoftwareEntryType(String displayName) {
+        this.displayName = displayName;
+    }
+
+    public static Optional<BiblatexSoftwareEntryType> fromName(String name) {
+        return Arrays.stream(BiblatexSoftwareEntryType.values())
+                     .filter(field -> field.getName().equalsIgnoreCase(name))
+                     .findAny();
+    }
+
+    @Override
+    public String getName() {
+        return displayName.toLowerCase(Locale.ENGLISH);
+    }
+
+    @Override
+    public String getDisplayName() {
+        return displayName;
+    }
+}
diff --git a/src/main/java/org/jabref/model/entry/types/BiblatexSoftwareEntryTypeDefinitions.java b/src/main/java/org/jabref/model/entry/types/BiblatexSoftwareEntryTypeDefinitions.java
index 0fc48e6d904..6a2e7f0851e 100644
--- a/src/main/java/org/jabref/model/entry/types/BiblatexSoftwareEntryTypeDefinitions.java
+++ b/src/main/java/org/jabref/model/entry/types/BiblatexSoftwareEntryTypeDefinitions.java
@@ -5,6 +5,7 @@
 
 import org.jabref.model.entry.BibEntryType;
 import org.jabref.model.entry.BibEntryTypeBuilder;
+import org.jabref.model.entry.field.BiblatexSoftwareField;
 import org.jabref.model.entry.field.OrFields;
 import org.jabref.model.entry.field.StandardField;
 
@@ -12,40 +13,40 @@ public class BiblatexSoftwareEntryTypeDefinitions {
     private static final BibEntryType SOFTWARE = new BibEntryTypeBuilder()
             .withType(StandardEntryType.Software)
             .withImportantFields(StandardField.DATE, StandardField.DOI, StandardField.EPRINTTYPE, StandardField.EPRINTCLASS, StandardField.EPRINT,
-                    StandardField.EDITOR, StandardField.FILE, StandardField.HALID, StandardField.HALVERSION, StandardField.INSTITUTION, StandardField.INTRODUCEDIN,
-                    StandardField.LICENSE, StandardField.MONTH, StandardField.NOTE, StandardField.ORGANIZATION, StandardField.PUBLISHER, StandardField.RELATED,
-                    StandardField.RELATEDSTRING, StandardField.REPOSITORY, StandardField.SWHID, StandardField.URLDATE, StandardField.VERSION)
+                    StandardField.EDITOR, StandardField.FILE, BiblatexSoftwareField.HALID, BiblatexSoftwareField.HALVERSION, StandardField.INSTITUTION, BiblatexSoftwareField.INTRODUCEDIN,
+                    BiblatexSoftwareField.LICENSE, StandardField.MONTH, StandardField.NOTE, StandardField.ORGANIZATION, StandardField.PUBLISHER, StandardField.RELATED,
+                    BiblatexSoftwareField.RELATEDSTRING, BiblatexSoftwareField.REPOSITORY, BiblatexSoftwareField.SWHID, StandardField.URLDATE, StandardField.VERSION)
             .withRequiredFields(new OrFields(StandardField.AUTHOR, StandardField.EDITOR), StandardField.TITLE, StandardField.URL, StandardField.VERSION, StandardField.YEAR)
             .build();
 
     private static final BibEntryType SOFTWAREVERSION = new BibEntryTypeBuilder()
-            .withType(StandardEntryType.SoftwareVersion)
-            .withImportantFields(StandardField.DATE, StandardField.EPRINTCLASS, StandardField.EPRINTTYPE, StandardField.HALID, StandardField.HALVERSION,
-                    StandardField.INSTITUTION, StandardField.INTRODUCEDIN, StandardField.LICENSE, StandardField.MONTH, StandardField.NOTE, StandardField.ORGANIZATION,
-                    StandardField.PUBLISHER, StandardField.RELATED, StandardField.RELATEDTYPE, StandardField.RELATEDSTRING,
-                    StandardField.REPOSITORY, StandardField.SWHID, StandardField.SUBTITLE, StandardField.URLDATE)
+            .withType(BiblatexSoftwareEntryType.SoftwareVersion)
+            .withImportantFields(StandardField.DATE, StandardField.EPRINTCLASS, StandardField.EPRINTTYPE, BiblatexSoftwareField.HALID, BiblatexSoftwareField.HALVERSION,
+                    StandardField.INSTITUTION, BiblatexSoftwareField.INTRODUCEDIN, BiblatexSoftwareField.LICENSE, StandardField.MONTH, StandardField.NOTE, StandardField.ORGANIZATION,
+                    StandardField.PUBLISHER, StandardField.RELATED, BiblatexSoftwareField.RELATEDTYPE, BiblatexSoftwareField.RELATEDSTRING,
+                    BiblatexSoftwareField.REPOSITORY, BiblatexSoftwareField.SWHID, StandardField.SUBTITLE, StandardField.URLDATE)
             .withRequiredFields(new OrFields(StandardField.AUTHOR, StandardField.EDITOR), StandardField.TITLE, StandardField.URL, StandardField.YEAR, StandardField.VERSION)
-            .withDetailFields(StandardField.DATE, StandardField.EPRINTCLASS, StandardField.EPRINTTYPE, StandardField.HALID, StandardField.HALVERSION,
-                    StandardField.INSTITUTION, StandardField.INTRODUCEDIN, StandardField.LICENSE, StandardField.MONTH, StandardField.NOTE, StandardField.ORGANIZATION,
-                    StandardField.PUBLISHER, StandardField.RELATED, StandardField.RELATEDTYPE, StandardField.RELATEDSTRING,
-                    StandardField.REPOSITORY, StandardField.SWHID, StandardField.SUBTITLE, StandardField.URLDATE)
+            .withDetailFields(StandardField.DATE, StandardField.EPRINTCLASS, StandardField.EPRINTTYPE, BiblatexSoftwareField.HALID, BiblatexSoftwareField.HALVERSION,
+                    StandardField.INSTITUTION, BiblatexSoftwareField.INTRODUCEDIN, BiblatexSoftwareField.LICENSE, StandardField.MONTH, StandardField.NOTE, StandardField.ORGANIZATION,
+                    StandardField.PUBLISHER, StandardField.RELATED, BiblatexSoftwareField.RELATEDTYPE, BiblatexSoftwareField.RELATEDSTRING,
+                    BiblatexSoftwareField.REPOSITORY, BiblatexSoftwareField.SWHID, StandardField.SUBTITLE, StandardField.URLDATE)
             .withRequiredFields(new OrFields(StandardField.AUTHOR, StandardField.EDITOR), StandardField.TITLE, StandardField.URL, StandardField.YEAR)
             .build();
     private static final BibEntryType SOFTWAREMODULE = new BibEntryTypeBuilder()
-            .withType(StandardEntryType.SoftwareModule)
+            .withType(BiblatexSoftwareEntryType.SoftwareModule)
             .withImportantFields(StandardField.DATE, StandardField.DOI, StandardField.EPRINTTYPE, StandardField.EPRINTCLASS, StandardField.EPRINT,
-                    StandardField.EDITOR, StandardField.FILE, StandardField.HALID, StandardField.HALVERSION, StandardField.INSTITUTION, StandardField.INTRODUCEDIN,
-                    StandardField.LICENSE, StandardField.MONTH, StandardField.NOTE, StandardField.ORGANIZATION, StandardField.PUBLISHER, StandardField.RELATED,
-                    StandardField.RELATEDSTRING, StandardField.REPOSITORY, StandardField.SWHID, StandardField.URLDATE, StandardField.VERSION)
+                    StandardField.EDITOR, StandardField.FILE, BiblatexSoftwareField.HALID, BiblatexSoftwareField.HALVERSION, StandardField.INSTITUTION, BiblatexSoftwareField.INTRODUCEDIN,
+                    BiblatexSoftwareField.LICENSE, StandardField.MONTH, StandardField.NOTE, StandardField.ORGANIZATION, StandardField.PUBLISHER, StandardField.RELATED,
+                    BiblatexSoftwareField.RELATEDSTRING, BiblatexSoftwareField.REPOSITORY, BiblatexSoftwareField.SWHID, StandardField.URLDATE, StandardField.VERSION)
             .withRequiredFields(StandardField.AUTHOR, StandardField.SUBTITLE, StandardField.URL, StandardField.YEAR)
             .build();
 
     private static final BibEntryType CODEFRAGMENT = new BibEntryTypeBuilder()
-            .withType(StandardEntryType.CodeFragment)
+            .withType(BiblatexSoftwareEntryType.CodeFragment)
             .withImportantFields(StandardField.DATE, StandardField.DOI, StandardField.EPRINTTYPE, StandardField.EPRINTCLASS, StandardField.EPRINT,
-                    StandardField.EDITOR, StandardField.FILE, StandardField.HALID, StandardField.HALVERSION, StandardField.INSTITUTION, StandardField.INTRODUCEDIN,
-                    StandardField.LICENSE, StandardField.MONTH, StandardField.NOTE, StandardField.ORGANIZATION, StandardField.PUBLISHER, StandardField.RELATED,
-                    StandardField.RELATEDSTRING, StandardField.REPOSITORY, StandardField.SWHID, StandardField.URLDATE, StandardField.VERSION)
+                    StandardField.EDITOR, StandardField.FILE, BiblatexSoftwareField.HALID, BiblatexSoftwareField.HALVERSION, StandardField.INSTITUTION, BiblatexSoftwareField.INTRODUCEDIN,
+                    BiblatexSoftwareField.LICENSE, StandardField.MONTH, StandardField.NOTE, StandardField.ORGANIZATION, StandardField.PUBLISHER, StandardField.RELATED,
+                    BiblatexSoftwareField.RELATEDSTRING, BiblatexSoftwareField.REPOSITORY, BiblatexSoftwareField.SWHID, StandardField.URLDATE, StandardField.VERSION)
             .withRequiredFields(StandardField.URL)
             .build();
 
diff --git a/src/main/java/org/jabref/model/entry/types/EntryTypeFactory.java b/src/main/java/org/jabref/model/entry/types/EntryTypeFactory.java
index 29422891f4e..6b40a56c4f4 100644
--- a/src/main/java/org/jabref/model/entry/types/EntryTypeFactory.java
+++ b/src/main/java/org/jabref/model/entry/types/EntryTypeFactory.java
@@ -47,9 +47,10 @@ private static boolean isBiblatex(EntryType type) {
     }
 
     public static EntryType parse(String typeName) {
-
         List<EntryType> types = new ArrayList<>(Arrays.<EntryType>asList(StandardEntryType.values()));
         types.addAll(Arrays.<EntryType>asList(IEEETranEntryType.values()));
+        types.addAll(Arrays.<EntryType>asList(BiblatexSoftwareEntryType.values()));
+        types.addAll(Arrays.<EntryType>asList(BiblatexApaEntryType.values()));
         types.addAll(Arrays.<EntryType>asList(SystematicLiteratureReviewStudyEntryType.values()));
 
         return types.stream().filter(type -> type.getName().equals(typeName.toLowerCase(Locale.ENGLISH))).findFirst().orElse(new UnknownEntryType(typeName));
diff --git a/src/main/java/org/jabref/model/entry/types/StandardEntryType.java b/src/main/java/org/jabref/model/entry/types/StandardEntryType.java
index fb2922e61a0..6f6f91ac6a5 100644
--- a/src/main/java/org/jabref/model/entry/types/StandardEntryType.java
+++ b/src/main/java/org/jabref/model/entry/types/StandardEntryType.java
@@ -36,10 +36,7 @@ public enum StandardEntryType implements EntryType {
     Thesis("Thesis"),
     WWW("WWW"),
     Software("Software"),
-    Dataset("Dataset"),
-    SoftwareVersion("SoftwareVersion"),
-    SoftwareModule("SoftwareModule"),
-    CodeFragment("CodeFragment");
+    Dataset("Dataset");
 
     private final String displayName;
 
diff --git a/src/main/java/org/jabref/model/groups/RegexKeywordGroup.java b/src/main/java/org/jabref/model/groups/RegexKeywordGroup.java
index 4db612e118f..dc603ffa8e5 100644
--- a/src/main/java/org/jabref/model/groups/RegexKeywordGroup.java
+++ b/src/main/java/org/jabref/model/groups/RegexKeywordGroup.java
@@ -20,14 +20,12 @@ public RegexKeywordGroup(String name, GroupHierarchyType context, Field searchFi
     }
 
     private static Pattern compilePattern(String searchExpression, boolean caseSensitive) {
-
         return caseSensitive ? Pattern.compile("\\b" + searchExpression + "\\b") : Pattern.compile(
                 "\\b" + searchExpression + "\\b", Pattern.CASE_INSENSITIVE);
     }
 
     @Override
     public boolean contains(BibEntry entry) {
-
         Optional<String> content = entry.getField(searchField);
         return content.map(value -> pattern.matcher(value).find()).orElse(false);
     }
diff --git a/src/main/java/org/jabref/model/metadata/MetaData.java b/src/main/java/org/jabref/model/metadata/MetaData.java
index 238658803d3..9b0ed2ae856 100644
--- a/src/main/java/org/jabref/model/metadata/MetaData.java
+++ b/src/main/java/org/jabref/model/metadata/MetaData.java
@@ -68,6 +68,7 @@ public class MetaData {
     private final ContentSelectors contentSelectors = new ContentSelectors();
     private final Map<String, List<String>> unknownMetaData = new HashMap<>();
     private boolean isEventPropagationEnabled = true;
+    private boolean encodingExplicitlySupplied;
 
     /**
      * Constructs an empty metadata.
@@ -291,6 +292,17 @@ public void setEncoding(Charset encoding, ChangePropagation postChanges) {
         }
     }
 
+    public boolean getEncodingExplicitlySupplied() {
+        return encodingExplicitlySupplied;
+    }
+
+    /**
+     * Sets the indication whether the encoding was set using "% Encoding: ..." or whether it was detected "magically"
+     */
+    public void setEncodingExplicitlySupplied(boolean encodingExplicitlySupplied) {
+        this.encodingExplicitlySupplied = encodingExplicitlySupplied;
+    }
+
     /**
      * If disabled {@link MetaDataChangedEvent} will not be posted.
      */
@@ -349,6 +361,7 @@ public boolean equals(Object o) {
         return (isProtected == metaData.isProtected)
                 && Objects.equals(groupsRoot.getValue(), metaData.groupsRoot.getValue())
                 && Objects.equals(encoding, metaData.encoding)
+                && Objects.equals(encodingExplicitlySupplied, metaData.encodingExplicitlySupplied)
                 && Objects.equals(saveOrderConfig, metaData.saveOrderConfig)
                 && Objects.equals(citeKeyPatterns, metaData.citeKeyPatterns)
                 && Objects.equals(userFileDirectory, metaData.userFileDirectory)
@@ -362,7 +375,7 @@ public boolean equals(Object o) {
 
     @Override
     public int hashCode() {
-        return Objects.hash(groupsRoot.getValue(), encoding, saveOrderConfig, citeKeyPatterns, userFileDirectory,
+        return Objects.hash(groupsRoot.getValue(), encoding, encodingExplicitlySupplied, saveOrderConfig, citeKeyPatterns, userFileDirectory,
                 defaultCiteKeyPattern, saveActions, mode, isProtected, defaultFileDirectory);
     }
 }
diff --git a/src/main/java/org/jabref/model/metadata/SaveOrderConfig.java b/src/main/java/org/jabref/model/metadata/SaveOrderConfig.java
index 9c79b0414aa..17ae10559ee 100644
--- a/src/main/java/org/jabref/model/metadata/SaveOrderConfig.java
+++ b/src/main/java/org/jabref/model/metadata/SaveOrderConfig.java
@@ -167,7 +167,6 @@ public SortCriterion(Field field, boolean descending) {
         }
 
         public SortCriterion() {
-
         }
 
         @Override
diff --git a/src/main/java/org/jabref/model/metadata/event/MetaDataChangedEvent.java b/src/main/java/org/jabref/model/metadata/event/MetaDataChangedEvent.java
index f910e50a47c..79650aa077f 100644
--- a/src/main/java/org/jabref/model/metadata/event/MetaDataChangedEvent.java
+++ b/src/main/java/org/jabref/model/metadata/event/MetaDataChangedEvent.java
@@ -4,7 +4,7 @@
 import org.jabref.model.metadata.MetaData;
 
 /**
- * {@link MetaDataChangedEvent} is fired when a tuple of meta data has been put or removed.
+ * {@link MetaDataChangedEvent} is fired when a tuple of metadata has been put or removed.
  */
 public class MetaDataChangedEvent extends BibDatabaseContextChangedEvent {
 
diff --git a/src/main/java/org/jabref/model/openoffice/backend/NamedRange.java b/src/main/java/org/jabref/model/openoffice/backend/NamedRange.java
index 63981ceba70..57fba4dc272 100644
--- a/src/main/java/org/jabref/model/openoffice/backend/NamedRange.java
+++ b/src/main/java/org/jabref/model/openoffice/backend/NamedRange.java
@@ -11,13 +11,9 @@
 import com.sun.star.text.XTextRange;
 
 /**
- * NamedRange (with NamedRangeManager) attempts to provide a common interface for working with
- * reference mark based and bookmark based text ranges to be used as locations to fill with citation
- * markers. LibreOffice supports name-based lookup and listing names for both (hence the name).
- *
- * Note: currently only implemented for refence marks (in NamedRangeReferenceMark and
- *       NamedRangeManagerReferenceMark). 
- * 
+ * NamedRange (with NamedRangeManager) attempts to provide a common interface for working with reference mark based and bookmark based text ranges to be used as locations to fill with citation markers. LibreOffice supports name-based lookup and listing names for both (hence the name).
+ * <p>
+ * Note: currently only implemented for refence marks (in NamedRangeReferenceMark and NamedRangeManagerReferenceMark).
  */
 public interface NamedRange {
 
@@ -27,45 +23,42 @@ public interface NamedRange {
      * @return Optional.empty if the mark is missing from the document.
      */
     Optional<XTextRange> getMarkRange(XTextDocument doc)
-        throws
-        NoDocumentException,
-        WrappedTargetException;
+            throws
+            NoDocumentException,
+            WrappedTargetException;
 
     /**
-     * Cursor for the reference marks as is, not prepared for filling, but does not need
-     * cleanFillCursor either.
+     * Cursor for the reference marks as is, not prepared for filling, but does not need cleanFillCursor either.
      */
     Optional<XTextCursor> getRawCursor(XTextDocument doc)
-        throws
-        NoDocumentException,
-        WrappedTargetException;
+            throws
+            NoDocumentException,
+            WrappedTargetException;
 
     /**
      * Get a cursor for filling in text.
-     *
+     * <p>
      * Must be followed by cleanFillCursor()
      */
     XTextCursor getFillCursor(XTextDocument doc)
-        throws
-        NoDocumentException,
-        WrappedTargetException,
-        CreationException;
+            throws
+            NoDocumentException,
+            WrappedTargetException,
+            CreationException;
 
     /**
-     * Remove brackets, but if the result would become empty, leave them; if the result would be a
-     * single character, leave the left bracket.
-     *
+     * Remove brackets, but if the result would become empty, leave them; if the result would be a single character, leave the left bracket.
      */
     void cleanFillCursor(XTextDocument doc)
-        throws
-        NoDocumentException,
-        WrappedTargetException;
+            throws
+            NoDocumentException,
+            WrappedTargetException;
 
     /**
-     *  Note: create is in NamedRangeManager
+     * Note: create is in NamedRangeManager
      */
     void removeFromDocument(XTextDocument doc)
-        throws
-        WrappedTargetException,
-        NoDocumentException;
+            throws
+            WrappedTargetException,
+            NoDocumentException;
 }
diff --git a/src/main/java/org/jabref/model/openoffice/backend/NamedRangeManager.java b/src/main/java/org/jabref/model/openoffice/backend/NamedRangeManager.java
index 9bbcc752350..25a82b4ad19 100644
--- a/src/main/java/org/jabref/model/openoffice/backend/NamedRangeManager.java
+++ b/src/main/java/org/jabref/model/openoffice/backend/NamedRangeManager.java
@@ -17,15 +17,15 @@ NamedRange createNamedRange(XTextDocument doc,
                                 XTextCursor position,
                                 boolean insertSpaceAfter,
                                 boolean withoutBrackets)
-        throws
-        CreationException;
+            throws
+            CreationException;
 
     List<String> getUsedNames(XTextDocument doc)
-        throws
-        NoDocumentException;
+            throws
+            NoDocumentException;
 
     Optional<NamedRange> getNamedRangeFromDocument(XTextDocument doc, String markName)
-        throws
-        NoDocumentException,
-        WrappedTargetException;
+            throws
+            NoDocumentException,
+            WrappedTargetException;
 }
diff --git a/src/main/java/org/jabref/model/openoffice/ootext/OOFormat.java b/src/main/java/org/jabref/model/openoffice/ootext/OOFormat.java
index 6b4a96de644..14f5822de4f 100644
--- a/src/main/java/org/jabref/model/openoffice/ootext/OOFormat.java
+++ b/src/main/java/org/jabref/model/openoffice/ootext/OOFormat.java
@@ -4,40 +4,33 @@
 
 /**
  * Helper functions to produce some of the markup as understood by OOTextIntoOO.write
- *
- * These do not cover all tags, only those needed to embed markup
- * from Layout and citation marker formatters into citation markers and
- * bibliography.
+ * <p>
+ * These do not cover all tags, only those needed to embed markup from Layout and citation marker formatters into citation markers and bibliography.
  */
 public class OOFormat {
 
     private OOFormat() {
-        /* */
     }
 
     /**
      * Mark {@code ootext} as using a character locale known to OO.
      *
      * @param locale language[-country[-territory]]
-     *
-     * https://www.openoffice.org/api/docs/common/ref/com/sun/star/lang/Locale.html
-     *
-     * The country part is optional.
-     *
-     * The territory part is not only optional, the allowed "codes are vendor and browser-specific",
-     * so probably best to avoid them if possible.
-     *
+     *               <p>
+     *               https://www.openoffice.org/api/docs/common/ref/com/sun/star/lang/Locale.html
+     *               <p>
+     *               The country part is optional.
+     *               <p>
+     *               The territory part is not only optional, the allowed "codes are vendor and browser-specific", so probably best to avoid them if possible.
      */
     public static OOText setLocale(OOText ootext, String locale) {
         return OOText.fromString(String.format("<span lang=\"%s\">", locale) + ootext.toString() + "</span>");
     }
 
     /**
-     * Mark {@code ootext} as using the character locale "zxx", which means "no language", "no
-     * linguistic content".
-     *
+     * Mark {@code ootext} as using the character locale "zxx", which means "no language", "no linguistic content".
+     * <p>
      * Used around citation marks, probably to turn off spellchecking.
-     *
      */
     public static OOText setLocaleNone(OOText ootext) {
         return OOFormat.setLocale(ootext, "zxx");
@@ -46,14 +39,12 @@ public static OOText setLocaleNone(OOText ootext) {
     /**
      * Mark {@code ootext} using a character style {@code charStyle}
      *
-     * @param charStyle Name of a character style known to OO. May be empty for "Standard", which in
-     *                  turn means do not override any properties.
-     *
+     * @param charStyle Name of a character style known to OO. May be empty for "Standard", which in turn means do not override any properties.
      */
     public static OOText setCharStyle(OOText ootext, String charStyle) {
         return OOText.fromString(String.format("<span oo:CharStyleName=\"%s\">", charStyle)
-                                 + ootext.toString()
-                                 + "</span>");
+                + ootext.toString()
+                + "</span>");
     }
 
     /**
@@ -81,4 +72,4 @@ public static OOText formatReferenceToPageNumberOfReferenceMark(String reference
         String string = String.format("<oo:referenceToPageNumberOfReferenceMark target=\"%s\">", referenceMarkName);
         return OOText.fromString(string);
     }
- }
+}
diff --git a/src/main/java/org/jabref/model/openoffice/ootext/OOText.java b/src/main/java/org/jabref/model/openoffice/ootext/OOText.java
index 5b5fa4caba9..8cd68e612f6 100644
--- a/src/main/java/org/jabref/model/openoffice/ootext/OOText.java
+++ b/src/main/java/org/jabref/model/openoffice/ootext/OOText.java
@@ -4,9 +4,8 @@
 
 /**
  * Text with HTML-like markup as understood by OOTextIntoOO.write
- *
- * Some of the tags can be added using OOFormat methods. Others come from the layout engine, either
- * by interpreting LaTeX markup or from settings in the jstyle file.
+ * <p>
+ * Some of the tags can be added using OOFormat methods. Others come from the layout engine, either by interpreting LaTeX markup or from settings in the jstyle file.
  */
 public class OOText {
 
@@ -17,7 +16,9 @@ private OOText(String data) {
         this.data = data;
     }
 
-    /** @return null for null input, otherwise the argument wrapped into a new OOText */
+    /**
+     * @return null for null input, otherwise the argument wrapped into a new OOText
+     */
     public static OOText fromString(String string) {
         if (string == null) {
             return null;
@@ -25,7 +26,9 @@ public static OOText fromString(String string) {
         return new OOText(string);
     }
 
-    /** @return null for null input, otherwise the string inside the argument */
+    /**
+     * @return null for null input, otherwise the string inside the argument
+     */
     public static String toString(OOText ootext) {
         if (ootext == null) {
             return null;
@@ -40,7 +43,6 @@ public String toString() {
 
     @Override
     public boolean equals(Object object) {
-
         if (object == this) {
             return true;
         }
diff --git a/src/main/java/org/jabref/model/openoffice/ootext/OOTextIntoOO.java b/src/main/java/org/jabref/model/openoffice/ootext/OOTextIntoOO.java
index 909b088b5b3..9c6190553a5 100644
--- a/src/main/java/org/jabref/model/openoffice/ootext/OOTextIntoOO.java
+++ b/src/main/java/org/jabref/model/openoffice/ootext/OOTextIntoOO.java
@@ -53,7 +53,7 @@ public class OOTextIntoOO {
     private static final Logger LOGGER = LoggerFactory.getLogger(OOTextIntoOO.class);
 
     /**
-     *  "ParaStyleName" is an OpenOffice Property name.
+     * "ParaStyleName" is an OpenOffice Property name.
      */
     private static final String PARA_STYLE_NAME = "ParaStyleName";
 
@@ -77,78 +77,60 @@ public class OOTextIntoOO {
     private static final byte SUBSCRIPT_HEIGHT = (byte) 58;
 
     private static final String TAG_NAME_REGEXP =
-        "(?:b|i|em|tt|smallcaps|sup|sub|u|s|p|span|oo:referenceToPageNumberOfReferenceMark)";
+            "(?:b|i|em|tt|smallcaps|sup|sub|u|s|p|span|oo:referenceToPageNumberOfReferenceMark)";
 
     private static final String ATTRIBUTE_NAME_REGEXP =
-        "(?:oo:ParaStyleName|oo:CharStyleName|lang|style|target)";
+            "(?:oo:ParaStyleName|oo:CharStyleName|lang|style|target)";
 
     private static final String ATTRIBUTE_VALUE_REGEXP = "\"([^\"]*)\"";
 
     private static final Pattern HTML_TAG =
-        Pattern.compile("<(/" + TAG_NAME_REGEXP + ")>"
-                        + "|"
-                        + "<(" + TAG_NAME_REGEXP + ")"
-                        + "((?:\\s+(" + ATTRIBUTE_NAME_REGEXP + ")=" + ATTRIBUTE_VALUE_REGEXP + ")*)"
-                        + ">");
+            Pattern.compile("<(/" + TAG_NAME_REGEXP + ")>"
+                    + "|"
+                    + "<(" + TAG_NAME_REGEXP + ")"
+                    + "((?:\\s+(" + ATTRIBUTE_NAME_REGEXP + ")=" + ATTRIBUTE_VALUE_REGEXP + ")*)"
+                    + ">");
 
     private static final Pattern ATTRIBUTE_PATTERN =
-        Pattern.compile("\\s+(" + ATTRIBUTE_NAME_REGEXP + ")=" + ATTRIBUTE_VALUE_REGEXP);
+            Pattern.compile("\\s+(" + ATTRIBUTE_NAME_REGEXP + ")=" + ATTRIBUTE_VALUE_REGEXP);
 
     private OOTextIntoOO() {
-        // Hide the public constructor
     }
 
     /**
-     * Insert a text with formatting indicated by HTML-like tags, into
-     * a text at the position given by a cursor.
-     *
-     * Limitation: understands no entities. It does not receive any either, unless
-     * the user provides it.
-     *
-     * To limit the damage {@code TAG_NAME_REGEXP} and {@code ATTRIBUTE_NAME_REGEXP}
-     * explicitly lists the names we care about.
-     *
+     * Insert a text with formatting indicated by HTML-like tags, into a text at the position given by a cursor.
+     * <p>
+     * Limitation: understands no entities. It does not receive any either, unless the user provides it.
+     * <p>
+     * To limit the damage {@code TAG_NAME_REGEXP} and {@code ATTRIBUTE_NAME_REGEXP} explicitly lists the names we care about.
+     * <p>
      * Notable changes w.r.t insertOOFormattedTextAtCurrentLocation:
-     *
+     * <p>
      * - new tags:
+     * <p>
+     * - {@code <span lang="zxx">} - earlier was applied from code
+     * <p>
+     * - {@code <span oo:CharStyleName="CharStylename">} - earlier was applied from code, for "CitationCharacterFormat"
+     * <p>
+     * - {@code <p>} start new paragraph - earlier was applied from code
+     * <p>
+     * - {@code <p oo:ParaStyleName="ParStyleName">} : start new paragraph and apply ParStyleName - earlier was applied from code
+     * <p>
+     * - {@code <tt>} - earlier: known, but ignored - now: equivalent to {@code <span oo:CharStyleName="Example">} - {@code <oo:referenceToPageNumberOfReferenceMark>} (self-closing)
+     * <p>
+     * - closing tags try to properly restore state (in particular, the "not directly set" state) instead of dictating an "off" state. This makes a difference when the value inherited from another level (for example the paragraph) is not the "off" state.
+     * <p>
+     * An example: a style with {@code ReferenceParagraphFormat="JR_bibentry"} Assume JR_bibentry in LibreOffice is a paragraph style that prescribes "bold" font. LAYOUT only prescribes bold around year. Which parts of the bibliography entries should come out as bold?
+     * <p>
+     * - The user can format citation marks (it is enough to format their start) and the properties not (everywhere) dictated by the style are preserved (where they are not).
      *
-     *   - {@code <span lang="zxx">}
-     *     - earlier was applied from code
-     *
-     *   - {@code <span oo:CharStyleName="CharStylename">}
-     *     - earlier was applied from code, for "CitationCharacterFormat"
-     *
-     *   - {@code <p>} start new paragraph
-     *     - earlier was applied from code
-     *
-     *   - {@code <p oo:ParaStyleName="ParStyleName">} : start new paragraph and apply ParStyleName
-     *     - earlier was applied from code
-     *
-     *   - {@code <tt>}
-     *     - earlier: known, but ignored
-     *     - now: equivalent to {@code <span oo:CharStyleName="Example">}
-     *   - {@code <oo:referenceToPageNumberOfReferenceMark>} (self-closing)
-     *
-     * - closing tags try to properly restore state (in particular, the "not directly set" state)
-     *   instead of dictating an "off" state. This makes a difference when the value inherited from
-     *   another level (for example the paragraph) is not the "off" state.
-     *
-     *   An example: a style with
-     *   {@code ReferenceParagraphFormat="JR_bibentry"}
-     *   Assume JR_bibentry in LibreOffice is a paragraph style that prescribes "bold" font.
-     *   LAYOUT only prescribes bold around year.
-     *   Which parts of the bibliography entries should come out as bold?
-     *
-     * - The user can format citation marks (it is enough to format their start) and the
-     *   properties not (everywhere) dictated by the style are preserved (where they are not).
-     *
-     * @param position   The cursor giving the insert location. Not modified.
-     * @param ootext     The marked-up text to insert.
+     * @param position The cursor giving the insert location. Not modified.
+     * @param ootext   The marked-up text to insert.
      */
     public static void write(XTextDocument doc, XTextCursor position, OOText ootext)
-        throws
-        WrappedTargetException,
-        CreationException {
+            throws
+            WrappedTargetException,
+            CreationException {
 
         Objects.requireNonNull(doc);
         Objects.requireNonNull(ootext);
@@ -169,7 +151,6 @@ public static void write(XTextDocument doc, XTextCursor position, OOText ootext)
         int piv = 0;
         Matcher tagMatcher = HTML_TAG.matcher(lText);
         while (tagMatcher.find()) {
-
             String currentSubstring = lText.substring(piv, tagMatcher.start());
             if (!currentSubstring.isEmpty()) {
                 cursor.setString(currentSubstring);
@@ -231,7 +212,7 @@ public static void write(XTextDocument doc, XTextCursor position, OOText ootext)
                             case "oo:ParaStyleName":
                                 // <p oo:ParaStyleName="Standard">
                                 if (StringUtil.isNullOrEmpty(value)) {
-                                    LOGGER.debug(String.format("oo:ParaStyleName inherited"));
+                                    LOGGER.debug("oo:ParaStyleName inherited");
                                 } else {
                                     if (setParagraphStyle(cursor, value)) {
                                         // Presumably tested already:
@@ -250,12 +231,8 @@ public static void write(XTextDocument doc, XTextCursor position, OOText ootext)
                         String key = pair.a;
                         String value = pair.b;
                         switch (key) {
-                            case "target":
-                                UnoCrossRef.insertReferenceToPageNumberOfReferenceMark(doc, value, cursor);
-                                break;
-                            default:
-                                LOGGER.warn(String.format("Unexpected attribute '%s' for <%s>", key, tagName));
-                                break;
+                            case "target" -> UnoCrossRef.insertReferenceToPageNumberOfReferenceMark(doc, value, cursor);
+                            default -> LOGGER.warn(String.format("Unexpected attribute '%s' for <%s>", key, tagName));
                         }
                     }
                     break;
@@ -270,27 +247,23 @@ public static void write(XTextDocument doc, XTextCursor position, OOText ootext)
                         String key = pair.a;
                         String value = pair.b;
                         switch (key) {
-                            case "oo:CharStyleName":
-                                // <span oo:CharStyleName="Standard">
-                                settings.addAll(setCharStyleName(value));
-                                break;
-                            case "lang":
-                                // <span lang="zxx">
-                                // <span lang="en-US">
-                                settings.addAll(setCharLocale(value));
-                                break;
-                            case "style":
+                            case "oo:CharStyleName" ->
+                                    // <span oo:CharStyleName="Standard">
+                                    settings.addAll(setCharStyleName(value));
+                            case "lang" ->
+                                    // <span lang="zxx">
+                                    // <span lang="en-US">
+                                    settings.addAll(setCharLocale(value));
+                            case "style" -> {
                                 // HTML-style small-caps
                                 if ("font-variant: small-caps".equals(value)) {
                                     settings.addAll(setCharCaseMap(CaseMap.SMALLCAPS));
                                     break;
                                 }
                                 LOGGER.warn(String.format("Unexpected value %s for attribute '%s' for <%s>",
-                                                          value, key, tagName));
-                                break;
-                            default:
-                                LOGGER.warn(String.format("Unexpected attribute '%s' for <%s>", key, tagName));
-                                break;
+                                        value, key, tagName));
+                            }
+                            default -> LOGGER.warn(String.format("Unexpected attribute '%s' for <%s>", key, tagName));
                         }
                     }
                     formatStack.pushLayer(settings);
@@ -310,9 +283,9 @@ public static void write(XTextDocument doc, XTextCursor position, OOText ootext)
                     String expected = expectEnd.pop();
                     if (!tagName.equals(expected)) {
                         LOGGER.warn(String.format("expected '<%s>', found '<%s>' after '%s'",
-                                                  expected,
-                                                  tagName,
-                                                  currentSubstring));
+                                expected,
+                                tagName,
+                                currentSubstring));
                     }
                     break;
                 default:
@@ -330,24 +303,20 @@ public static void write(XTextDocument doc, XTextCursor position, OOText ootext)
         cursor.collapseToEnd();
 
         if (!expectEnd.empty()) {
-            String rest = "";
+            StringBuilder rest = new StringBuilder();
             for (String s : expectEnd) {
-                rest = String.format("<%s>", s) + rest;
+                rest.insert(0, String.format("<%s>", s));
             }
-            LOGGER.warn(String.format("OOTextIntoOO.write:"
-                                      + " expectEnd stack is not empty at the end: %s%n",
-                                      rest));
+            LOGGER.warn(String.format("OOTextIntoOO.write: expectEnd stack is not empty at the end: %s%n", rest));
         }
     }
 
     /**
-     * Purpose: in some cases we do not want to inherit direct
-     *          formatting from the context.
-     *
-     *          In particular, when filling the bibliography title and body.
+     * Purpose: in some cases we do not want to inherit direct formatting from the context.
+     * <p>
+     * In particular, when filling the bibliography title and body.
      */
     public static void removeDirectFormatting(XTextCursor cursor) {
-
         XMultiPropertyStates mpss = UnoCast.cast(XMultiPropertyStates.class, cursor).get();
 
         XPropertySet propertySet = UnoCast.cast(XPropertySet.class, cursor).get();
@@ -358,8 +327,8 @@ public static void removeDirectFormatting(XTextCursor cursor) {
             propertySet.setPropertyValue(CHAR_STYLE_NAME, "Standard");
             xPropertyState.setPropertyToDefault("CharCaseMap");
         } catch (UnknownPropertyException |
-                 PropertyVetoException |
-                 WrappedTargetException ex) {
+                PropertyVetoException |
+                WrappedTargetException ex) {
             LOGGER.warn("exception caught", ex);
         }
 
@@ -374,14 +343,14 @@ public static void removeDirectFormatting(XTextCursor cursor) {
 
         // Only report those we do not yet know about
         final Set<String> knownToFail = Set.of("ListAutoFormat",
-                                               "ListId",
-                                               "NumberingIsNumber",
-                                               "NumberingLevel",
-                                               "NumberingRules",
-                                               "NumberingStartValue",
-                                               "ParaChapterNumberingLevel",
-                                               "ParaIsNumberingRestart",
-                                               "ParaStyleName");
+                "ListId",
+                "NumberingIsNumber",
+                "NumberingLevel",
+                "NumberingRules",
+                "NumberingStartValue",
+                "ParaChapterNumberingLevel",
+                "ParaIsNumberingRestart",
+                "ParaStyleName");
 
         // query again, just in case it matters
         propertySet = UnoCast.cast(XPropertySet.class, cursor).get();
@@ -422,34 +391,34 @@ static class MyPropertyStack {
          */
         static final Set<String> CONTROLLED_PROPERTIES = Set.of(
 
-            /* Used for SuperScript, SubScript.
-             *
-             * These three are interdependent: changing one may change others.
-             */
-            "CharEscapement", "CharEscapementHeight", "CharAutoEscapement",
+                /* Used for SuperScript, SubScript.
+                 *
+                 * These three are interdependent: changing one may change others.
+                 */
+                "CharEscapement", "CharEscapementHeight", "CharAutoEscapement",
 
-            /* used for Bold */
-            "CharWeight",
+                /* used for Bold */
+                "CharWeight",
 
-            /* Used for Italic */
-            "CharPosture",
+                /* Used for Italic */
+                "CharPosture",
 
-            /* Used for strikeout. These two are interdependent. */
-            "CharStrikeout", "CharCrossedOut",
+                /* Used for strikeout. These two are interdependent. */
+                "CharStrikeout", "CharCrossedOut",
 
-            /* Used for underline. These three are interdependent, but apparently
-             * we can leave out the last two.
-             */
-            "CharUnderline", // "CharUnderlineColor", "CharUnderlineHasColor",
+                /* Used for underline. These three are interdependent, but apparently
+                 * we can leave out the last two.
+                 */
+                "CharUnderline", // "CharUnderlineColor", "CharUnderlineHasColor",
 
-            /* Used for lang="zxx", to silence spellchecker. */
-            "CharLocale",
+                /* Used for lang="zxx", to silence spellchecker. */
+                "CharLocale",
 
-            /* Used for CitationCharacterFormat.  */
-            "CharStyleName",
+                /* Used for CitationCharacterFormat.  */
+                "CharStyleName",
 
-            /* Used for <smallcaps> and <span style="font-variant: small-caps"> */
-            "CharCaseMap");
+                /* Used for <smallcaps> and <span style="font-variant: small-caps"> */
+                "CharCaseMap");
 
         /**
          * The number of properties actually controlled.
@@ -467,20 +436,15 @@ static class MyPropertyStack {
         final String[] goodNames;
 
         /**
-         * Maintain a stack of layers, each containing a description of the desired state of
-         * properties. Each description is an ArrayList of property values, Optional.empty()
-         * encoding "not directly set".
+         * Maintain a stack of layers, each containing a description of the desired state of properties. Each description is an ArrayList of property values, Optional.empty() encoding "not directly set".
          */
         final Stack<ArrayList<Optional<Object>>> layers;
 
         MyPropertyStack(XTextCursor cursor) {
-
             XPropertySet propertySet = UnoCast.cast(XPropertySet.class, cursor).get();
             XPropertySetInfo propertySetInfo = propertySet.getPropertySetInfo();
 
-            /*
-             * On creation, initialize the property name -- index mapping.
-             */
+            // On creation, initialize the property name -- index mapping.
             this.goodNameToIndex = new HashMap<>();
             int nextIndex = 0;
             for (Property p : propertySetInfo.getProperties()) {
@@ -498,19 +462,16 @@ static class MyPropertyStack {
 
             this.goodNames = new String[goodSize];
             for (Map.Entry<String, Integer> entry : goodNameToIndex.entrySet()) {
-                goodNames[ entry.getValue() ] = entry.getKey();
+                goodNames[entry.getValue()] = entry.getKey();
             }
 
-            // XMultiPropertySet.setPropertyValues() requires alphabetically sorted property names.
-            // We adjust here:
+            // XMultiPropertySet.setPropertyValues() requires alphabetically sorted property names. We adjust here:
             Arrays.sort(goodNames);
             for (int i = 0; i < goodSize; i++) {
                 this.goodNameToIndex.put(goodNames[i], i);
             }
 
-            /*
-             * Get the initial state of the properties and add the first layer.
-             */
+            // Get the initial state of the properties and add the first layer.
             XMultiPropertyStates mpss = UnoCast.cast(XMultiPropertyStates.class, cursor).get();
             PropertyState[] propertyStates;
             try {
@@ -537,9 +498,8 @@ static class MyPropertyStack {
         }
 
         /**
-         * Given a list of property name, property value pairs, construct and push a new layer
-         * describing the intended state after these have been applied.
-         *
+         * Given a list of property name, property value pairs, construct and push a new layer describing the intended state after these have been applied.
+         * <p>
          * Opening tags usually call this.
          */
         void pushLayer(List<OOPair<String, Object>> settings) {
@@ -571,7 +531,7 @@ void popLayer() {
 
         /**
          * Apply the current desired formatting state to a cursor.
-         *
+         * <p>
          * The idea is to minimize the number of calls to OpenOffice.
          */
         void apply(XTextCursor cursor) {
@@ -629,24 +589,22 @@ private static List<OOPair<String, String>> parseAttributes(String attributes) {
         while (attributeMatcher.find()) {
             String key = attributeMatcher.group(1);
             String value = attributeMatcher.group(2);
-            res.add(new OOPair<String, String>(key, value));
+            res.add(new OOPair<>(key, value));
         }
         return res;
     }
 
-    /*
-     * We rely on property values being either DIRECT_VALUE or DEFAULT_VALUE (not
-     * AMBIGUOUS_VALUE). If the cursor covers a homogeneous region, or is collapsed, then this is
-     * true.
+    /**
+     * We rely on property values being either DIRECT_VALUE or DEFAULT_VALUE (not AMBIGUOUS_VALUE). If the cursor covers a homogeneous region, or is collapsed, then this is true.
      */
     private static boolean isPropertyDefault(XTextCursor cursor, String propertyName)
-        throws
-        UnknownPropertyException {
+            throws
+            UnknownPropertyException {
         XPropertyState xPropertyState = UnoCast.cast(XPropertyState.class, cursor).get();
         PropertyState state = xPropertyState.getPropertyState(propertyName);
         if (state == PropertyState.AMBIGUOUS_VALUE) {
             throw new java.lang.IllegalArgumentException("PropertyState.AMBIGUOUS_VALUE"
-                                                         + " (expected properties for a homogeneous cursor)");
+                    + " (expected properties for a homogeneous cursor)");
         }
         return state == PropertyState.DEFAULT_VALUE;
     }
@@ -657,33 +615,33 @@ private static boolean isPropertyDefault(XTextCursor cursor, String propertyName
 
     private static List<OOPair<String, Object>> setCharWeight(float value) {
         List<OOPair<String, Object>> settings = new ArrayList<>();
-        settings.add(new OOPair<>("CharWeight", (Float) value));
+        settings.add(new OOPair<>("CharWeight", value));
         return settings;
     }
 
     private static List<OOPair<String, Object>> setCharPosture(FontSlant value) {
         List<OOPair<String, Object>> settings = new ArrayList<>();
-        settings.add(new OOPair<>("CharPosture", (Object) value));
+        settings.add(new OOPair<>("CharPosture", value));
         return settings;
     }
 
     private static List<OOPair<String, Object>> setCharCaseMap(short value) {
         List<OOPair<String, Object>> settings = new ArrayList<>();
-        settings.add(new OOPair<>("CharCaseMap", (Short) value));
+        settings.add(new OOPair<>("CharCaseMap", value));
         return settings;
     }
 
     // com.sun.star.awt.FontUnderline
     private static List<OOPair<String, Object>> setCharUnderline(short value) {
         List<OOPair<String, Object>> settings = new ArrayList<>();
-        settings.add(new OOPair<>(CHAR_UNDERLINE, (Short) value));
+        settings.add(new OOPair<>(CHAR_UNDERLINE, value));
         return settings;
     }
 
     // com.sun.star.awt.FontStrikeout
     private static List<OOPair<String, Object>> setCharStrikeout(short value) {
         List<OOPair<String, Object>> settings = new ArrayList<>();
-        settings.add(new OOPair<>(CHAR_STRIKEOUT, (Short) value));
+        settings.add(new OOPair<>(CHAR_STRIKEOUT, value));
         return settings;
     }
 
@@ -701,7 +659,7 @@ private static List<OOPair<String, Object>> setCharStyleName(String value) {
     // Locale
     private static List<OOPair<String, Object>> setCharLocale(Locale value) {
         List<OOPair<String, Object>> settings = new ArrayList<>();
-        settings.add(new OOPair<>("CharLocale", (Object) value));
+        settings.add(new OOPair<>("CharLocale", value));
         return settings;
     }
 
@@ -731,12 +689,12 @@ private static List<OOPair<String, Object>> setCharEscapement(Optional<Short> va
                                                                   MyPropertyStack formatStack) {
         List<OOPair<String, Object>> settings = new ArrayList<>();
         Optional<Short> oldValue = (formatStack
-                                    .getPropertyValue(CHAR_ESCAPEMENT)
-                                    .map(e -> (short) e));
+                .getPropertyValue(CHAR_ESCAPEMENT)
+                .map(e -> (short) e));
 
         Optional<Byte> oldHeight = (formatStack
-                                    .getPropertyValue(CHAR_ESCAPEMENT_HEIGHT)
-                                    .map(e -> (byte) e));
+                .getPropertyValue(CHAR_ESCAPEMENT_HEIGHT)
+                .map(e -> (byte) e));
 
         if (relative && (value.isPresent() || height.isPresent())) {
             double oldHeightFloat = oldHeight.orElse(CHAR_ESCAPEMENT_HEIGHT_DEFAULT) * 0.01;
@@ -746,17 +704,17 @@ private static List<OOPair<String, Object>> setCharEscapement(Optional<Short> va
             byte newHeight = (byte) Math.round(heightFloat * oldHeightFloat);
             short newValue = (short) Math.round(valueFloat * oldHeightFloat + oldValueFloat);
             if (value.isPresent()) {
-                settings.add(new OOPair<>(CHAR_ESCAPEMENT, (Short) newValue));
+                settings.add(new OOPair<>(CHAR_ESCAPEMENT, newValue));
             }
             if (height.isPresent()) {
-                settings.add(new OOPair<>(CHAR_ESCAPEMENT_HEIGHT, (Byte) newHeight));
+                settings.add(new OOPair<>(CHAR_ESCAPEMENT_HEIGHT, newHeight));
             }
         } else {
             if (value.isPresent()) {
-                settings.add(new OOPair<>(CHAR_ESCAPEMENT, (Short) value.get()));
+                settings.add(new OOPair<>(CHAR_ESCAPEMENT, value.get()));
             }
             if (height.isPresent()) {
-                settings.add(new OOPair<>(CHAR_ESCAPEMENT_HEIGHT, (Byte) height.get()));
+                settings.add(new OOPair<>(CHAR_ESCAPEMENT_HEIGHT, height.get()));
             }
         }
         return settings;
@@ -764,19 +722,19 @@ private static List<OOPair<String, Object>> setCharEscapement(Optional<Short> va
 
     private static List<OOPair<String, Object>> setSubScript(MyPropertyStack formatStack) {
         return setCharEscapement(Optional.of(SUBSCRIPT_VALUE),
-                                 Optional.of(SUBSCRIPT_HEIGHT),
-                                 true,
-                                 formatStack);
+                Optional.of(SUBSCRIPT_HEIGHT),
+                true,
+                formatStack);
     }
 
     private static List<OOPair<String, Object>> setSuperScript(MyPropertyStack formatStack) {
         return setCharEscapement(Optional.of(SUPERSCRIPT_VALUE),
-                                 Optional.of(SUPERSCRIPT_HEIGHT),
-                                 true,
-                                 formatStack);
+                Optional.of(SUPERSCRIPT_HEIGHT),
+                true,
+                formatStack);
     }
 
-    /*
+    /**
      * @return true on failure
      */
     public static boolean setParagraphStyle(XTextCursor cursor, String paragraphStyle) {
@@ -789,9 +747,9 @@ public static boolean setParagraphStyle(XTextCursor cursor, String paragraphStyl
             propertySet.setPropertyValue(PARA_STYLE_NAME, paragraphStyle);
             return PASS;
         } catch (UnknownPropertyException
-                 | PropertyVetoException
-                 | com.sun.star.lang.IllegalArgumentException
-                 | WrappedTargetException ex) {
+                | PropertyVetoException
+                | com.sun.star.lang.IllegalArgumentException
+                | WrappedTargetException ex) {
             return FAIL;
         }
     }
@@ -806,5 +764,4 @@ private static void insertParagraphBreak(XText text, XTextCursor cursor) {
             throw new java.lang.IllegalArgumentException("Caught unexpected com.sun.star.lang.IllegalArgumentException", ex);
         }
     }
-
 }
diff --git a/src/main/java/org/jabref/model/openoffice/rangesort/FunctionalTextViewCursor.java b/src/main/java/org/jabref/model/openoffice/rangesort/FunctionalTextViewCursor.java
index e08a7f4a2ad..c3831d93f35 100644
--- a/src/main/java/org/jabref/model/openoffice/rangesort/FunctionalTextViewCursor.java
+++ b/src/main/java/org/jabref/model/openoffice/rangesort/FunctionalTextViewCursor.java
@@ -44,13 +44,13 @@
 public class FunctionalTextViewCursor {
 
     /* The initial position of the cursor or null. */
-    private XTextRange initialPosition;
+    private final XTextRange initialPosition;
 
     /* The initial selection in the document or null. */
-    private XServiceInfo initialSelection;
+    private final XServiceInfo initialSelection;
 
     /* The view cursor, potentially moved from its original location. */
-    private XTextViewCursor viewCursor;
+    private final XTextViewCursor viewCursor;
 
     private FunctionalTextViewCursor(XTextRange initialPosition,
                                      XServiceInfo initialSelection,
@@ -69,7 +69,6 @@ private FunctionalTextViewCursor(XTextRange initialPosition,
      * instance.restore() after finished using the cursor.
      */
     public static OOResult<FunctionalTextViewCursor, String> get(XTextDocument doc) {
-
         Objects.requireNonNull(doc);
 
         XTextRange initialPosition = null;
@@ -90,8 +89,8 @@ public static OOResult<FunctionalTextViewCursor, String> get(XTextDocument doc)
         if (initialSelection == null) {
             String errorMessage = ("Selection is not available: cannot provide a functional view cursor");
             return OOResult.error(errorMessage);
-        } else if (!Arrays.stream(initialSelection.getSupportedServiceNames())
-                   .anyMatch("com.sun.star.text.TextRanges"::equals)) {
+        } else if (Arrays.stream(initialSelection.getSupportedServiceNames())
+                         .noneMatch("com.sun.star.text.TextRanges"::equals)) {
             // initialSelection does not support TextRanges.
             // We need to change it (and the viewCursor with it).
             XTextRange newSelection = doc.getText().getStart();
diff --git a/src/main/java/org/jabref/model/openoffice/rangesort/RangeOverlap.java b/src/main/java/org/jabref/model/openoffice/rangesort/RangeOverlap.java
index 3edd059d7ff..1f4f3ae0ed4 100644
--- a/src/main/java/org/jabref/model/openoffice/rangesort/RangeOverlap.java
+++ b/src/main/java/org/jabref/model/openoffice/rangesort/RangeOverlap.java
@@ -3,7 +3,7 @@
 import java.util.List;
 
 /**
- *  Used in reporting range overlaps.
+ * Used in reporting range overlaps.
  */
 public class RangeOverlap<V> {
     public final RangeOverlapKind kind;
diff --git a/src/main/java/org/jabref/model/openoffice/rangesort/RangeOverlapBetween.java b/src/main/java/org/jabref/model/openoffice/rangesort/RangeOverlapBetween.java
index 16b7735fb7a..a5cb13fb4f0 100644
--- a/src/main/java/org/jabref/model/openoffice/rangesort/RangeOverlapBetween.java
+++ b/src/main/java/org/jabref/model/openoffice/rangesort/RangeOverlapBetween.java
@@ -14,13 +14,14 @@
 
 public class RangeOverlapBetween {
 
-    private RangeOverlapBetween() { }
+    private RangeOverlapBetween() {
+    }
 
     /**
      * Check for any overlap between two sets of XTextRange values.
-     *
+     * <p>
      * Assume fewHolders is small (usually a single element, for checking the cursor)
-     *
+     * <p>
      * Returns on first problem found.
      */
     public static <V extends RangeHolder>
@@ -44,8 +45,8 @@ List<RangeOverlap<V>> findFirst(XTextDocument doc,
         for (V aHolder : fewHolders) {
             XText aText = aHolder.getRange().getText();
             fewTuples.add(new OOTuple3<>(aText,
-                                         UnoCast.cast(XTextRangeCompare.class, aText).get(),
-                                         aHolder));
+                    UnoCast.cast(XTextRangeCompare.class, aText).get(),
+                    aHolder));
         }
 
         /*
@@ -81,14 +82,14 @@ List<RangeOverlap<V>> findFirst(XTextDocument doc,
                 //
                 // We return EQUAL_RANGE
                 RangeOverlapKind kind = (equal ? RangeOverlapKind.EQUAL_RANGE
-                                         : (touching ? RangeOverlapKind.TOUCH
-                                            : RangeOverlapKind.OVERLAP));
+                        : (touching ? RangeOverlapKind.TOUCH
+                        : RangeOverlapKind.OVERLAP));
 
                 List<V> valuesForOverlappingRanges = new ArrayList<>();
                 valuesForOverlappingRanges.add(aHolder);
                 valuesForOverlappingRanges.add(bHolder);
 
-                result.add(new RangeOverlap<V>(kind, valuesForOverlappingRanges));
+                result.add(new RangeOverlap<>(kind, valuesForOverlappingRanges));
                 return result;
             }
         }
diff --git a/src/main/java/org/jabref/model/openoffice/rangesort/RangeOverlapKind.java b/src/main/java/org/jabref/model/openoffice/rangesort/RangeOverlapKind.java
index 2bb7f8f4af7..1098a85a87f 100644
--- a/src/main/java/org/jabref/model/openoffice/rangesort/RangeOverlapKind.java
+++ b/src/main/java/org/jabref/model/openoffice/rangesort/RangeOverlapKind.java
@@ -2,13 +2,19 @@
 
 public enum RangeOverlapKind {
 
-    /** The ranges share a boundary */
+    /**
+     * The ranges share a boundary
+     */
     TOUCH,
 
-    /** They share some characters */
+    /**
+     * They share some characters
+     */
     OVERLAP,
 
-    /** They cover the same XTextRange */
+    /**
+     * They cover the same XTextRange
+     */
     EQUAL_RANGE
 }
 
diff --git a/src/main/java/org/jabref/model/openoffice/rangesort/RangeOverlapWithin.java b/src/main/java/org/jabref/model/openoffice/rangesort/RangeOverlapWithin.java
index a8534b630ae..69ff4ca91d1 100644
--- a/src/main/java/org/jabref/model/openoffice/rangesort/RangeOverlapWithin.java
+++ b/src/main/java/org/jabref/model/openoffice/rangesort/RangeOverlapWithin.java
@@ -12,23 +12,18 @@
 
 public class RangeOverlapWithin {
 
-    private RangeOverlapWithin() { }
+    private RangeOverlapWithin() {
+    }
 
     /**
      * Report identical, overlapping or touching ranges between elements of rangeHolders.
+     * <p>
+     * For overlapping and touching, only report consecutive ranges and only with a single sample of otherwise identical ranges.
      *
-     * For overlapping and touching, only report consecutive ranges and only with a single sample of
-     * otherwise identical ranges.
-     *
-     * @param rangeHolders represent the ranges to be checked.
-     *
-     *        Note: for each rangeHolder, rangeHolder.getRange() is called multiple times.
-     *              To avoid repeated work, they should keep a copy of the range instead of
-     *              getting it each time from the document.
-     *
-     * @param reportAtMost Limit the number of records returned to atMost.
-     *        Zero {@code reportAtMost} means no limit.
-     *
+     * @param rangeHolders    represent the ranges to be checked.
+     *                        <p>
+     *                        Note: for each rangeHolder, rangeHolder.getRange() is called multiple times. To avoid repeated work, they should keep a copy of the range instead of getting it each time from the document.
+     * @param reportAtMost    Limit the number of records returned to atMost. Zero {@code reportAtMost} means no limit.
      * @param includeTouching Should the result contain ranges sharing only a boundary?
      */
     public static <V extends RangeHolder>
@@ -44,13 +39,10 @@ List<RangeOverlap<V>> findOverlappingRanges(XTextDocument doc,
 
     /**
      * Report identical, overlapping or touching ranges.
+     * <p>
+     * For overlapping and touching, only report consecutive ranges and only with a single sample of otherwise identical ranges.
      *
-     * For overlapping and touching, only report consecutive ranges and only with a single sample of
-     * otherwise identical ranges.
-     *
-     * @param atMost Limit the number of records returned to atMost.
-     *        Zero {@code atMost} means no limit.
-     *
+     * @param atMost          Limit the number of records returned to atMost. Zero {@code atMost} means no limit.
      * @param includeTouching Should the result contain ranges sharing only a boundary?
      */
     public static <V extends RangeHolder>
@@ -66,7 +58,7 @@ List<RangeOverlap<V>> findOverlappingRanges(RangeSort.RangePartitions<V> input,
                 continue;
             }
             XTextRangeCompare cmp = UnoCast.cast(XTextRangeCompare.class,
-                                                 partition.get(0).getRange().getText()).get();
+                    partition.get(0).getRange().getText()).get();
 
             for (int i = 0; i < (partition.size() - 1); i++) {
                 V aHolder = partition.get(i);
@@ -82,15 +74,15 @@ List<RangeOverlap<V>> findOverlappingRanges(RangeSort.RangePartitions<V> input,
                     // aValues.add(bHolder);
                     // collect those equal
                     while (i < (partition.size() - 1) &&
-                           UnoTextRange.compareStartsThenEndsUnsafe(
-                               cmp,
-                               aRange,
-                               partition.get(i + 1).getRange()) == 0) {
+                            UnoTextRange.compareStartsThenEndsUnsafe(
+                                    cmp,
+                                    aRange,
+                                    partition.get(i + 1).getRange()) == 0) {
                         bHolder = partition.get(i + 1);
                         aValues.add(bHolder);
                         i++;
                     }
-                    result.add(new RangeOverlap<V>(RangeOverlapKind.EQUAL_RANGE, aValues));
+                    result.add(new RangeOverlap<>(RangeOverlapKind.EQUAL_RANGE, aValues));
                     if (atMost > 0 && result.size() >= atMost) {
                         return result;
                     }
@@ -105,17 +97,16 @@ List<RangeOverlap<V>> findOverlappingRanges(RangeSort.RangePartitions<V> input,
                     List<V> valuesForOverlappingRanges = new ArrayList<>();
                     valuesForOverlappingRanges.add(aHolder);
                     valuesForOverlappingRanges.add(bHolder);
-                    result.add(new RangeOverlap<V>((cmpResult == 0)
-                                                   ? RangeOverlapKind.TOUCH
-                                                   : RangeOverlapKind.OVERLAP,
-                                                   valuesForOverlappingRanges));
+                    result.add(new RangeOverlap<>((cmpResult == 0)
+                            ? RangeOverlapKind.TOUCH
+                            : RangeOverlapKind.OVERLAP,
+                            valuesForOverlappingRanges));
                 }
                 if (atMost > 0 && result.size() >= atMost) {
-                        return result;
+                    return result;
                 }
             }
         }
         return result;
     }
-
 }
diff --git a/src/main/java/org/jabref/model/openoffice/rangesort/RangeSort.java b/src/main/java/org/jabref/model/openoffice/rangesort/RangeSort.java
index 99ace5154e1..77982a9a7db 100644
--- a/src/main/java/org/jabref/model/openoffice/rangesort/RangeSort.java
+++ b/src/main/java/org/jabref/model/openoffice/rangesort/RangeSort.java
@@ -13,22 +13,17 @@
 import com.sun.star.text.XTextRangeCompare;
 
 /**
- * RangeSort provides sorting based on XTextRangeCompare, which only provides comparison
- * between XTextRange values within the same XText.
+ * RangeSort provides sorting based on XTextRangeCompare, which only provides comparison between XTextRange values within the same XText.
  */
 public class RangeSort {
 
     private RangeSort() {
-        /**/
     }
 
     /**
      * Compare two RangeHolders (using RangeHolder.getRange()) within an XText.
-     *
-     * Note: since we only look at the ranges, this comparison is generally not consistent with
-     * `equals` on the RangeHolders. Probably should not be used for key comparison in
-     * {@code TreeMap<RangeHolder>} or {@code Set<RangeHolder>}
-     *
+     * <p>
+     * Note: since we only look at the ranges, this comparison is generally not consistent with `equals` on the RangeHolders. Probably should not be used for key comparison in {@code TreeMap<RangeHolder>} or {@code Set<RangeHolder>}
      */
     private static class HolderComparatorWithinPartition implements Comparator<RangeHolder> {
 
@@ -36,7 +31,7 @@ private static class HolderComparatorWithinPartition implements Comparator<Range
 
         HolderComparatorWithinPartition(XText text) {
             cmp = (UnoCast.cast(XTextRangeCompare.class, text)
-                   .orElseThrow(java.lang.IllegalArgumentException::new));
+                          .orElseThrow(java.lang.IllegalArgumentException::new));
         }
 
         /**
@@ -50,7 +45,7 @@ public int compare(RangeHolder a, RangeHolder b) {
 
     /**
      * Sort a list of RangeHolder values known to share the same getText().
-     *
+     * <p>
      * Note: RangeHolder.getRange() is called many times.
      */
     public static <V extends RangeHolder> void sortWithinPartition(List<V> rangeHolders) {
@@ -83,7 +78,7 @@ public List<List<V>> getPartitions() {
     }
 
     /**
-     *  Partition RangeHolders by the corresponding XText.
+     * Partition RangeHolders by the corresponding XText.
      */
     public static <V extends RangeHolder> RangePartitions<V> partitionRanges(List<V> holders) {
         RangePartitions<V> result = new RangePartitions<>();
diff --git a/src/main/java/org/jabref/model/openoffice/rangesort/RangeSortEntry.java b/src/main/java/org/jabref/model/openoffice/rangesort/RangeSortEntry.java
index 0ed686ee901..a9b834027ff 100644
--- a/src/main/java/org/jabref/model/openoffice/rangesort/RangeSortEntry.java
+++ b/src/main/java/org/jabref/model/openoffice/rangesort/RangeSortEntry.java
@@ -9,7 +9,7 @@ public class RangeSortEntry<T> implements RangeSortable<T> {
 
     private XTextRange range;
     private int indexInPosition;
-    private T content;
+    private final T content;
 
     public RangeSortEntry(XTextRange range, int indexInPosition, T content) {
         this.range = range;
diff --git a/src/main/java/org/jabref/model/openoffice/rangesort/RangeSortVisual.java b/src/main/java/org/jabref/model/openoffice/rangesort/RangeSortVisual.java
index e412f4ade6c..45692ed1703 100644
--- a/src/main/java/org/jabref/model/openoffice/rangesort/RangeSortVisual.java
+++ b/src/main/java/org/jabref/model/openoffice/rangesort/RangeSortVisual.java
@@ -14,25 +14,21 @@
 
 /**
  * Sort XTextRange values visually (top-down,left-to-right).
- *
+ * <p>
  * Requires functional XTextViewCursor.
- *
- * Problem: for multicolumn layout and when viewing pages side-by-side in LO, the
- *          (top-down,left-to-right) order interpreted as-on-the-screen: an XTextRange at the top of
- *          the second column or second page is sorted before an XTextRange at the bottom of the
- *          first column of the first page.
+ * <p>
+ * Problem: for multicolumn layout and when viewing pages side-by-side in LO, the (top-down,left-to-right) order interpreted as-on-the-screen: an XTextRange at the top of the second column or second page is sorted before an XTextRange at the bottom of the first column of the first page.
  */
 public class RangeSortVisual {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(RangeSortVisual.class);
 
     private RangeSortVisual() {
-        /**/
     }
 
     /**
      * Sort the input {@code inputs} visually.
-     *
+     * <p>
      * Requires a functional {@code XTextViewCursor}.
      *
      * @return The input, sorted by the elements XTextRange and getIndexInPosition.
@@ -63,8 +59,8 @@ public static <T> List<RangeSortable<T>> visualSort(List<RangeSortable<T>> input
         for (int i = 0; i < inputSize; i++) {
             RangeSortable<T> input = inputs.get(i);
             comparableMarks.add(new ComparableMark<>(positions.get(i),
-                                         input.getIndexInPosition(),
-                                         input));
+                    input.getIndexInPosition(),
+                    input));
         }
         comparableMarks.sort(RangeSortVisual::compareTopToBottomLeftToRight);
 
@@ -82,22 +78,16 @@ public static <T> List<RangeSortable<T>> visualSort(List<RangeSortable<T>> input
     }
 
     /**
-     *  Given a location, return its position: coordinates relative to the top left position of the
-     *  first page of the document.
-     *
-     * Note: for text layouts with two or more columns, this gives the wrong order:
-     *       top-down/left-to-right does not match reading order.
-     *
-     * Note: The "relative to the top left position of the first page" is meant "as it appears on
-     *       the screen".
-     *
-     *       In particular: when viewing pages side-by-side, the top half of the right page is
-     *       higher than the lower half of the left page. Again, top-down/left-to-right does not
-     *       match reading order.
+     * Given a location, return its position: coordinates relative to the top left position of the first page of the document.
+     * <p>
+     * Note: for text layouts with two or more columns, this gives the wrong order: top-down/left-to-right does not match reading order.
+     * <p>
+     * Note: The "relative to the top left position of the first page" is meant "as it appears on the screen".
+     * <p>
+     * In particular: when viewing pages side-by-side, the top half of the right page is higher than the lower half of the left page. Again, top-down/left-to-right does not match reading order.
      *
      * @param range  Location.
-     * @param cursor To get the position, we need az XTextViewCursor.
-     *               It will be moved to the range.
+     * @param cursor To get the position, we need az XTextViewCursor. It will be moved to the range.
      */
     private static Point findPositionOfTextRange(XTextRange range, XTextViewCursor cursor) {
         cursor.gotoRange(range, false);
@@ -105,7 +95,6 @@ private static Point findPositionOfTextRange(XTextRange range, XTextViewCursor c
     }
 
     private static <T> int compareTopToBottomLeftToRight(ComparableMark<T> a, ComparableMark<T> b) {
-
         if (a.position.Y != b.position.Y) {
             return a.position.Y - b.position.Y;
         }
@@ -117,10 +106,9 @@ private static <T> int compareTopToBottomLeftToRight(ComparableMark<T> a, Compar
 
     /**
      * A reference mark name paired with its visual position.
-     *
-     * Comparison is based on (Y,X,indexInPosition): vertical compared first, horizontal second,
-     * indexInPosition third.
-     *
+     * <p>
+     * Comparison is based on (Y,X,indexInPosition): vertical compared first, horizontal second, indexInPosition third.
+     * <p>
      * Used for sorting reference marks by their visual positions.
      */
     private static class ComparableMark<T> {
@@ -138,7 +126,5 @@ public ComparableMark(Point position, int indexInPosition, T content) {
         public T getContent() {
             return content;
         }
-
     }
-
 }
diff --git a/src/main/java/org/jabref/model/openoffice/rangesort/RangeSortable.java b/src/main/java/org/jabref/model/openoffice/rangesort/RangeSortable.java
index 59a4c3fa9af..15482f0a3e6 100644
--- a/src/main/java/org/jabref/model/openoffice/rangesort/RangeSortable.java
+++ b/src/main/java/org/jabref/model/openoffice/rangesort/RangeSortable.java
@@ -7,9 +7,10 @@
  */
 public interface RangeSortable<T> extends RangeHolder {
 
-    /** The XTextRange
-     *
-     *  For citation marks in footnotes this may be the range of the footnote mark.
+    /**
+     * The XTextRange
+     * <p>
+     * For citation marks in footnotes this may be the range of the footnote mark.
      */
     XTextRange getRange();
 
diff --git a/src/main/java/org/jabref/model/openoffice/style/Citation.java b/src/main/java/org/jabref/model/openoffice/style/Citation.java
index 7bae4fd2548..899013773f2 100644
--- a/src/main/java/org/jabref/model/openoffice/style/Citation.java
+++ b/src/main/java/org/jabref/model/openoffice/style/Citation.java
@@ -10,27 +10,36 @@
 
 public class Citation implements ComparableCitation, CitationMarkerEntry, CitationMarkerNumericEntry {
 
-    /** key in database */
+    /**
+     * key in database
+     */
     public final String citationKey;
 
-    /** Result from database lookup. Optional.empty() if not found. */
+    /**
+     * Result from database lookup. Optional.empty() if not found.
+     */
     private Optional<CitationLookupResult> db;
 
-    /** The number used for numbered citation styles . */
+    /**
+     * The number used for numbered citation styles .
+     */
     private Optional<Integer> number;
 
-    /** Letter that makes the in-text citation unique. */
+    /**
+     * Letter that makes the in-text citation unique.
+     */
     private Optional<String> uniqueLetter;
 
-    /** pageInfo */
+    /**
+     * pageInfo
+     */
     private Optional<OOText> pageInfo;
 
-    /** isFirstAppearanceOfSource */
-    private boolean isFirstAppearanceOfSource;
-
     /**
-     *
+     * isFirstAppearanceOfSource
      */
+    private boolean isFirstAppearanceOfSource;
+
     public Citation(String citationKey) {
         this.citationKey = citationKey;
         this.db = Optional.empty();
@@ -57,9 +66,7 @@ public boolean getIsFirstAppearanceOfSource() {
 
     @Override
     public Optional<BibEntry> getBibEntry() {
-        return (db.isPresent()
-                ? Optional.of(db.get().entry)
-                : Optional.empty());
+        return db.map(citationLookupResult -> citationLookupResult.entry);
     }
 
     public static Optional<CitationLookupResult> lookup(BibDatabase database, String key) {
@@ -70,10 +77,10 @@ public static Optional<CitationLookupResult> lookup(BibDatabase database, String
 
     public static Optional<CitationLookupResult> lookup(List<BibDatabase> databases, String key) {
         return (databases.stream()
-                .map(database -> Citation.lookup(database, key))
-                .filter(Optional::isPresent)
-                .map(Optional::get)
-                .findFirst());
+                         .map(database -> Citation.lookup(database, key))
+                         .filter(Optional::isPresent)
+                         .map(Optional::get)
+                         .findFirst());
     }
 
     public void lookupInDatabases(List<BibDatabase> databases) {
@@ -129,18 +136,17 @@ public void setIsFirstAppearanceOfSource(boolean value) {
      * Setters for CitationGroups.distribute()
      */
     public static void setLookupResult(OOPair<Citation, Optional<CitationLookupResult>> pair) {
-        Citation cit = pair.a;
-        cit.db = pair.b;
+        Citation citation = pair.a;
+        citation.db = pair.b;
     }
 
     public static void setNumber(OOPair<Citation, Optional<Integer>> pair) {
-        Citation cit = pair.a;
-        cit.number = pair.b;
+        Citation citation = pair.a;
+        citation.number = pair.b;
     }
 
     public static void setUniqueLetter(OOPair<Citation, Optional<String>> pair) {
-        Citation cit = pair.a;
-        cit.uniqueLetter = pair.b;
+        Citation citation = pair.a;
+        citation.uniqueLetter = pair.b;
     }
-
 }
diff --git a/src/main/java/org/jabref/model/openoffice/style/CitationGroup.java b/src/main/java/org/jabref/model/openoffice/style/CitationGroup.java
index 90afb872d4f..4fbb62d94a5 100644
--- a/src/main/java/org/jabref/model/openoffice/style/CitationGroup.java
+++ b/src/main/java/org/jabref/model/openoffice/style/CitationGroup.java
@@ -28,10 +28,6 @@ public class CitationGroup {
     public final CitationType citationType;
     public final List<Citation> citationsInStorageOrder;
 
-    /*
-     * Extra data
-     */
-
     /*
      * A name of a reference mark to link to by formatCitedOnPages.
      * May be initially empty, if backend does not use reference marks.
@@ -86,7 +82,6 @@ public int numberOfCitations() {
      * Sort citations for presentation within a CitationGroup.
      */
     void imposeLocalOrder(Comparator<BibEntry> entryComparator) {
-
         // For JabRef52 the single pageInfo is always in the last-in-localorder citation.
         // We adjust here accordingly by taking it out and adding it back after sorting.
         final int last = this.numberOfCitations() - 1;
@@ -98,7 +93,7 @@ void imposeLocalOrder(Comparator<BibEntry> entryComparator) {
         }
 
         this.localOrder = OOListUtil.order(citationsInStorageOrder,
-                                           new CompareCitation(entryComparator, true));
+                new CompareCitation(entryComparator, true));
 
         if (dataModel == OODataModel.JabRef52) {
             getCitationsInLocalOrder().get(last).setPageInfo(lastPageInfo);
@@ -114,7 +109,7 @@ public List<Integer> getLocalOrder() {
      */
 
     public List<Citation> getCitationsInLocalOrder() {
-        return OOListUtil.map(localOrder, i -> citationsInStorageOrder.get(i));
+        return OOListUtil.map(localOrder, citationsInStorageOrder::get);
     }
 
     /*
@@ -152,5 +147,4 @@ public void setCitationMarker(Optional<OOText> citationMarker) {
     public Optional<OOText> getCitationMarker() {
         return this.citationMarker;
     }
-
 }
diff --git a/src/main/java/org/jabref/model/openoffice/style/CitationGroupId.java b/src/main/java/org/jabref/model/openoffice/style/CitationGroupId.java
index baaa931214c..6c271b12267 100644
--- a/src/main/java/org/jabref/model/openoffice/style/CitationGroupId.java
+++ b/src/main/java/org/jabref/model/openoffice/style/CitationGroupId.java
@@ -5,6 +5,7 @@
  */
 public class CitationGroupId {
     String groupId;
+
     public CitationGroupId(String groupId) {
         this.groupId = groupId;
     }
diff --git a/src/main/java/org/jabref/model/openoffice/style/CitationGroups.java b/src/main/java/org/jabref/model/openoffice/style/CitationGroups.java
index e5e642fa652..7ffe943dad6 100644
--- a/src/main/java/org/jabref/model/openoffice/style/CitationGroups.java
+++ b/src/main/java/org/jabref/model/openoffice/style/CitationGroups.java
@@ -19,15 +19,14 @@
 
 /**
  * CitationGroups : the set of citation groups in the document.
- *
+ * <p>
  * This is the main input (as well as output) for creating citation markers and bibliography.
- *
  */
 public class CitationGroups {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(CitationGroups.class);
 
-    private Map<CitationGroupId, CitationGroup> citationGroupsUnordered;
+    private final Map<CitationGroupId, CitationGroup> citationGroupsUnordered;
 
     /**
      * Provides order of appearance for the citation groups.
@@ -35,7 +34,7 @@ public class CitationGroups {
     private Optional<List<CitationGroupId>> globalOrder;
 
     /**
-     *  This is going to be the bibliography
+     * This is going to be the bibliography
      */
     private Optional<CitedKeys> bibliography;
 
@@ -43,7 +42,6 @@ public class CitationGroups {
      * Constructor
      */
     public CitationGroups(Map<CitationGroupId, CitationGroup> citationGroups) {
-
         this.citationGroupsUnordered = citationGroups;
 
         this.globalOrder = Optional.empty();
@@ -114,13 +112,12 @@ public List<CitationGroup> getCitationGroupsInGlobalOrder() {
         if (globalOrder.isEmpty()) {
             throw new IllegalStateException("getCitationGroupsInGlobalOrder: not ordered yet");
         }
-        return OOListUtil.map(globalOrder.get(), groupId -> citationGroupsUnordered.get(groupId));
+        return OOListUtil.map(globalOrder.get(), citationGroupsUnordered::get);
     }
 
     /**
-     * Impose an order of citation groups by providing the order of their citation group
-     * idendifiers.
-     *
+     * Impose an order of citation groups by providing the order of their citation group idendifiers.
+     * <p>
      * Also set indexInGlobalOrder for each citation group.
      */
     public void setGlobalOrder(List<CitationGroupId> globalOrder) {
@@ -151,8 +148,7 @@ public void imposeLocalOrder(Comparator<BibEntry> entryComparator) {
     }
 
     /**
-     * Collect citations into a list of cited sources using neither CitationGroup.globalOrder or
-     * Citation.localOrder
+     * Collect citations into a list of cited sources using neither CitationGroup.globalOrder or Citation.localOrder
      */
     public CitedKeys getCitedKeysUnordered() {
         LinkedHashMap<String, CitedKey> res = new LinkedHashMap<>();
@@ -203,7 +199,6 @@ public Optional<CitedKeys> getBibliography() {
      * @return Citation keys where lookupCitations() failed.
      */
     public List<String> getUnresolvedKeys() {
-
         CitedKeys bib = getBibliography().orElse(getCitedKeysUnordered());
 
         List<String> unresolvedKeys = new ArrayList<>();
@@ -216,9 +211,9 @@ public List<String> getUnresolvedKeys() {
     }
 
     public void createNumberedBibliographySortedInOrderOfAppearance() {
-        if (!bibliography.isEmpty()) {
+        if (bibliography.isPresent()) {
             throw new IllegalStateException("createNumberedBibliographySortedInOrderOfAppearance:"
-                                            + " already have a bibliography");
+                    + " already have a bibliography");
         }
         CitedKeys citedKeys = getCitedKeysSortedInOrderOfAppearance();
         citedKeys.numberCitedKeysInCurrentOrder();
@@ -230,7 +225,7 @@ public void createNumberedBibliographySortedInOrderOfAppearance() {
      * precondition: database lookup already performed (otherwise we just sort citation keys)
      */
     public void createPlainBibliographySortedByComparator(Comparator<BibEntry> entryComparator) {
-        if (!bibliography.isEmpty()) {
+        if (bibliography.isPresent()) {
             throw new IllegalStateException("createPlainBibliographySortedByComparator: already have a bibliography");
         }
         CitedKeys citedKeys = getCitedKeysUnordered();
@@ -242,7 +237,7 @@ public void createPlainBibliographySortedByComparator(Comparator<BibEntry> entry
      * precondition: database lookup already performed (otherwise we just sort citation keys)
      */
     public void createNumberedBibliographySortedByComparator(Comparator<BibEntry> entryComparator) {
-        if (!bibliography.isEmpty()) {
+        if (bibliography.isPresent()) {
             throw new IllegalStateException("createNumberedBibliographySortedByComparator: already have a bibliography");
         }
         CitedKeys citedKeys = getCitedKeysUnordered();
@@ -261,7 +256,7 @@ public Optional<CitationGroup> getCitationGroup(CitationGroupId groupId) {
         return Optional.ofNullable(group);
     }
 
-    /*
+    /**
      * @return true if all citation groups have referenceMarkNameForLinking
      */
     public boolean citationGroupsProvideReferenceMarkNameForLinking() {
@@ -290,5 +285,4 @@ public void afterRemoveCitationGroup(CitationGroup group) {
 
         bibliography = Optional.empty();
     }
-
 }
diff --git a/src/main/java/org/jabref/model/openoffice/style/CitationLookupResult.java b/src/main/java/org/jabref/model/openoffice/style/CitationLookupResult.java
index bfe6dc1debe..c82177a7e69 100644
--- a/src/main/java/org/jabref/model/openoffice/style/CitationLookupResult.java
+++ b/src/main/java/org/jabref/model/openoffice/style/CitationLookupResult.java
@@ -19,16 +19,12 @@ public CitationLookupResult(BibEntry entry, BibDatabase database) {
 
     /**
      * Note: BibEntry overrides Object.equals, but BibDatabase does not.
-     *
-     *       Consequently, {@code this.database.equals(that.database)} below
-     *       is equivalent to {@code this.database == that.database}.
-     *
-     *       Since within each GUI call we use a fixed list of databases, it is OK.
-     *
-     *  CitationLookupResult.equals is used in CitedKey.addPath to check the added Citation
-     *  refers to the same source as the others. As long as we look up each citation key
-     *  only once (in CitationGroups.lookupCitations), the default implementation for equals
-     *  would be sufficient (and could also omit hashCode below).
+     * <p>
+     * Consequently, {@code this.database.equals(that.database)} below is equivalent to {@code this.database == that.database}.
+     * <p>
+     * Since within each GUI call we use a fixed list of databases, it is OK.
+     * <p>
+     * CitationLookupResult.equals is used in CitedKey.addPath to check the added Citation refers to the same source as the others. As long as we look up each citation key only once (in CitationGroups.lookupCitations), the default implementation for equals would be sufficient (and could also omit hashCode below).
      */
     @Override
     public boolean equals(Object otherObject) {
diff --git a/src/main/java/org/jabref/model/openoffice/style/CitationMarkerEntry.java b/src/main/java/org/jabref/model/openoffice/style/CitationMarkerEntry.java
index 5fcb9bcc1a8..18bbe5588b3 100644
--- a/src/main/java/org/jabref/model/openoffice/style/CitationMarkerEntry.java
+++ b/src/main/java/org/jabref/model/openoffice/style/CitationMarkerEntry.java
@@ -15,14 +15,12 @@ public interface CitationMarkerEntry extends CitationMarkerNormEntry {
     Optional<String> getUniqueLetter();
 
     /**
-     * pageInfo for this citation, provided by the user.
-     *          May be empty, for none.
+     * pageInfo for this citation, provided by the user. May be empty, for none.
      */
     Optional<OOText> getPageInfo();
 
     /**
-     *  @return true if this citation is the first appearance of the source cited. Some styles use
-     *               different limit on the number of authors shown in this case.
+     * @return true if this citation is the first appearance of the source cited. Some styles use different limit on the number of authors shown in this case.
      */
     boolean getIsFirstAppearanceOfSource();
 }
diff --git a/src/main/java/org/jabref/model/openoffice/style/CitationMarkerNormEntry.java b/src/main/java/org/jabref/model/openoffice/style/CitationMarkerNormEntry.java
index a2581b38b60..1489dede932 100644
--- a/src/main/java/org/jabref/model/openoffice/style/CitationMarkerNormEntry.java
+++ b/src/main/java/org/jabref/model/openoffice/style/CitationMarkerNormEntry.java
@@ -7,14 +7,16 @@
  */
 public interface CitationMarkerNormEntry {
 
-    /** Citation key. This is what we usually get from the document.
-     *
-     *  Used if getLookupResult() returns empty, which indicates failure to lookup in the databases.
+    /**
+     * Citation key. This is what we usually get from the document.
+     * <p>
+     * Used if getLookupResult() returns empty, which indicates failure to lookup in the databases.
      */
     String getCitationKey();
 
-    /** Result of looking up citation key in databases.
-     *
+    /**
+     * Result of looking up citation key in databases.
+     * <p>
      * Optional.empty() indicates unresolved citation.
      */
     Optional<CitationLookupResult> getLookupResult();
diff --git a/src/main/java/org/jabref/model/openoffice/style/CitationPath.java b/src/main/java/org/jabref/model/openoffice/style/CitationPath.java
index 0920ea20feb..ba562ebe6bf 100644
--- a/src/main/java/org/jabref/model/openoffice/style/CitationPath.java
+++ b/src/main/java/org/jabref/model/openoffice/style/CitationPath.java
@@ -1,8 +1,7 @@
 package org.jabref.model.openoffice.style;
 
 /**
- * Identifies a citation with the identifier of the citation group containing it and its storage
- * index within.
+ * Identifies a citation with the identifier of the citation group containing it and its storage index within.
  */
 public class CitationPath {
 
diff --git a/src/main/java/org/jabref/model/openoffice/style/CitedKey.java b/src/main/java/org/jabref/model/openoffice/style/CitedKey.java
index 5331204bd75..8920e5a3933 100644
--- a/src/main/java/org/jabref/model/openoffice/style/CitedKey.java
+++ b/src/main/java/org/jabref/model/openoffice/style/CitedKey.java
@@ -10,14 +10,13 @@
 
 /**
  * Cited keys are collected from the citations in citation groups.
- *
- * They contain backreferences to the corresponding citations in {@code where}. This allows the
- * extra information generated using CitedKeys to be distributed back to the in-text citations.
+ * <p>
+ * They contain backreferences to the corresponding citations in {@code where}. This allows the extra information generated using CitedKeys to be distributed back to the in-text citations.
  */
 public class CitedKey implements
-                      ComparableCitedKey,
-                      CitationMarkerNormEntry,
-                      CitationMarkerNumericBibEntry {
+        ComparableCitedKey,
+        CitationMarkerNormEntry,
+        CitationMarkerNumericBibEntry {
 
     public final String citationKey;
     private final List<CitationPath> where;
@@ -27,16 +26,15 @@ public class CitedKey implements
     private Optional<String> uniqueLetter; // For AuthorYear citation styles.
     private Optional<OOText> normCitMarker;  // For AuthorYear citation styles.
 
-    CitedKey(String citationKey, CitationPath path, Citation cit) {
-
+    CitedKey(String citationKey, CitationPath path, Citation citation) {
         this.citationKey = citationKey;
         this.where = new ArrayList<>(); // remember order
         this.where.add(path);
 
         // synchronized with Citation
-        this.db = cit.getLookupResult();
-        this.number = cit.getNumber();
-        this.uniqueLetter = cit.getUniqueLetter();
+        this.db = citation.getLookupResult();
+        this.number = citation.getNumber();
+        this.uniqueLetter = citation.getUniqueLetter();
 
         // CitedKey only
         this.normCitMarker = Optional.empty();
@@ -120,19 +118,19 @@ void lookupInDatabases(List<BibDatabase> databases) {
         this.db = Citation.lookup(databases, this.citationKey);
     }
 
-    void distributeLookupResult(CitationGroups cgs) {
-        cgs.distributeToCitations(where, Citation::setLookupResult, db);
+    void distributeLookupResult(CitationGroups citationGroups) {
+        citationGroups.distributeToCitations(where, Citation::setLookupResult, db);
     }
 
     /*
      * Make unique using a letter or by numbering
      */
 
-    void distributeNumber(CitationGroups cgs) {
-        cgs.distributeToCitations(where, Citation::setNumber, number);
+    void distributeNumber(CitationGroups citationGroups) {
+        citationGroups.distributeToCitations(where, Citation::setNumber, number);
     }
 
-    void distributeUniqueLetter(CitationGroups cgs) {
-        cgs.distributeToCitations(where, Citation::setUniqueLetter, uniqueLetter);
+    void distributeUniqueLetter(CitationGroups citationGroups) {
+        citationGroups.distributeToCitations(where, Citation::setUniqueLetter, uniqueLetter);
     }
 }
diff --git a/src/main/java/org/jabref/model/openoffice/style/CitedKeys.java b/src/main/java/org/jabref/model/openoffice/style/CitedKeys.java
index 059c1b6123a..a5afedede80 100644
--- a/src/main/java/org/jabref/model/openoffice/style/CitedKeys.java
+++ b/src/main/java/org/jabref/model/openoffice/style/CitedKeys.java
@@ -63,22 +63,21 @@ public void lookupInDatabases(List<BibDatabase> databases) {
         }
     }
 
-    void distributeLookupResults(CitationGroups cgs) {
+    void distributeLookupResults(CitationGroups citationGroups) {
         for (CitedKey ck : this.data.values()) {
-            ck.distributeLookupResult(cgs);
+            ck.distributeLookupResult(citationGroups);
         }
     }
 
-    void distributeNumbers(CitationGroups cgs) {
+    void distributeNumbers(CitationGroups citationGroups) {
         for (CitedKey ck : this.data.values()) {
-            ck.distributeNumber(cgs);
+            ck.distributeNumber(citationGroups);
         }
     }
 
-    public void distributeUniqueLetters(CitationGroups cgs) {
+    public void distributeUniqueLetters(CitationGroups citationGroups) {
         for (CitedKey ck : this.data.values()) {
-            ck.distributeUniqueLetter(cgs);
+            ck.distributeUniqueLetter(citationGroups);
         }
     }
-
 }
diff --git a/src/main/java/org/jabref/model/openoffice/style/ComparableCitation.java b/src/main/java/org/jabref/model/openoffice/style/ComparableCitation.java
index 81120c09b2a..42a7e5869ba 100644
--- a/src/main/java/org/jabref/model/openoffice/style/ComparableCitation.java
+++ b/src/main/java/org/jabref/model/openoffice/style/ComparableCitation.java
@@ -5,8 +5,7 @@
 import org.jabref.model.openoffice.ootext.OOText;
 
 /**
- * When sorting citations (in a group), we also consider pageInfo.
- * Otherwise we sort citations as cited keys.
+ * When sorting citations (in a group), we also consider pageInfo. Otherwise we sort citations as cited keys.
  */
 public interface ComparableCitation extends ComparableCitedKey {
     Optional<OOText> getPageInfo();
diff --git a/src/main/java/org/jabref/model/openoffice/style/CompareCitation.java b/src/main/java/org/jabref/model/openoffice/style/CompareCitation.java
index 966715b11a8..1d27674ba1d 100644
--- a/src/main/java/org/jabref/model/openoffice/style/CompareCitation.java
+++ b/src/main/java/org/jabref/model/openoffice/style/CompareCitation.java
@@ -10,7 +10,7 @@
  */
 public class CompareCitation implements Comparator<ComparableCitation> {
 
-    private CompareCitedKey citedKeyComparator;
+    private final CompareCitedKey citedKeyComparator;
 
     CompareCitation(Comparator<BibEntry> entryComparator, boolean unresolvedComesFirst) {
         this.citedKeyComparator = new CompareCitedKey(entryComparator, unresolvedComesFirst);
diff --git a/src/main/java/org/jabref/model/openoffice/style/NonUniqueCitationMarker.java b/src/main/java/org/jabref/model/openoffice/style/NonUniqueCitationMarker.java
index 34300734d2f..e633f7a9c70 100644
--- a/src/main/java/org/jabref/model/openoffice/style/NonUniqueCitationMarker.java
+++ b/src/main/java/org/jabref/model/openoffice/style/NonUniqueCitationMarker.java
@@ -1,15 +1,18 @@
 package org.jabref.model.openoffice.style;
 
 /**
- * What should createCitationMarker do if it discovers that uniqueLetters provided are not
- * sufficient for unique presentation?
+ * What should createCitationMarker do if it discovers that uniqueLetters provided are not sufficient for unique presentation?
  */
 public enum NonUniqueCitationMarker {
 
-    /** Give an insufficient representation anyway.  */
+    /**
+     * Give an insufficient representation anyway.
+     */
     FORGIVEN,
 
-    /** Throw an exception */
+    /**
+     * Throw an exception
+     */
     THROWS
 }
 
diff --git a/src/main/java/org/jabref/model/openoffice/style/OODataModel.java b/src/main/java/org/jabref/model/openoffice/style/OODataModel.java
index 835715dfca5..470edc1694d 100644
--- a/src/main/java/org/jabref/model/openoffice/style/OODataModel.java
+++ b/src/main/java/org/jabref/model/openoffice/style/OODataModel.java
@@ -6,13 +6,19 @@
 
 import org.jabref.model.openoffice.ootext.OOText;
 
-/**   What is the data stored?   */
+/**
+ * What is the data stored?
+ */
 public enum OODataModel {
 
-    /** JabRef52: pageInfo belongs to CitationGroup, not Citation. */
+    /**
+     * JabRef52: pageInfo belongs to CitationGroup, not Citation.
+     */
     JabRef52,
 
-    /** JabRef60: pageInfo belongs to Citation. */
+    /**
+     * JabRef60: pageInfo belongs to Citation.
+     */
     JabRef60;
 
     /**
diff --git a/src/main/java/org/jabref/model/openoffice/style/PageInfo.java b/src/main/java/org/jabref/model/openoffice/style/PageInfo.java
index 1ff87569a3b..7fd56293d73 100644
--- a/src/main/java/org/jabref/model/openoffice/style/PageInfo.java
+++ b/src/main/java/org/jabref/model/openoffice/style/PageInfo.java
@@ -7,7 +7,6 @@
 public class PageInfo {
 
     private PageInfo() {
-        // hide public constructor
     }
 
     /*
@@ -27,11 +26,10 @@ public static Optional<OOText> normalizePageInfo(Optional<OOText> optionalText)
 
     /**
      * Defines sort order for pageInfo strings.
-     *
+     * <p>
      * Optional.empty comes before non-empty.
      */
     public static int comparePageInfo(Optional<OOText> a, Optional<OOText> b) {
-
         Optional<OOText> aa = PageInfo.normalizePageInfo(a);
         Optional<OOText> bb = PageInfo.normalizePageInfo(b);
         if (aa.isEmpty() && bb.isEmpty()) {
diff --git a/src/main/java/org/jabref/model/openoffice/uno/CreationException.java b/src/main/java/org/jabref/model/openoffice/uno/CreationException.java
index 091d5469e2d..84e3c8afe55 100644
--- a/src/main/java/org/jabref/model/openoffice/uno/CreationException.java
+++ b/src/main/java/org/jabref/model/openoffice/uno/CreationException.java
@@ -2,14 +2,12 @@
 
 /**
  * Exception used to indicate failure in either
- *
- *  XMultiServiceFactory.createInstance()
- *  XMultiComponentFactory.createInstanceWithContext()
+ * <p>
+ * XMultiServiceFactory.createInstance() XMultiComponentFactory.createInstanceWithContext()
  */
 public class CreationException extends Exception {
 
     public CreationException(String message) {
         super(message);
     }
-
 }
diff --git a/src/main/java/org/jabref/model/openoffice/uno/UnoBookmark.java b/src/main/java/org/jabref/model/openoffice/uno/UnoBookmark.java
index fdbbb0dd1c6..f187527aeab 100644
--- a/src/main/java/org/jabref/model/openoffice/uno/UnoBookmark.java
+++ b/src/main/java/org/jabref/model/openoffice/uno/UnoBookmark.java
@@ -14,14 +14,15 @@
 
 public class UnoBookmark {
 
-    private UnoBookmark() { }
+    private UnoBookmark() {
+    }
 
     /**
      * Provides access to bookmarks by name.
      */
     public static XNameAccess getNameAccess(XTextDocument doc)
-        throws
-        NoDocumentException {
+            throws
+            NoDocumentException {
 
         XBookmarksSupplier supplier = UnoCast.cast(XBookmarksSupplier.class, doc).get();
         try {
@@ -38,32 +39,28 @@ public static XNameAccess getNameAccess(XTextDocument doc)
      * @return The XTextRange for the bookmark, or Optional.empty().
      */
     public static Optional<XTextRange> getAnchor(XTextDocument doc, String name)
-        throws
-        WrappedTargetException,
-        NoDocumentException {
+            throws
+            WrappedTargetException,
+            NoDocumentException {
 
         XNameAccess nameAccess = getNameAccess(doc);
         return (UnoNameAccess.getTextContentByName(nameAccess, name).map(XTextContent::getAnchor));
     }
 
     /**
-     * Insert a bookmark with the given name at the cursor provided, or with another name if the one
-     * we asked for is already in use.
-     *
+     * Insert a bookmark with the given name at the cursor provided, or with another name if the one we asked for is already in use.
+     * <p>
      * In LibreOffice the another name is in "{name}{number}" format.
      *
-     * @param name     For the bookmark.
-     * @param range    Cursor marking the location or range for the bookmark.
-     * @param absorb   Shall we incorporate range?
-     *
+     * @param name   For the bookmark.
+     * @param range  Cursor marking the location or range for the bookmark.
+     * @param absorb Shall we incorporate range?
      * @return The XNamed interface of the bookmark.
-     *
-     *         result.getName() should be checked by the caller, because its name may differ from
-     *         the one requested.
+     * result.getName() should be checked by the caller, because its name may differ from the one requested.
      */
     public static XNamed create(XTextDocument doc, String name, XTextRange range, boolean absorb)
-        throws
-        CreationException {
+            throws
+            CreationException {
         return UnoNamed.insertNamedTextContent(doc, "com.sun.star.text.Bookmark", name, range, absorb);
     }
 
@@ -71,9 +68,9 @@ public static XNamed create(XTextDocument doc, String name, XTextRange range, bo
      * Remove the named bookmark if it exists.
      */
     public static void removeIfExists(XTextDocument doc, String name)
-        throws
-        NoDocumentException,
-        WrappedTargetException {
+            throws
+            NoDocumentException,
+            WrappedTargetException {
 
         XNameAccess marks = UnoBookmark.getNameAccess(doc);
 
diff --git a/src/main/java/org/jabref/model/openoffice/uno/UnoCast.java b/src/main/java/org/jabref/model/openoffice/uno/UnoCast.java
index fcc1bcc3e12..3234e4d130a 100644
--- a/src/main/java/org/jabref/model/openoffice/uno/UnoCast.java
+++ b/src/main/java/org/jabref/model/openoffice/uno/UnoCast.java
@@ -6,7 +6,8 @@
 
 public class UnoCast {
 
-    private UnoCast() { }
+    private UnoCast() {
+    }
 
     /**
      * cast : short for Optional.ofNullable(UnoRuntime.queryInterface(...))
diff --git a/src/main/java/org/jabref/model/openoffice/uno/UnoCrossRef.java b/src/main/java/org/jabref/model/openoffice/uno/UnoCrossRef.java
index f5d20a1de4f..7df6d7dc04c 100644
--- a/src/main/java/org/jabref/model/openoffice/uno/UnoCrossRef.java
+++ b/src/main/java/org/jabref/model/openoffice/uno/UnoCrossRef.java
@@ -14,7 +14,8 @@
 
 public class UnoCrossRef {
 
-    private UnoCrossRef() { }
+    private UnoCrossRef() {
+    }
 
     /**
      * Update TextFields, etc. We use it to refresh cross-references in the document.
@@ -26,17 +27,16 @@ public static void refresh(XTextDocument doc) {
     }
 
     /**
-     * Insert a clickable cross-reference to a reference mark, with a label containing the target's
-     * page number.
-     *
+     * Insert a clickable cross-reference to a reference mark, with a label containing the target's page number.
+     * <p>
      * May need a documentConnection.refresh() after, to update the text shown.
      */
     public static void insertReferenceToPageNumberOfReferenceMark(XTextDocument doc,
                                                                   String referenceMarkName,
                                                                   XTextRange cursor)
-        throws
-        CreationException,
-        WrappedTargetException {
+            throws
+            CreationException,
+            WrappedTargetException {
 
         // based on: https://wiki.openoffice.org/wiki/Documentation/DevGuide/Text/Reference_Marks
         XMultiServiceFactory msf = UnoCast.cast(XMultiServiceFactory.class, doc).get();
@@ -62,20 +62,20 @@ public static void insertReferenceToPageNumberOfReferenceMark(XTextDocument doc,
         try {
             // specify that the source is a reference mark (could also be a footnote,
             // bookmark or sequence field)
-            xFieldProps.setPropertyValue("ReferenceFieldSource", Short.valueOf(ReferenceFieldSource.REFERENCE_MARK));
+            xFieldProps.setPropertyValue("ReferenceFieldSource", ReferenceFieldSource.REFERENCE_MARK);
         } catch (UnknownPropertyException ex) {
             throw new java.lang.IllegalStateException("The created GetReference does not have property"
-                                                      + " 'ReferenceFieldSource'");
+                    + " 'ReferenceFieldSource'");
         } catch (PropertyVetoException ex) {
             throw new java.lang.IllegalStateException("Caught PropertyVetoException on 'ReferenceFieldSource'");
         }
 
         try {
             // We want the reference displayed as page number
-            xFieldProps.setPropertyValue("ReferenceFieldPart", Short.valueOf(ReferenceFieldPart.PAGE));
+            xFieldProps.setPropertyValue("ReferenceFieldPart", ReferenceFieldPart.PAGE);
         } catch (UnknownPropertyException ex) {
             throw new java.lang.IllegalStateException("The created GetReference does not have property"
-                                                      + " 'ReferenceFieldPart'");
+                    + " 'ReferenceFieldPart'");
         } catch (PropertyVetoException ex) {
             throw new java.lang.IllegalStateException("Caught PropertyVetoException on 'ReferenceFieldPart'");
         }
diff --git a/src/main/java/org/jabref/model/openoffice/uno/UnoCursor.java b/src/main/java/org/jabref/model/openoffice/uno/UnoCursor.java
index e761a56e12f..da29ee84d92 100644
--- a/src/main/java/org/jabref/model/openoffice/uno/UnoCursor.java
+++ b/src/main/java/org/jabref/model/openoffice/uno/UnoCursor.java
@@ -11,22 +11,22 @@
 
 public class UnoCursor {
 
-    private UnoCursor() { }
+    private UnoCursor() {
+    }
 
     /**
      * Get the cursor positioned by the user.
      */
     public static Optional<XTextViewCursor> getViewCursor(XTextDocument doc) {
         return (UnoTextDocument.getCurrentController(doc)
-                .flatMap(e -> UnoCast.cast(XTextViewCursorSupplier.class, e))
-                .map(XTextViewCursorSupplier::getViewCursor));
+                               .flatMap(e -> UnoCast.cast(XTextViewCursorSupplier.class, e))
+                               .map(XTextViewCursorSupplier::getViewCursor));
     }
 
     /**
      * Create a text cursor for a textContent.
      *
      * @return Optional.empty if mark is null, otherwise cursor.
-     *
      */
     public static Optional<XTextCursor> getTextCursorOfTextContentAnchor(XTextContent mark) {
         if (mark == null) {
diff --git a/src/main/java/org/jabref/model/openoffice/uno/UnoNameAccess.java b/src/main/java/org/jabref/model/openoffice/uno/UnoNameAccess.java
index 243c136f382..1250d56d923 100644
--- a/src/main/java/org/jabref/model/openoffice/uno/UnoNameAccess.java
+++ b/src/main/java/org/jabref/model/openoffice/uno/UnoNameAccess.java
@@ -9,14 +9,15 @@
 
 public class UnoNameAccess {
 
-    private UnoNameAccess() { }
+    private UnoNameAccess() {
+    }
 
     /**
      * @return null if name not found, or if the result does not support the XTextContent interface.
      */
     public static Optional<XTextContent> getTextContentByName(XNameAccess nameAccess, String name)
-        throws
-        WrappedTargetException {
+            throws
+            WrappedTargetException {
         try {
             return UnoCast.cast(XTextContent.class, nameAccess.getByName(name));
         } catch (NoSuchElementException ex) {
diff --git a/src/main/java/org/jabref/model/openoffice/uno/UnoNamed.java b/src/main/java/org/jabref/model/openoffice/uno/UnoNamed.java
index 5f1f50c873d..b9f43e56f80 100644
--- a/src/main/java/org/jabref/model/openoffice/uno/UnoNamed.java
+++ b/src/main/java/org/jabref/model/openoffice/uno/UnoNamed.java
@@ -8,38 +8,27 @@
 
 public class UnoNamed {
 
-    private UnoNamed() { }
+    private UnoNamed() {
+    }
 
     /**
      * Insert a new instance of a service at the provided cursor position.
      *
-     * @param service For example
-     *                "com.sun.star.text.ReferenceMark",
-     *                "com.sun.star.text.Bookmark" or
-     *                "com.sun.star.text.TextSection".
-     *
-     *                Passed to this.asXMultiServiceFactory().createInstance(service)
-     *                The result is expected to support the XNamed and XTextContent interfaces.
-     *
-     * @param name    For the ReferenceMark, Bookmark, TextSection.
-     *                If the name is already in use, LibreOffice may change the name.
-     *
+     * @param service For example "com.sun.star.text.ReferenceMark", "com.sun.star.text.Bookmark" or "com.sun.star.text.TextSection".
+     *                <p>
+     *                Passed to this.asXMultiServiceFactory().createInstance(service) The result is expected to support the XNamed and XTextContent interfaces.
+     * @param name    For the ReferenceMark, Bookmark, TextSection. If the name is already in use, LibreOffice may change the name.
      * @param range   Marks the location or range for the thing to be inserted.
-     *
-     * @param absorb ReferenceMark, Bookmark and TextSection can incorporate a text range.
-     *               If absorb is true, the text in the range becomes part of the thing.
-     *               If absorb is false, the thing is inserted at the end of the range.
-     *
+     * @param absorb  ReferenceMark, Bookmark and TextSection can incorporate a text range. If absorb is true, the text in the range becomes part of the thing. If absorb is false, the thing is inserted at the end of the range.
      * @return The XNamed interface, in case we need to check the actual name.
-     *
      */
     static XNamed insertNamedTextContent(XTextDocument doc,
                                          String service,
                                          String name,
                                          XTextRange range,
                                          boolean absorb)
-        throws
-        CreationException {
+            throws
+            CreationException {
 
         XMultiServiceFactory msf = UnoCast.cast(XMultiServiceFactory.class, doc).get();
 
@@ -51,14 +40,13 @@ static XNamed insertNamedTextContent(XTextDocument doc,
         }
 
         XNamed xNamed = (UnoCast.cast(XNamed.class, xObject)
-                         .orElseThrow(() -> new IllegalArgumentException("Service is not an XNamed")));
+                                .orElseThrow(() -> new IllegalArgumentException("Service is not an XNamed")));
         xNamed.setName(name);
 
         // get XTextContent interface
         XTextContent xTextContent = (UnoCast.cast(XTextContent.class, xObject)
-                                     .orElseThrow(() -> new IllegalArgumentException("Service is not an XTextContent")));
+                                            .orElseThrow(() -> new IllegalArgumentException("Service is not an XTextContent")));
         range.getText().insertTextContent(range, xTextContent, absorb);
         return xNamed;
     }
-
 }
diff --git a/src/main/java/org/jabref/model/openoffice/uno/UnoProperties.java b/src/main/java/org/jabref/model/openoffice/uno/UnoProperties.java
index 3a47818cf8b..80ea0c11c80 100644
--- a/src/main/java/org/jabref/model/openoffice/uno/UnoProperties.java
+++ b/src/main/java/org/jabref/model/openoffice/uno/UnoProperties.java
@@ -15,42 +15,31 @@
 import com.sun.star.lang.WrappedTargetException;
 
 /**
- *  Utilities for properties.
+ * Utilities for properties.
  */
 public class UnoProperties {
 
-    private UnoProperties() { }
-
-    /*
-     * asPropertySet
-     */
+    private UnoProperties() {
+    }
 
     public static Optional<XPropertySet> asPropertySet(XPropertyContainer propertyContainer) {
         return UnoCast.cast(XPropertySet.class, propertyContainer);
     }
 
-    /*
-     * getPropertySetInfo
-     */
-
     public static Optional<XPropertySetInfo> getPropertySetInfo(XPropertySet propertySet) {
         return (Optional.ofNullable(propertySet)
-                .flatMap(e -> Optional.ofNullable(e.getPropertySetInfo())));
+                        .flatMap(e -> Optional.ofNullable(e.getPropertySetInfo())));
     }
 
     public static Optional<XPropertySetInfo> getPropertySetInfo(XPropertyContainer propertyContainer) {
         return Optional.ofNullable(propertyContainer).flatMap(UnoProperties::getPropertySetInfo);
     }
 
-    /*
-     * getPropertyNames
-     */
-
     public static List<String> getPropertyNames(Property[] properties) {
         Objects.requireNonNull(properties);
         return (Arrays.stream(properties)
-                .map(p -> p.Name)
-                .collect(Collectors.toList()));
+                      .map(p -> p.Name)
+                      .collect(Collectors.toList()));
     }
 
     public static List<String> getPropertyNames(XPropertySetInfo propertySetInfo) {
@@ -67,13 +56,9 @@ public static List<String> getPropertyNames(XPropertyContainer propertyContainer
                 .orElse(new ArrayList<>()));
     }
 
-    /*
-     * getPropertyValue
-     */
-
     public static Optional<Object> getValueAsObject(XPropertySet propertySet, String property)
-        throws
-        WrappedTargetException {
+            throws
+            WrappedTargetException {
         Objects.requireNonNull(propertySet);
         Objects.requireNonNull(property);
         try {
@@ -84,8 +69,8 @@ public static Optional<Object> getValueAsObject(XPropertySet propertySet, String
     }
 
     public static Optional<Object> getValueAsObject(XPropertyContainer propertyContainer, String property)
-        throws
-        WrappedTargetException {
+            throws
+            WrappedTargetException {
         Optional<XPropertySet> propertySet = asPropertySet(propertyContainer);
         if (propertySet.isEmpty()) {
             return Optional.empty();
diff --git a/src/main/java/org/jabref/model/openoffice/uno/UnoRedlines.java b/src/main/java/org/jabref/model/openoffice/uno/UnoRedlines.java
index 2c408648d6f..3793ce7a079 100644
--- a/src/main/java/org/jabref/model/openoffice/uno/UnoRedlines.java
+++ b/src/main/java/org/jabref/model/openoffice/uno/UnoRedlines.java
@@ -12,13 +12,13 @@
 import com.sun.star.text.XTextDocument;
 
 /**
- *  Change tracking and Redlines
+ * Change tracking and Redlines
  */
 public class UnoRedlines {
 
     public static boolean getRecordChanges(XTextDocument doc)
-        throws
-        WrappedTargetException {
+            throws
+            WrappedTargetException {
 
         // https://wiki.openoffice.org/wiki/Documentation/DevGuide/Text/Settings
         // "Properties of com.sun.star.text.TextDocument"
diff --git a/src/main/java/org/jabref/model/openoffice/uno/UnoReferenceMark.java b/src/main/java/org/jabref/model/openoffice/uno/UnoReferenceMark.java
index 7a719042d79..062564b8156 100644
--- a/src/main/java/org/jabref/model/openoffice/uno/UnoReferenceMark.java
+++ b/src/main/java/org/jabref/model/openoffice/uno/UnoReferenceMark.java
@@ -17,17 +17,17 @@
 
 public class UnoReferenceMark {
 
-    private UnoReferenceMark() { }
+    private UnoReferenceMark() {
+    }
 
     /**
      * @throws NoDocumentException If cannot get reference marks
-     *
-     * Note: also used by `isDocumentConnectionMissing` to test if we have a working connection.
-     *
+     *                             <p>
+     *                             Note: also used by `isDocumentConnectionMissing` to test if we have a working connection.
      */
     public static XNameAccess getNameAccess(XTextDocument doc)
-        throws
-        NoDocumentException {
+            throws
+            NoDocumentException {
 
         XReferenceMarksSupplier supplier = UnoCast.cast(XReferenceMarksSupplier.class, doc).get();
 
@@ -40,11 +40,11 @@ public static XNameAccess getNameAccess(XTextDocument doc)
 
     /**
      * Names of all reference marks.
-     *
+     * <p>
      * Empty list for nothing.
      */
     public static List<String> getListOfNames(XTextDocument doc)
-        throws NoDocumentException {
+            throws NoDocumentException {
 
         XNameAccess nameAccess = UnoReferenceMark.getNameAccess(doc);
         String[] names = nameAccess.getElementNames();
@@ -56,13 +56,13 @@ public static List<String> getListOfNames(XTextDocument doc)
 
     /**
      * Remove the named reference mark.
-     *
+     * <p>
      * Removes both the text and the mark itself.
      */
     public static void removeIfExists(XTextDocument doc, String name)
-        throws
-        WrappedTargetException,
-        NoDocumentException {
+            throws
+            WrappedTargetException,
+            NoDocumentException {
 
         XNameAccess xReferenceMarks = UnoReferenceMark.getNameAccess(doc);
 
@@ -80,46 +80,41 @@ public static void removeIfExists(XTextDocument doc, String name)
     }
 
     /**
-     *  @return reference mark as XTextContent, Optional.empty if not found.
+     * @return reference mark as XTextContent, Optional.empty if not found.
      */
     public static Optional<XTextContent> getAsTextContent(XTextDocument doc, String name)
-        throws
-        NoDocumentException,
-        WrappedTargetException {
+            throws
+            NoDocumentException,
+            WrappedTargetException {
 
         XNameAccess nameAccess = UnoReferenceMark.getNameAccess(doc);
         return UnoNameAccess.getTextContentByName(nameAccess, name);
     }
 
     /**
-     *  XTextRange for the named reference mark, Optional.empty if not found.
+     * XTextRange for the named reference mark, Optional.empty if not found.
      */
     public static Optional<XTextRange> getAnchor(XTextDocument doc, String name)
-        throws
-        NoDocumentException,
-        WrappedTargetException {
+            throws
+            NoDocumentException,
+            WrappedTargetException {
         return (UnoReferenceMark.getAsTextContent(doc, name)
-                .map(XTextContent::getAnchor));
+                                .map(XTextContent::getAnchor));
     }
 
     /**
      * Insert a new reference mark at the provided cursor position.
+     * <p>
+     * If {@code absorb} is true, the text in the cursor range will become the text with gray background.
+     * <p>
+     * Note: LibreOffice 6.4.6.2 will create multiple reference marks with the same name without error or renaming. Its GUI does not allow this, but we can create them programmatically. In the GUI, clicking on any of those identical names will move the cursor to the same mark.
      *
-     * If {@code absorb} is true, the text in the cursor range will become the text with gray
-     * background.
-     *
-     * Note: LibreOffice 6.4.6.2 will create multiple reference marks with the same name without
-     *       error or renaming.
-     *       Its GUI does not allow this, but we can create them programmatically.
-     *       In the GUI, clicking on any of those identical names will move the cursor to the same
-     *       mark.
-     *
-     * @param name     For the reference mark.
+     * @param name  For the reference mark.
      * @param range Cursor marking the location or range for the reference mark.
      */
     public static XNamed create(XTextDocument doc, String name, XTextRange range, boolean absorb)
-        throws
-        CreationException {
+            throws
+            CreationException {
         return UnoNamed.insertNamedTextContent(doc, "com.sun.star.text.ReferenceMark", name, range, absorb);
     }
 }
diff --git a/src/main/java/org/jabref/model/openoffice/uno/UnoScreenRefresh.java b/src/main/java/org/jabref/model/openoffice/uno/UnoScreenRefresh.java
index e5c27fcbb5c..6de0afe5ad6 100644
--- a/src/main/java/org/jabref/model/openoffice/uno/UnoScreenRefresh.java
+++ b/src/main/java/org/jabref/model/openoffice/uno/UnoScreenRefresh.java
@@ -7,17 +7,17 @@
  */
 public class UnoScreenRefresh {
 
-    private UnoScreenRefresh() { }
+    private UnoScreenRefresh() {
+    }
 
     /**
      * Disable screen refresh.
-     *
+     * <p>
      * Must be paired with unlockControllers()
-     *
+     * <p>
      * https://www.openoffice.org/api/docs/common/ref/com/sun/star/frame/XModel.html
-     *
-     * While there is at least one lock remaining, some
-     * notifications for display updates are not broadcasted.
+     * <p>
+     * While there is at least one lock remaining, some notifications for display updates are not broadcasted.
      */
     public static void lockControllers(XTextDocument doc) {
         doc.lockControllers();
diff --git a/src/main/java/org/jabref/model/openoffice/uno/UnoSelection.java b/src/main/java/org/jabref/model/openoffice/uno/UnoSelection.java
index 43d89ed157b..a6e581cfce1 100644
--- a/src/main/java/org/jabref/model/openoffice/uno/UnoSelection.java
+++ b/src/main/java/org/jabref/model/openoffice/uno/UnoSelection.java
@@ -17,7 +17,8 @@ public class UnoSelection {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(UnoSelection.class);
 
-    private UnoSelection() { }
+    private UnoSelection() {
+    }
 
     private static Optional<XSelectionSupplier> getSelectionSupplier(XTextDocument doc) {
         if (doc == null) {
@@ -39,46 +40,21 @@ private static Optional<XSelectionSupplier> getSelectionSupplier(XTextDocument d
 
     /**
      * @return may be Optional.empty(), or some type supporting XServiceInfo
-     *
-     *
-     * So far it seems the first thing we have to do
-     * with a selection is to decide what do we have.
-     *
+     * So far it seems the first thing we have to do with a selection is to decide what do we have.
+     * <p>
      * One way to do that is accessing its XServiceInfo interface.
-     *
-     * Experiments using printServiceInfo with cursor in various
-     * positions in the document:
-     *
-     * With cursor within the frame, in text:
-     * *** xserviceinfo.getImplementationName: "SwXTextRanges"
-     *      "com.sun.star.text.TextRanges"
-     *
-     * With cursor somewhere else in text:
-     * *** xserviceinfo.getImplementationName: "SwXTextRanges"
-     *      "com.sun.star.text.TextRanges"
-     *
-     * With cursor in comment (also known as "annotation"):
-     * *** XSelectionSupplier is OK
-     * *** Object initialSelection is null
-     * *** xserviceinfo is null
-     *
-     * With frame selected:
-     * *** xserviceinfo.getImplementationName: "SwXTextFrame"
-     *     "com.sun.star.text.BaseFrame"
-     *     "com.sun.star.text.TextContent"
-     *     "com.sun.star.document.LinkTarget"
-     *     "com.sun.star.text.TextFrame"
-     *     "com.sun.star.text.Text"
-     *
-     * With cursor selecting an inserted image:
-     * *** XSelectionSupplier is OK
-     * *** Object initialSelection is OK
-     * *** xserviceinfo is OK
-     * *** xserviceinfo.getImplementationName: "SwXTextGraphicObject"
-     *      "com.sun.star.text.BaseFrame"
-     *      "com.sun.star.text.TextContent"
-     *      "com.sun.star.document.LinkTarget"
-     *      "com.sun.star.text.TextGraphicObject"
+     * <p>
+     * Experiments using printServiceInfo with cursor in various positions in the document:
+     * <p>
+     * With cursor within the frame, in text: *** xserviceinfo.getImplementationName: "SwXTextRanges" "com.sun.star.text.TextRanges"
+     * <p>
+     * With cursor somewhere else in text: *** xserviceinfo.getImplementationName: "SwXTextRanges" "com.sun.star.text.TextRanges"
+     * <p>
+     * With cursor in comment (also known as "annotation"): *** XSelectionSupplier is OK *** Object initialSelection is null *** xserviceinfo is null
+     * <p>
+     * With frame selected: *** xserviceinfo.getImplementationName: "SwXTextFrame" "com.sun.star.text.BaseFrame" "com.sun.star.text.TextContent" "com.sun.star.document.LinkTarget" "com.sun.star.text.TextFrame" "com.sun.star.text.Text"
+     * <p>
+     * With cursor selecting an inserted image: *** XSelectionSupplier is OK *** Object initialSelection is OK *** xserviceinfo is OK *** xserviceinfo.getImplementationName: "SwXTextGraphicObject" "com.sun.star.text.BaseFrame" "com.sun.star.text.TextContent" "com.sun.star.document.LinkTarget" "com.sun.star.text.TextGraphicObject"
      */
     public static Optional<XServiceInfo> getSelectionAsXServiceInfo(XTextDocument doc) {
         Objects.requireNonNull(doc);
@@ -100,13 +76,9 @@ public static Optional<XServiceInfo> getSelectionAsXServiceInfo(XTextDocument do
     }
 
     /**
-     * Select the object represented by {@code newSelection} if it is
-     * known and selectable in this {@code XSelectionSupplier} object.
-     *
-     * Presumably result from {@code XSelectionSupplier.getSelection()} is
-     * usually OK. It also accepted
-     * {@code XTextRange newSelection = doc.getText().getStart();}
-     *
+     * Select the object represented by {@code newSelection} if it is known and selectable in this {@code XSelectionSupplier} object.
+     * <p>
+     * Presumably result from {@code XSelectionSupplier.getSelection()} is usually OK. It also accepted {@code XTextRange newSelection = doc.getText().getStart();}
      */
     public static void select(XTextDocument doc, Object newSelection) {
         Objects.requireNonNull(doc);
diff --git a/src/main/java/org/jabref/model/openoffice/uno/UnoStyle.java b/src/main/java/org/jabref/model/openoffice/uno/UnoStyle.java
index cd4065ba8b3..aa659919fab 100644
--- a/src/main/java/org/jabref/model/openoffice/uno/UnoStyle.java
+++ b/src/main/java/org/jabref/model/openoffice/uno/UnoStyle.java
@@ -18,11 +18,12 @@ public class UnoStyle {
     public static final String CHARACTER_STYLES = "CharacterStyles";
     public static final String PARAGRAPH_STYLES = "ParagraphStyles";
 
-    private UnoStyle() { }
+    private UnoStyle() {
+    }
 
     private static Optional<XStyle> getStyleFromFamily(XTextDocument doc, String familyName, String styleName)
-        throws
-        WrappedTargetException {
+            throws
+            WrappedTargetException {
 
         XStyleFamiliesSupplier fss = UnoCast.cast(XStyleFamiliesSupplier.class, doc).get();
         XNameAccess families = UnoCast.cast(XNameAccess.class, fss.getStyleFamilies()).get();
@@ -43,34 +44,34 @@ private static Optional<XStyle> getStyleFromFamily(XTextDocument doc, String fam
     }
 
     public static Optional<XStyle> getParagraphStyle(XTextDocument doc, String styleName)
-        throws
-        WrappedTargetException {
+            throws
+            WrappedTargetException {
         return getStyleFromFamily(doc, PARAGRAPH_STYLES, styleName);
     }
 
     public static Optional<XStyle> getCharacterStyle(XTextDocument doc, String styleName)
-        throws
-        WrappedTargetException {
+            throws
+            WrappedTargetException {
         return getStyleFromFamily(doc, CHARACTER_STYLES, styleName);
     }
 
     public static Optional<String> getInternalNameOfStyle(XTextDocument doc, String familyName,
                                                           String name)
-        throws
-        WrappedTargetException {
+            throws
+            WrappedTargetException {
         return (getStyleFromFamily(doc, familyName, name)
                 .map(XStyle::getName));
     }
 
     public static Optional<String> getInternalNameOfParagraphStyle(XTextDocument doc, String name)
-        throws
-        WrappedTargetException {
+            throws
+            WrappedTargetException {
         return getInternalNameOfStyle(doc, PARAGRAPH_STYLES, name);
     }
 
     public static Optional<String> getInternalNameOfCharacterStyle(XTextDocument doc, String name)
-        throws
-        WrappedTargetException {
+            throws
+            WrappedTargetException {
         return getInternalNameOfStyle(doc, CHARACTER_STYLES, name);
     }
 }
diff --git a/src/main/java/org/jabref/model/openoffice/uno/UnoTextDocument.java b/src/main/java/org/jabref/model/openoffice/uno/UnoTextDocument.java
index c7e94e6bb4c..6abe3959f29 100644
--- a/src/main/java/org/jabref/model/openoffice/uno/UnoTextDocument.java
+++ b/src/main/java/org/jabref/model/openoffice/uno/UnoTextDocument.java
@@ -7,6 +7,7 @@
 import com.sun.star.document.XDocumentPropertiesSupplier;
 import com.sun.star.frame.XController;
 import com.sun.star.frame.XFrame;
+import com.sun.star.lang.DisposedException;
 import com.sun.star.lang.WrappedTargetException;
 import com.sun.star.text.XTextDocument;
 import org.slf4j.Logger;
@@ -16,25 +17,20 @@ public class UnoTextDocument {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(UnoTextDocument.class);
 
-    private UnoTextDocument() { }
+    private UnoTextDocument() {
+    }
 
     /**
-     *  @return True if we cannot reach the current document.
+     * @return True if we cannot reach the current document.
      */
     public static boolean isDocumentConnectionMissing(XTextDocument doc) {
-
-        boolean missing = false;
-        if (doc == null) {
-            missing = true;
-        }
+        boolean missing = doc == null;
 
         // Attempt to check document is really available
         if (!missing) {
             try {
                 UnoReferenceMark.getNameAccess(doc);
-            } catch (NoDocumentException ex) {
-                missing = true;
-            } catch (com.sun.star.lang.DisposedException ex) {
+            } catch (NoDocumentException | DisposedException ex) {
                 missing = true;
             }
         }
@@ -54,11 +50,10 @@ public static Optional<XController> getCurrentController(XTextDocument doc) {
     }
 
     /**
-     *  @param doc The XTextDocument we want the frame title for. Null allowed.
-     *  @return The title or Optional.empty()
+     * @param doc The XTextDocument we want the frame title for. Null allowed.
+     * @return The title or Optional.empty()
      */
     public static Optional<String> getFrameTitle(XTextDocument doc) {
-
         Optional<XFrame> frame = getCurrentController(doc).map(XController::getFrame);
         if (frame.isEmpty()) {
             return Optional.empty();
@@ -84,8 +79,8 @@ public static Optional<String> getFrameTitle(XTextDocument doc) {
 
     static Optional<XDocumentProperties> getDocumentProperties(XTextDocument doc) {
         return (Optional.ofNullable(doc)
-                .flatMap(e -> UnoCast.cast(XDocumentPropertiesSupplier.class, e))
-                .map(XDocumentPropertiesSupplier::getDocumentProperties));
+                        .flatMap(e -> UnoCast.cast(XDocumentPropertiesSupplier.class, e))
+                        .map(XDocumentPropertiesSupplier::getDocumentProperties));
     }
 }
 
diff --git a/src/main/java/org/jabref/model/openoffice/uno/UnoTextRange.java b/src/main/java/org/jabref/model/openoffice/uno/UnoTextRange.java
index 56cb1498e2a..520878833e5 100644
--- a/src/main/java/org/jabref/model/openoffice/uno/UnoTextRange.java
+++ b/src/main/java/org/jabref/model/openoffice/uno/UnoTextRange.java
@@ -3,33 +3,30 @@
 import java.util.Optional;
 
 import com.sun.star.text.XFootnote;
+import com.sun.star.text.XTextContent;
 import com.sun.star.text.XTextRange;
 import com.sun.star.text.XTextRangeCompare;
 
 public class UnoTextRange {
 
-    private UnoTextRange() { }
+    private UnoTextRange() {
+    }
 
     /**
-     *  If original is in a footnote, return a range containing
-     *  the corresponding footnote marker.
-     *
-     *  Returns Optional.empty if not in a footnote.
+     * If original is in a footnote, return a range containing the corresponding footnote marker.
+     * <p>
+     * Returns Optional.empty if not in a footnote.
      */
     public static Optional<XTextRange> getFootnoteMarkRange(XTextRange original) {
         Optional<XFootnote> footer = UnoCast.cast(XFootnote.class, original.getText());
-        if (footer.isPresent()) {
-            // If we are inside a footnote,
-            // find the linking footnote marker:
-            // The footnote's anchor gives the correct position in the text:
-            return Optional.ofNullable(footer.get().getAnchor());
-        }
-        return Optional.empty();
+        // If we are inside a footnote,
+        // find the linking footnote marker:
+        // The footnote's anchor gives the correct position in the text:
+        return footer.map(XTextContent::getAnchor);
     }
 
     /**
-     * Test if two XTextRange values are comparable (i.e. they share
-     * the same getText()).
+     * Test if two XTextRange values are comparable (i.e. they share the same getText()).
      */
     public static boolean comparables(XTextRange a, XTextRange b) {
         return a.getText() == b.getText();
@@ -37,7 +34,6 @@ public static boolean comparables(XTextRange a, XTextRange b) {
 
     /**
      * @return follows java conventions
-     *
      * 1 if  (a &gt; b); (-1) if (a &lt; b)
      */
     public static int compareStartsUnsafe(XTextRangeCompare compare, XTextRange a, XTextRange b) {
@@ -54,7 +50,6 @@ public static int compareStarts(XTextRange a, XTextRange b) {
 
     /**
      * @return follows java conventions
-     *
      * 1 if  (a &gt; b); (-1) if (a &lt; b)
      */
     public static int compareEnds(XTextRange a, XTextRange b) {
diff --git a/src/main/java/org/jabref/model/openoffice/uno/UnoTextSection.java b/src/main/java/org/jabref/model/openoffice/uno/UnoTextSection.java
index 3b9797f553e..56293eee947 100644
--- a/src/main/java/org/jabref/model/openoffice/uno/UnoTextSection.java
+++ b/src/main/java/org/jabref/model/openoffice/uno/UnoTextSection.java
@@ -17,11 +17,11 @@
 public class UnoTextSection {
 
     /**
-     *  @return An XNameAccess to find sections by name.
+     * @return An XNameAccess to find sections by name.
      */
     public static XNameAccess getNameAccess(XTextDocument doc)
-        throws
-        NoDocumentException {
+            throws
+            NoDocumentException {
 
         XTextSectionsSupplier supplier = UnoCast.cast(XTextSectionsSupplier.class, doc).get();
         try {
@@ -32,12 +32,12 @@ public static XNameAccess getNameAccess(XTextDocument doc)
     }
 
     /**
-     *  Get an XTextSection by name.
+     * Get an XTextSection by name.
      */
     public static Optional<XTextSection> getByName(XTextDocument doc, String name)
-        throws
-        WrappedTargetException,
-        NoDocumentException {
+            throws
+            WrappedTargetException,
+            NoDocumentException {
         XNameAccess nameAccess = getNameAccess(doc);
         try {
             return Optional.ofNullable((XTextSection) ((Any) nameAccess.getByName(name)).getObject());
@@ -53,26 +53,25 @@ public static Optional<XTextSection> getByName(XTextDocument doc, String name)
      * @return The XTextRange for the section, or Optional.empty().
      */
     public static Optional<XTextRange> getAnchor(XTextDocument doc, String name)
-        throws
-        WrappedTargetException,
-        NoDocumentException {
+            throws
+            WrappedTargetException,
+            NoDocumentException {
 
         XNameAccess nameAccess = getNameAccess(doc);
         return (UnoNameAccess.getTextContentByName(nameAccess, name).map(XTextContent::getAnchor));
     }
 
     /**
-     *  Create a text section with the provided name and insert it at the provided cursor.
+     * Create a text section with the provided name and insert it at the provided cursor.
      *
-     *  @param name  The desired name for the section.
-     *  @param range The location to insert at.
-     *
-     *  If an XTextSection by that name already exists, LibreOffice (6.4.6.2) creates a section with
-     *  a name different from what we requested, in "Section {number}" format.
+     * @param name  The desired name for the section.
+     * @param range The location to insert at.
+     *              <p>
+     *              If an XTextSection by that name already exists, LibreOffice (6.4.6.2) creates a section with a name different from what we requested, in "Section {number}" format.
      */
     public static XNamed create(XTextDocument doc, String name, XTextRange range, boolean absorb)
-        throws
-        CreationException {
+            throws
+            CreationException {
 
         return UnoNamed.insertNamedTextContent(doc, "com.sun.star.text.TextSection", name, range, absorb);
     }
diff --git a/src/main/java/org/jabref/model/openoffice/uno/UnoUndo.java b/src/main/java/org/jabref/model/openoffice/uno/UnoUndo.java
index 4f08bb0ed5c..bd1f85e1690 100644
--- a/src/main/java/org/jabref/model/openoffice/uno/UnoUndo.java
+++ b/src/main/java/org/jabref/model/openoffice/uno/UnoUndo.java
@@ -12,23 +12,20 @@
  */
 public class UnoUndo {
 
-    private UnoUndo() { }
+    private UnoUndo() {
+    }
 
     public static Optional<XUndoManager> getXUndoManager(XTextDocument doc) {
         // https://www.openoffice.org/api/docs/common/ref/com/sun/star/document/XUndoManager.html
         return (UnoCast.cast(XUndoManagerSupplier.class, doc)
-                .map(XUndoManagerSupplier::getUndoManager));
+                       .map(XUndoManagerSupplier::getUndoManager));
     }
 
     /**
-     * Each call to enterUndoContext must be paired by a call to leaveUndoContext, otherwise, the
-     * document's undo stack is left in an inconsistent state.
+     * Each call to enterUndoContext must be paired by a call to leaveUndoContext, otherwise, the document's undo stack is left in an inconsistent state.
      */
     public static void enterUndoContext(XTextDocument doc, String title) {
-        Optional<XUndoManager> undoManager = getXUndoManager(doc);
-        if (undoManager.isPresent()) {
-            undoManager.get().enterUndoContext(title);
-        }
+        getXUndoManager(doc).ifPresent(undoManager -> undoManager.enterUndoContext(title));
     }
 
     public static void leaveUndoContext(XTextDocument doc) {
diff --git a/src/main/java/org/jabref/model/openoffice/uno/UnoUserDefinedProperty.java b/src/main/java/org/jabref/model/openoffice/uno/UnoUserDefinedProperty.java
index f5ec43f3211..85158db2d1c 100644
--- a/src/main/java/org/jabref/model/openoffice/uno/UnoUserDefinedProperty.java
+++ b/src/main/java/org/jabref/model/openoffice/uno/UnoUserDefinedProperty.java
@@ -24,14 +24,15 @@
 
 /**
  * Document level user-defined properties.
- *
- *  LibreOffice GUI: [File]/[Properties]/[Custom Properties]
+ * <p>
+ * LibreOffice GUI: [File]/[Properties]/[Custom Properties]
  */
 public class UnoUserDefinedProperty {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(UnoUserDefinedProperty.class);
 
-    private UnoUserDefinedProperty() { }
+    private UnoUserDefinedProperty() {
+    }
 
     public static Optional<XPropertyContainer> getPropertyContainer(XTextDocument doc) {
         return UnoTextDocument.getDocumentProperties(doc).map(XDocumentProperties::getUserDefinedProperties);
@@ -39,24 +40,20 @@ public static Optional<XPropertyContainer> getPropertyContainer(XTextDocument do
 
     public static List<String> getListOfNames(XTextDocument doc) {
         return (UnoUserDefinedProperty.getPropertyContainer(doc)
-                .map(UnoProperties::getPropertyNames)
-                .orElse(new ArrayList<>()));
+                                      .map(UnoProperties::getPropertyNames)
+                                      .orElse(new ArrayList<>()));
     }
 
     /**
      * @param property Name of a custom document property in the current document.
-     *
      * @return The value of the property or Optional.empty()
-     *
-     * These properties are used to store extra data about individual citation.
-     * In particular, the `pageInfo` part.
-     *
+     * These properties are used to store extra data about individual citation. In particular, the `pageInfo` part.
      */
     public static Optional<String> getStringValue(XTextDocument doc, String property)
-        throws
-        WrappedTargetException {
+            throws
+            WrappedTargetException {
         Optional<XPropertySet> propertySet = (UnoUserDefinedProperty.getPropertyContainer(doc)
-                                              .flatMap(UnoProperties::asPropertySet));
+                                                                    .flatMap(UnoProperties::asPropertySet));
         if (propertySet.isEmpty()) {
             throw new java.lang.IllegalArgumentException("getting UserDefinedProperties as XPropertySet failed");
         }
@@ -69,16 +66,14 @@ public static Optional<String> getStringValue(XTextDocument doc, String property
     }
 
     /**
-     * @param property Name of a custom document property in the current document.
-     *                 Created if does not exist yet.
-     *
-     * @param value The value to be stored.
+     * @param property Name of a custom document property in the current document. Created if does not exist yet.
+     * @param value    The value to be stored.
      */
     public static void setStringProperty(XTextDocument doc, String property, String value)
-        throws
-        IllegalTypeException,
-        PropertyVetoException,
-        WrappedTargetException {
+            throws
+            IllegalTypeException,
+            PropertyVetoException,
+            WrappedTargetException {
 
         Objects.requireNonNull(property);
         Objects.requireNonNull(value);
@@ -114,12 +109,12 @@ public static void setStringProperty(XTextDocument doc, String property, String
 
     /**
      * @param property Name of a custom document property in the current document.
-     *
-     *  Logs warning if does not exist.
+     *                 <p>
+     *                 Logs warning if does not exist.
      */
     public static void remove(XTextDocument doc, String property)
-        throws
-        NotRemoveableException {
+            throws
+            NotRemoveableException {
 
         Objects.requireNonNull(property);
 
@@ -133,18 +128,18 @@ public static void remove(XTextDocument doc, String property)
             container.get().removeProperty(property);
         } catch (UnknownPropertyException ex) {
             LOGGER.warn(String.format("UnoUserDefinedProperty.remove(%s) This property was not there to remove",
-                                      property));
+                    property));
         }
     }
 
     /**
      * @param property Name of a custom document property in the current document.
-     *
-     * Keep silent if property did not exist.
+     *                 <p>
+     *                 Keep silent if property did not exist.
      */
     public static void removeIfExists(XTextDocument doc, String property)
-        throws
-        NotRemoveableException {
+            throws
+            NotRemoveableException {
 
         Objects.requireNonNull(property);
 
diff --git a/src/main/java/org/jabref/model/openoffice/util/OOListUtil.java b/src/main/java/org/jabref/model/openoffice/util/OOListUtil.java
index 59295c798fe..c61b81655a7 100644
--- a/src/main/java/org/jabref/model/openoffice/util/OOListUtil.java
+++ b/src/main/java/org/jabref/model/openoffice/util/OOListUtil.java
@@ -1,6 +1,5 @@
 package org.jabref.model.openoffice.util;
 
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 import java.util.function.Function;
@@ -10,22 +9,22 @@
 public class OOListUtil {
 
     public static <T, U> List<U> map(List<T> list, Function<T, U> fun) {
-        return list.stream().map(e -> fun.apply(e)).collect(Collectors.toList());
+        return list.stream().map(fun).collect(Collectors.toList());
     }
 
-    /** Integers 0..(len-1) */
+    /**
+     * Integers 0..(len-1)
+     */
     public static List<Integer> makeIndices(int len) {
         return Stream.iterate(0, i -> i + 1).limit(len).collect(Collectors.toList());
     }
 
-    /** Return indices so that list.get(indices.get(i)) is sorted. */
+    /**
+     * Return indices so that list.get(indices.get(i)) is sorted.
+     */
     public static <T extends U, U> List<Integer> order(List<T> list, Comparator<U> comparator) {
         List<Integer> indices = makeIndices(list.size());
-        Collections.sort(indices, new Comparator<Integer>() {
-                @Override public int compare(final Integer a, final Integer b) {
-                    return comparator.compare((U) list.get(a), (U) list.get(b));
-                }
-            });
+        indices.sort((a, b) -> comparator.compare(list.get(a), list.get(b)));
         return indices;
     }
 }
diff --git a/src/main/java/org/jabref/model/openoffice/util/OOPair.java b/src/main/java/org/jabref/model/openoffice/util/OOPair.java
index 9d1596d19ef..006c33e942e 100644
--- a/src/main/java/org/jabref/model/openoffice/util/OOPair.java
+++ b/src/main/java/org/jabref/model/openoffice/util/OOPair.java
@@ -3,6 +3,7 @@
 public class OOPair<A, B> {
     public final A a;
     public final B b;
+
     public OOPair(A a, B b) {
         this.a = a;
         this.b = b;
diff --git a/src/main/java/org/jabref/model/openoffice/util/OOResult.java b/src/main/java/org/jabref/model/openoffice/util/OOResult.java
index c90bc68ad13..afbdeaf617e 100644
--- a/src/main/java/org/jabref/model/openoffice/util/OOResult.java
+++ b/src/main/java/org/jabref/model/openoffice/util/OOResult.java
@@ -91,12 +91,16 @@ public <F> OOResult<R, F> mapError(Function<E, F> fun) {
         }
     }
 
-    /** Throw away the error part. */
+    /**
+     * Throw away the error part.
+     */
     public Optional<R> getOptional() {
         return result;
     }
 
-    /** Throw away the result part. */
+    /**
+     * Throw away the result part.
+     */
     public OOVoidResult<E> asVoidResult() {
         if (isError()) {
             return OOVoidResult.error(getError());
@@ -104,6 +108,5 @@ public OOVoidResult<E> asVoidResult() {
             return OOVoidResult.ok();
         }
     }
-
 }
 
diff --git a/src/main/java/org/jabref/model/openoffice/util/OOTuple3.java b/src/main/java/org/jabref/model/openoffice/util/OOTuple3.java
index 8742e06764f..cff3079efa1 100644
--- a/src/main/java/org/jabref/model/openoffice/util/OOTuple3.java
+++ b/src/main/java/org/jabref/model/openoffice/util/OOTuple3.java
@@ -1,13 +1,11 @@
 package org.jabref.model.openoffice.util;
 
 /**
- * This class allows three objects to be packed together, and later accessed as fields `a`, `b` and
- * `c`.
- *
+ * This class allows three objects to be packed together, and later accessed as fields `a`, `b` and `c`.
+ * <p>
  * Can be used to avoid creating a new class for just this purpose.
- *
+ * <p>
  * Can be useful if you do not have `Trifunction` at hand but need to pass three objects at a time.
- *
  */
 public class OOTuple3<A, B, C> {
 
diff --git a/src/main/java/org/jabref/model/pdf/search/SearchFieldConstants.java b/src/main/java/org/jabref/model/pdf/search/SearchFieldConstants.java
index 5f114d50faa..a42baead1b6 100644
--- a/src/main/java/org/jabref/model/pdf/search/SearchFieldConstants.java
+++ b/src/main/java/org/jabref/model/pdf/search/SearchFieldConstants.java
@@ -10,5 +10,5 @@ public class SearchFieldConstants {
 
     public static final String[] PDF_FIELDS = new String[]{PATH, CONTENT, PAGE_NUMBER, MODIFIED, ANNOTATIONS};
 
-    public static final String VERSION = "0.5a";
+    public static final String VERSION = "lucene92";
 }
diff --git a/src/main/java/org/jabref/model/push/PushToApplicationConstants.java b/src/main/java/org/jabref/model/push/PushToApplicationConstants.java
index 434426d4e33..a6eac06dd30 100644
--- a/src/main/java/org/jabref/model/push/PushToApplicationConstants.java
+++ b/src/main/java/org/jabref/model/push/PushToApplicationConstants.java
@@ -11,5 +11,4 @@ public class PushToApplicationConstants {
 
     private PushToApplicationConstants() {
     }
-
 }
diff --git a/src/main/java/org/jabref/model/schema/DublinCoreSchemaCustom.java b/src/main/java/org/jabref/model/schema/DublinCoreSchemaCustom.java
new file mode 100644
index 00000000000..e4d4cfe3215
--- /dev/null
+++ b/src/main/java/org/jabref/model/schema/DublinCoreSchemaCustom.java
@@ -0,0 +1,66 @@
+package org.jabref.model.schema;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+import org.apache.commons.lang3.reflect.FieldUtils;
+import org.apache.xmpbox.XMPMetadata;
+import org.apache.xmpbox.schema.DublinCoreSchema;
+import org.apache.xmpbox.type.AbstractField;
+import org.apache.xmpbox.type.ArrayProperty;
+import org.apache.xmpbox.type.DateType;
+import org.apache.xmpbox.type.StructuredType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ *  A DublinCoreSchema extension Class.
+ *  In case anyone intends to alter standard behaviour.
+ */
+@StructuredType(preferedPrefix = "dc", namespace = "http://purl.org/dc/elements/1.1/")
+public class DublinCoreSchemaCustom extends DublinCoreSchema {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(DublinCoreSchemaCustom.class);
+
+    public DublinCoreSchemaCustom(XMPMetadata metadata) {
+        super(metadata);
+    }
+
+    public static DublinCoreSchema copyDublinCoreSchema(DublinCoreSchema dcSchema) {
+        if (Objects.isNull(dcSchema)) {
+            return null;
+        }
+
+        try {
+            DublinCoreSchemaCustom dublinCoreSchemaCustom = new DublinCoreSchemaCustom(dcSchema.getMetadata());
+            FieldUtils.writeField(dublinCoreSchemaCustom, "container", dcSchema.getContainer(), true);
+            FieldUtils.writeField(dublinCoreSchemaCustom, "attributes",
+                    FieldUtils.readField(dcSchema, "attributes", true), true);
+            return dublinCoreSchemaCustom;
+        } catch (Exception e) {
+            LOGGER.error("Error making custom DC Schema. Using the default", e);
+            return dcSchema;
+        }
+    }
+
+    /**
+     *  Overloaded XMP Schema method
+     *  Behaviour is same except when seqName is "Date". Will return raw value instead
+     */
+    @Override
+    public List<String> getUnqualifiedSequenceValueList(String seqName) {
+        AbstractField abstractProperty = getAbstractProperty(seqName);
+        if (abstractProperty instanceof ArrayProperty) {
+            if ("date".equals(seqName)) {
+                return ((ArrayProperty) abstractProperty).getContainer()
+                        .getAllProperties()
+                        .stream()
+                        .map(field -> (String) ((DateType) field).getRawValue())
+                        .collect(Collectors.toList());
+            }
+            return ((ArrayProperty) abstractProperty).getElementsAsString();
+        }
+        return null;
+    }
+}
diff --git a/src/main/java/org/jabref/model/search/rules/ContainBasedSearchRule.java b/src/main/java/org/jabref/model/search/rules/ContainBasedSearchRule.java
deleted file mode 100644
index cf7c7568368..00000000000
--- a/src/main/java/org/jabref/model/search/rules/ContainBasedSearchRule.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package org.jabref.model.search.rules;
-
-import java.io.IOException;
-import java.util.EnumSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
-import java.util.Vector;
-import java.util.stream.Collectors;
-
-import org.jabref.architecture.AllowedToUseLogic;
-import org.jabref.gui.Globals;
-import org.jabref.gui.LibraryTab;
-import org.jabref.logic.pdf.search.retrieval.PdfSearcher;
-import org.jabref.model.database.BibDatabaseContext;
-import org.jabref.model.entry.BibEntry;
-import org.jabref.model.entry.field.Field;
-import org.jabref.model.pdf.search.PdfSearchResults;
-import org.jabref.model.pdf.search.SearchResult;
-import org.jabref.model.search.rules.SearchRules.SearchFlags;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Search rule for contain-based search.
- */
-@AllowedToUseLogic("Because access to the lucene index is needed")
-public class ContainBasedSearchRule implements SearchRule {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(LibraryTab.class);
-
-    private final EnumSet<SearchFlags> searchFlags;
-
-    private String lastQuery;
-    private List<SearchResult> lastSearchResults;
-
-    private final BibDatabaseContext databaseContext;
-
-    public ContainBasedSearchRule(EnumSet<SearchFlags> searchFlags) {
-        this.searchFlags = searchFlags;
-        this.lastQuery = "";
-        lastSearchResults = new Vector<>();
-
-        databaseContext = Globals.stateManager.getActiveDatabase().orElse(null);
-    }
-
-    @Override
-    public boolean validateSearchStrings(String query) {
-        return true;
-    }
-
-    @Override
-    public boolean applyRule(String query, BibEntry bibEntry) {
-
-        String searchString = query;
-        if (!searchFlags.contains(SearchRules.SearchFlags.CASE_SENSITIVE)) {
-            searchString = searchString.toLowerCase(Locale.ROOT);
-        }
-
-        List<String> unmatchedWords = new SentenceAnalyzer(searchString).getWords();
-
-        for (Field fieldKey : bibEntry.getFields()) {
-            String formattedFieldContent = bibEntry.getLatexFreeField(fieldKey).get();
-            if (!searchFlags.contains(SearchRules.SearchFlags.CASE_SENSITIVE)) {
-                formattedFieldContent = formattedFieldContent.toLowerCase(Locale.ROOT);
-            }
-
-            Iterator<String> unmatchedWordsIterator = unmatchedWords.iterator();
-            while (unmatchedWordsIterator.hasNext()) {
-                String word = unmatchedWordsIterator.next();
-                if (formattedFieldContent.contains(word)) {
-                    unmatchedWordsIterator.remove();
-                }
-            }
-
-            if (unmatchedWords.isEmpty()) {
-                return true;
-            }
-        }
-
-        return getFulltextResults(query, bibEntry).numSearchResults() > 0; // Didn't match all words.
-    }
-
-    @Override
-    public PdfSearchResults getFulltextResults(String query, BibEntry bibEntry) {
-
-        if (!searchFlags.contains(SearchRules.SearchFlags.FULLTEXT) || databaseContext == null) {
-            return new PdfSearchResults(List.of());
-        }
-
-        if (!query.equals(this.lastQuery)) {
-            this.lastQuery = query;
-            lastSearchResults = List.of();
-            try {
-                PdfSearcher searcher = PdfSearcher.of(databaseContext);
-                PdfSearchResults results = searcher.search(query, 5);
-                lastSearchResults = results.getSortedByScore();
-            } catch (IOException e) {
-                LOGGER.error("Could not retrieve search results!", e);
-            }
-        }
-
-        return new PdfSearchResults(lastSearchResults.stream().filter(searchResult -> searchResult.isResultFor(bibEntry)).collect(Collectors.toList()));
-    }
-
-    public EnumSet<SearchFlags> getSearchFlags() {
-        return searchFlags;
-    }
-}
diff --git a/src/main/java/org/jabref/model/search/rules/ContainsBasedSearchRule.java b/src/main/java/org/jabref/model/search/rules/ContainsBasedSearchRule.java
new file mode 100644
index 00000000000..7162061641a
--- /dev/null
+++ b/src/main/java/org/jabref/model/search/rules/ContainsBasedSearchRule.java
@@ -0,0 +1,59 @@
+package org.jabref.model.search.rules;
+
+import java.util.EnumSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+
+import org.jabref.architecture.AllowedToUseLogic;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.field.Field;
+import org.jabref.model.search.rules.SearchRules.SearchFlags;
+import org.jabref.model.strings.StringUtil;
+
+/**
+ * Search rule for a search based on String.contains()
+ */
+@AllowedToUseLogic("Because access to the lucene index is needed")
+public class ContainsBasedSearchRule extends FullTextSearchRule {
+
+    public ContainsBasedSearchRule(EnumSet<SearchFlags> searchFlags) {
+        super(searchFlags);
+    }
+
+    @Override
+    public boolean validateSearchStrings(String query) {
+        return true;
+    }
+
+    @Override
+    public boolean applyRule(String query, BibEntry bibEntry) {
+        String searchString = query;
+        if (!searchFlags.contains(SearchRules.SearchFlags.CASE_SENSITIVE)) {
+            searchString = searchString.toLowerCase(Locale.ROOT);
+        }
+
+        List<String> unmatchedWords = new SentenceAnalyzer(searchString).getWords();
+
+        for (Field fieldKey : bibEntry.getFields()) {
+            String formattedFieldContent = StringUtil.stripAccents(bibEntry.getLatexFreeField(fieldKey).get());
+            if (!searchFlags.contains(SearchRules.SearchFlags.CASE_SENSITIVE)) {
+                formattedFieldContent = formattedFieldContent.toLowerCase(Locale.ROOT);
+            }
+
+            Iterator<String> unmatchedWordsIterator = unmatchedWords.iterator();
+            while (unmatchedWordsIterator.hasNext()) {
+                String word = StringUtil.stripAccents(unmatchedWordsIterator.next());
+                if (formattedFieldContent.contains(word)) {
+                    unmatchedWordsIterator.remove();
+                }
+            }
+
+            if (unmatchedWords.isEmpty()) {
+                return true;
+            }
+        }
+
+        return getFulltextResults(query, bibEntry).numSearchResults() > 0; // Didn't match all words.
+    }
+}
diff --git a/src/main/java/org/jabref/model/search/rules/FullTextSearchRule.java b/src/main/java/org/jabref/model/search/rules/FullTextSearchRule.java
new file mode 100644
index 00000000000..27cfbf65b8b
--- /dev/null
+++ b/src/main/java/org/jabref/model/search/rules/FullTextSearchRule.java
@@ -0,0 +1,71 @@
+package org.jabref.model.search.rules;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.jabref.architecture.AllowedToUseLogic;
+import org.jabref.gui.Globals;
+import org.jabref.logic.pdf.search.retrieval.PdfSearcher;
+import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.pdf.search.PdfSearchResults;
+import org.jabref.model.pdf.search.SearchResult;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * All classes providing full text search results inherit from this class.
+ * <p>
+ * Some kind of caching of the full text search results is implemented.
+ */
+@AllowedToUseLogic("Because access to the lucene index is needed")
+public abstract class FullTextSearchRule implements SearchRule {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(FullTextSearchRule.class);
+
+    protected final EnumSet<SearchRules.SearchFlags> searchFlags;
+
+    protected String lastQuery;
+    protected List<SearchResult> lastSearchResults;
+
+    private final BibDatabaseContext databaseContext;
+
+    public FullTextSearchRule(EnumSet<SearchRules.SearchFlags> searchFlags) {
+        this.searchFlags = searchFlags;
+        this.lastQuery = "";
+        lastSearchResults = Collections.emptyList();
+
+        databaseContext = Globals.stateManager.getActiveDatabase().orElse(null);
+    }
+
+    public EnumSet<SearchRules.SearchFlags> getSearchFlags() {
+        return searchFlags;
+    }
+
+    @Override
+    public PdfSearchResults getFulltextResults(String query, BibEntry bibEntry) {
+        if (!searchFlags.contains(SearchRules.SearchFlags.FULLTEXT) || databaseContext == null) {
+            return new PdfSearchResults();
+        }
+
+        if (!query.equals(this.lastQuery)) {
+            this.lastQuery = query;
+            lastSearchResults = Collections.emptyList();
+            try {
+                PdfSearcher searcher = PdfSearcher.of(databaseContext);
+                PdfSearchResults results = searcher.search(query, 5);
+                lastSearchResults = results.getSortedByScore();
+            } catch (IOException e) {
+                LOGGER.error("Could not retrieve search results!", e);
+            }
+        }
+
+        return new PdfSearchResults(lastSearchResults.stream()
+                                                     .filter(searchResult -> searchResult.isResultFor(bibEntry))
+                                                     .collect(Collectors.toList()));
+    }
+}
diff --git a/src/main/java/org/jabref/model/search/rules/GrammarBasedSearchRule.java b/src/main/java/org/jabref/model/search/rules/GrammarBasedSearchRule.java
index 777cbb6ebf8..704b9066cc2 100644
--- a/src/main/java/org/jabref/model/search/rules/GrammarBasedSearchRule.java
+++ b/src/main/java/org/jabref/model/search/rules/GrammarBasedSearchRule.java
@@ -23,6 +23,7 @@
 import org.jabref.model.pdf.search.PdfSearchResults;
 import org.jabref.model.pdf.search.SearchResult;
 import org.jabref.model.search.rules.SearchRules.SearchFlags;
+import org.jabref.model.strings.StringUtil;
 import org.jabref.search.SearchBaseVisitor;
 import org.jabref.search.SearchLexer;
 import org.jabref.search.SearchParser;
@@ -166,8 +167,8 @@ public Comparator(String field, String value, ComparisonOperator operator, EnumS
             this.operator = operator;
 
             int option = searchFlags.contains(SearchRules.SearchFlags.CASE_SENSITIVE) ? 0 : Pattern.CASE_INSENSITIVE;
-            this.fieldPattern = Pattern.compile(searchFlags.contains(SearchRules.SearchFlags.REGULAR_EXPRESSION) ? field : "\\Q" + field + "\\E", option);
-            this.valuePattern = Pattern.compile(searchFlags.contains(SearchRules.SearchFlags.REGULAR_EXPRESSION) ? value : "\\Q" + value + "\\E", option);
+            this.fieldPattern = Pattern.compile(searchFlags.contains(SearchRules.SearchFlags.REGULAR_EXPRESSION) ? StringUtil.stripAccents(field) : "\\Q" + StringUtil.stripAccents(field) + "\\E", option);
+            this.valuePattern = Pattern.compile(searchFlags.contains(SearchRules.SearchFlags.REGULAR_EXPRESSION) ? StringUtil.stripAccents(value) : "\\Q" + StringUtil.stripAccents(value) + "\\E", option);
         }
 
         public boolean compare(BibEntry entry) {
@@ -193,7 +194,7 @@ public boolean compare(BibEntry entry) {
             for (Field field : fieldsKeys) {
                 Optional<String> fieldValue = entry.getLatexFreeField(field);
                 if (fieldValue.isPresent()) {
-                    if (matchFieldValue(fieldValue.get())) {
+                    if (matchFieldValue(StringUtil.stripAccents(fieldValue.get()))) {
                         return true;
                     }
                 }
diff --git a/src/main/java/org/jabref/model/search/rules/RegexBasedSearchRule.java b/src/main/java/org/jabref/model/search/rules/RegexBasedSearchRule.java
index 0cc4bcb1f0a..3c2a3e001c7 100644
--- a/src/main/java/org/jabref/model/search/rules/RegexBasedSearchRule.java
+++ b/src/main/java/org/jabref/model/search/rules/RegexBasedSearchRule.java
@@ -1,24 +1,16 @@
 package org.jabref.model.search.rules;
 
-import java.io.IOException;
 import java.util.EnumSet;
-import java.util.List;
-import java.util.Locale;
 import java.util.Optional;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
-import java.util.stream.Collectors;
 
 import org.jabref.architecture.AllowedToUseLogic;
-import org.jabref.gui.Globals;
-import org.jabref.logic.pdf.search.retrieval.PdfSearcher;
-import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
-import org.jabref.model.pdf.search.PdfSearchResults;
-import org.jabref.model.pdf.search.SearchResult;
 import org.jabref.model.search.rules.SearchRules.SearchFlags;
+import org.jabref.model.strings.StringUtil;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -27,36 +19,18 @@
  * Search rule for regex-based search.
  */
 @AllowedToUseLogic("Because access to the lucene index is needed")
-public class RegexBasedSearchRule implements SearchRule {
+public class RegexBasedSearchRule extends FullTextSearchRule {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(GrammarBasedSearchRule.class);
-
-    private final EnumSet<SearchFlags> searchFlags;
-
-    private String lastQuery;
-    private List<SearchResult> lastSearchResults;
-
-    private final BibDatabaseContext databaseContext;
+    private static final Logger LOGGER = LoggerFactory.getLogger(RegexBasedSearchRule.class);
 
     public RegexBasedSearchRule(EnumSet<SearchFlags> searchFlags) {
-        this.searchFlags = searchFlags;
-
-        databaseContext = Globals.stateManager.getActiveDatabase().orElse(null);
-    }
-
-    public EnumSet<SearchFlags> getSearchFlags() {
-        return searchFlags;
+        super(searchFlags);
     }
 
     @Override
     public boolean validateSearchStrings(String query) {
-        String searchString = query;
-        if (!searchFlags.contains(SearchRules.SearchFlags.CASE_SENSITIVE)) {
-            searchString = searchString.toLowerCase(Locale.ROOT);
-        }
-
         try {
-            Pattern.compile(searchString, searchFlags.contains(SearchRules.SearchFlags.CASE_SENSITIVE) ? 0 : Pattern.CASE_INSENSITIVE);
+            Pattern.compile(query, searchFlags.contains(SearchRules.SearchFlags.CASE_SENSITIVE) ? 0 : Pattern.CASE_INSENSITIVE);
         } catch (PatternSyntaxException ex) {
             return false;
         }
@@ -66,17 +40,17 @@ public boolean validateSearchStrings(String query) {
     @Override
     public boolean applyRule(String query, BibEntry bibEntry) {
         Pattern pattern;
-
         try {
-            pattern = Pattern.compile(query, searchFlags.contains(SearchRules.SearchFlags.CASE_SENSITIVE) ? 0 : Pattern.CASE_INSENSITIVE);
+            pattern = Pattern.compile(StringUtil.stripAccents(query), searchFlags.contains(SearchRules.SearchFlags.CASE_SENSITIVE) ? 0 : Pattern.CASE_INSENSITIVE);
         } catch (PatternSyntaxException ex) {
+            LOGGER.debug("Could not compile regex {}", query, ex);
             return false;
         }
 
         for (Field field : bibEntry.getFields()) {
             Optional<String> fieldOptional = bibEntry.getField(field);
             if (fieldOptional.isPresent()) {
-                String fieldContentNoBrackets = bibEntry.getLatexFreeField(field).get();
+                String fieldContentNoBrackets = StringUtil.stripAccents(bibEntry.getLatexFreeField(field).get());
                 Matcher m = pattern.matcher(fieldContentNoBrackets);
                 if (m.find()) {
                     return true;
@@ -85,25 +59,4 @@ public boolean applyRule(String query, BibEntry bibEntry) {
         }
         return getFulltextResults(query, bibEntry).numSearchResults() > 0;
     }
-
-    @Override
-    public PdfSearchResults getFulltextResults(String query, BibEntry bibEntry) {
-
-        if (!searchFlags.contains(SearchRules.SearchFlags.FULLTEXT) || databaseContext == null) {
-            return new PdfSearchResults(List.of());
-        }
-
-        if (!query.equals(this.lastQuery)) {
-            this.lastQuery = query;
-            lastSearchResults = List.of();
-            try {
-                PdfSearcher searcher = PdfSearcher.of(databaseContext);
-                PdfSearchResults results = searcher.search(query, 5);
-                lastSearchResults = results.getSortedByScore();
-            } catch (IOException e) {
-                LOGGER.error("Could not retrieve search results!", e);
-            }
-        }
-        return new PdfSearchResults(lastSearchResults.stream().filter(searchResult -> searchResult.isResultFor(bibEntry)).collect(Collectors.toList()));
-    }
 }
diff --git a/src/main/java/org/jabref/model/search/rules/SearchRules.java b/src/main/java/org/jabref/model/search/rules/SearchRules.java
index 614c353f834..71c35a7e33e 100644
--- a/src/main/java/org/jabref/model/search/rules/SearchRules.java
+++ b/src/main/java/org/jabref/model/search/rules/SearchRules.java
@@ -3,6 +3,9 @@
 import java.util.EnumSet;
 import java.util.regex.Pattern;
 
+/**
+ * This is a factory to instantiate the matching SearchRule implementation matching a given query
+ */
 public class SearchRules {
 
     private static final Pattern SIMPLE_EXPRESSION = Pattern.compile("[^\\p{Punct}]*");
@@ -15,7 +18,7 @@ private SearchRules() {
      */
     public static SearchRule getSearchRuleByQuery(String query, EnumSet<SearchFlags> searchFlags) {
         if (isSimpleQuery(query)) {
-            return new ContainBasedSearchRule(searchFlags);
+            return new ContainsBasedSearchRule(searchFlags);
         }
 
         // this searches specified fields if specified,
@@ -36,7 +39,7 @@ static SearchRule getSearchRule(EnumSet<SearchFlags> searchFlags) {
         if (searchFlags.contains(SearchFlags.REGULAR_EXPRESSION)) {
             return new RegexBasedSearchRule(searchFlags);
         } else {
-            return new ContainBasedSearchRule(searchFlags);
+            return new ContainsBasedSearchRule(searchFlags);
         }
     }
 
diff --git a/src/main/java/org/jabref/model/strings/LatexToUnicodeAdapter.java b/src/main/java/org/jabref/model/strings/LatexToUnicodeAdapter.java
index c8bfb0a3a6b..01c4c304ef2 100644
--- a/src/main/java/org/jabref/model/strings/LatexToUnicodeAdapter.java
+++ b/src/main/java/org/jabref/model/strings/LatexToUnicodeAdapter.java
@@ -6,7 +6,7 @@
 import java.util.regex.Pattern;
 
 import com.github.tomtung.latex2unicode.LaTeX2Unicode;
-import fastparse.core.Parsed;
+import fastparse.Parsed;
 
 /**
  * Adapter class for the latex2unicode lib. This is an alternative to our LatexToUnicode class
diff --git a/src/main/java/org/jabref/model/strings/StringUtil.java b/src/main/java/org/jabref/model/strings/StringUtil.java
index c3f9e53a0fc..2a443306e4d 100644
--- a/src/main/java/org/jabref/model/strings/StringUtil.java
+++ b/src/main/java/org/jabref/model/strings/StringUtil.java
@@ -198,7 +198,6 @@ public static String wrap(String in, int wrapAmount, String newline) {
         // remove all whitespace at the end of the string, this especially includes \r created when the field content has \r\n as line separator
         addWrappedLine(result, CharMatcher.whitespace().trimTrailingFrom(lines[0]), wrapAmount, newline);
         for (int i = 1; i < lines.length; i++) {
-
             if (lines[i].trim().isEmpty()) {
                 result.append(newline);
                 result.append('\t');
@@ -258,6 +257,7 @@ public static String quoteForHTML(String toQuote) {
      * Decodes an encoded double String array back into array form. The array
      * is assumed to be square, and delimited by the characters ';' (first dim) and
      * ':' (second dim).
+     *
      * @param value The encoded String to be decoded.
      * @return The decoded String array.
      */
@@ -311,7 +311,6 @@ public static String[][] decodeStringDoubleArray(String value) {
      * @return The resulting string after wrapping capitals.
      */
     public static String putBracesAroundCapitals(String s) {
-
         boolean inString = false;
         boolean isBracing = false;
         boolean escaped = false;
@@ -331,14 +330,12 @@ public static String putBracesAroundCapitals(String s) {
             // See if we should start bracing:
             if ((inBrace == 0) && !isBracing && !inString && Character.isLetter((char) c)
                     && Character.isUpperCase((char) c)) {
-
                 buf.append('{');
                 isBracing = true;
             }
 
             // See if we should close a brace set:
             if (isBracing && !(Character.isLetter((char) c) && Character.isUpperCase((char) c))) {
-
                 buf.append('}');
                 isBracing = false;
             }
@@ -413,6 +410,7 @@ public static String unifyLineBreaks(String s, String newline) {
     /**
      * Checks if the given String has exactly one pair of surrounding curly braces <br>
      * Strings with escaped characters in curly braces at the beginning and end are respected, too
+     *
      * @param toCheck The string to check
      * @return True, if the check was succesful. False otherwise.
      */
@@ -705,7 +703,6 @@ public static String capitalizeFirst(String toCapitalize) {
         } else {
             return toCapitalize.toUpperCase(Locale.ROOT);
         }
-
     }
 
     /**
@@ -753,4 +750,15 @@ public static String quoteStringIfSpaceIsContained(String string) {
             return string;
         }
     }
+
+    /**
+     * Checks if the given string contains any whitespace characters. The supported whitespace characters
+     * are the set of characters matched by {@code \s} in regular expressions, which are {@code [ \t\n\x0B\f\r]}.
+     *
+     * @param s The string to check
+     * @return {@code True} if the given string does contain at least one whitespace character, {@code False} otherwise
+     * */
+    public static boolean containsWhitespace(String s) {
+        return s.chars().anyMatch(Character::isWhitespace);
+    }
 }
diff --git a/src/main/java/org/jabref/model/study/Study.java b/src/main/java/org/jabref/model/study/Study.java
index cc117f0160e..1c85a1d77c2 100644
--- a/src/main/java/org/jabref/model/study/Study.java
+++ b/src/main/java/org/jabref/model/study/Study.java
@@ -1,6 +1,5 @@
 package org.jabref.model.study;
 
-import java.time.LocalDate;
 import java.util.List;
 import java.util.Objects;
 
@@ -12,16 +11,17 @@
  *
  * This class defines all aspects of a scientific study relevant to the application. It is a proxy for the file based study definition.
  */
-
-@JsonPropertyOrder({"authors", "title", "last-search-date", "research-questions", "queries", "databases"})
+@JsonPropertyOrder({"authors", "title", "research-questions", "queries", "databases"})
 public class Study {
     private List<String> authors;
+
     private String title;
-    @JsonProperty("last-search-date")
-    private LocalDate lastSearchDate;
+
     @JsonProperty("research-questions")
     private List<String> researchQuestions;
+
     private List<StudyQuery> queries;
+
     private List<StudyDatabase> databases;
 
     public Study(List<String> authors, String title, List<String> researchQuestions, List<StudyQuery> queryEntries, List<StudyDatabase> databases) {
@@ -54,14 +54,6 @@ public void setQueries(List<StudyQuery> queries) {
         this.queries = queries;
     }
 
-    public LocalDate getLastSearchDate() {
-        return lastSearchDate;
-    }
-
-    public void setLastSearchDate(LocalDate date) {
-        lastSearchDate = date;
-    }
-
     public List<StudyDatabase> getDatabases() {
         return databases;
     }
@@ -91,7 +83,6 @@ public String toString() {
         return "Study{" +
                 "authors=" + authors +
                 ", studyName='" + title + '\'' +
-                ", lastSearchDate=" + lastSearchDate +
                 ", researchQuestions=" + researchQuestions +
                 ", queries=" + queries +
                 ", libraries=" + databases +
@@ -99,57 +90,21 @@ public String toString() {
     }
 
     @Override
-    public boolean equals(Object o) {
-        if (this == o) {
+    public boolean equals(Object other) {
+        if (this == other) {
             return true;
         }
-        if (o == null || getClass() != o.getClass()) {
+        if (other == null || getClass() != other.getClass()) {
             return false;
         }
 
-        Study study = (Study) o;
+        Study otherStudy = (Study) other;
 
-        if (getAuthors() != null ? !getAuthors().equals(study.getAuthors()) : study.getAuthors() != null) {
-            return false;
-        }
-        if (getTitle() != null ? !getTitle().equals(study.getTitle()) : study.getTitle() != null) {
-            return false;
-        }
-        if (getLastSearchDate() != null ? !getLastSearchDate().equals(study.getLastSearchDate()) : study.getLastSearchDate() != null) {
-            return false;
-        }
-        if (getResearchQuestions() != null ? !getResearchQuestions().equals(study.getResearchQuestions()) : study.getResearchQuestions() != null) {
-            return false;
-        }
-        if (getQueries() != null ? !getQueries().equals(study.getQueries()) : study.getQueries() != null) {
-            return false;
-        }
-        return getDatabases() != null ? getDatabases().equals(study.getDatabases()) : study.getDatabases() == null;
-    }
-
-    public boolean equalsBesideLastSearchDate(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-
-        Study study = (Study) o;
-
-        if (getAuthors() != null ? !getAuthors().equals(study.getAuthors()) : study.getAuthors() != null) {
-            return false;
-        }
-        if (getTitle() != null ? !getTitle().equals(study.getTitle()) : study.getTitle() != null) {
-            return false;
-        }
-        if (getResearchQuestions() != null ? !getResearchQuestions().equals(study.getResearchQuestions()) : study.getResearchQuestions() != null) {
-            return false;
-        }
-        if (getQueries() != null ? !getQueries().equals(study.getQueries()) : study.getQueries() != null) {
-            return false;
-        }
-        return getDatabases() != null ? getDatabases().equals(study.getDatabases()) : study.getDatabases() == null;
+        return Objects.equals(authors, otherStudy.authors) &&
+                Objects.equals(title, otherStudy.title) &&
+                Objects.equals(researchQuestions, otherStudy.researchQuestions) &&
+                Objects.equals(queries, otherStudy.queries) &&
+                Objects.equals(databases, otherStudy.databases);
     }
 
     @Override
diff --git a/src/main/java/org/jabref/model/study/StudyQuery.java b/src/main/java/org/jabref/model/study/StudyQuery.java
index ae5a42b0783..940d842eb66 100644
--- a/src/main/java/org/jabref/model/study/StudyQuery.java
+++ b/src/main/java/org/jabref/model/study/StudyQuery.java
@@ -11,7 +11,6 @@ public StudyQuery(String query) {
      * Used for Jackson deserialization
      */
     public StudyQuery() {
-
     }
 
     public String getQuery() {
diff --git a/src/main/java/org/jabref/model/util/FileHelper.java b/src/main/java/org/jabref/model/util/FileHelper.java
index 25509e50c69..a55d70dff33 100644
--- a/src/main/java/org/jabref/model/util/FileHelper.java
+++ b/src/main/java/org/jabref/model/util/FileHelper.java
@@ -6,11 +6,13 @@
 import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
 import java.util.Objects;
 import java.util.Optional;
 
+import org.jabref.logic.util.io.FileUtil;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.preferences.FilePreferences;
 
@@ -22,8 +24,31 @@
 import org.apache.tika.mime.MimeType;
 import org.apache.tika.mime.MimeTypeException;
 import org.apache.tika.parser.AutoDetectParser;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+/**
+ * @deprecated Please use {@link FileUtil}
+ */
+@Deprecated
 public class FileHelper {
+    /**
+     * MUST ALWAYS BE A SORTED ARRAY because it is used in a binary search
+     */
+    // @formatter:off
+    private static final int[] ILLEGAL_CHARS = {
+            0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
+            10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
+            20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
+            30, 31, 34,
+            42,
+            58,
+            60, 62, 63,
+            123, 124, 125
+    };
+    // @formatter:on
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(FileHelper.class);
 
     /**
      * Returns the extension of a file or Optional.empty() if the file does not have one (no . in name).
@@ -105,6 +130,26 @@ public static Optional<Path> find(String fileName, List<Path> directories) {
                           .findFirst();
     }
 
+    /**
+     * Detect illegal characters in given filename.
+     *
+     * @param fileName the fileName to detect
+     * @return Boolean whether there is a illegal name.
+     */
+    public static boolean detectBadFileName(String fileName) {
+        for (int i = 0; i < fileName.length(); i++) {
+            char c = fileName.charAt(i);
+            if (!isCharLegal(c)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public static boolean isCharLegal(char c) {
+        return Arrays.binarySearch(ILLEGAL_CHARS, c) < 0;
+    }
+
     /**
      * Converts a relative filename to an absolute one, if necessary. Returns
      * an empty optional if the file does not exist.
@@ -112,9 +157,12 @@ public static Optional<Path> find(String fileName, List<Path> directories) {
     public static Optional<Path> find(String fileName, Path directory) {
         Objects.requireNonNull(fileName);
         Objects.requireNonNull(directory);
-
         // Explicitly check for an empty String, as File.exists returns true on that empty path, because it maps to the default jar location
         // if we then call toAbsoluteDir, it would always return the jar-location folder. This is not what we want here
+        if (detectBadFileName(fileName)) {
+            LOGGER.error("Invalid characters in path for file {} ", fileName);
+            return Optional.empty();
+        }
         if (fileName.isEmpty()) {
             return Optional.of(directory);
         }
diff --git a/src/main/java/org/jabref/model/util/FileUpdateMonitor.java b/src/main/java/org/jabref/model/util/FileUpdateMonitor.java
index 7f9d6a32362..9575bf3a8d5 100644
--- a/src/main/java/org/jabref/model/util/FileUpdateMonitor.java
+++ b/src/main/java/org/jabref/model/util/FileUpdateMonitor.java
@@ -20,7 +20,8 @@ public interface FileUpdateMonitor {
     void removeListener(Path path, FileUpdateListener listener);
 
     /**
-     * Indicates whether or not the native system's file monitor has successfully started.
+     * Indicates whether the native system's file monitor has successfully started.
+     *
      * @return true is process is running; false otherwise.
      */
     boolean isActive();
diff --git a/src/main/java/org/jabref/preferences/FilePreferences.java b/src/main/java/org/jabref/preferences/FilePreferences.java
index a2f2c9e4a4b..037324fc1dd 100644
--- a/src/main/java/org/jabref/preferences/FilePreferences.java
+++ b/src/main/java/org/jabref/preferences/FilePreferences.java
@@ -1,7 +1,10 @@
 package org.jabref.preferences;
 
 import java.nio.file.Path;
+import java.util.Comparator;
 import java.util.Optional;
+import java.util.Set;
+import java.util.TreeSet;
 
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
@@ -9,7 +12,10 @@
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableSet;
 
+import org.jabref.gui.externalfiletype.ExternalFileType;
 import org.jabref.model.strings.StringUtil;
 
 public class FilePreferences {
@@ -24,6 +30,7 @@ public class FilePreferences {
     private final BooleanProperty downloadLinkedFiles = new SimpleBooleanProperty();
     private final BooleanProperty fulltextIndexLinkedFiles = new SimpleBooleanProperty();
     private final ObjectProperty<Path> workingDirectory = new SimpleObjectProperty<>();
+    private final ObservableSet<ExternalFileType> externalFileTypes = FXCollections.observableSet(new TreeSet<>(Comparator.comparing(ExternalFileType::getName)));
 
     public FilePreferences(String user,
                            String mainFileDirectory,
@@ -32,7 +39,8 @@ public FilePreferences(String user,
                            String fileDirectoryPattern,
                            boolean downloadLinkedFiles,
                            boolean fulltextIndexLinkedFiles,
-                           Path workingDirectory) {
+                           Path workingDirectory,
+                           Set<ExternalFileType> externalFileTypes) {
         this.user.setValue(user);
         this.mainFileDirectory.setValue(mainFileDirectory);
         this.storeFilesRelativeToBibFile.setValue(storeFilesRelativeToBibFile);
@@ -41,6 +49,7 @@ public FilePreferences(String user,
         this.downloadLinkedFiles.setValue(downloadLinkedFiles);
         this.fulltextIndexLinkedFiles.setValue(fulltextIndexLinkedFiles);
         this.workingDirectory.setValue(workingDirectory);
+        this.externalFileTypes.addAll(externalFileTypes);
     }
 
     public String getUser() { // Read only
@@ -134,4 +143,8 @@ public ObjectProperty<Path> workingDirectoryProperty() {
     public void setWorkingDirectory(Path workingDirectory) {
         this.workingDirectory.set(workingDirectory);
     }
+
+    public ObservableSet<ExternalFileType> getExternalFileTypes() {
+        return this.externalFileTypes;
+    }
 }
diff --git a/src/main/java/org/jabref/preferences/GeneralPreferences.java b/src/main/java/org/jabref/preferences/GeneralPreferences.java
index 4598c00e392..1383e6c11b4 100644
--- a/src/main/java/org/jabref/preferences/GeneralPreferences.java
+++ b/src/main/java/org/jabref/preferences/GeneralPreferences.java
@@ -1,7 +1,5 @@
 package org.jabref.preferences;
 
-import java.nio.charset.Charset;
-
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleBooleanProperty;
@@ -10,7 +8,6 @@
 import org.jabref.model.database.BibDatabaseMode;
 
 public class GeneralPreferences {
-    private final ObjectProperty<Charset> defaultEncoding;
     private final ObjectProperty<BibDatabaseMode> defaultBibDatabaseMode;
     private final BooleanProperty warnAboutDuplicatesInInspection;
     private final BooleanProperty confirmDelete;
@@ -18,13 +15,11 @@ public class GeneralPreferences {
     private final BooleanProperty memoryStickMode;
     private final BooleanProperty showAdvancedHints;
 
-    public GeneralPreferences(Charset defaultEncoding,
-                              BibDatabaseMode defaultBibDatabaseMode,
+    public GeneralPreferences(BibDatabaseMode defaultBibDatabaseMode,
                               boolean warnAboutDuplicatesInInspection,
                               boolean confirmDelete,
                               boolean memoryStickMode,
                               boolean showAdvancedHints) {
-        this.defaultEncoding = new SimpleObjectProperty<>(defaultEncoding);
         this.defaultBibDatabaseMode = new SimpleObjectProperty<>(defaultBibDatabaseMode);
         this.warnAboutDuplicatesInInspection = new SimpleBooleanProperty(warnAboutDuplicatesInInspection);
         this.confirmDelete = new SimpleBooleanProperty(confirmDelete);
@@ -33,18 +28,6 @@ public GeneralPreferences(Charset defaultEncoding,
         this.showAdvancedHints = new SimpleBooleanProperty(showAdvancedHints);
     }
 
-    public Charset getDefaultEncoding() {
-        return defaultEncoding.get();
-    }
-
-    public ObjectProperty<Charset> defaultEncodingProperty() {
-        return defaultEncoding;
-    }
-
-    public void setDefaultEncoding(Charset defaultEncoding) {
-        this.defaultEncoding.set(defaultEncoding);
-    }
-
     public BibDatabaseMode getDefaultBibDatabaseMode() {
         return defaultBibDatabaseMode.get();
     }
diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java
index 4354c31be99..1ec582152f6 100644
--- a/src/main/java/org/jabref/preferences/JabRefPreferences.java
+++ b/src/main/java/org/jabref/preferences/JabRefPreferences.java
@@ -8,7 +8,6 @@
 import java.io.StringReader;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
-import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -43,6 +42,8 @@
 import org.jabref.gui.autocompleter.AutoCompletePreferences;
 import org.jabref.gui.desktop.JabRefDesktop;
 import org.jabref.gui.entryeditor.EntryEditorPreferences;
+import org.jabref.gui.externalfiletype.ExternalFileType;
+import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.groups.GroupViewMode;
 import org.jabref.gui.groups.GroupsPreferences;
 import org.jabref.gui.keyboard.KeyBindingRepository;
@@ -73,6 +74,7 @@
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.ImporterPreferences;
 import org.jabref.logic.importer.fetcher.DoiFetcher;
+import org.jabref.logic.importer.fetcher.GrobidPreferences;
 import org.jabref.logic.importer.fileformat.CustomImporter;
 import org.jabref.logic.journals.JournalAbbreviationPreferences;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
@@ -83,9 +85,12 @@
 import org.jabref.logic.layout.format.FileLinkPreferences;
 import org.jabref.logic.layout.format.NameFormatterPreferences;
 import org.jabref.logic.net.ProxyPreferences;
+import org.jabref.logic.net.ssl.SSLPreferences;
+import org.jabref.logic.net.ssl.TrustStoreManager;
 import org.jabref.logic.openoffice.OpenOfficePreferences;
 import org.jabref.logic.openoffice.style.StyleLoader;
 import org.jabref.logic.preferences.DOIPreferences;
+import org.jabref.logic.preferences.FetcherApiKey;
 import org.jabref.logic.preferences.OwnerPreferences;
 import org.jabref.logic.preferences.TimestampPreferences;
 import org.jabref.logic.preview.PreviewLayout;
@@ -113,6 +118,7 @@
 import org.jabref.model.strings.StringUtil;
 
 import com.tobiasdiez.easybind.EasyBind;
+import net.harawata.appdirs.AppDirsFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -211,6 +217,10 @@ public class JabRefPreferences implements PreferencesService {
     public static final String BASE_DOI_URI = "baseDOIURI";
     public static final String USE_CUSTOM_DOI_URI = "useCustomDOIURI";
 
+    public static final String FETCHER_CUSTOM_KEY_NAMES = "fetcherCustomKeyNames";
+    public static final String FETCHER_CUSTOM_KEY_USES = "fetcherCustomKeyUses";
+    public static final String FETCHER_CUSTOM_KEYS = "fetcherCustomKeys";
+
     public static final String USE_OWNER = "useOwner";
     public static final String DEFAULT_OWNER = "defaultOwner";
     public static final String OVERWRITE_OWNER = "overwriteOwner";
@@ -293,16 +303,7 @@ public class JabRefPreferences implements PreferencesService {
     public static final String VALIDATE_IN_ENTRY_EDITOR = "validateInEntryEditor";
 
     /**
-     * The OpenOffice/LibreOffice connection preferences are:
-     * OO_PATH main directory for OO/LO installation, used to detect location on Win/macOS when using manual connect
-     * OO_EXECUTABLE_PATH path to soffice-file
-     * OO_JARS_PATH directory that contains juh.jar, jurt.jar, ridl.jar, unoil.jar
-     * OO_SYNC_WHEN_CITING true if the reference list is updated when adding a new citation
-     * OO_SHOW_PANEL true if the OO panel is shown on startup
-     * OO_USE_ALL_OPEN_DATABASES true if all databases should be used when citing
-     * OO_BIBLIOGRAPHY_STYLE_FILE path to the used style file
-     * OO_EXTERNAL_STYLE_FILES list with paths to external style files
-     * STYLES_*_* size and position of "Select style" dialog
+     * The OpenOffice/LibreOffice connection preferences are: OO_PATH main directory for OO/LO installation, used to detect location on Win/macOS when using manual connect OO_EXECUTABLE_PATH path to soffice-file OO_JARS_PATH directory that contains juh.jar, jurt.jar, ridl.jar, unoil.jar OO_SYNC_WHEN_CITING true if the reference list is updated when adding a new citation OO_SHOW_PANEL true if the OO panel is shown on startup OO_USE_ALL_OPEN_DATABASES true if all databases should be used when citing OO_BIBLIOGRAPHY_STYLE_FILE path to the used style file OO_EXTERNAL_STYLE_FILES list with paths to external style files STYLES_*_* size and position of "Select style" dialog
      */
     public static final String OO_EXECUTABLE_PATH = "ooExecutablePath";
     public static final String OO_PATH = "ooPath";
@@ -351,6 +352,9 @@ public class JabRefPreferences implements PreferencesService {
     private static final String PROXY_PASSWORD = "proxyPassword";
     private static final String PROXY_USE_AUTHENTICATION = "useProxyAuthentication";
 
+    // SSL
+    private static final String TRUSTSTORE_PATH = "truststorePath";
+
     // Auto completion
     private static final String AUTO_COMPLETE = "autoComplete";
     private static final String AUTOCOMPLETER_FIRSTNAME_MODE = "autoCompFirstNameMode";
@@ -426,13 +430,13 @@ public class JabRefPreferences implements PreferencesService {
     private List<MainTableColumnModel> searchDialogTableColunns;
     private List<MainTableColumnModel> searchDialogColumnSortOrder;
 
-    private Set<CustomImporter> customImporters;
     private String userName;
 
     private PreviewPreferences previewPreferences;
     private SidePanePreferences sidePanePreferences;
     private AppearancePreferences appearancePreferences;
     private ImporterPreferences importerPreferences;
+    private GrobidPreferences grobidPreferences;
     private ProtectedTermsPreferences protectedTermsPreferences;
     private MrDlibPreferences mrDlibPreferences;
     private EntryEditorPreferences entryEditorPreferences;
@@ -440,6 +444,7 @@ public class JabRefPreferences implements PreferencesService {
     private GuiPreferences guiPreferences;
     private RemotePreferences remotePreferences;
     private ProxyPreferences proxyPreferences;
+    private SSLPreferences sslPreferences;
     private SearchPreferences searchPreferences;
     private AutoLinkPreferences autoLinkPreferences;
     private ImportExportPreferences importExportPreferences;
@@ -523,6 +528,11 @@ private JabRefPreferences() {
         defaults.put(PROXY_USERNAME, "");
         defaults.put(PROXY_PASSWORD, "");
 
+        // SSL
+        defaults.put(TRUSTSTORE_PATH, Path.of(AppDirsFactory.getInstance()
+                                                            .getUserDataDir(OS.APP_DIR_APP_NAME, "ssl", OS.APP_DIR_APP_AUTHOR))
+                                          .resolve("truststore.jks").toString());
+
         defaults.put(POS_X, 0);
         defaults.put(POS_Y, 0);
         defaults.put(SIZE_X, 1024);
@@ -623,6 +633,10 @@ private JabRefPreferences() {
 
         defaults.put(SPECIALFIELDSENABLED, Boolean.TRUE);
 
+        defaults.put(FETCHER_CUSTOM_KEY_NAMES, "Springer;IEEEXplore;SAO/NASA ADS;ScienceDirect;Biodiversity Heritage");
+        defaults.put(FETCHER_CUSTOM_KEY_USES, "FALSE;FALSE;FALSE;FALSE;FALSE");
+        defaults.put(FETCHER_CUSTOM_KEYS, "");
+
         defaults.put(USE_OWNER, Boolean.FALSE);
         defaults.put(OVERWRITE_OWNER, Boolean.FALSE);
         defaults.put(AVOID_OVERWRITING_KEY, Boolean.FALSE);
@@ -747,6 +761,24 @@ private static String convertListToString(List<String> value) {
         return value.stream().map(val -> StringUtil.quote(val, STRINGLIST_DELIMITER.toString(), '\\')).collect(Collectors.joining(STRINGLIST_DELIMITER.toString()));
     }
 
+    private static List<String> convertStringToList(String toConvert) {
+        if (StringUtil.isBlank(toConvert)) {
+            return Collections.emptyList();
+        }
+
+        StringReader reader = new StringReader(toConvert);
+        List<String> result = new ArrayList<>();
+        Optional<String> rs;
+        try {
+            while ((rs = getNextUnit(reader)).isPresent()) {
+                result.add(rs.get());
+            }
+        } catch (IOException ignored) {
+            // Ignored
+        }
+        return result;
+    }
+
     private static Preferences getPrefsNodeForCustomizedEntryTypes(BibDatabaseMode mode) {
         return switch (mode) {
             case BIBTEX -> PREFS_NODE.node(CUSTOMIZED_BIBTEX_TYPES);
@@ -904,8 +936,7 @@ private void remove(String key) {
     }
 
     /**
-     * Puts a list of strings into the Preferences, by linking its elements with a STRINGLIST_DELIMITER into a single
-     * string. Escape characters make the process transparent even if strings contains a STRINGLIST_DELIMITER.
+     * Puts a list of strings into the Preferences, by linking its elements with a STRINGLIST_DELIMITER into a single string. Escape characters make the process transparent even if strings contains a STRINGLIST_DELIMITER.
      */
     public void putStringList(String key, List<String> value) {
         if (value == null) {
@@ -920,22 +951,7 @@ public void putStringList(String key, List<String> value) {
      * Returns a List of Strings containing the chosen columns.
      */
     public List<String> getStringList(String key) {
-        String names = get(key);
-        if (names == null) {
-            return Collections.emptyList();
-        }
-
-        StringReader rd = new StringReader(names);
-        List<String> res = new ArrayList<>();
-        Optional<String> rs;
-        try {
-            while ((rs = getNextUnit(rd)).isPresent()) {
-                res.add(rs.get());
-            }
-        } catch (IOException ignored) {
-            // Ignored
-        }
-        return res;
+        return convertStringToList(get(key));
     }
 
     /**
@@ -947,10 +963,16 @@ public List<String> getStringList(String key) {
     public void clear() throws BackingStoreException {
         clearAllBibEntryTypes();
         clearCitationKeyPatterns();
+        clearTruststoreFromCustomCertificates();
         prefs.clear();
         new SharedDatabasePreferences().clear();
     }
 
+    private void clearTruststoreFromCustomCertificates() {
+        TrustStoreManager trustStoreManager = new TrustStoreManager(Path.of(defaults.get(TRUSTSTORE_PATH).toString()));
+        trustStoreManager.clearCustomCertificates();
+    }
+
     /**
      * Removes the given key from the preferences.
      *
@@ -1027,6 +1049,20 @@ private Object getObject(Preferences prefs, String key) {
         }
     }
 
+    /**
+     * Returns a list of Strings stored by key+N with N being an incrementing number
+     */
+    private List<String> getSeries(String key) {
+        int i = 0;
+        List<String> series = new ArrayList<>();
+        String item;
+        while (!StringUtil.isBlank(item = get(key + i))) {
+            series.add(item);
+            i++;
+        }
+        return series;
+    }
+
     /**
      * Removes all entries keyed by prefix+number, where number is equal to or higher than the given number.
      *
@@ -1066,8 +1102,7 @@ public void exportPreferences(Path file) throws JabRefException {
      * Imports Preferences from an XML file.
      *
      * @param file Path of file to import from
-     * @throws JabRefException thrown if importing the preferences failed due to an InvalidPreferencesFormatException or
-     *                         an IOException
+     * @throws JabRefException thrown if importing the preferences failed due to an InvalidPreferencesFormatException or an IOException
      */
     @Override
     public void importPreferences(Path file) throws JabRefException {
@@ -1124,7 +1159,7 @@ public void setOpenOfficePreferences(OpenOfficePreferences openOfficePreferences
 
     @Override
     public JournalAbbreviationPreferences getJournalAbbreviationPreferences() {
-        return new JournalAbbreviationPreferences(getStringList(EXTERNAL_JOURNAL_LISTS), getGeneralPreferences().getDefaultEncoding());
+        return new JournalAbbreviationPreferences(getStringList(EXTERNAL_JOURNAL_LISTS), StandardCharsets.UTF_8);
     }
 
     @Override
@@ -1294,14 +1329,12 @@ public GeneralPreferences getGeneralPreferences() {
         }
 
         generalPreferences = new GeneralPreferences(
-                Charset.forName(get(DEFAULT_ENCODING)),
                 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.defaultEncodingProperty(), (obs, oldValue, newValue) -> put(DEFAULT_ENCODING, newValue.name()));
         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));
@@ -1439,24 +1472,17 @@ private Map<String, Set<Field>> getEntryEditorTabList() {
      */
     private void updateEntryEditorTabList() {
         Map<String, Set<Field>> tabs = new LinkedHashMap<>();
-        int i = 0;
-        String name;
-        if (hasKey(CUSTOM_TAB_NAME + 0)) {
-            // The user has modified from the default values:
-            while (hasKey(CUSTOM_TAB_NAME + i)) {
-                name = get(CUSTOM_TAB_NAME + i);
-                Set<Field> entry = FieldFactory.parseFieldList(get(CUSTOM_TAB_FIELDS + i));
-                tabs.put(name, entry);
-                i++;
-            }
-        } else {
-            // Nothing set, so we use the default values:
-            while (get(CUSTOM_TAB_NAME + "_def" + i) != null) {
-                name = get(CUSTOM_TAB_NAME + "_def" + i);
-                Set<Field> entry = FieldFactory.parseFieldList(get(CUSTOM_TAB_FIELDS + "_def" + i));
-                tabs.put(name, entry);
-                i++;
-            }
+        List<String> tabNames = getSeries(CUSTOM_TAB_NAME);
+        List<String> tabFields = getSeries(CUSTOM_TAB_FIELDS);
+
+        if (tabNames.isEmpty() || tabNames.size() != tabFields.size()) {
+            // Nothing set, so we use the default values
+            tabNames = getSeries(CUSTOM_TAB_NAME + "_def");
+            tabFields = getSeries(CUSTOM_TAB_FIELDS + "_def");
+        }
+
+        for (int i = 0; i < tabNames.size(); i++) {
+            tabs.put(tabNames.get(i), FieldFactory.parseFieldList(tabFields.get(i)));
         }
         entryEditorTabList = tabs;
     }
@@ -1528,7 +1554,7 @@ public List<Field> getAllDefaultTabFieldNames() {
                 break;
             }
 
-            customFields.addAll(Arrays.stream(fields.split(STRINGLIST_DELIMITER.toString())).map(FieldFactory::parseField).collect(Collectors.toList()));
+            customFields.addAll(Arrays.stream(fields.split(STRINGLIST_DELIMITER.toString())).map(FieldFactory::parseField).toList());
             defNumber++;
         }
         return customFields;
@@ -1607,6 +1633,19 @@ public ProxyPreferences getProxyPreferences() {
         return proxyPreferences;
     }
 
+    @Override
+    public SSLPreferences getSSLPreferences() {
+        if (Objects.nonNull(sslPreferences)) {
+            return sslPreferences;
+        }
+
+        sslPreferences = new SSLPreferences(
+                get(TRUSTSTORE_PATH)
+        );
+
+        return sslPreferences;
+    }
+
     //*************************************************************************************************************
     // CitationKeyPatternPreferences
     //*************************************************************************************************************
@@ -1889,26 +1928,24 @@ public void storeMainTableNameFormatPreferences(MainTableNameFormatPreferences p
 
     //*************************************************************************************************************
     // Generic Column Handling
-    //***********************************************s**************************************************************
+    //*************************************************************************************************************
 
-    public List<MainTableColumnModel> updateColumns(String columnNamesList, String columnWidthList, String sortTypeList, double defaultWidth) {
+    private List<MainTableColumnModel> updateColumns(String columnNamesList, String columnWidthList, String sortTypeList, double defaultWidth) {
         List<String> columnNames = getStringList(columnNamesList);
         List<Double> columnWidths = getStringList(columnWidthList)
-                                                                  .stream()
-                                                                  .map(string -> {
-                                                                      try {
-                                                                          return Double.parseDouble(string);
-                                                                      } catch (NumberFormatException e) {
-                                                                          LOGGER.error("Exception while parsing column widths. Choosing default.", e);
-                                                                          return defaultWidth;
-                                                                      }
-                                                                  })
-                                                                  .collect(Collectors.toList());
+                .stream()
+                .map(string -> {
+                    try {
+                        return Double.parseDouble(string);
+                    } catch (NumberFormatException e) {
+                        LOGGER.error("Exception while parsing column widths. Choosing default.", e);
+                        return defaultWidth;
+                    }
+                }).toList();
 
         List<SortType> columnSortTypes = getStringList(sortTypeList)
-                                                                    .stream()
-                                                                    .map(SortType::valueOf)
-                                                                    .collect(Collectors.toList());
+                .stream()
+                .map(SortType::valueOf).toList();
 
         List<MainTableColumnModel> columns = new ArrayList<>();
         for (int i = 0; i < columnNames.size(); i++) {
@@ -1961,8 +1998,8 @@ private List<MainTableColumnModel> updateColumnSortOrder(String sortOrderList, L
     @Override
     public ColumnPreferences getSearchDialogColumnPreferences() {
         return new ColumnPreferences(
-                                     createSearchDialogColumns(),
-                                     createSearchDialogColumnSortOrder());
+                createSearchDialogColumns(),
+                createSearchDialogColumnSortOrder());
     }
 
     /**
@@ -2075,12 +2112,12 @@ public AppearancePreferences getAppearancePreferences() {
     @Override
     public ImportFormatPreferences getImportFormatPreferences() {
         return new ImportFormatPreferences(
-                getCustomImportFormats(),
                 getKeywordDelimiter(),
                 getCitationKeyPatternPreferences(),
                 getFieldContentParserPreferences(),
                 getXmpPreferences(),
-                getDOIPreferences());
+                getDOIPreferences(),
+                getGrobidPreferences());
     }
 
     @Override
@@ -2184,7 +2221,8 @@ public FilePreferences getFilePreferences() {
                 get(IMPORT_FILEDIRPATTERN),
                 getBoolean(DOWNLOAD_LINKED_FILES),
                 getBoolean(FULLTEXT_INDEX_LINKED_FILES),
-                Path.of(get(WORKING_DIRECTORY))
+                Path.of(get(WORKING_DIRECTORY)),
+                ExternalFileTypes.fromString(get(EXTERNAL_FILE_TYPES))
         );
 
         EasyBind.listen(filePreferences.mainFileDirectoryProperty(), (obs, oldValue, newValue) -> put(MAIN_FILE_DIRECTORY, newValue));
@@ -2194,6 +2232,8 @@ public FilePreferences getFilePreferences() {
         EasyBind.listen(filePreferences.downloadLinkedFilesProperty(), (obs, oldValue, newValue) -> putBoolean(DOWNLOAD_LINKED_FILES, newValue));
         EasyBind.listen(filePreferences.fulltextIndexLinkedFilesProperty(), (obs, oldValue, newValue) -> putBoolean(FULLTEXT_INDEX_LINKED_FILES, newValue));
         EasyBind.listen(filePreferences.workingDirectoryProperty(), (obs, oldValue, newValue) -> put(WORKING_DIRECTORY, newValue.toString()));
+        filePreferences.getExternalFileTypes().addListener((SetChangeListener<ExternalFileType>) c ->
+                put(EXTERNAL_FILE_TYPES, ExternalFileTypes.toStringList(filePreferences.getExternalFileTypes())));
 
         return filePreferences;
     }
@@ -2277,77 +2317,22 @@ public ImportExportPreferences getImportExportPreferences() {
         return importExportPreferences;
     }
 
-    @Override
-    public Set<CustomImporter> getCustomImportFormats() {
-        if (this.customImporters == null) {
-            updateCustomImportFormats();
-        }
-        return this.customImporters;
-    }
-
-    private void updateCustomImportFormats() {
-        Set<CustomImporter> importers = new TreeSet<>();
-        int i = 0;
-
-        List<String> importerString;
-        while (!((importerString = getStringList(CUSTOM_IMPORT_FORMAT + i)).isEmpty())) {
-            try {
-                if (importerString.size() == 2) {
-                    // New format: basePath, className
-                    importers.add(new CustomImporter(importerString.get(0), importerString.get(1)));
-                } else {
-                    // Old format: name, cliId, className, basePath
-                    importers.add(new CustomImporter(importerString.get(3), importerString.get(2)));
-                }
-            } catch (Exception e) {
-                LOGGER.warn("Could not load " + importerString.get(0) + " from preferences. Will ignore.", e);
-            }
-            i++;
-        }
-
-        this.customImporters = importers;
-    }
-
-    @Override
-    public void storeCustomImportFormats(Set<CustomImporter> importers) {
-        purgeCustomImportFormats();
-        CustomImporter[] importersArray = importers.toArray(new CustomImporter[0]);
-        for (int i = 0; i < importersArray.length; i++) {
-            putStringList(CUSTOM_IMPORT_FORMAT + i, importersArray[i].getAsStringList());
-        }
-
-        this.customImporters = importers;
-    }
-
-    private void purgeCustomImportFormats() {
-        for (int i = 0; !(getStringList(CUSTOM_IMPORT_FORMAT + i).isEmpty()); i++) {
-            remove(CUSTOM_IMPORT_FORMAT + i);
-        }
-    }
-
     @Override
     public List<TemplateExporter> getCustomExportFormats(JournalAbbreviationRepository abbreviationRepository) {
-        int i = 0;
-        List<TemplateExporter> formats = new ArrayList<>();
-        String exporterName;
-        String filename;
-        String extension;
         LayoutFormatterPreferences layoutPreferences = getLayoutFormatterPreferences(abbreviationRepository);
         SavePreferences savePreferences = getSavePreferencesForExport();
-        List<String> formatData;
-        while (!((formatData = getStringList(CUSTOM_EXPORT_FORMAT + i)).isEmpty())) {
-            exporterName = formatData.get(EXPORTER_NAME_INDEX);
-            filename = formatData.get(EXPORTER_FILENAME_INDEX);
-            extension = formatData.get(EXPORTER_EXTENSION_INDEX);
+        List<TemplateExporter> formats = new ArrayList<>();
+
+        for (String toImport : getSeries(CUSTOM_EXPORT_FORMAT)) {
+            List<String> formatData = convertStringToList(toImport);
             TemplateExporter format = new TemplateExporter(
-                    exporterName,
-                    filename,
-                    extension,
+                    formatData.get(EXPORTER_NAME_INDEX),
+                    formatData.get(EXPORTER_FILENAME_INDEX),
+                    formatData.get(EXPORTER_EXTENSION_INDEX),
                     layoutPreferences,
                     savePreferences);
             format.setCustomExport(true);
             formats.add(format);
-            i++;
         }
         return formats;
     }
@@ -2355,7 +2340,7 @@ public List<TemplateExporter> getCustomExportFormats(JournalAbbreviationReposito
     @Override
     public void storeCustomExportFormats(List<TemplateExporter> exporters) {
         if (exporters.isEmpty()) {
-            purgeCustomExportFormats(0);
+            purgeSeries(CUSTOM_EXPORT_FORMAT, 0);
         } else {
             for (int i = 0; i < exporters.size(); i++) {
                 List<String> exporterData = new ArrayList<>();
@@ -2365,15 +2350,7 @@ public void storeCustomExportFormats(List<TemplateExporter> exporters) {
                 exporterData.add(EXPORTER_EXTENSION_INDEX, exporters.get(i).getFileType().getExtensions().get(0));
                 putStringList(CUSTOM_EXPORT_FORMAT + i, exporterData);
             }
-            purgeCustomExportFormats(exporters.size());
-        }
-    }
-
-    private void purgeCustomExportFormats(int from) {
-        int i = from;
-        while (!getStringList(CUSTOM_EXPORT_FORMAT + i).isEmpty()) {
-            remove(CUSTOM_EXPORT_FORMAT + i);
-            i++;
+            purgeSeries(CUSTOM_EXPORT_FORMAT, exporters.size());
         }
     }
 
@@ -2735,16 +2712,6 @@ public void storeLastPreferencesExportPath(Path exportFile) {
         put(PREFS_EXPORT_PATH, exportFile.toString());
     }
 
-    @Override
-    public Optional<String> getExternalFileTypes() {
-        return Optional.ofNullable(get(EXTERNAL_FILE_TYPES, null));
-    }
-
-    @Override
-    public void storeExternalFileTypes(String externalFileTypes) {
-        put(EXTERNAL_FILE_TYPES, externalFileTypes);
-    }
-
     @Override
     public MrDlibPreferences getMrDlibPreferences() {
         if (Objects.nonNull(mrDlibPreferences)) {
@@ -2802,16 +2769,95 @@ public ImporterPreferences getImporterPreferences() {
 
         importerPreferences = new ImporterPreferences(
                 getBoolean(GENERATE_KEY_ON_IMPORT),
-                getBoolean(GROBID_ENABLED),
-                getBoolean(GROBID_OPT_OUT),
-                get(GROBID_URL)
+                getCustomImportFormats(),
+                getFetcherKeys()
         );
 
         EasyBind.listen(importerPreferences.generateNewKeyOnImportProperty(), (obs, oldValue, newValue) -> putBoolean(GENERATE_KEY_ON_IMPORT, newValue));
-        EasyBind.listen(importerPreferences.grobidEnabledProperty(), (obs, oldValue, newValue) -> putBoolean(GROBID_ENABLED, newValue));
-        EasyBind.listen(importerPreferences.grobidOptOutProperty(), (obs, oldValue, newValue) -> putBoolean(GROBID_OPT_OUT, newValue));
-        EasyBind.listen(importerPreferences.grobidURLProperty(), (obs, oldValue, newValue) -> put(GROBID_URL, newValue));
+        importerPreferences.getApiKeys().addListener((InvalidationListener) c -> storeFetcherKeys(importerPreferences.getApiKeys()));
+        importerPreferences.getCustomImportList().addListener((InvalidationListener) c -> storeCustomImportFormats(importerPreferences.getCustomImportList()));
 
         return importerPreferences;
     }
+
+    private Set<CustomImporter> getCustomImportFormats() {
+        Set<CustomImporter> importers = new TreeSet<>();
+
+        for (String toImport : getSeries(CUSTOM_IMPORT_FORMAT)) {
+            List<String> importerString = convertStringToList(toImport);
+            try {
+                if (importerString.size() == 2) {
+                    // New format: basePath, className
+                    importers.add(new CustomImporter(importerString.get(0), importerString.get(1)));
+                } else {
+                    // Old format: name, cliId, className, basePath
+                    importers.add(new CustomImporter(importerString.get(3), importerString.get(2)));
+                }
+            } catch (Exception e) {
+                LOGGER.warn("Could not load " + importerString.get(0) + " from preferences. Will ignore.", e);
+            }
+        }
+
+        return importers;
+    }
+
+    public void storeCustomImportFormats(Set<CustomImporter> importers) {
+        purgeSeries(CUSTOM_IMPORT_FORMAT, 0);
+        CustomImporter[] importersArray = importers.toArray(new CustomImporter[0]);
+        for (int i = 0; i < importersArray.length; i++) {
+            putStringList(CUSTOM_IMPORT_FORMAT + i, importersArray[i].getAsStringList());
+        }
+    }
+
+    private Set<FetcherApiKey> getFetcherKeys() {
+        Set<FetcherApiKey> fetcherApiKeys = new HashSet<>();
+
+        List<String> names = getStringList(FETCHER_CUSTOM_KEY_NAMES);
+        List<String> uses = getStringList(FETCHER_CUSTOM_KEY_USES);
+        List<String> keys = getStringList(FETCHER_CUSTOM_KEYS);
+
+        for (int i = 0; i < names.size(); i++) {
+            fetcherApiKeys.add(new FetcherApiKey(
+                    names.get(i),
+                    // i < uses.size() ? Boolean.parseBoolean(uses.get(i)) : false
+                    (i < uses.size()) && Boolean.parseBoolean(uses.get(i)),
+                    i < keys.size() ? keys.get(i) : ""));
+        }
+
+        return fetcherApiKeys;
+    }
+
+    private void storeFetcherKeys(Set<FetcherApiKey> fetcherApiKeys) {
+        List<String> names = new ArrayList<>();
+        List<String> uses = new ArrayList<>();
+        List<String> keys = new ArrayList<>();
+
+        for (FetcherApiKey apiKey : fetcherApiKeys) {
+            names.add(apiKey.getName());
+            uses.add(String.valueOf(apiKey.shouldUse()));
+            keys.add(apiKey.getKey());
+        }
+
+        putStringList(FETCHER_CUSTOM_KEY_NAMES, names);
+        putStringList(FETCHER_CUSTOM_KEY_USES, uses);
+        putStringList(FETCHER_CUSTOM_KEYS, keys);
+    }
+
+    @Override
+    public GrobidPreferences getGrobidPreferences() {
+        if (Objects.nonNull(grobidPreferences)) {
+            return grobidPreferences;
+        }
+
+        grobidPreferences = new GrobidPreferences(
+                getBoolean(GROBID_ENABLED),
+                getBoolean(GROBID_OPT_OUT),
+                get(GROBID_URL));
+
+        EasyBind.listen(grobidPreferences.grobidEnabledProperty(), (obs, oldValue, newValue) -> putBoolean(GROBID_ENABLED, newValue));
+        EasyBind.listen(grobidPreferences.grobidOptOutProperty(), (obs, oldValue, newValue) -> putBoolean(GROBID_OPT_OUT, newValue));
+        EasyBind.listen(grobidPreferences.grobidURLProperty(), (obs, oldValue, newValue) -> put(GROBID_URL, newValue));
+
+        return grobidPreferences;
+    }
 }
diff --git a/src/main/java/org/jabref/preferences/PreferencesService.java b/src/main/java/org/jabref/preferences/PreferencesService.java
index 8d60a243af5..f3329750992 100644
--- a/src/main/java/org/jabref/preferences/PreferencesService.java
+++ b/src/main/java/org/jabref/preferences/PreferencesService.java
@@ -3,7 +3,6 @@
 import java.nio.file.Path;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 import java.util.Set;
 import java.util.prefs.BackingStoreException;
 
@@ -26,7 +25,7 @@
 import org.jabref.logic.exporter.TemplateExporter;
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.ImporterPreferences;
-import org.jabref.logic.importer.fileformat.CustomImporter;
+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;
@@ -34,6 +33,7 @@
 import org.jabref.logic.layout.format.FileLinkPreferences;
 import org.jabref.logic.layout.format.NameFormatterPreferences;
 import org.jabref.logic.net.ProxyPreferences;
+import org.jabref.logic.net.ssl.SSLPreferences;
 import org.jabref.logic.openoffice.OpenOfficePreferences;
 import org.jabref.logic.preferences.DOIPreferences;
 import org.jabref.logic.preferences.OwnerPreferences;
@@ -155,6 +155,8 @@ public interface PreferencesService {
 
     ProxyPreferences getProxyPreferences();
 
+    SSLPreferences getSSLPreferences();
+
     //*************************************************************************************************************
     // CitationKeyPatternPreferences
     //*************************************************************************************************************
@@ -231,12 +233,10 @@ public interface PreferencesService {
 
     void storeCustomExportFormats(List<TemplateExporter> exporters);
 
-    Set<CustomImporter> getCustomImportFormats();
-
-    void storeCustomImportFormats(Set<CustomImporter> customImporters);
-
     ImporterPreferences getImporterPreferences();
 
+    GrobidPreferences getGrobidPreferences();
+
     //*************************************************************************************************************
     // Preview preferences
     //*************************************************************************************************************
@@ -275,12 +275,7 @@ public interface PreferencesService {
 
     void storeLastPreferencesExportPath(Path exportFile);
 
-    Optional<String> getExternalFileTypes();
-
-    void storeExternalFileTypes(String externalFileTypes);
-
     MrDlibPreferences getMrDlibPreferences();
 
     ProtectedTermsPreferences getProtectedTermsPreferences();
-
 }
diff --git a/src/main/resources/build.properties b/src/main/resources/build.properties
index ec86a4cab54..efe52c53aad 100644
--- a/src/main/resources/build.properties
+++ b/src/main/resources/build.properties
@@ -5,3 +5,4 @@ azureInstrumentationKey=${azureInstrumentationKey}
 springerNatureAPIKey=${springerNatureAPIKey}
 astrophysicsDataSystemAPIKey=${astrophysicsDataSystemAPIKey}
 ieeeAPIKey=${ieeeAPIKey}
+biodiversityHeritageApiKey=${biodiversityHeritageApiKey}
diff --git a/src/main/resources/csl-locales/locales-en-US.xml b/src/main/resources/csl-locales/locales-en-US.xml
index 83f31d12c80..9d6ab241e08 100644
--- a/src/main/resources/csl-locales/locales-en-US.xml
+++ b/src/main/resources/csl-locales/locales-en-US.xml
@@ -315,39 +315,39 @@
     </term>
 
     <!-- SHORT LOCATOR FORMS -->
-    <term name="appendix">			 
+    <term name="appendix" form="short">			 
       <single>app.</single>
       <multiple>apps.</multiple>						 
     </term>
-    <term name="article-locator">			 
+    <term name="article-locator" form="short">			 
       <single>art.</single>
       <multiple>arts.</multiple>
     </term>
-    <term name="elocation">			 
+    <term name="elocation" form="short">			 
       <single>loc.</single>
       <multiple>locs.</multiple>
     </term>
-    <term name="equation">			 
+    <term name="equation" form="short">			 
       <single>eq.</single>
       <multiple>eqs.</multiple>
     </term>
-    <term name="rule">			 
+    <term name="rule" form="short">			 
       <single>r.</single>
       <multiple>rr.</multiple>						 
     </term>
-    <term name="scene">			 
+    <term name="scene" form="short">			 
       <single>sc.</single>
       <multiple>scs.</multiple>						 
     </term>
-    <term name="table">			 
+    <term name="table" form="short">			 
       <single>tbl.</single>
       <multiple>tbls.</multiple>						 
     </term>
-    <term name="timestamp"> <!-- generally blank -->
+    <term name="timestamp" form="short"> <!-- generally blank -->
       <single></single>
       <multiple></multiple>						 
     </term>
-    <term name="title-locator">			 
+    <term name="title-locator" form="short">			 
       <single>tit.</single>
       <multiple>tits.</multiple>
     </term>
diff --git a/src/main/resources/csl-styles/ieee.csl b/src/main/resources/csl-styles/ieee.csl
index 8dccec4707a..bff5b9197ed 100644
--- a/src/main/resources/csl-styles/ieee.csl
+++ b/src/main/resources/csl-styles/ieee.csl
@@ -246,7 +246,7 @@
           </group>
         </group>
         <!-- Available: https://URL.com/ -->
-        <group delimiter=": ">
+        <group delimiter=": " prefix=" ">
           <text term="available at" text-case="capitalize-first"/>
           <text variable="URL"/>
         </group>
diff --git a/src/main/resources/journals/journalList.mv b/src/main/resources/journals/journalList.mv
index c213faa002e..b39bb854c43 100644
Binary files a/src/main/resources/journals/journalList.mv and b/src/main/resources/journals/journalList.mv differ
diff --git a/src/main/resources/l10n/JabRef_da.properties b/src/main/resources/l10n/JabRef_da.properties
index 078e5f7fe5f..97eeb562207 100644
--- a/src/main/resources/l10n/JabRef_da.properties
+++ b/src/main/resources/l10n/JabRef_da.properties
@@ -12,7 +12,7 @@
 %0\ doesn't\ contain\ the\ term\ <b>%1</b>=%0 indeholder ikke udtrykket <b>%1</b>
 
 
-%0\ export\ successful=%0-eksport lykkedes
+
 
 %0\ matches\ the\ regular\ expression\ <b>%1</b>=%0 matcher regulærudtrykket <b>%1</b>
 
@@ -123,8 +123,6 @@ Cite\ command=Citations-kommando
 
 Clear=Ryd
 
-Clear\ fields=Ryd felter
-
 
 Close\ dialog=Luk dialog
 
@@ -192,7 +190,7 @@ Library\ properties=Libraryegenskaber
 
 Default=Standard
 
-Default\ encoding=Standard kodning
+The\ chosen\ encoding\ '%0'\ could\ not\ encode\ the\ following\ characters\:=Den valgte tegnkodning '%0' kunne ikke kode de følgende tegn\:
 
 
 
@@ -446,6 +444,8 @@ Moved\ group\ "%0".=Flyttede gruppen "%0".
 
 
 
+
+
 Name=Navn
 
 Name\ formatter=Navneformatering
@@ -528,8 +528,6 @@ Path\ to\ %0\ not\ defined=Sti til %0 ikke defineret
 
 Path\ to\ LyX\ pipe=Sti til LyX-pipe
 
-PDF\ does\ not\ exist=PDF-filen findes ikke
-
 
 Please\ enter\ a\ name\ for\ the\ group.=Skriv et navn til gruppen.
 
@@ -575,11 +573,18 @@ Remove\ entry\ from\ import=Fjern post fra import
 
 Remove\ group=Fjern gruppe
 
-Remove\ group\ "%0"?=Fjern gruppen "%0"?
+Remove\ group\ and\ subgroups=Fjern gruppe og undergrupper
+
+
+
+
+
 
 Remove\ group\ "%0"\ and\ its\ subgroups?=Fjern gruppen "%0" og dens undergrupper?
 
-Remove\ group\ and\ subgroups=Fjern gruppe og undergrupper
+Removed\ group\ "%0"\ and\ its\ subgroups.=Fjernede gruppen "%0" og dens undergrupper
+
+
 
 Remove\ link=Slet link
 
@@ -588,8 +593,6 @@ Remove\ old\ entry=Fjern gammel post
 
 Removed\ group\ "%0".=Fjernede gruppen "%0"
 
-Removed\ group\ "%0"\ and\ its\ subgroups.=Fjernede gruppen "%0" og dens undergrupper
-
 Removed\ string=Streng fjernet
 
 Renamed\ string=ændrede navn på streng
@@ -643,9 +646,6 @@ Select\ file\ from\ ZIP-archive=Vælg fil fra ZIP-fil
 
 Select\ the\ tree\ nodes\ to\ view\ and\ accept\ or\ reject\ changes=Vælg forgreningerne for at inspicere og acceptere eller forkaste ændringer
 
-Set\ field=Sæt felt
-Set\ fields=Sæt felter
-
 Settings=Indstillinger
 
 Shortcut=Genvej
@@ -676,7 +676,6 @@ Size=Størrelse
 Skipped\ -\ No\ PDF\ linked=Sprang over - ingen PDF-fil linket
 Skipped\ -\ PDF\ does\ not\ exist=Sprang over - PDF-filen findes ikke
 
-Skipped\ entry.=Sprang over post.
 
 
 source\ edit=redigering af kilde
@@ -688,8 +687,6 @@ Statically\ group\ entries\ by\ manual\ assignment=Grupper poster statisk ved ma
 
 Switches\ between\ full\ and\ abbreviated\ journal\ name\ if\ the\ journal\ name\ is\ known.=Skifter mellem fuldt og forkortet tidsskriftsnavn hvis navnet er kendt.
 
-The\ chosen\ encoding\ '%0'\ could\ not\ encode\ the\ following\ characters\:=Den valgte tegnkodning '%0' kunne ikke kode de følgende tegn\:
-
 
 the\ field\ <b>%0</b>=feltet <b>%0</b>
 The\ group\ "%0"\ already\ contains\ the\ selection.=Gruppen "%0" indeholder allerede de valgte poster.
@@ -790,8 +787,6 @@ MIME\ type=MIME-type
 This\ feature\ lets\ new\ files\ be\ opened\ or\ imported\ into\ an\ already\ running\ instance\ of\ JabRef\ instead\ of\ opening\ a\ new\ instance.\ For\ instance,\ this\ is\ useful\ when\ you\ open\ a\ file\ in\ JabRef\ from\ your\ web\ browser.\ Note\ that\ this\ will\ prevent\ you\ from\ running\ more\ than\ one\ instance\ of\ JabRef\ at\ a\ time.=Denne funktion tillader, at flere filer kan åbnes eller importeres i en allerede kørende JabRef i stedet for at åbne programmet påny. For eksempel er dette praktisk, når du åbner filer i JabRef fra din web browser. Bemærk at dette vil forhindre dig i at køre mere end en instans af JabRef ad gangen.
 
 Rename\ field=Omdøb felt
-Rename\ field\ to=Omdøb felt til
-Move\ contents\ of\ a\ field\ into\ a\ field\ with\ a\ different\ name=Flyt indhold af et felt til et felt med et andet navn
 
 Cannot\ use\ port\ %0\ for\ remote\ operation;\ another\ application\ may\ be\ using\ it.\ Try\ specifying\ another\ port.=Kan ikke bruge port %0 til fjernstyring; et andet program bruger den måske. Prøv en anden port.
 
@@ -846,7 +841,6 @@ Extra\ information\ (e.g.\ page\ number)=Ekstra information (f.eks. sidenr.)
 Manage\ citations=Administrer referencer
 Problem\ modifying\ citation=Der opstod et problem med at ændre referencen
 Citation=Reference
-Could\ not\ resolve\ BibTeX\ entry\ for\ citation\ marker\ '%0'.=Kunne ikke udrede BibTeX-post for referencen '%0'.
 Select\ style=Vælg stil
 Journals=Tidsskrifter
 Cite=Referer
@@ -858,16 +852,25 @@ Select\ Writer\ document=Vælg Writer-dokument
 Sync\ OpenOffice/LibreOffice\ bibliography=Synkroniser med OpenOffice/LibreOffice-bibliografi
 Select\ which\ open\ Writer\ document\ to\ work\ on=Vælg hvilket åbent Writer-dokument du vil arbejde på
 Connected\ to\ document=Forbundet til dokument
+
+
+
 Insert\ a\ citation\ without\ text\ (the\ entry\ will\ appear\ in\ the\ reference\ list)=Indsæt en reference uden tekst (referencen optræder i referencelisten)
 Cite\ selected\ entries\ with\ extra\ information=Referer valgte poster med ekstra information
 Ensure\ that\ the\ bibliography\ is\ up-to-date=Sørg for at bibliografien er opdateret
+
+
+
+
+
 Unable\ to\ synchronize\ bibliography=Kunne ikke synkronisere bibliografi
 Combine\ pairs\ of\ citations\ that\ are\ separated\ by\ spaces\ only=Kombiner referencepar der kun er adskilt med mellemrum
 Autodetection\ failed=Autodetektion fejlede
 Please\ wait...=Vent venligst...
 Connection\ lost=Forbindelse tabt
-The\ paragraph\ format\ is\ controlled\ by\ the\ property\ 'ReferenceParagraphFormat'\ or\ 'ReferenceHeaderParagraphFormat'\ in\ the\ style\ file.=Afsnitsformatet styres af indstillingen 'ReferenceParagraphFormat' eller 'ReferenceHeaderParagraphFormat' i stil-filen.
-The\ character\ format\ is\ controlled\ by\ the\ citation\ property\ 'CitationCharacterFormat'\ in\ the\ style\ file.=Tegnformatet styres af referenceindstillingen 'CitationCharacterFormat' i stil-filen.
+
+
+
 Automatically\ sync\ bibliography\ when\ inserting\ citations=Synkroniser automatisk bibliografi når der indsættes referencer
 Look\ up\ BibTeX\ entries\ in\ the\ active\ tab\ only=Slå kun BibTeX-poster op i det aktive faneblad
 Look\ up\ BibTeX\ entries\ in\ all\ open\ libraries=Slå BibTeX-poster op i alle åbne libraryr
@@ -900,6 +903,7 @@ Manage\ keywords=Håndter nøgleord
 
 
 
+
 Merge\ entries=Flet indgange
 
 
@@ -908,6 +912,7 @@ Finished\ automatically\ setting\ external\ links.=Fuldførte automatisk udfyldn
 
 
 
+
 Open\ folder=Åben mappe
 
 
@@ -920,6 +925,7 @@ Path\ to\ %0=Sti til %0
 
 
 Could\ not\ connect\ to\ %0=Kunne ikke forbinde til %0
+
 Invalid\ DOI\:\ '%0'.=Ugyldig DOI\: '%0'.
 
 
@@ -947,6 +953,11 @@ Unabbreviate\ journal\ names=Ekspander tidsskriftsnavn
 
 
 
+
+
+
+
+
 
 
 
@@ -995,7 +1006,6 @@ Existing\ file=Eksisterende fil
 
 
 
-
 
 
 Check\ integrity=Tjek integritet
@@ -1041,6 +1051,27 @@ Default\ pattern=Standardmønster
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
diff --git a/src/main/resources/l10n/JabRef_de.properties b/src/main/resources/l10n/JabRef_de.properties
index 2fdb5eee39f..901ac722dc2 100644
--- a/src/main/resources/l10n/JabRef_de.properties
+++ b/src/main/resources/l10n/JabRef_de.properties
@@ -19,7 +19,9 @@ Unable\ to\ monitor\ file\ changes.\ Please\ close\ files\ and\ processes\ and\
 
 %0/%1\ entries=%0/%1 Einträge
 
-%0\ export\ successful=%0-Export erfolgreich
+Export\ operation\ finished\ successfully.=Exportvorgang erfolgreich abgeschlossen.
+
+Reveal\ in\ File\ Explorer=Im Datei-Explorer anzeigen
 
 %0\ matches\ the\ regular\ expression\ <b>%1</b>=%0 exakt dem regulären Ausdruck <b>%1</b> entspricht
 
@@ -151,8 +153,6 @@ Cite\ command=Cite-Befehl
 
 Clear=Zurücksetzen
 
-Clear\ fields=Felder löschen
-
 Open\ /\ close\ entry\ editor=Eintragseditor öffnen / schließen
 
 Close\ dialog=Dialog schließen
@@ -172,7 +172,13 @@ Copied=Kopiert
 
 Copy=Kopieren
 
+Copy\ title=Kopiere Titel
+Copy\ \\cite{citation\ key}=Kopiere \\cite{citation key}
+Copy\ citation\ (html)=Zitat kopieren (html)
+Copy\ citation\ (text)=Zitat kopieren (Text)
 Copy\ citation\ key=Kopiere Zitationsschlüssel
+Copy\ citation\ key\ and\ link=Zitationscchlüssel und Titel kopieren
+Copy\ citation\ key\ and\ title=Zitationscchlüssel und Titel kopieren
 
 Copy\ to\ clipboard=In die Zwischenablage kopieren
 
@@ -227,7 +233,9 @@ Library\ properties=Eigenschaften der Bibliothek
 
 Default=Standard
 
-Default\ encoding=Standard-Zeichenkodierung
+Character\ encoding\ UTF-8\ is\ not\ supported.=Die Zeichenkodierung UTF-8 wird nicht unterstützt.
+UTF-8\ could\ not\ be\ used\ to\ encode\ the\ following\ characters\:\ %0=UTF-8 konnte nicht verwendet werden, um die folgenden Zeichen zu kodieren\: %0
+The\ chosen\ encoding\ '%0'\ could\ not\ encode\ the\ following\ characters\:=Die gewählte Kodierung '%0' konnte folgende Buchstaben nicht darstellen\:
 
 Downloading=Lade herunter
 
@@ -275,6 +283,7 @@ Downloaded\ website\ as\ an\ HTML\ file.=Webseite als HTML-Datei herunterladen.
 
 duplicate\ removal=Duplikate entfernen
 
+Duplicate\ fields=Doppelte Felder
 
 Duplicate\ string\ name=Doppelter String-Name
 
@@ -510,6 +519,7 @@ Main\ file\ directory=Standard-Verzeichnis für Dateien
 Manage\ custom\ exports=Verwalte externe Exportfilter
 
 Manage\ custom\ imports=Verwalte externe Importfilter
+External\ file\ types=Externe Dateitypen
 
 Mark\ new\ entries\ with\ owner\ name=Neue Einträge mit Namen des Besitzers versehen
 
@@ -532,6 +542,10 @@ Moved\ group\ "%0".=Gruppe "%0" verschoben.
 
 Mr.\ DLib\ Privacy\ settings=Mr. DLib Privatsphäre-Einstellungen
 
+No\ database\ is\ open=Keine Datenbank ist geöffnet
+
+We\ need\ a\ database\ to\ export\ from.\ Open\ one.=Wir benötigen eine Datenbank, um aus ihr zu exportieren. Öffne eine.
+
 No\ recommendations\ received\ from\ Mr.\ DLib\ for\ this\ entry.=Keine Empfehlungen von Mr. DLib für diesen Eintrag.
 
 Error\ while\ fetching\ recommendations\ from\ Mr.DLib.=Fehler beim Abrufen von Empfehlungen von Mr.DLib.
@@ -624,8 +638,6 @@ Path\ to\ %0\ not\ defined=Pfad zu %0 nicht definiert
 
 Path\ to\ LyX\ pipe=Pfad zur LyX-pipe
 
-PDF\ does\ not\ exist=PDF existiert nicht
-
 File\ has\ no\ attached\ annotations=Datei hat keine angefügten Annotationen
 
 Please\ enter\ a\ name\ for\ the\ group.=Bitte geben Sie einen Namen für die Gruppe ein.
@@ -691,11 +703,25 @@ Remove\ selected\ entries\ from\ this\ group=Ausgewählte Einträge aus dieser G
 
 Remove\ group=Gruppe löschen
 
-Remove\ group\ "%0"?=Gruppe "%0" löschen?
+Remove\ group\ and\ subgroups=Gruppe und Untergruppen löschen
+
+Remove\ groups\ and\ subgroups=Gruppen und Untergruppen entfernen
+
+Remove\ all\ selected\ groups\ and\ keep\ their\ subgroups?=Alle ausgewählten Gruppen entfernen und ihre Untergruppen beibehalten?
+
+Remove\ group\ "%0"\ and\ keep\ its\ subgroups?=Gruppe "%0" entfernen und Untergruppen beibehalten?
+
+Remove\ groups=Gruppen entfernen
+
+Removed\ all\ selected\ groups.=Alle ausgewählten Gruppen entfernen.
 
 Remove\ group\ "%0"\ and\ its\ subgroups?=Gruppe "%0" inklusive Untergruppen löschen?
 
-Remove\ group\ and\ subgroups=Gruppe und Untergruppen löschen
+Removed\ group\ "%0"\ and\ its\ subgroups.=Gruppe "%0" inklusive Untergruppen gelöscht.
+
+Remove\ all\ selected\ groups\ and\ their\ subgroups?=Alle ausgewählten Gruppen und ihre Untergruppen entfernen?
+
+Removed\ all\ selected\ groups\ and\ their\ subgroups.=Alle ausgewählten Gruppen und ihre Untergruppen entfernt.
 
 Remove\ link=Link löschen
 
@@ -705,8 +731,6 @@ Remove\ string\ %0=Entferne String %0
 
 Removed\ group\ "%0".=Gruppe "%0" gelöscht.
 
-Removed\ group\ "%0"\ and\ its\ subgroups.=Gruppe "%0" inklusive Untergruppen gelöscht.
-
 Removed\ string=String gelöscht
 
 Renamed\ string=String umbenannt
@@ -729,6 +753,8 @@ Replaces\ Unicode\ ligatures\ with\ their\ expanded\ form=Unicode-Ligaturen durc
 
 Required\ fields=Benötigte Felder
 
+Do\ not\ resolve\ BibTeX\ strings=BibTeX-Zeichenketten nicht auflösen
+Resolve\ BibTeX\ strings\ for\ the\ following\ fields=BibTeX-Zeichenketten für folgende Felder auflösen
 
 resolved=davon aufgelöst
 
@@ -742,6 +768,7 @@ Review=Überprüfung
 Review\ changes=Änderungen überprüfen
 Review\ Field\ Migration=Review-Feld Migration
 
+Loading=Wird geladen...
 
 Save=Speichern
 Save\ all\ finished.=Speichern aller Dateien beendet
@@ -775,9 +802,6 @@ Select\ file\ from\ ZIP-archive=Eintrag aus der ZIP-Archiv auswählen
 
 Select\ the\ tree\ nodes\ to\ view\ and\ accept\ or\ reject\ changes=Wählen Sie die Verzweigungen aus, um die Änderungen zu sehen und anzunehmen oder zu verwerfen
 
-Set\ field=Setze Feld
-Set\ fields=Felder setzen
-
 Settings=Einstellungen
 
 Shortcut=Tastenkürzel
@@ -810,7 +834,12 @@ Size=Größe
 Skipped\ -\ No\ PDF\ linked=Übersprungen - Kein PDF verlinkt
 Skipped\ -\ PDF\ does\ not\ exist=Übersprungen - PDF exisitert nicht
 
-Skipped\ entry.=Eintrag übersprungen.
+JabRef\ skipped\ the\ entry.=JabRef hat den Eintrag übersprungen.
+Import\ error=Fehler beim Importieren
+Open\ library\ error=Fehler beim Öffnen der Bibliothek
+Please\ check\ your\ library\ file\ for\ wrong\ syntax.=Bitte überprüfen Sie Ihre Bibliotheksdatei auf falsche Syntax.
+SourceTab\ error=SourceTab Fehler
+User\ input\ via\ entry-editor\ in\ `{}bibtex\ source`\ tab\ led\ to\ failure.=Benutzereingabe via Eintragseditor im Tab `{}bibtex source` führte zu einem Fehler.
 
 Sort\ subgroups=Untergruppen sortieren
 
@@ -825,8 +854,6 @@ Sublibrary\ from\ AUX\ to\ BibTeX=Subbibliothek von AUX bis BibTeX
 
 Switches\ between\ full\ and\ abbreviated\ journal\ name\ if\ the\ journal\ name\ is\ known.=Wechselt zwischen vollem und abgekürztem Zeitschriftentitel falls bekannt.
 
-The\ chosen\ encoding\ '%0'\ could\ not\ encode\ the\ following\ characters\:=Die gewählte Kodierung '%0' konnte folgende Buchstaben nicht darstellen\:
-
 
 the\ field\ <b>%0</b>=das Feld <b>%0</b>
 The\ group\ "%0"\ already\ contains\ the\ selection.=Die Gruppe "%0" enthält bereits diese Auswahl.
@@ -901,6 +928,7 @@ Warning=Warnung
 
 Warnings=Warnungen
 
+Warning\:\ You\ added\ field\ "%0"\ twice.\ Only\ one\ will\ be\ kept.=Warnung\: Sie haben das Feld "%0" zweimal hinzugefügt. Es wird nur eines behalten.
 
 web\ link=Web-Link
 
@@ -958,10 +986,6 @@ Line\ %0\:\ Found\ corrupted\ citation\ key\ %1\ (comma\ missing).=Zeile %0\: Be
 No\ full\ text\ document\ found=Kein Volltext-Dokument gefunden
 Download\ from\ URL=Download von URL
 Rename\ field=Feld umbenennen
-Append\ field=An Feld anfügen
-Append\ to\ fields=An Felder anfügen
-Rename\ field\ to=Feld umbenennen
-Move\ contents\ of\ a\ field\ into\ a\ field\ with\ a\ different\ name=Inhalt eines Felds in ein Feld mit anderem Namen verschieben
 
 Cannot\ use\ port\ %0\ for\ remote\ operation;\ another\ application\ may\ be\ using\ it.\ Try\ specifying\ another\ port.=Port %0 konnte nicht für externen Zugriff genutzt werden; er wird möglicherweise von einer anderen Anwendung benutzt. Versuchen Sie einen anderen Port.
 
@@ -1031,9 +1055,9 @@ Cite\ special=Spezielles Zitieren
 Extra\ information\ (e.g.\ page\ number)=Zusatzinformation (z.B. Seitenzahl)
 Manage\ citations=Literaturverweise verwalten
 Problem\ modifying\ citation=Problem beim Ändern des Literaturverweises
+Problem\ collecting\ citations=Beim sammeln von Zitaten ist ein Problem aufgetreten
 Citation=Literaturverweis
 Connecting...=Verbinde...
-Could\ not\ resolve\ BibTeX\ entry\ for\ citation\ marker\ '%0'.=BibTeX-Eintrag für Verweismarker '0%' konnte nicht aufgelöst werden.
 Select\ style=Stil wählen
 Journals=Zeitschriften
 Cite=Zitieren
@@ -1045,17 +1069,36 @@ Select\ Writer\ document=Writer-Dokument wählen
 Sync\ OpenOffice/LibreOffice\ bibliography=OpenOffice/LibreOffice-Bibliographie synchronisieren
 Select\ which\ open\ Writer\ document\ to\ work\ on=Bitte wählen Sie, mit welchem geöffneten Writer-Dokument Sie arbeiten möchten
 Connected\ to\ document=Verbindung zum Dokument hergestellt
+
+Could\ not\ connect\ to\ any\ Writer\ document.\ Please\ make\ sure\ a\ document\ is\ open\ before\ using\ the\ 'Select\ Writer\ document'\ button\ to\ connect\ to\ it.=Konnte keine Verbindung zu einem Writer-Dokument herstellen. Bitte stellen Sie sicher, dass ein Dokument geöffnet ist, bevor Sie die Schaltfläche 'Writer-Dokument auswählen' verwenden, um eine Verbindung herzustellen.
+
+No\ Writer\ documents\ found=Keine Writer-Dokumente gefunden
+
 Insert\ a\ citation\ without\ text\ (the\ entry\ will\ appear\ in\ the\ reference\ list)=Literaturverweis ohne Text einfügen (der Eintrag wird in der Literaturliste erscheinen)
 Cite\ selected\ entries\ with\ extra\ information=Ausgewählte Einträge mit Zusatzinformation zitieren
 Ensure\ that\ the\ bibliography\ is\ up-to-date=Sicherstellen, dass die Bibliographie aktuell ist
+
 Your\ OpenOffice/LibreOffice\ document\ references\ the\ citation\ key\ '%0',\ which\ could\ not\ be\ found\ in\ your\ current\ library.=Ihr OpenOffice/LibreOffice Dokument verweist auf den Zitationsschlüssel '%0', der in Ihrer aktuellen Bibliothek nicht gefunden werden konnte.
+
+This\ operation\ requires\ a\ bibliography\ database.=Dieser Vorgang erfordert eine Bibliografiebibliothek.
+
+Your\ OpenOffice/LibreOffice\ document\ references\ at\ least\ %0\ citation\ keys\ which\ could\ not\ be\ found\ in\ your\ current\ library.\ Some\ of\ these\ are\ %1.=Ihre OpenOffice/LibreOffice Dokumente verweisen mindestens auf %0 Zitierschlüssel, die in Ihrer aktuellen Bibliothek nicht gefunden werden konnten. Einige davon sind %1.
+
+Your\ OpenOffice/LibreOffice\ document\ references\ no\ citation\ keys\ which\ could\ also\ be\ found\ in\ your\ current\ library.=Ihr OpenOffice/LibreOffice Dokument verweist auf keine Zitierschlüssel, die auch in Ihrer aktuellen Bibliothek gefunden werden konnten.
+
 Unable\ to\ synchronize\ bibliography=Synchronisieren der Bibliographie fehlgeschlagen
 Combine\ pairs\ of\ citations\ that\ are\ separated\ by\ spaces\ only=Verbinde Paare von Literaturverweisen, die nur durch Leerzeichen voneinander getrennt sind
 Autodetection\ failed=Automatische Erkennung fehlgeschlagen
 Please\ wait...=Bitte warten...
 Connection\ lost=Verbindung verloren
-The\ paragraph\ format\ is\ controlled\ by\ the\ property\ 'ReferenceParagraphFormat'\ or\ 'ReferenceHeaderParagraphFormat'\ in\ the\ style\ file.=Das Abschnittsformat wird von der Eigenschaft 'ReferenceParagraphFormat' oder 'ReferenceHeaderParagraphFormat' in der Stildatei bestimmt.
-The\ character\ format\ is\ controlled\ by\ the\ citation\ property\ 'CitationCharacterFormat'\ in\ the\ style\ file.=Das Zeichenformat wird von der Eigenschaft 'CitationCharacterFormat' in der Stildatei bestimmt.
+
+Could\ not\ update\ bibliography=Konnte Bibliografie nicht aktualisieren
+Not\ connected\ to\ document=Nicht mit Dokument verbunden
+Problem\ combining\ cite\ markers=Problem bei der Kombination von Zitiermarkierungen
+Unable\ to\ reload\ style\ file=Stildatei konnte nicht neu geladen werden
+
+Problem\ during\ separating\ cite\ markers=Problem bei der Trennung von Zitiermarkierungen
+
 Automatically\ sync\ bibliography\ when\ inserting\ citations=Bibliographie beim Einfügen von Literaturverweisen automatisch synchronisieren
 Look\ up\ BibTeX\ entries\ in\ the\ active\ tab\ only=BibTeX-Einträge nur im aktiven Tab suchen
 Look\ up\ BibTeX\ entries\ in\ all\ open\ libraries=BibTeX-Einträge in allen geöffneten Bibliotheken suchen
@@ -1157,7 +1200,9 @@ Toggle\ relevance=Relevanz markieren/aufheben
 Toggle\ quality\ assured=Qualität markieren/aufheben
 Toggle\ print\ status=Druckstatus markieren/aufheben
 Update\ keywords=Stichworte aktualisieren
+Problem\ connecting=Verbindungsproblem
 Connection\ to\ OpenOffice/LibreOffice\ has\ been\ lost.\ Please\ make\ sure\ OpenOffice/LibreOffice\ is\ running,\ and\ try\ to\ reconnect.=Verbindung zu OpenOffice/LibreOffice verloren. Bitte stellen Sie sicher, dass OpenOffice/LibreOffice läuft, und versuchen Sie, erneut zu verbinden.
+
 JabRef\ will\ send\ at\ least\ one\ request\ per\ entry\ to\ a\ publisher.=JabRef sendet pro Eintrag mindestens eine Anfrage an einen Herausgeber.
 Correct\ the\ entry,\ and\ reopen\ editor\ to\ display/edit\ source.=Eintrag korrigieren und Editor erneut öffnen, um den Quelltext anzuzeigen/zu bearbeiten.
 Could\ not\ connect\ to\ running\ OpenOffice/LibreOffice.=Verbindung zu OpenOffice/LibreOffice fehlgeschlagen.
@@ -1171,8 +1216,6 @@ To\ disable\ the\ memory\ stick\ mode\ rename\ or\ remove\ the\ jabref.xml\ file
 Unable\ to\ connect.\ One\ possible\ reason\ is\ that\ JabRef\ and\ OpenOffice/LibreOffice\ are\ not\ both\ running\ in\ either\ 32\ bit\ mode\ or\ 64\ bit\ mode.=Verbindung fehlgeschlagen. Ein möglicher Grund ist, dass JabRef und OpenOffice/LibreOffice nicht beide im 32-bit oder 64-bit Modus laufen.
 Delimiter(s)=Trennzeichen
 When\ downloading\ files,\ or\ moving\ linked\ files\ to\ the\ file\ directory,\ use\ the\ bib\ file\ location.=Wenn Sie Dateien herunterladen oder verknüpfte Dateien in das Dateiverzeichnis verschieben, verwenden Sie den Speicherort der bib-Datei.
-Your\ style\ file\ specifies\ the\ character\ format\ '%0',\ which\ is\ undefined\ in\ your\ current\ OpenOffice/LibreOffice\ document.=Ihre Stildatei legt das Zeichenformat '%0' fest, das in Ihrem aktuellen OpenOffice/LibreOffice-Dokument nicht definiert ist.
-Your\ style\ file\ specifies\ the\ paragraph\ format\ '%0',\ which\ is\ undefined\ in\ your\ current\ OpenOffice/LibreOffice\ document.=Ihre Stildatei legt das Abschnittsformat '%0' fest, das in Ihrem aktuellen OpenOffice/LibreOffice-Dokument nicht definiert ist.
 
 Searching...=Suche läuft...
 Please\ enter\ a\ search\ string=Bitte geben Sie eine Suchphrase ein
@@ -1210,6 +1253,16 @@ Use\ custom\ proxy\ configuration=Benutzerdefinierte Proxy-Konfiguration verwend
 Proxy\ requires\ authentication=Proxy erfordert Authentifizierung
 Attention\:\ Password\ is\ stored\ in\ plain\ text\!=Achtung\: Das Passwort wird im Klartext gespeichert\!
 Clear\ connection\ settings=Verbindungseinstellungen zurücksetzen
+Check\ Proxy\ Setting=Überprüfe Proxy-Einstellungen
+Check\ connection=Verbindung prüfen
+Connection\ failed\!=Verbindung fehlgeschlagen\!
+Connection\ successful\!=Verbindung erfolgreich\!
+
+SSL\ Configuration=SSL-Konfiguration
+SSL\ configuration\ changed=SSL-Konfiguration geändert
+SSL\ certificate\ file=SSL-Zertifikatsdatei
+Duplicate\ Certificates=Doppelte Zertifikate
+You\ already\ added\ this\ certificate=Sie haben dieses Zertifikat bereits hinzugefügt
 
 Open\ folder=Ordner öffnen
 Export\ sort\ order=Sortierreihenfolge exportieren
@@ -1246,6 +1299,7 @@ Please\ open\ %0\ manually.=Bitte öffnen Sie %0 manuell.
 The\ link\ has\ been\ copied\ to\ the\ clipboard.=Der Link wurde in die Zwischenablage kopiert.
 
 Open\ %0\ file=%0 Datei öffnen
+Could\ not\ detect\ terminal\ automatically.\ Please\ define\ a\ custom\ terminal\ in\ the\ preferences.=Konsole konnte nicht automatisch erkannt werden. Bitte definieren Sie eine eigene Konsolenapplikation in den Einstellungen.
 
 Cannot\ delete\ file=Datei kann nicht gelöscht werden.
 File\ permission\ error=Fehler beim Dateizugriff.
@@ -1291,9 +1345,7 @@ Save\ changes=Änderungen speichern
 Discard\ changes=Änderungen verwerfen
 Library\ '%0'\ has\ changed.=Die Bibliothek '%0' wurde geändert.
 Print\ entry\ preview=Eintragsvorschau drucken
-Copy\ title=Kopiere Titel
-Copy\ \\cite{citation\ key}=Kopiere \\cite{citation key}
-Copy\ citation\ key\ and\ title=Zitationscchlüssel und Titel kopieren
+
 Invalid\ DOI\:\ '%0'.=Ungültiger DOI\: '%0'.
 Same\ DOI\ used\ in\ multiple\ entries=Gleiche DOI wird in mehreren Einträgen benutzt
 should\ start\ with\ a\ name=sollte mit einem Name beginnen
@@ -1554,6 +1606,22 @@ Custom=Benutzerdefiniert
 Export\ cited=Exportiere zitierte Einträge
 Unable\ to\ generate\ new\ library=Kann keine neue Bibliothek generieren
 
+The\ cursor\ is\ in\ a\ protected\ area.=Der Cursor befindet sich in einem geschützten Bereich.
+JabRefException=JabRefException
+No\ bibliography\ database\ is\ open\ for\ citation.=Keine Bibliografie-Bibliothek für Zitate geöffnet.
+
+No\ database\ is\ open\ for\ updating\ citation\ markers\ after\ citing.=Nach dem Zitieren ist keine Bibliothek für die Aktualisierung von Zitiermarkierungen geöffnet.
+
+No\ bibliography\ entries\ are\ selected\ for\ citation.=Es sind keine Bibliografieeinträge für Zitate ausgewählt.
+No\ bibliography\ style\ is\ selected\ for\ citation.=Kein Bibliografiestil für Zitate ausgewählt.
+No\ database=Keine Datenbank
+
+No\ entries\ selected\ for\ citation=Keine Einträge für Zitation ausgewählt
+Open\ one\ before\ citing.=Wählen Sie vor dem Zitieren eine aus.
+
+Select\ one\ before\ citing.=Wählen Sie vor dem Zitieren eine aus.
+Select\ some\ before\ citing.=Wählen Sie vor dem Zitieren einige aus.
+
 Found\ identical\ ranges=Identische Bereiche gefunden
 Found\ overlapping\ ranges=Überlappende Bereiche gefunden
 Found\ touching\ ranges=Sich berührende Bereiche gefunden
@@ -1619,6 +1687,8 @@ Issue\ report\ successful=Problemreport war erfolgreich
 Your\ issue\ was\ reported\ in\ your\ browser.=Ihr Problem wurde im Browser gemeldet.
 The\ log\ and\ exception\ information\ was\ copied\ to\ your\ clipboard.=Die Log und Ausnahmefehler-Informationen wurden in die Zwischenablage kopiert.
 Please\ paste\ this\ information\ (with\ Ctrl+V)\ in\ the\ issue\ description.=Bitte fügen Sie die Informationen (mit STRG+V) in die Problembeschreibung ein.
+Last\ notification=Letzte Benachrichtigung
+Check\ the\ event\ log\ to\ see\ all\ notifications=Überprüfe das Ereignisprotokoll, um alle Benachrichtigungen zu sehen
 
 Host=Host
 Port=Port
@@ -1656,7 +1726,6 @@ Protected\ terms\ file=Geschützte Begriffsdatei
 Style\ file=Stildatei
 
 Open\ OpenOffice/LibreOffice\ connection=Öffne OpenOffice/LibreOffice Verbindung
-You\ must\ enter\ at\ least\ one\ field\ name=Sie müssen mindestens einen Feldnamen angeben
 Non-ASCII\ encoded\ character\ found=Nicht ASCII-kodiertes Zeichen gefunden
 Non-UTF-8\ encoded\ field\ found=Nicht UTF-8 kodiertes Feld gefunden
 Toggle\ web\ search\ interface=Websuche ein-/ausschalten
@@ -1702,7 +1771,6 @@ should\ be\ normalized=Sollte normalisiert sein
 
 Empty\ search\ ID=Leere Such-ID
 The\ given\ search\ ID\ was\ empty.=Die übergebene Such-ID ist leer.
-Copy\ citation\ key\ and\ link=Zitationscchlüssel und Titel kopieren
 biblatex\ field\ only=Nur ein biblatex-Feld
 
 Error\ while\ generating\ fetch\ URL=Fehler beim generieren der Abruf URL
@@ -1795,7 +1863,6 @@ Removes\ all\ hyphenated\ line\ breaks\ in\ the\ field\ content.=Entfernen aller
 Could\ not\ retrieve\ entry\ data\ from\ '%0'.=Konnte Daten von '%0' nicht abrufen.
 Entry\ from\ %0\ could\ not\ be\ parsed.=Eintrag von %0 konnte nicht analysiert werden.
 Invalid\ identifier\:\ '%0'.=Ungültige Kennung\: "%0".
-This\ paper\ has\ been\ withdrawn.=Dieses Paper wurde zurückgezogen.
 empty\ citation\ key=leerer Zitationsschlüssel
 Aux\ file=Aux-Datei
 Group\ containing\ entries\ cited\ in\ a\ given\ TeX\ file=Gruppe mit Einträgen die in einer vorhanden Tex-Datei zitiert worden sind
@@ -1823,9 +1890,6 @@ Could\ not\ connect\ to\ Vim\ server.\ Make\ sure\ that\ Vim\ is\ running\ with\
 Could\ not\ connect\ to\ a\ running\ gnuserv\ process.\ Make\ sure\ that\ Emacs\ or\ XEmacs\ is\ running,\ and\ that\ the\ server\ has\ been\ started\ (by\ running\ the\ command\ 'server-start'/'gnuserv-start').=Keine Verbindung zu einem laufenden gnuserv-Prozess möglich. Vergewissern Sie sich, dass Emacs oder XEmacs läuft und dass der Server gestartet wurde (mit dem Befehl 'server-start'/'gnuserv-start').
 Error\ pushing\ entries=Fehler beim Einfügen der Einträge
 
-Undefined\ character\ format=Nicht definiertes Zeichenformat
-Undefined\ paragraph\ format=Nicht definiertes Paragraphenformat
-
 Preamble=Präambel
 Markings=Markierungen
 Use\ selected\ instance=Ausgewählte Instanz verwenden
@@ -1845,8 +1909,8 @@ Blog=Blog
 Check\ integrity=Integrität prüfen
 Cleanup\ URL\ link=URL-Link bereinigen
 Cleanup\ URL\ link\ by\ removing\ special\ symbols\ and\ extracting\ simple\ link=URL-Link bereinigen durch Entfernen von Sondersymbolen und Extraktion des einfachen Links
+Copy\ DOI=DOI kopieren
 Copy\ DOI\ url=DOI-URL kopieren
-Copy\ citation=Kopiere Zitation
 Development\ version=Entwicklungsversion
 Export\ selected\ entries=Ausgewählte Einträge exportieren
 Export\ selected\ entries\ to\ clipboard=Ausgewählte Einträge in die Zwischenablage kopieren
@@ -1857,8 +1921,6 @@ Manage\ protected\ terms=Geschützte Terme verwalten
 New\ entry\ from\ plain\ text=Neuer Eintrag aus Klartext
 Import\ by\ ID=Import per ID
 Enter\ a\ valid\ ID=Gültige ID eingeben
-Imported\ one\ entry=Ein Eintrag importiert
-Entry\ already\ exists=Eintrag existiert bereits
 New\ sublibrary\ based\ on\ AUX\ file=Neue Unterbibliothek basierend auf AUX Datei
 Push\ entries\ to\ external\ application\ (%0)=Einträge in externe Anwendung einfügen (%0)
 Quit=Beenden
@@ -2048,6 +2110,7 @@ Please\ provide\ a\ valid\ aux\ file.=Bitte geben Sie eine gültige aux-Datei an
 Keyword\ delimiter=Schlüsselwort-Trennzeichen
 Hierarchical\ keyword\ delimiter=Hierarchisches Schlüsselwort-Trennzeichen
 Escape\ ampersands=Kaufmnännische-Und-Zeichen maskieren
+Escape\ dollar\ sign=Dollar-Zeichen maskieren.
 
 Hint\:\n\nTo\ search\ all\ fields\ for\ <b>Smith</b>,\ enter\:\n<tt>smith</tt>\n\nTo\ search\ the\ field\ <b>author</b>\ for\ <b>Smith</b>\ and\ the\ field\ <b>title</b>\ for\ <b>electrical</b>,\ enter\:\n<tt>author\=Smith\ and\ title\=electrical</tt>=Tipp\:\n\nUm alle Felder für <b>Smith</b>zu durchsuchen, geben Sie ein\:\n<tt>smith</tt>\n\nUm das Feld <b>author</b> für <b>Smith</b> und das Feld <b>Titel</b> für <b>electrical</b> zu durchsuchen geben Sie ein\:\n<tt>Autor\=Smith und title\=electrical</tt>
 
@@ -2282,10 +2345,6 @@ Removes\ digits.=Ziffern entfernen.
 
 Presets=Voreinstellungen
 
-Check\ Proxy\ Setting=Überprüfe Proxy-Einstellungen
-Check\ connection=Verbindung prüfen
-Connection\ failed\!=Verbindung fehlgeschlagen\!
-Connection\ successful\!=Verbindung erfolgreich\!
 Generate\ groups\ from\ keywords\ in\ the\ following\ field=Gruppen aus Schlüsselwörtern im folgenden Feld generieren
 Generate\ groups\ for\ author\ last\ names=Gruppen für Nachnamen der Autoren generieren
 Regular\ expression=Regulärere Ausdruck
@@ -2305,15 +2364,43 @@ Separate\ merged\ citations=Aufteilen zusammengeführter Zitate
 Separate\ citations=Zitate separieren
 
 Unprotect\ terms=Terme nicht mehr schützen
-Error\ connecting\ to\ Writer\ document=Fehler beim Verbinden zum Writer-Dokument
-You\ need\ to\ open\ Writer\ with\ a\ document\ before\ connecting=Sie müssen Writer mit einem Dokument öffnen, bevor Sie sich verbinden können
 
 Generate\ a\ new\ key\ for\ imported\ entries\ (overwriting\ their\ default)=Erzeugen eines neuen Schlüssels für importierte Einträge (Überschreiben der Voreinstellung)
+Warn\ about\ duplicates\ on\ import=Beim Import vor Duplikaten warnen
 Import\ and\ Export=Import und Export
 Custom\ DOI\ URI=Eigene DOI-URI
 Use\ custom\ DOI\ base\ URI\ for\ article\ access=Verwende benutzerdefinierte DOI Basis-URI für den Zugriff auf Artikel
 
 Cited\ on\ pages=Auf Seiten zitiert
+Please\ move\ the\ cursor\ into\ the\ document\ text.=Bitte bewegen Sie den Cursor in den Text des Dokuments.
+To\ get\ the\ visual\ positions\ of\ your\ citations\ I\ need\ to\ move\ the\ cursor\ around,\ but\ could\ not\ get\ it.=Um die visuelle Position Ihrer Zitate zu erhalten, muss ich den Cursor bewegen, aber konnte es nicht hinbekommen.
+
+I\ cannot\ insert\ to\ the\ cursors\ current\ location.=Ich kann nicht an die aktuelle Position des Cursors einfügen.
+
+Please\ move\ the\ cursor\ to\ the\ location\ for\ the\ new\ citation.=Bitte bewegen Sie den Cursor an den Ort für das neue Zitat.
+
+Please\ create\ it\ in\ the\ document\ or\ change\ in\ the\ file\:=Bitte erstellen Sie es im Dokument oder ändern Sie die Datei\:
+
+Please\ use\ the\ latter\ in\ the\ style\ file\ below\ to\ avoid\ localization\ problems.=Bitte verwenden Sie diese in der folgenden Stildatei, um Lokalisierungsprobleme zu vermeiden.
+
+The\ %0\ character\ style\ '%1'\ is\ a\ display\ name\ for\ '%2'.=Der %0 Zeichenstil '%1' ist ein Anzeigename für '%2'.
+
+The\ %0\ character\ style\ '%1'\ is\ missing\ from\ the\ document=Der %0 Zeichenstil '%1' fehlt im Dokument
+
+The\ %0\ paragraph\ style\ '%1'\ is\ a\ display\ name\ for\ '%2'.=Der %0 Absatzstil '%1' ist ein Anzeigename für '%2'.
+
+The\ %0\ paragraph\ style\ '%1'\ is\ missing\ from\ the\ document=Der %0 Absatzstil '%1' fehlt im Dokument
+
+Error\ while\ checking\ if\ Writer\ is\ recording\ changes\ or\ has\ recorded\ changes.=Fehler bei der Überprüfung, ob Writer Änderungen aufzeichnet oder aufgezeichnete Änderungen enthält.
+
+Cannot\ work\ with\ [Edit]/[Track\ Changes]/[Record]\ turned\ on.=Funktioniert nicht, wenn [Edit]/[Track Changes]/[Record] aktiviert ist.
+
+Changes\ by\ JabRef\ could\ result\ in\ unexpected\ interactions\ with\ recorded\ changes.=Änderungen von JabRef könnten zu unerwarteten Wechselwirkungen mit aufgezeichneten Änderungen führen.
+
+Recording\ and/or\ Recorded\ changes=Änderungen aufzeichnen und/oder aufgezeichnete Änderungen
+
+Use\ [Edit]/[Track\ Changes]/[Manage]\ to\ resolve\ them\ first.=Verwende [Edit]/[Track Changes]/[Manage], um diese zuerst aufzulösen.
+
 Unable\ to\ find\ valid\ certification\ path\ to\ requested\ target(%0),\ download\ anyway?=Es konnte kein gültiger Zertifizierungspfad zum angeforderten Ziel gefunden werden(%0), trotzdem herunterladen?
 Download\ operation\ canceled.=Downloadvorgang abgebrochen.
 
@@ -2330,7 +2417,6 @@ Entry\ Type=Eintragstyp
 Entry\ types=Eintragstypen
 Field\ names=Feldnamen
 Others=Andere
-Overwrite\ existing\ field\ values=Bestehende Feldwerte überschreiben
 Recommended=Empfohlen
 
 Authors\ and\ Title=Autoren und Titel
@@ -2361,6 +2447,8 @@ Query=Abfrage
 Question=Frage
 Select\ directory=Verzeichnis wählen
 
+Fulltext\ Index=Volltext Index
+Automatically\ index\ all\ linked\ files\ for\ fulltext\ search=Alle verknüpften Dateien automatisch für die Volltextsuche indizieren
 Rebuild\ fulltext\ search\ index=Volltext-Suchindex neu erstellen
 Rebuild\ fulltext\ search\ index\ for\ current\ library?=Volltext-Suchindex für die aktuelle Bibliothek neu erstellen?
 Rebuilding\ fulltext\ search\ index...=Volltext-Suchindex wird neu erstellt...
@@ -2373,6 +2461,9 @@ Grobid\ URL=Grobid URL
 Remote\ services=Remote-Dienste
 Allow\ sending\ PDF\ files\ and\ raw\ citation\ strings\ to\ a\ JabRef\ online\ service\ (Grobid)\ to\ determine\ Metadata.\ This\ produces\ better\ results.=Erlaube das Senden von PDF-Dateien und Rohzitaten an einen JabRef Online-Dienst (Grobid) um Metadaten zu ermitteln. Dies führt zu besseren Ergebnissen.
 
+Fetcher\ cannot\ be\ tested\!=Der Fetcher kann nicht getestet werden\!
+Fetcher\ unknown\!=Fetcher unbekannt\!
+
 Character\ by\ character=Zeichen für Zeichen
 Embedded=Eingebettet
 Entry=Eintrag
@@ -2387,3 +2478,43 @@ Search\ across\ libraries\ in\ a\ new\ window=Suche über Bibliotheken in einem
 Keep\ search\ string\ across\ libraries=Suchbegriff über alle Bibliotheken beibehalten
 Keep\ dialog\ always\ on\ top=Dialogfenster immer im Vordergrund halten
 Search\ results\ from\ open\ libraries=Suchergebnisse aus offenen Bibliotheken
+
+Add\ certificate=Zertifikat hinzufügen
+Serial\ number=Seriennummer
+Issuer=Aussteller
+Valid\ from=Gültig seit
+Valid\ to=Gültig bis
+Signature\ algorithm=Signaturalgorithmus
+Version=Version
+
+Error\ downloading=Fehler beim Herunterladen
+
+Error\ while\ writing\ metadata.\ See\ the\ error\ log\ for\ details.=Fehler beim Schreiben von Metadaten. Details finden Sie im Fehlerprotokoll.
+Failed\ to\ write\ metadata,\ file\ %1\ not\ found.=Metadaten können nicht geschrieben werden, Datei %1 nicht gefunden.
+Success\!\ Finished\ writing\ metadata.=Erfolgreich\! Das Schreiben der Metadaten ist abgeschlossen.
+
+Custom\ API\ key=Eigener API-Schlüssel
+Check\ %0\ API\ Key\ Setting=%0 API-Schlüsseleinstellungen überprüfen
+
+Edit\ content=Inhalt ändern
+Copy\ or\ Move\ content=Inhalt kopieren oder verschieben
+Overwrite\ field\ content=Inhalt des Feldes überschreiben
+Set=Festlegen
+Append=Anfügen
+Clear\ field\ content=Feldinhalt löschen
+Set\ or\ append\ content=Setze oder füge Inhalt an
+Edit\ field\ content\ for\ selected\ entries=Feldinhalt der ausgewählten Einträge bearbeiten
+Rename=Umbenennen
+New\ field\ name=Neuer Feldname
+Copy\ content=Inhalt kopieren
+Move\ content=Inhalt verschieben
+Swap\ content=Inhalte vertauschen
+Copy\ or\ move\ the\ content\ of\ one\ field\ to\ another=Inhalt eines Feldes kopieren oder in ein anderes Feld verschieben
+Automatic\ field\ editor=Automatischer Feldeditor
+From=Von
+Keep\ Modifications=Änderungen akzeptieren
+To=Nach
+
+(Note\:\ If\ original\ entries\ lack\ keywords\ to\ qualify\ for\ the\ new\ group\ configuration,\ confirming\ here\ will\ add\ them)=(Hinweis\: Wenn es den ursprünglichen Einträgen an Schlüsselwörtern fehlt, die sich für die neue Gruppenkonfiguration qualifizieren, wird die Bestätigung hier diese hinzufügen)
+Assign=Zuweisen
+Do\ not\ assign=Nicht zuweisen
diff --git a/src/main/resources/l10n/JabRef_el.properties b/src/main/resources/l10n/JabRef_el.properties
index c5e38c110fa..e3f04f56ffe 100644
--- a/src/main/resources/l10n/JabRef_el.properties
+++ b/src/main/resources/l10n/JabRef_el.properties
@@ -12,7 +12,7 @@
 %0\ doesn't\ contain\ the\ term\ <b>%1</b>=%0 δεν περιέχει τον όρο <b>%1</b>
 
 
-%0\ export\ successful=%0 επιτυχής εξαγωγή
+
 
 %0\ matches\ the\ regular\ expression\ <b>%1</b>=%0 ταιριάζει την συνήθη έκφραση <b>%1</b>
 
@@ -127,8 +127,6 @@ Cite\ command=Εντολή αναφοράς
 
 Clear=Καθαρισμός
 
-Clear\ fields=Καθαρισμός πεδίων
-
 
 Close\ dialog=Κλείσμο διαλόγου
 
@@ -147,6 +145,7 @@ Copied=Αντιγράφηκε
 
 Copy=Αντιγραφή
 
+Copy\ title=Αντιγραφή τίτλου
 
 Copy\ to\ clipboard=Αντιγραφή στο πρόχειρο
 
@@ -197,7 +196,7 @@ Library\ properties=Ιδιότητες βιβλιοθήκης
 
 Default=Προεπιλογή
 
-Default\ encoding=Προεπιλεγμένη κωδικοποίηση
+The\ chosen\ encoding\ '%0'\ could\ not\ encode\ the\ following\ characters\:=Η επιλεγμένη κωδικοποίηση '%0' δεν κατάφερε να κωδικοποιήσει τους παρακάτω χαρακτήρες\:
 
 
 
@@ -465,6 +464,8 @@ Moved\ group\ "%0".=Η ομάδα "%0" έχει μετακινηθεί.
 
 
 
+
+
 Name=Όνομα
 
 Name\ formatter=Μορφοποιητής ονόματος
@@ -549,8 +550,6 @@ Path\ to\ %0\ not\ defined=Δεν έχει οριστεί διαδρομή γι
 
 Path\ to\ LyX\ pipe=Διαδρομή προς τον αγωγό LyX
 
-PDF\ does\ not\ exist=Το PDF δεν υπάρχει
-
 File\ has\ no\ attached\ annotations=Το αρχείο δεν περιέχει συνημμένους σχολιασμούς
 
 Please\ enter\ a\ name\ for\ the\ group.=Παρακαλώ πληκτρολογήστε ένα όνομα για την ομάδα.
@@ -608,11 +607,18 @@ Remove\ selected\ entries\ from\ this\ group=Αφαίρεση επιλεγμέν
 
 Remove\ group=Αφαίρεση ομάδας
 
-Remove\ group\ "%0"?=Αφαίρεση της ομάδας "%0";
+Remove\ group\ and\ subgroups=Αφαίρεση ομάδας και υπο-ομάδων
+
+
+
+
+
 
 Remove\ group\ "%0"\ and\ its\ subgroups?=Αφαίρεση της ομάδας "%0" και των υπο-ομάδων της;
 
-Remove\ group\ and\ subgroups=Αφαίρεση ομάδας και υπο-ομάδων
+Removed\ group\ "%0"\ and\ its\ subgroups.=Η ομάδα "%0" και οι υπο-ομάδες της έχουν αφαιρεθεί.
+
+
 
 Remove\ link=Αφαίρεση συνδέσμου
 
@@ -621,8 +627,6 @@ Remove\ old\ entry=Αφαίρεση παλαιάς καταχώρησης
 
 Removed\ group\ "%0".=Η ομάδα "%0" έχει αφαιρεθεί.
 
-Removed\ group\ "%0"\ and\ its\ subgroups.=Η ομάδα "%0" και οι υπο-ομάδες της έχουν αφαιρεθεί.
-
 Removed\ string=Η συμβολοσειρά έχει αφαιρεθεί
 
 Renamed\ string=Η συμβολοσειρά έχει μετονομαστεί
@@ -679,9 +683,6 @@ Select\ file\ from\ ZIP-archive=Επιλογή αρχείου από συμπι
 
 Select\ the\ tree\ nodes\ to\ view\ and\ accept\ or\ reject\ changes=Επιλέξτε τους δενδροειδείς κόμβους για να προβάλλετε και να αποδεχτείτε ή να απορρίψετε αλλαγές
 
-Set\ field=Ορισμός πεδίου
-Set\ fields=Ορισμός πεδίων
-
 Settings=Ρυθμίσεις
 
 Shortcut=Συντόμευση
@@ -714,7 +715,6 @@ Size=Μέγεθος
 Skipped\ -\ No\ PDF\ linked=Παραβλέφθηκε - Δεν έχει συνδεθεί PDF
 Skipped\ -\ PDF\ does\ not\ exist=Παραβλέφθηκε - Δεν υπάρχει PDF
 
-Skipped\ entry.=Η καταχώρηση παραβλέφθηκε.
 
 
 source\ edit=επεξεργασία πηγής
@@ -727,8 +727,6 @@ Status=Κατάσταση
 
 Switches\ between\ full\ and\ abbreviated\ journal\ name\ if\ the\ journal\ name\ is\ known.=Εναλλαγή από πλήρες ή συντετμημένο όνομα περιοδικού, εάν το όνομα του περιοδικού είναι άγνωστο.
 
-The\ chosen\ encoding\ '%0'\ could\ not\ encode\ the\ following\ characters\:=Η επιλεγμένη κωδικοποίηση '%0' δεν κατάφερε να κωδικοποιήσει τους παρακάτω χαρακτήρες\:
-
 
 the\ field\ <b>%0</b>=το πεδίο <b>%0</b>
 The\ group\ "%0"\ already\ contains\ the\ selection.=Η ομάδα "%0" περιέχει ήδη την επιλογή.
@@ -831,10 +829,6 @@ This\ feature\ lets\ new\ files\ be\ opened\ or\ imported\ into\ an\ already\ ru
 No\ full\ text\ document\ found=Δεν βρέθηκε αρχείο πλήρους κειμένου
 Download\ from\ URL=Κατέβασμα από σύνδεσμο URL
 Rename\ field=Μετονομασία πεδίου
-Append\ field=Προσάρτηση πεδίου
-Append\ to\ fields=Προσάρτηση στα πεδία
-Rename\ field\ to=Μετονομασία πεδίου ως
-Move\ contents\ of\ a\ field\ into\ a\ field\ with\ a\ different\ name=Μετακίνηση περιεχομένων ενός πεδίου σε ένα πεδίο με διαφορετικό όνομα
 
 Cannot\ use\ port\ %0\ for\ remote\ operation;\ another\ application\ may\ be\ using\ it.\ Try\ specifying\ another\ port.=Αδύνατη η χρήση της θύρας %0 για απομακρυσμένη λειτουργία, ίσως χρησιμοποιείται από μια άλλη εφαρμογή. Δοκιμάστε να ορίσετε άλλη θύρα.
 
@@ -894,7 +888,6 @@ Manage\ citations=Διαχείριση αναφορών
 Problem\ modifying\ citation=Πρόβλημα κατά την τροποποίηση της αναφοράς
 Citation=Αναφορά
 Connecting...=Πραγματοποιείται σύνδεση...
-Could\ not\ resolve\ BibTeX\ entry\ for\ citation\ marker\ '%0'.=Αδυναμία επίλυσης της καταχώρησης BibTeX για τον δείκτη αναφοράς '%0'.
 Select\ style=Επιλογή στυλ
 Journals=Περιοδικά
 Cite=Αναφέρει
@@ -906,16 +899,25 @@ Select\ Writer\ document=Επιλογή εγγράφου Writer
 Sync\ OpenOffice/LibreOffice\ bibliography=Συγχρονισμός βιβλιογραφίας OpenOffice/LibreOffice
 Select\ which\ open\ Writer\ document\ to\ work\ on=Επιλογή εγγράφου Writer για εργασία
 Connected\ to\ document=Συνδέθηκε στο έγγραφο
+
+
+
 Insert\ a\ citation\ without\ text\ (the\ entry\ will\ appear\ in\ the\ reference\ list)=Εισάγετε μια αναφορά χωρίς κείμενο (η καταχώρηση θα εμφανιστεί στη λίστα παραπομπών)
 Cite\ selected\ entries\ with\ extra\ information=Αναφορά επιλεγμένων καταχωρήσεων με περισσότερες πληροφορίες
 Ensure\ that\ the\ bibliography\ is\ up-to-date=Βεβαιωθείτε πως η βιβλιογραφία έχει ενημερωθεί
+
+
+
+
+
 Unable\ to\ synchronize\ bibliography=Αδυναμία συγχρονισμού βιβλιογραφίας
 Combine\ pairs\ of\ citations\ that\ are\ separated\ by\ spaces\ only=Συνδυασμός ζευγών αναφορών που χωρίζονται μόνο με κενό
 Autodetection\ failed=Αποτυχία αυτόματης εύρεσης
 Please\ wait...=Παρακαλώ περιμένετε...
 Connection\ lost=Απώλεια σύνδεσης
-The\ paragraph\ format\ is\ controlled\ by\ the\ property\ 'ReferenceParagraphFormat'\ or\ 'ReferenceHeaderParagraphFormat'\ in\ the\ style\ file.=Η μορφή παραγράφου ελέγχεται από την ιδιότητα 'ΠαραπομπήΠαράγραφοςΜορφή' ή 'ΠαραπομπήΕπικεφαλίδαΠαράγραφοςΜορφή' στο αρχείο στυλ.
-The\ character\ format\ is\ controlled\ by\ the\ citation\ property\ 'CitationCharacterFormat'\ in\ the\ style\ file.=Η μορφή χαρακτήρων ελέγχεται από την ιδιότητα αναφορών 'ΑναφοράΧαρακτήραςΜορφή' στο αρχείο στυλ.
+
+
+
 Automatically\ sync\ bibliography\ when\ inserting\ citations=Αυτόματος συγχρονισμός βιβλιογραφίας κατά την προσθήκη αναφορών
 Look\ up\ BibTeX\ entries\ in\ the\ active\ tab\ only=Αναζήτηση καταχωρήσεων BibTeX μόνο στην ενεργή καρτέλα
 Look\ up\ BibTeX\ entries\ in\ all\ open\ libraries=Αναζήτηση καταχωρήσεων BibTeX σε όλες τις ενεργές βιβλιοθήκες
@@ -999,6 +1001,7 @@ Toggle\ quality\ assured=Αλλάξτε την επιλογή εξασφαλισ
 Toggle\ print\ status=Αλλάξτε την επιλογή κατάστασης εκτύπωσης
 Update\ keywords=Ενημέρωση λέξεων-κλειδιών
 Connection\ to\ OpenOffice/LibreOffice\ has\ been\ lost.\ Please\ make\ sure\ OpenOffice/LibreOffice\ is\ running,\ and\ try\ to\ reconnect.=Απώλεια σύνδεσης με το OpenOffice/LibreOffice. Παρακαλώ βεβαιωθείτε πως το OpenOffice/LibreOffice λειτουργεί, και επιχειρήστε επανασύνδεση.
+
 JabRef\ will\ send\ at\ least\ one\ request\ per\ entry\ to\ a\ publisher.=Το JabRef θα στείλει σε έναν εκδότη τουλάχιστον ένα αίτημα ανά καταχώρηση.
 Correct\ the\ entry,\ and\ reopen\ editor\ to\ display/edit\ source.=Διορθώστε την καταχώρηση, και ανοίξτε ξανά τον επεξεργαστή κειμένου για να προβάλλετε/επεξεργαστείτε την πηγή.
 Could\ not\ connect\ to\ running\ OpenOffice/LibreOffice.=Αδυναμία σύνδεσης σε εν λειτουργία OpenOffice/LibreOffice.
@@ -1010,8 +1013,6 @@ Not\ connected\ to\ any\ Writer\ document.\ Please\ make\ sure\ a\ document\ is\
 Removed\ all\ subgroups\ of\ group\ "%0".=Αφαίρεση όλων των υπο-ομάδων της ομάδας "%0".
 To\ disable\ the\ memory\ stick\ mode\ rename\ or\ remove\ the\ jabref.xml\ file\ in\ the\ same\ folder\ as\ JabRef.=Για την απενεργοποίηση της λειτουργίας memory stick, μετονομάστε ή μετακινήστε το αρχείο jabref.xml στον ίδιο φάκελο με το JabRef.
 Unable\ to\ connect.\ One\ possible\ reason\ is\ that\ JabRef\ and\ OpenOffice/LibreOffice\ are\ not\ both\ running\ in\ either\ 32\ bit\ mode\ or\ 64\ bit\ mode.=Αδυναμία σύνδεσης. Μια πιθανή αιτία είναι ότι το JabRef και το OpenOffice/LibreOffice δεν τρέχουν σε ίδια λειτουργία 32 bit ή 64 bit.
-Your\ style\ file\ specifies\ the\ character\ format\ '%0',\ which\ is\ undefined\ in\ your\ current\ OpenOffice/LibreOffice\ document.=Το αρχείο στυλ καθορίζει τη μορφή χαρακτήρων '%0', η οποία δεν ορίζεται στο τρέχον αρχείο OpenOffice/LibreOffice.
-Your\ style\ file\ specifies\ the\ paragraph\ format\ '%0',\ which\ is\ undefined\ in\ your\ current\ OpenOffice/LibreOffice\ document.=Το αρχείο στυλ καθορίζει τη μορφή παραγράφου '%0', η οποία δεν ορίζεται στο τρέχον αρχείο OpenOffice/LibreOffice.
 
 Searching...=Πραγματοποιείται αναζήτηση...
 Please\ enter\ a\ search\ string=Παρακαλώ εισάγετε μια συμβολοσειρά αναζήτησης
@@ -1041,6 +1042,7 @@ Proxy\ requires\ authentication=Ο διακομιστής μεσολάβησης
 Attention\:\ Password\ is\ stored\ in\ plain\ text\!=Προσοχή\: Ο κωδικός πρόσβασης είναι αποθηκευμένος σε απλό κείμενο\!
 Clear\ connection\ settings=Εκκαθάριση ρυθμίσεων σύνδεσης
 
+
 Open\ folder=Άνοιγμα φακέλου
 Export\ sort\ order=Εξαγωγή σειράς ταξινόμησης
 
@@ -1113,7 +1115,7 @@ Save\ changes=Αποθήκευση αλλαγών
 Discard\ changes=Απόρριψη αλλαγών
 Library\ '%0'\ has\ changed.=Η βιβλιοθήκη '%0' έχει αλλάξει.
 Print\ entry\ preview=Προεπισκόπηση εκτύπωσης καταχώρησης
-Copy\ title=Αντιγραφή τίτλου
+
 Invalid\ DOI\:\ '%0'.=Μη έγκυρο DOI\: '%0'.
 should\ start\ with\ a\ name=πρέπει να ξεκινάει με όνομα
 should\ end\ with\ a\ name=πρέπει να τελειώνει με όνομα
@@ -1353,6 +1355,11 @@ Export\ cited=Εξαγωγή των αναφερόμενων
 Unable\ to\ generate\ new\ library=Αδυναμία δημιουργίας νέας βιβλιοθήκης
 
 
+
+
+
+
+
 Error\ occured\ while\ executing\ the\ command\ "%0".=Προέκυψε σφάλμα κατά την εκτέλεση της εντολής "%0".
 Reformat\ ISSN=Αναδιαμόρφωση ISSN
 
@@ -1438,7 +1445,6 @@ Protected\ terms\ file=Αρχείο προστατευμένων όρων
 Style\ file=Αρχείο στυλ
 
 Open\ OpenOffice/LibreOffice\ connection=Άνοιγμα σύνδεσης OpenOffice/LibreOffice
-You\ must\ enter\ at\ least\ one\ field\ name=Πρέπει να καταχωρήσετε τουλάχιστον ένα όνομα πεδίου
 Non-ASCII\ encoded\ character\ found=Βρέθηκε χαρακτήρας χωρίς κωδικοποίηση ASCII
 Toggle\ web\ search\ interface=Εναλλαγή διεπαφής αναζήτησης στο διαδίκτυο
 
@@ -1559,7 +1565,6 @@ Removes\ all\ hyphenated\ line\ breaks\ in\ the\ field\ content.=Αφαιρεί
 Could\ not\ retrieve\ entry\ data\ from\ '%0'.=Αδυναμία ανάκτησης δεδομένων καταχώρησης από '%0'.
 Entry\ from\ %0\ could\ not\ be\ parsed.=Αδυναμία ανάλυσης καταχώρησης από %0.
 Invalid\ identifier\:\ '%0'.=Μη έγκυρο αναγνωριστικό\: '%0'.
-This\ paper\ has\ been\ withdrawn.=Αυτή η εργασία έχει αποσυρθεί.
 Aux\ file=Αρχείο AUX
 Group\ containing\ entries\ cited\ in\ a\ given\ TeX\ file=Ομάδα που περιέχει καταχωρήσεις που αναφέρονται σε ένα συγκεκριμένο αρχείο TeX
 
@@ -1585,9 +1590,6 @@ Could\ not\ connect\ to\ Vim\ server.\ Make\ sure\ that\ Vim\ is\ running\ with\
 Could\ not\ connect\ to\ a\ running\ gnuserv\ process.\ Make\ sure\ that\ Emacs\ or\ XEmacs\ is\ running,\ and\ that\ the\ server\ has\ been\ started\ (by\ running\ the\ command\ 'server-start'/'gnuserv-start').=Αδυναμία σύνδεσης σε μια ενεργή διεργασία gnuserv. Βεβαιωθείτε πως το Emacs ή XEmacs εκτελείται, και πως ο διακομιστής έχει εκκινηθεί (τρέχοντας την εντολή 'server-start'/'gnuserv-start').
 Error\ pushing\ entries=Σφάλμα κατά την προώθηση καταχωρήσεων
 
-Undefined\ character\ format=Μη καθορισμένη μορφή χαρακτήρων
-Undefined\ paragraph\ format=Μη καθορισμένη μορφή παραγράφου
-
 Markings=Μαρκάρισμα
 Use\ selected\ instance=Χρήση επιλεγμένου παραθύρου
 
@@ -1603,7 +1605,6 @@ The\ group\ name\ contains\ the\ keyword\ separator\ "%0"\ and\ thus\ probably\
 Blog=Ιστολόγιο
 Check\ integrity=Έλεγχος συνοχής
 Copy\ DOI\ url=Αντιγραφή DOI URL
-Copy\ citation=Αντιγραφή αναφοράς
 Development\ version=Έκδοση ανάπτυξης λογισμικού
 Export\ selected\ entries=Εξαγωγή επιλεγμένων καταχωρήσεων
 Export\ selected\ entries\ to\ clipboard=Εξαγωγή των επιλεγμένων καταχωρήσεων στο πρόχειρο
@@ -1660,6 +1661,27 @@ Default\ pattern=Προεπιλεγμένο μοτίβο
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index aabe159a6a5..6dff22b68d0 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -19,7 +19,9 @@ Unable\ to\ monitor\ file\ changes.\ Please\ close\ files\ and\ processes\ and\
 
 %0/%1\ entries=%0/%1 entries
 
-%0\ export\ successful=%0 export successful
+Export\ operation\ finished\ successfully.=Export operation finished successfully.
+
+Reveal\ in\ File\ Explorer=Reveal in File Explorer
 
 %0\ matches\ the\ regular\ expression\ <b>%1</b>=%0 matches the regular expression <b>%1</b>
 
@@ -41,8 +43,6 @@ Abstract=Abstract
 
 Accept=Accept
 
-Accept\ change=Accept change
-
 Accept\ recommendations\ from\ Mr.\ DLib=Accept recommendations from Mr. DLib
 
 Action=Action
@@ -62,6 +62,7 @@ Add\ subgroup=Add subgroup
 
 Added\ group\ "%0".=Added group "%0".
 
+Added\ string\:\ '%0'=Added string: '%0'
 Added\ string=Added string
 
 All\ entries=All entries
@@ -151,8 +152,6 @@ Cite\ command=Cite command
 
 Clear=Clear
 
-Clear\ fields=Clear fields
-
 Open\ /\ close\ entry\ editor=Open / close entry editor
 
 Close\ dialog=Close dialog
@@ -206,9 +205,9 @@ Create\ custom\ fields\ for\ each\ BibTeX\ entry=Create custom fields for each B
 
 crossreferenced\ entries\ included=crossreferenced entries included
 
-Current\ content=Current content
+Current\ content\:\ %0=Current content: %0
 
-Current\ value=Current value
+Current\ value\:\ %0=Current value: %0
 
 Custom\ entry\ types=Custom entry types
 
@@ -224,8 +223,6 @@ cut\ entries=cut entries
 
 cut\ entry\ %0=cut entry %0
 
-DOI\ not\ found=DOI not found
-
 Library\ encoding=Library encoding
 
 Library\ properties=Library properties
@@ -233,7 +230,9 @@ Library\ properties=Library properties
 
 Default=Default
 
-Default\ encoding=Default encoding
+Character\ encoding\ UTF-8\ is\ not\ supported.=Character encoding UTF-8 is not supported.
+UTF-8\ could\ not\ be\ used\ to\ encode\ the\ following\ characters\:\ %0=UTF-8 could not be used to encode the following characters: %0
+The\ chosen\ encoding\ '%0'\ could\ not\ encode\ the\ following\ characters\:=The chosen encoding '%0' could not encode the following characters:
 
 Downloading=Downloading
 
@@ -321,7 +320,6 @@ Entry\ preview=Entry preview
 Entry\ table=Entry table
 Entry\ table\ columns=Entry table columns
 Entry\ Title\ (Required\ to\ deliver\ recommendations.)=Entry Title (Required to deliver recommendations.)
-Entry\ type=Entry type
 Error=Error
 Error\ occurred\ when\ parsing\ entry=Error occurred when parsing entry
 Error\ opening\ file=Error opening file
@@ -337,7 +335,7 @@ Export\ to\ text\ file.=Export to text file.
 Exporting=Exporting
 Extension=Extension
 
-External\ changes=External changes
+External\ Changes\ Resolver=External Changes Resolver
 
 External\ file\ links=External file links
 
@@ -500,7 +498,8 @@ Keyword=Keyword
 Keywords=Keywords
 
 Label=Label
-
+Label\:\ %0=Label: %0
+Content\:\ %0=Content: %0
 Language=Language
 
 Last\ modified=Last modified
@@ -531,6 +530,7 @@ Modified\ group\ "%0".=Modified group "%0".
 Modified\ groups=Modified groups
 
 Modified\ string=Modified string
+Modified\ string\:\ '%0' =Modified string: '%0'
 
 Modify=Modify
 
@@ -540,6 +540,10 @@ Moved\ group\ "%0".=Moved group "%0".
 
 Mr.\ DLib\ Privacy\ settings=Mr. DLib Privacy settings
 
+No\ database\ is\ open=No database is open
+
+We\ need\ a\ database\ to\ export\ from.\ Open\ one.=We need a database to export from. Open one.
+
 No\ recommendations\ received\ from\ Mr.\ DLib\ for\ this\ entry.=No recommendations received from Mr. DLib for this entry.
 
 Error\ while\ fetching\ recommendations\ from\ Mr.DLib.=Error while fetching recommendations from Mr.DLib.
@@ -572,8 +576,6 @@ No\ journal\ names\ could\ be\ abbreviated.=No journal names could be abbreviate
 
 No\ journal\ names\ could\ be\ unabbreviated.=No journal names could be unabbreviated.
 
-No\ DOI\ data\ exists=No DOI data exists
-
 not=not
 
 not\ found=not found
@@ -632,8 +634,6 @@ Path\ to\ %0\ not\ defined=Path to %0 not defined
 
 Path\ to\ LyX\ pipe=Path to LyX pipe
 
-PDF\ does\ not\ exist=PDF does not exist
-
 File\ has\ no\ attached\ annotations=File has no attached annotations
 
 Please\ enter\ a\ name\ for\ the\ group.=Please enter a name for the group.
@@ -699,11 +699,25 @@ Remove\ selected\ entries\ from\ this\ group=Remove selected entries from this g
 
 Remove\ group=Remove group
 
-Remove\ group\ "%0"?=Remove group "%0"?
+Remove\ group\ and\ subgroups=Remove group and subgroups
+
+Remove\ groups\ and\ subgroups=Remove groups and subgroups
+
+Remove\ all\ selected\ groups\ and\ keep\ their\ subgroups?=Remove all selected groups and keep their subgroups?
+
+Remove\ group\ "%0"\ and\ keep\ its\ subgroups?=Remove group "%0" and keep its subgroups?
+
+Remove\ groups=Remove groups
+
+Removed\ all\ selected\ groups.=Removed all selected groups.
 
 Remove\ group\ "%0"\ and\ its\ subgroups?=Remove group "%0" and its subgroups?
 
-Remove\ group\ and\ subgroups=Remove group and subgroups
+Removed\ group\ "%0"\ and\ its\ subgroups.=Removed group "%0" and its subgroups.
+
+Remove\ all\ selected\ groups\ and\ their\ subgroups?=Remove all selected groups and their subgroups?
+
+Removed\ all\ selected\ groups\ and\ their\ subgroups.=Removed all selected groups and their subgroups.
 
 Remove\ link=Remove link
 
@@ -713,11 +727,10 @@ Remove\ string\ %0=Remove string %0
 
 Removed\ group\ "%0".=Removed group "%0".
 
-Removed\ group\ "%0"\ and\ its\ subgroups.=Removed group "%0" and its subgroups.
-
-Removed\ string=Removed string
+Deleted\ string=Deleted string
+Deleted\ string\:\ '%0'=Deleted string: '%0'
 
-Renamed\ string=Renamed string
+Renamed\ string\:\ '%0'=Renamed string: '%0'
 
 Replace=Replace
 Replace\ With\:=Replace With:
@@ -784,11 +797,6 @@ Select\ entry\ type=Select entry type
 
 Select\ file\ from\ ZIP-archive=Select file from ZIP-archive
 
-Select\ the\ tree\ nodes\ to\ view\ and\ accept\ or\ reject\ changes=Select the tree nodes to view and accept or reject changes
-
-Set\ field=Set field
-Set\ fields=Set fields
-
 Settings=Settings
 
 Shortcut=Shortcut
@@ -821,7 +829,12 @@ Size=Size
 Skipped\ -\ No\ PDF\ linked=Skipped - No PDF linked
 Skipped\ -\ PDF\ does\ not\ exist=Skipped - PDF does not exist
 
-Skipped\ entry.=Skipped entry.
+JabRef\ skipped\ the\ entry.=JabRef skipped the entry.
+Import\ error=Import error
+Open\ library\ error=Open library error
+Please\ check\ your\ library\ file\ for\ wrong\ syntax.=Please check your library file for wrong syntax.
+SourceTab\ error=SourceTab error
+User\ input\ via\ entry-editor\ in\ `{}bibtex\ source`\ tab\ led\ to\ failure.=User input via entry-editor in `{}bibtex source` tab led to failure.
 
 Sort\ subgroups=Sort subgroups
 
@@ -836,8 +849,6 @@ Sublibrary\ from\ AUX\ to\ BibTeX=Sublibrary from AUX to BibTeX
 
 Switches\ between\ full\ and\ abbreviated\ journal\ name\ if\ the\ journal\ name\ is\ known.=Switches between full and abbreviated journal name if the journal name is known.
 
-The\ chosen\ encoding\ '%0'\ could\ not\ encode\ the\ following\ characters\:=The chosen encoding '%0' could not encode the following characters:
-
 
 the\ field\ <b>%0</b>=the field <b>%0</b>
 The\ group\ "%0"\ already\ contains\ the\ selection.=The group "%0" already contains the selection.
@@ -897,7 +908,7 @@ Username=Username
 
 Value\ cleared\ externally=Value cleared externally
 
-Value\ set\ externally=Value set externally
+Value\ set\ externally\:\ %0=Value set externally: %0
 
 verify\ that\ LyX\ is\ running\ and\ that\ the\ lyxpipe\ is\ valid=verify that LyX is running and that the lyxpipe is valid
 
@@ -970,10 +981,6 @@ Line\ %0\:\ Found\ corrupted\ citation\ key\ %1\ (comma\ missing).=Line %0: Foun
 No\ full\ text\ document\ found=No full text document found
 Download\ from\ URL=Download from URL
 Rename\ field=Rename field
-Append\ field=Append field
-Append\ to\ fields=Append to fields
-Rename\ field\ to=Rename field to
-Move\ contents\ of\ a\ field\ into\ a\ field\ with\ a\ different\ name=Move contents of a field into a field with a different name
 
 Cannot\ use\ port\ %0\ for\ remote\ operation;\ another\ application\ may\ be\ using\ it.\ Try\ specifying\ another\ port.=Cannot use port %0 for remote operation; another application may be using it. Try specifying another port.
 
@@ -1043,9 +1050,9 @@ Cite\ special=Cite special
 Extra\ information\ (e.g.\ page\ number)=Extra information (e.g. page number)
 Manage\ citations=Manage citations
 Problem\ modifying\ citation=Problem modifying citation
+Problem\ collecting\ citations=Problem collecting citations
 Citation=Citation
 Connecting...=Connecting...
-Could\ not\ resolve\ BibTeX\ entry\ for\ citation\ marker\ '%0'.=Could not resolve BibTeX entry for citation marker '%0'.
 Select\ style=Select style
 Journals=Journals
 Cite=Cite
@@ -1057,17 +1064,36 @@ Select\ Writer\ document=Select Writer document
 Sync\ OpenOffice/LibreOffice\ bibliography=Sync OpenOffice/LibreOffice bibliography
 Select\ which\ open\ Writer\ document\ to\ work\ on=Select which open Writer document to work on
 Connected\ to\ document=Connected to document
+
+Could\ not\ connect\ to\ any\ Writer\ document.\ Please\ make\ sure\ a\ document\ is\ open\ before\ using\ the\ 'Select\ Writer\ document'\ button\ to\ connect\ to\ it.=Could not connect to any Writer document. Please make sure a document is open before using the 'Select Writer document' button to connect to it.
+
+No\ Writer\ documents\ found=No Writer documents found
+
 Insert\ a\ citation\ without\ text\ (the\ entry\ will\ appear\ in\ the\ reference\ list)=Insert a citation without text (the entry will appear in the reference list)
 Cite\ selected\ entries\ with\ extra\ information=Cite selected entries with extra information
 Ensure\ that\ the\ bibliography\ is\ up-to-date=Ensure that the bibliography is up-to-date
+
 Your\ OpenOffice/LibreOffice\ document\ references\ the\ citation\ key\ '%0',\ which\ could\ not\ be\ found\ in\ your\ current\ library.=Your OpenOffice/LibreOffice document references the citation key '%0', which could not be found in your current library.
+
+This\ operation\ requires\ a\ bibliography\ database.=This operation requires a bibliography database.
+
+Your\ OpenOffice/LibreOffice\ document\ references\ at\ least\ %0\ citation\ keys\ which\ could\ not\ be\ found\ in\ your\ current\ library.\ Some\ of\ these\ are\ %1.=Your OpenOffice/LibreOffice document references at least %0 citation keys which could not be found in your current library. Some of these are %1.
+
+Your\ OpenOffice/LibreOffice\ document\ references\ no\ citation\ keys\ which\ could\ also\ be\ found\ in\ your\ current\ library.=Your OpenOffice/LibreOffice document references no citation keys which could also be found in your current library.
+
 Unable\ to\ synchronize\ bibliography=Unable to synchronize bibliography
 Combine\ pairs\ of\ citations\ that\ are\ separated\ by\ spaces\ only=Combine pairs of citations that are separated by spaces only
 Autodetection\ failed=Autodetection failed
 Please\ wait...=Please wait...
 Connection\ lost=Connection lost
-The\ paragraph\ format\ is\ controlled\ by\ the\ property\ 'ReferenceParagraphFormat'\ or\ 'ReferenceHeaderParagraphFormat'\ in\ the\ style\ file.=The paragraph format is controlled by the property 'ReferenceParagraphFormat' or 'ReferenceHeaderParagraphFormat' in the style file.
-The\ character\ format\ is\ controlled\ by\ the\ citation\ property\ 'CitationCharacterFormat'\ in\ the\ style\ file.=The character format is controlled by the citation property 'CitationCharacterFormat' in the style file.
+
+Could\ not\ update\ bibliography=Could not update bibliography
+Not\ connected\ to\ document=Not connected to document
+Problem\ combining\ cite\ markers=Problem combining cite markers
+Unable\ to\ reload\ style\ file=Unable to reload style file
+
+Problem\ during\ separating\ cite\ markers=Problem during separating cite markers
+
 Automatically\ sync\ bibliography\ when\ inserting\ citations=Automatically sync bibliography when inserting citations
 Look\ up\ BibTeX\ entries\ in\ the\ active\ tab\ only=Look up BibTeX entries in the active tab only
 Look\ up\ BibTeX\ entries\ in\ all\ open\ libraries=Look up BibTeX entries in all open libraries
@@ -1169,7 +1195,9 @@ Toggle\ relevance=Toggle relevance
 Toggle\ quality\ assured=Toggle quality assured
 Toggle\ print\ status=Toggle print status
 Update\ keywords=Update keywords
+Problem\ connecting=Problem connecting
 Connection\ to\ OpenOffice/LibreOffice\ has\ been\ lost.\ Please\ make\ sure\ OpenOffice/LibreOffice\ is\ running,\ and\ try\ to\ reconnect.=Connection to OpenOffice/LibreOffice has been lost. Please make sure OpenOffice/LibreOffice is running, and try to reconnect.
+
 JabRef\ will\ send\ at\ least\ one\ request\ per\ entry\ to\ a\ publisher.=JabRef will send at least one request per entry to a publisher.
 Correct\ the\ entry,\ and\ reopen\ editor\ to\ display/edit\ source.=Correct the entry, and reopen editor to display/edit source.
 Could\ not\ connect\ to\ running\ OpenOffice/LibreOffice.=Could not connect to running OpenOffice/LibreOffice.
@@ -1183,8 +1211,6 @@ To\ disable\ the\ memory\ stick\ mode\ rename\ or\ remove\ the\ jabref.xml\ file
 Unable\ to\ connect.\ One\ possible\ reason\ is\ that\ JabRef\ and\ OpenOffice/LibreOffice\ are\ not\ both\ running\ in\ either\ 32\ bit\ mode\ or\ 64\ bit\ mode.=Unable to connect. One possible reason is that JabRef and OpenOffice/LibreOffice are not both running in either 32 bit mode or 64 bit mode.
 Delimiter(s)=Delimiter(s)
 When\ downloading\ files,\ or\ moving\ linked\ files\ to\ the\ file\ directory,\ use\ the\ bib\ file\ location.=When downloading files, or moving linked files to the file directory, use the bib file location.
-Your\ style\ file\ specifies\ the\ character\ format\ '%0',\ which\ is\ undefined\ in\ your\ current\ OpenOffice/LibreOffice\ document.=Your style file specifies the character format '%0', which is undefined in your current OpenOffice/LibreOffice document.
-Your\ style\ file\ specifies\ the\ paragraph\ format\ '%0',\ which\ is\ undefined\ in\ your\ current\ OpenOffice/LibreOffice\ document.=Your style file specifies the paragraph format '%0', which is undefined in your current OpenOffice/LibreOffice document.
 
 Searching...=Searching...
 Please\ enter\ a\ search\ string=Please enter a search string
@@ -1222,6 +1248,16 @@ Use\ custom\ proxy\ configuration=Use custom proxy configuration
 Proxy\ requires\ authentication=Proxy requires authentication
 Attention\:\ Password\ is\ stored\ in\ plain\ text\!=Attention: Password is stored in plain text!
 Clear\ connection\ settings=Clear connection settings
+Check\ Proxy\ Setting=Check Proxy Setting
+Check\ connection=Check connection
+Connection\ failed\!=Connection failed\!
+Connection\ successful\!=Connection successful\!
+
+SSL\ Configuration=SSL Configuration
+SSL\ configuration\ changed=SSL configuration changed
+SSL\ certificate\ file=SSL certificate file
+Duplicate\ Certificates=Duplicate Certificates
+You\ already\ added\ this\ certificate=You already added this certificate
 
 Open\ folder=Open folder
 Export\ sort\ order=Export sort order
@@ -1258,6 +1294,7 @@ Please\ open\ %0\ manually.=Please open %0 manually.
 The\ link\ has\ been\ copied\ to\ the\ clipboard.=The link has been copied to the clipboard.
 
 Open\ %0\ file=Open %0 file
+Could\ not\ detect\ terminal\ automatically.\ Please\ define\ a\ custom\ terminal\ in\ the\ preferences.=Could not detect terminal automatically. Please define a custom terminal in the preferences.
 
 Cannot\ delete\ file=Cannot delete file
 File\ permission\ error=File permission error
@@ -1269,8 +1306,6 @@ Help\ on\ Name\ Formatting=Help on Name Formatting
 
 Add\ new\ file\ type=Add new file type
 
-Left\ entry=Left entry
-Right\ entry=Right entry
 Original\ entry=Original entry
 No\ information\ added=No information added
 Select\ at\ least\ one\ entry\ to\ manage\ keywords.=Select at least one entry to manage keywords.
@@ -1278,14 +1313,18 @@ OpenDocument\ text=OpenDocument text
 OpenDocument\ spreadsheet=OpenDocument spreadsheet
 OpenDocument\ presentation=OpenDocument presentation
 %0\ image=%0 image
+Added\ entry\ '%0'=Added entry '%0'
 Added\ entry=Added entry
+Modified\ entry\ '%0'=Modified entry '%0'
 Modified\ entry=Modified entry
+Deleted\ entry\ '%0'=Deleted entry '%0'
 Deleted\ entry=Deleted entry
 Modified\ groups\ tree=Modified groups tree
 Removed\ all\ groups=Removed all groups
-Accepting\ the\ change\ replaces\ the\ complete\ groups\ tree\ with\ the\ externally\ modified\ groups\ tree.=Accepting the change replaces the complete groups tree with the externally modified groups tree.
+%0.\ Accepting\ the\ change\ replaces\ the\ complete\ groups\ tree\ with\ the\ externally\ modified\ groups\ tree.=%0. Accepting the change replaces the complete groups tree with the externally modified groups tree.
 Select\ export\ format=Select export format
-Return\ to\ JabRef=Return to JabRef
+Return\ to\ library=Return to library
+On\ JabRef=On JabRef
 Could\ not\ connect\ to\ %0=Could not connect to %0
 Warning\:\ %0\ out\ of\ %1\ entries\ have\ undefined\ title.=Warning: %0 out of %1 entries have undefined title.
 Warning\:\ %0\ out\ of\ %1\ entries\ have\ undefined\ citation\ key.=Warning: %0 out of %1 entries have undefined citation key.
@@ -1316,7 +1355,6 @@ should\ contain\ a\ valid\ page\ number\ range=should contain a valid page numbe
 No\ results\ found.=No results found.
 Found\ %0\ results.=Found %0 results.
 Invalid\ regular\ expression=Invalid regular expression
-plain\ text=plain text
 This\ search\ contains\ entries\ in\ which\ any\ field\ contains\ the\ regular\ expression\ <b>%0</b>=This search contains entries in which any field contains the regular expression <b>%0</b>
 This\ search\ contains\ entries\ in\ which\ any\ field\ contains\ the\ term\ <b>%0</b>=This search contains entries in which any field contains the term <b>%0</b>
 This\ search\ contains\ entries\ in\ which=This search contains entries in which
@@ -1515,11 +1553,7 @@ Verse=Verse
 change\ entries\ of\ group=change entries of group
 odd\ number\ of\ unescaped\ '\#'=odd number of unescaped '#'
 
-Plain\ text=Plain text
 Show\ diff=Show diff
-character=character
-word=word
-Show\ symmetric\ diff=Show symmetric diff
 Copy\ Version=Copy Version
 Maintainers=Maintainers
 Contributors=Contributors
@@ -1564,6 +1598,22 @@ Custom=Custom
 Export\ cited=Export cited
 Unable\ to\ generate\ new\ library=Unable to generate new library
 
+The\ cursor\ is\ in\ a\ protected\ area.=The cursor is in a protected area.
+JabRefException=JabRefException
+No\ bibliography\ database\ is\ open\ for\ citation.=No bibliography database is open for citation.
+
+No\ database\ is\ open\ for\ updating\ citation\ markers\ after\ citing.=No database is open for updating citation markers after citing.
+
+No\ bibliography\ entries\ are\ selected\ for\ citation.=No bibliography entries are selected for citation.
+No\ bibliography\ style\ is\ selected\ for\ citation.=No bibliography style is selected for citation.
+No\ database=No database
+
+No\ entries\ selected\ for\ citation=No entries selected for citation
+Open\ one\ before\ citing.=Open one before citing.
+
+Select\ one\ before\ citing.=Select one before citing.
+Select\ some\ before\ citing.=Select some before citing.
+
 Found\ identical\ ranges=Found identical ranges
 Found\ overlapping\ ranges=Found overlapping ranges
 Found\ touching\ ranges=Found touching ranges
@@ -1629,6 +1679,8 @@ Issue\ report\ successful=Issue report successful
 Your\ issue\ was\ reported\ in\ your\ browser.=Your issue was reported in your browser.
 The\ log\ and\ exception\ information\ was\ copied\ to\ your\ clipboard.=The log and exception information was copied to your clipboard.
 Please\ paste\ this\ information\ (with\ Ctrl+V)\ in\ the\ issue\ description.=Please paste this information (with Ctrl+V) in the issue description.
+Last\ notification=Last notification
+Check\ the\ event\ log\ to\ see\ all\ notifications=Check the event log to see all notifications
 
 Host=Host
 Port=Port
@@ -1666,7 +1718,6 @@ Protected\ terms\ file=Protected terms file
 Style\ file=Style file
 
 Open\ OpenOffice/LibreOffice\ connection=Open OpenOffice/LibreOffice connection
-You\ must\ enter\ at\ least\ one\ field\ name=You must enter at least one field name
 Non-ASCII\ encoded\ character\ found=Non-ASCII encoded character found
 Non-UTF-8\ encoded\ field\ found=Non-UTF-8 encoded field found
 Toggle\ web\ search\ interface=Toggle web search interface
@@ -1718,7 +1769,7 @@ Error\ while\ generating\ fetch\ URL=Error while generating fetch URL
 Error\ while\ parsing\ ID\ list=Error while parsing ID list
 Unable\ to\ get\ PubMed\ IDs=Unable to get PubMed IDs
 Backup\ found=Backup found
-A\ backup\ file\ for\ '%0'\ was\ found.=A backup file for '%0' was found.
+A\ backup\ file\ for\ '%0'\ was\ found\ at\ '%1'.=A backup file for '%0' was found at '%1'.
 This\ could\ indicate\ that\ JabRef\ did\ not\ shut\ down\ cleanly\ last\ time\ the\ file\ was\ used.=This could indicate that JabRef did not shut down cleanly last time the file was used.
 Do\ you\ want\ to\ recover\ the\ library\ from\ the\ backup\ file?=Do you want to recover the library from the backup file?
 
@@ -1804,7 +1855,6 @@ Removes\ all\ hyphenated\ line\ breaks\ in\ the\ field\ content.=Removes all hyp
 Could\ not\ retrieve\ entry\ data\ from\ '%0'.=Could not retrieve entry data from '%0'.
 Entry\ from\ %0\ could\ not\ be\ parsed.=Entry from %0 could not be parsed.
 Invalid\ identifier\:\ '%0'.=Invalid identifier: '%0'.
-This\ paper\ has\ been\ withdrawn.=This paper has been withdrawn.
 empty\ citation\ key=empty citation key
 Aux\ file=Aux file
 Group\ containing\ entries\ cited\ in\ a\ given\ TeX\ file=Group containing entries cited in a given TeX file
@@ -1832,9 +1882,6 @@ Could\ not\ connect\ to\ Vim\ server.\ Make\ sure\ that\ Vim\ is\ running\ with\
 Could\ not\ connect\ to\ a\ running\ gnuserv\ process.\ Make\ sure\ that\ Emacs\ or\ XEmacs\ is\ running,\ and\ that\ the\ server\ has\ been\ started\ (by\ running\ the\ command\ 'server-start'/'gnuserv-start').=Could not connect to a running gnuserv process. Make sure that Emacs or XEmacs is running, and that the server has been started (by running the command 'server-start'/'gnuserv-start').
 Error\ pushing\ entries=Error pushing entries
 
-Undefined\ character\ format=Undefined character format
-Undefined\ paragraph\ format=Undefined paragraph format
-
 Preamble=Preamble
 Markings=Markings
 Use\ selected\ instance=Use selected instance
@@ -1866,8 +1913,6 @@ Manage\ protected\ terms=Manage protected terms
 New\ entry\ from\ plain\ text=New entry from plain text
 Import\ by\ ID=Import by ID
 Enter\ a\ valid\ ID=Enter a valid ID
-Imported\ one\ entry=Imported one entry
-Entry\ already\ exists=Entry already exists
 New\ sublibrary\ based\ on\ AUX\ file=New sublibrary based on AUX file
 Push\ entries\ to\ external\ application\ (%0)=Push entries to external application (%0)
 Quit=Quit
@@ -1942,7 +1987,6 @@ Find\ and\ replace=Find and replace
 
 Found\ documents\:=Found documents\:
 Use\ selected\ document=Use selected document
-Accept\ changes=Accept changes
 Dismiss\ changes=Dismiss changes
 The\ library\ has\ been\ modified\ by\ another\ program.=The library has been modified by another program.
 
@@ -2031,16 +2075,7 @@ Reset\ All=Reset All
 Linked\ identifiers=Linked identifiers
 
 insert\ entries=insert entries
-In\ JabRef=In JabRef
 On\ disk=On disk
-Select\ all\ changes\ on\ the\ left=Select all changes on the left
-Select\ all\ changes\ on\ the\ right=Select all changes on the right
-Dismiss=Dismiss
-Mark\ all\ changes\ as\ accepted=Mark all changes as accepted
-Unmark\ all\ changes=Unmark all changes
-
-Normalize\ newline\ characters=Normalize newline characters
-Normalizes\ all\ newline\ characters\ in\ the\ field\ content.=Normalizes all newline characters in the field content.
 
 Independent=Independent
 Intersection=Intersection
@@ -2057,6 +2092,7 @@ Please\ provide\ a\ valid\ aux\ file.=Please provide a valid aux file.
 Keyword\ delimiter=Keyword delimiter
 Hierarchical\ keyword\ delimiter=Hierarchical keyword delimiter
 Escape\ ampersands=Escape ampersands
+Escape\ dollar\ sign=Escape dollar sign
 
 Hint\:\n\nTo\ search\ all\ fields\ for\ <b>Smith</b>,\ enter\:\n<tt>smith</tt>\n\nTo\ search\ the\ field\ <b>author</b>\ for\ <b>Smith</b>\ and\ the\ field\ <b>title</b>\ for\ <b>electrical</b>,\ enter\:\n<tt>author\=Smith\ and\ title\=electrical</tt>=Hint:\n\nTo search all fields for <b>Smith</b>, enter:\n<tt>smith</tt>\n\nTo search the field <b>author</b> for <b>Smith</b> and the field <b>title</b> for <b>electrical</b>, enter:\n<tt>author=Smith and title=electrical</tt>
 
@@ -2291,10 +2327,6 @@ Removes\ digits.=Removes digits.
 
 Presets=Presets
 
-Check\ Proxy\ Setting=Check Proxy Setting
-Check\ connection=Check connection
-Connection\ failed\!=Connection failed\!
-Connection\ successful\!=Connection successful\!
 Generate\ groups\ from\ keywords\ in\ the\ following\ field=Generate groups from keywords in the following field
 Generate\ groups\ for\ author\ last\ names=Generate groups for author last names
 Regular\ expression=Regular expression
@@ -2314,8 +2346,6 @@ Separate\ merged\ citations=Separate merged citations
 Separate\ citations=Separate citations
 
 Unprotect\ terms=Unprotect terms
-Error\ connecting\ to\ Writer\ document=Error connecting to Writer document
-You\ need\ to\ open\ Writer\ with\ a\ document\ before\ connecting=You need to open Writer with a document before connecting
 
 Generate\ a\ new\ key\ for\ imported\ entries\ (overwriting\ their\ default)=Generate a new key for imported entries (overwriting their default)
 Warn\ about\ duplicates\ on\ import=Warn about duplicates on import
@@ -2324,6 +2354,35 @@ Custom\ DOI\ URI=Custom DOI URI
 Use\ custom\ DOI\ base\ URI\ for\ article\ access=Use custom DOI base URI for article access
 
 Cited\ on\ pages=Cited on pages
+Please\ move\ the\ cursor\ into\ the\ document\ text.=Please\ move\ the\ cursor\ into\ the\ document\ text.
+To\ get\ the\ visual\ positions\ of\ your\ citations\ I\ need\ to\ move\ the\ cursor\ around,\ but\ could\ not\ get\ it.=To\ get\ the\ visual\ positions\ of\ your\ citations\ I\ need\ to\ move\ the\ cursor\ around,\ but\ could\ not\ get\ it.
+
+I\ cannot\ insert\ to\ the\ cursors\ current\ location.=I\ cannot\ insert\ to\ the\ cursors\ current\ location.
+
+Please\ move\ the\ cursor\ to\ the\ location\ for\ the\ new\ citation.=Please\ move\ the\ cursor\ to\ the\ location\ for\ the\ new\ citation.
+
+Please\ create\ it\ in\ the\ document\ or\ change\ in\ the\ file\:=Please create it in the document or change in the file:
+
+Please\ use\ the\ latter\ in\ the\ style\ file\ below\ to\ avoid\ localization\ problems.=Please use the latter in the style file below to avoid localization problems.
+
+The\ %0\ character\ style\ '%1'\ is\ a\ display\ name\ for\ '%2'.=The %0 character style '%1' is a display name for '%2'.
+
+The\ %0\ character\ style\ '%1'\ is\ missing\ from\ the\ document=The %0 character style '%1' is missing from the document
+
+The\ %0\ paragraph\ style\ '%1'\ is\ a\ display\ name\ for\ '%2'.=The %0 paragraph style '%1' is a display name for '%2'.
+
+The\ %0\ paragraph\ style\ '%1'\ is\ missing\ from\ the\ document=The %0 paragraph style '%1' is missing from the document
+
+Error\ while\ checking\ if\ Writer\ is\ recording\ changes\ or\ has\ recorded\ changes.=Error while checking if Writer is recording changes or has recorded changes.
+
+Cannot\ work\ with\ [Edit]/[Track\ Changes]/[Record]\ turned\ on.=Cannot work with [Edit]/[Track Changes]/[Record] turned on.
+
+Changes\ by\ JabRef\ could\ result\ in\ unexpected\ interactions\ with\ recorded\ changes.=Changes by JabRef could result in unexpected interactions with recorded changes.
+
+Recording\ and/or\ Recorded\ changes=Recording and/or Recorded changes
+
+Use\ [Edit]/[Track\ Changes]/[Manage]\ to\ resolve\ them\ first.=Use [Edit]/[Track Changes]/[Manage] to resolve them first.
+
 Unable\ to\ find\ valid\ certification\ path\ to\ requested\ target(%0),\ download\ anyway?=Unable to find valid certification path to requested target(%0), download anyway?
 Download\ operation\ canceled.=Download operation canceled.
 
@@ -2340,7 +2399,6 @@ Entry\ Type=Entry Type
 Entry\ types=Entry types
 Field\ names=Field names
 Others=Others
-Overwrite\ existing\ field\ values=Overwrite existing field values
 Recommended=Recommended
 
 Authors\ and\ Title=Authors and Title
@@ -2385,6 +2443,9 @@ Grobid\ URL=Grobid URL
 Remote\ services=Remote services
 Allow\ sending\ PDF\ files\ and\ raw\ citation\ strings\ to\ a\ JabRef\ online\ service\ (Grobid)\ to\ determine\ Metadata.\ This\ produces\ better\ results.=Allow sending PDF files and raw citation strings to a JabRef online service (Grobid) to determine Metadata. This produces better results.
 
+Fetcher\ cannot\ be\ tested\!=Fetcher cannot be tested!
+Fetcher\ unknown\!=Fetcher unknown!
+
 Character\ by\ character=Character by character
 Embedded=Embedded
 Entry=Entry
@@ -2399,3 +2460,72 @@ Search\ across\ libraries\ in\ a\ new\ window=Search across libraries in a new w
 Keep\ search\ string\ across\ libraries=Keep search string across libraries
 Keep\ dialog\ always\ on\ top=Keep dialog always on top
 Search\ results\ from\ open\ libraries=Search results from open libraries
+
+Add\ certificate=Add certificate
+Serial\ number=Serial number
+Issuer=Issuer
+Valid\ from=Valid from
+Valid\ to=Valid to
+Signature\ algorithm=Signature algorithm
+Version=Version
+
+Error\ downloading=Error downloading
+
+No\ data\ was\ found\ for\ the\ identifier=No data was found for the identifier
+Server\ not\ available=Server not available
+Fetching\ information\ using\ %0=Fetching information using %0
+Look\ up\ identifier=Look up identifier
+Bibliographic\ data\ not\ found.\ Cause\ is\ likely\ the\ client\ side.\ Please\ check\ connection\ and\ identifier\ for\ correctness.=Bibliographic data not found. Cause is likely the client side. Please check connection and identifier for correctness.
+Bibliographic\ data\ not\ found.\ Cause\ is\ likely\ the\ server\ side.\ Please\ try\ agan\ later.=Bibliographic data not found. Cause is likely the server side. Please try agan later.
+Error\ message\ %0=Error message %0
+Identifier\ not\ found=Identifier not found
+
+Error\ while\ writing\ metadata.\ See\ the\ error\ log\ for\ details.=Error while writing metadata. See the error log for details.
+Failed\ to\ write\ metadata,\ file\ %1\ not\ found.=Failed to write metadata, file %1 not found.
+Success\!\ Finished\ writing\ metadata.=Success! Finished writing metadata.
+
+Custom\ API\ key=Custom API key
+Check\ %0\ API\ Key\ Setting=Check %0 API Key Setting
+
+Edit\ content=Edit content
+Copy\ or\ Move\ content=Copy or Move content
+Overwrite\ field\ content=Overwrite field content
+Set=Set
+Append=Append
+Clear\ field\ content=Clear field content
+Set\ or\ append\ content=Set or append content
+Edit\ field\ content\ for\ selected\ entries=Edit field content for selected entries
+Rename=Rename
+New\ field\ name=New field name
+Copy\ content=Copy content
+Move\ content=Move content
+Swap\ content=Swap content
+Copy\ or\ move\ the\ content\ of\ one\ field\ to\ another=Copy or move the content of one field to another
+Automatic\ field\ editor=Automatic field editor
+From=From
+Keep\ Modifications=Keep Modifications
+To=To
+Open\ Link=Open Link
+Highlight\ words=Highlight words
+Highlight\ characters=Highlight characters
+Unified\ View=Unified View
+Split\ View=Split View
+Plain\ Text=Plain Text
+Show\ Diff=Show Diff
+Merged\ Entry=Merged Entry
+
+Edit\ file\ link=Edit file link
+
+(Note\:\ If\ original\ entries\ lack\ keywords\ to\ qualify\ for\ the\ new\ group\ configuration,\ confirming\ here\ will\ add\ them)=(Note: If original entries lack keywords to qualify for the new group configuration, confirming here will add them)
+Assign=Assign
+Do\ not\ assign=Do not assign
+
+Error\ occured\ %0=Error occured %0
+Left\ Entry=Left Entry
+Merge\ %0=Merge %0
+Right\ Entry=Right Entry
+Unmerge\ %0=Unmerge %0
+plain\ text=plain text
+
+The\ %0s\ are\ the\ same.\ However,\ the\ order\ of\ field\ content\ differs=The %0s are the same. However, the order of field content differs
+
diff --git a/src/main/resources/l10n/JabRef_es.properties b/src/main/resources/l10n/JabRef_es.properties
index 94ef1ff63b7..60e35d98ad0 100644
--- a/src/main/resources/l10n/JabRef_es.properties
+++ b/src/main/resources/l10n/JabRef_es.properties
@@ -1,7 +1,12 @@
+Could\ not\ delete\ empty\ entries.=No se pudieron eliminar entradas vacías.
 
+Delete\ empty\ entries=Eliminar entradas vacías
 
+Empty\ entries=Vaciar entradas
 
+Keep\ empty\ entries=Mantener entradas vacías
 
+Library\ '%0'\ has\ empty\ entries.\ Do\ you\ want\ to\ delete\ them?=La biblioteca '%0' tiene entradas vacías. ¿Quieres eliminarlas?
 
 Unable\ to\ monitor\ file\ changes.\ Please\ close\ files\ and\ processes\ and\ restart.\ You\ may\ encounter\ errors\ if\ you\ continue\ with\ this\ session.=No es posible supervisar los cambios en los archivos. Cierre los archivos y procesos y reinicie. Puede que se produzcan errores si continúa con esta sesión.
 %0\ contains\ the\ regular\ expression\ <b>%1</b>=%0 contiene la expresión regular <b>%1</b>
@@ -14,7 +19,8 @@ Unable\ to\ monitor\ file\ changes.\ Please\ close\ files\ and\ processes\ and\
 
 %0/%1\ entries=%0/%1 entradas
 
-%0\ export\ successful=%0 exportado con éxito
+
+Reveal\ in\ File\ Explorer=Mostrar en Explorador de Archivos
 
 %0\ matches\ the\ regular\ expression\ <b>%1</b>=%0 coincidencias con la Expresión Regular <b>%1</b>
 
@@ -49,6 +55,7 @@ The\ path\ need\ not\ be\ on\ the\ classpath\ of\ JabRef.=La ruta no debe estar
 
 Add\ a\ regular\ expression\ for\ the\ key\ pattern.=Añadir una expresión regular para el patrón clave.
 
+Add\ entry\ manually=Añadir entrada manualmente
 
 Add\ selected\ entries\ to\ this\ group=Añadir entradas seleccionadas a este grupo
 
@@ -145,8 +152,6 @@ Cite\ command=Comando Citar
 
 Clear=Limpiar
 
-Clear\ fields=Limpiar campos
-
 Open\ /\ close\ entry\ editor=Abrir o cerrar editor de entradas
 
 Close\ dialog=Cerrar diálogo
@@ -166,7 +171,13 @@ Copied=Copiado
 
 Copy=Copiar
 
+Copy\ title=Copiar título
+Copy\ \\cite{citation\ key}=Copiar \\cite{citation key}
+Copy\ citation\ (html)=Copiar cita (html)
+Copy\ citation\ (text)=Copiar cita (texto)
 Copy\ citation\ key=Copiar clave de cita
+Copy\ citation\ key\ and\ link=Copiar clave de cita y enlace
+Copy\ citation\ key\ and\ title=Copiar clave y título de cita
 
 Copy\ to\ clipboard=Copiar al portapapeles
 
@@ -212,14 +223,18 @@ cut\ entries=Cortar entradas
 
 cut\ entry\ %0=corte de entrada %0
 
+DOI\ not\ found=DOI no encontrado
 
 Library\ encoding=Codificación de la biblioteca
 
 Library\ properties=Propiedades de la biblioteca
+%0\ -\ Library\ properties=%0 - Propiedades de la biblioteca
 
 Default=Por defecto
 
-Default\ encoding=Codificación por defecto
+Character\ encoding\ UTF-8\ is\ not\ supported.=La codificación de caracteres UTF-8 no restá soportada.
+UTF-8\ could\ not\ be\ used\ to\ encode\ the\ following\ characters\:\ %0=UTF-8 no se pudo utilizar para codificar los siguientes caracteres\: %0
+The\ chosen\ encoding\ '%0'\ could\ not\ encode\ the\ following\ characters\:=La codificación de caracteres '%' no puede codificar los siguientes caracteres\:
 
 Downloading=Descargando
 
@@ -267,6 +282,7 @@ Downloaded\ website\ as\ an\ HTML\ file.=Se descargó el sitio web como un archi
 
 duplicate\ removal=eliminación de duplicados
 
+Duplicate\ fields=Campos duplicados
 
 Duplicate\ string\ name=Nombre de cadena duplicado
 
@@ -328,6 +344,7 @@ External\ file\ links=Enlaces a archivos externos
 
 External\ programs=Programas externos
 
+Failed\ to\ import\ by\ ID=Error al importar por ID
 
 Field=Campo
 
@@ -352,6 +369,7 @@ Filter=Filtro
 
 Filter\ groups=Filtros
 
+Finished\ writing\ metadata\ for\ %0\ file\ (%1\ skipped,\ %2\ errors).=Escritura de metadatos para el archivo %0 finalizada (%1 omitidos, %2 errores).
 
 First\ select\ the\ entries\ you\ want\ keys\ to\ be\ generated\ for.=En primer lugar, seleccione las entradas para las que desea generar claves
 
@@ -368,6 +386,7 @@ Formatter\ name=Nombre del formateador
 
 found\ in\ AUX\ file=encontrado en archivo AUX
 
+Fulltext\ search=Búsqueda de texto completo
 
 Fulltext\ for=Texto completo de
 
@@ -446,6 +465,9 @@ Include\ subgroups\:\ When\ selected,\ view\ entries\ contained\ in\ this\ group
 Independent\ group\:\ When\ selected,\ view\ only\ this\ group's\ entries=Grupo independiente\: ver sólo las entradas de este grupo cuando esté seleccionado.
 I\ Agree=Acepto
 
+Indexing\ pdf\ files=Indexando archivos pdf
+Indexing\ for\ %0=Indexando para %0
+%0\ of\ %1\ linked\ files\ added\ to\ the\ index=%0 de %1 archivos enlazados añadidos al índice
 
 Invalid\ citation\ key=La clave de cita no es válida
 
@@ -459,6 +481,8 @@ JabRef\ requests\ recommendations\ from\ Mr.\ DLib,\ which\ is\ an\ external\ se
 JabRef\ Version\ (Required\ to\ ensure\ backwards\ compatibility\ with\ Mr.\ DLib's\ Web\ Service)=Versión JabRef (necesaria para asegurar la compatibilidad con el servicio web de Mr. DLib)
 
 Journal\ abbreviations=Abreviaturas de publicaciones
+Journal\ lists\:=Listados de revistas\:
+Remove\ journal\ '%0'=Eliminar revista '%0'
 
 Keep\ both=Mantener ambos
 
@@ -494,6 +518,7 @@ Main\ file\ directory=Carpeta del archivo principal
 Manage\ custom\ exports=Administrar exportaciones personalizadas
 
 Manage\ custom\ imports=Administrar importaciones personalizadas
+External\ file\ types=Tipos de archivos externos
 
 Mark\ new\ entries\ with\ owner\ name=Marcar nuevas entradas con nombre de propietario
 
@@ -516,6 +541,10 @@ Moved\ group\ "%0".=Se ha movido el grupo "%0".
 
 Mr.\ DLib\ Privacy\ settings=Mr. DLib Configuración de la privacidad
 
+No\ database\ is\ open=No hay ninguna base de datos abierta
+
+We\ need\ a\ database\ to\ export\ from.\ Open\ one.=Necesitamos una base de datos desde la que exportar. Abrir una.
+
 No\ recommendations\ received\ from\ Mr.\ DLib\ for\ this\ entry.=No se han recibido recomendaciones del Mr. DLib para esta entrada.
 
 Error\ while\ fetching\ recommendations\ from\ Mr.DLib.=Error al buscar recomendaciones de Mr. DLib.
@@ -548,6 +577,7 @@ No\ journal\ names\ could\ be\ abbreviated.=No se pudieron abreviar nombres de r
 
 No\ journal\ names\ could\ be\ unabbreviated.=No se pudieron expandir nombres de revistas.
 
+No\ DOI\ data\ exists=No existen datos DOI
 
 not=no
 
@@ -607,8 +637,6 @@ Path\ to\ %0\ not\ defined=Ruta hasta %0 sin definir
 
 Path\ to\ LyX\ pipe=Ruta hasta el pipe LyX
 
-PDF\ does\ not\ exist=No existe el PDF
-
 File\ has\ no\ attached\ annotations=El fichero no tiene anotaciones adjuntas
 
 Please\ enter\ a\ name\ for\ the\ group.=Introduzca un nombre para el grupo.
@@ -674,11 +702,25 @@ Remove\ selected\ entries\ from\ this\ group=Eliminar las entradas seleccionadas
 
 Remove\ group=Eliminar grupo
 
-Remove\ group\ "%0"?=¿Eliminar el grupo "%0%?
+Remove\ group\ and\ subgroups=Eliminar grupo y subgrupos
+
+Remove\ groups\ and\ subgroups=Eliminar grupos y subgrupos
+
+Remove\ all\ selected\ groups\ and\ keep\ their\ subgroups?=¿Eliminar todos los grupos seleccionados y mantener sus subgrupos?
+
+Remove\ group\ "%0"\ and\ keep\ its\ subgroups?=¿Eliminar grupo "%0" y mantener sus subgrupos?
+
+Remove\ groups=Eliminar grupos
+
+Removed\ all\ selected\ groups.=Eliminados todos los grupos seleccionados.
 
 Remove\ group\ "%0"\ and\ its\ subgroups?=¿Eliminar el grupo "%0" y sus subgrupos?
 
-Remove\ group\ and\ subgroups=Eliminar grupo y subgrupos
+Removed\ group\ "%0"\ and\ its\ subgroups.=Se ha eliminado el grupo "%0" y sus subgrupos.
+
+Remove\ all\ selected\ groups\ and\ their\ subgroups?=¿Eliminar todos los grupos seleccionados y sus subgrupos?
+
+Removed\ all\ selected\ groups\ and\ their\ subgroups.=Eliminados todos los grupos seleccionados y sus subgrupos.
 
 Remove\ link=Eliminar enlace
 
@@ -688,8 +730,6 @@ Remove\ string\ %0=Eliminar cadena %0
 
 Removed\ group\ "%0".=el grupo "%0" se ha eliminado.
 
-Removed\ group\ "%0"\ and\ its\ subgroups.=Se ha eliminado el grupo "%0" y sus subgrupos.
-
 Removed\ string=Cadena eliminada
 
 Renamed\ string=Cadena renombrada
@@ -712,6 +752,8 @@ Replaces\ Unicode\ ligatures\ with\ their\ expanded\ form=Reemplaza las ligadura
 
 Required\ fields=Campos requeridos
 
+Do\ not\ resolve\ BibTeX\ strings=No resolver cadenas BibTeX
+Resolve\ BibTeX\ strings\ for\ the\ following\ fields=Resolver las cadenas BibTeX para los siguientes campos
 
 resolved=resuelto
 
@@ -719,11 +761,13 @@ Restart=Reiniciar
 
 Restart\ required=Reinicio requerido
 
+Return\ to\ dialog=Volver al diálogo
 
 Review=Revisar
 Review\ changes=Revisar cambios
 Review\ Field\ Migration=Revisar campo de migración
 
+Loading=Cargando
 
 Save=Guardar
 Save\ all\ finished.=Guardar todos los finalizados
@@ -737,6 +781,7 @@ Save\ library\ as...=Guardar biblioteca como...
 Saving=Guardando
 Saving\ all\ libraries...=Guardando todas las bibliotecas...
 Saving\ library=Guardando biblioteca
+Library\ saved=Biblioteca guardada
 Saved\ selected\ to\ '%0'.=Selección guardada en '%0'.
 
 Search=Buscar
@@ -756,9 +801,6 @@ Select\ file\ from\ ZIP-archive=Seleccionar archivo desde archivo ZIP
 
 Select\ the\ tree\ nodes\ to\ view\ and\ accept\ or\ reject\ changes=Seleccionar nodos de árbol para ver y aceptar o rechazar los cambios.
 
-Set\ field=Establecer campo
-Set\ fields=Establecer campos
-
 Settings=Ajustes
 
 Shortcut=Atajo
@@ -791,7 +833,12 @@ Size=Tamaño
 Skipped\ -\ No\ PDF\ linked=Omitido - No se enlazó PDF
 Skipped\ -\ PDF\ does\ not\ exist=Omitido - No existe el PDF
 
-Skipped\ entry.=Entrada omitida.
+JabRef\ skipped\ the\ entry.=JabRef omitió la entrada.
+Import\ error=Error al importar
+Open\ library\ error=Error al abrir la biblioteca
+Please\ check\ your\ library\ file\ for\ wrong\ syntax.=Por favor, comprueba errores de sintaxis en tu archivo de biblioteca.
+SourceTab\ error=Error de SourceTab
+User\ input\ via\ entry-editor\ in\ `{}bibtex\ source`\ tab\ led\ to\ failure.=Entrada de usuario a través del editor de entrada en la pestaña `{}bibtex source` condujo al error.
 
 Sort\ subgroups=Ordenar subgrupos
 
@@ -806,8 +853,6 @@ Sublibrary\ from\ AUX\ to\ BibTeX=Subbiblioteca de AUX a BibTeX
 
 Switches\ between\ full\ and\ abbreviated\ journal\ name\ if\ the\ journal\ name\ is\ known.=Cambia entre nombre completo y abreviado de la revista si se conoce el nombre de la revista.
 
-The\ chosen\ encoding\ '%0'\ could\ not\ encode\ the\ following\ characters\:=La codificación de caracteres '%' no puede codificar los siguientes caracteres\:
-
 
 the\ field\ <b>%0</b>=el campo <b>%0</b>
 The\ group\ "%0"\ already\ contains\ the\ selection.=El grupo "%0" ya contiene la selección.
@@ -882,13 +927,18 @@ Warning=Advertencia
 
 Warnings=Advertencias
 
+Warning\:\ You\ added\ field\ "%0"\ twice.\ Only\ one\ will\ be\ kept.=Advertencia\: Añadiste el campo "%0" dos veces. Solo uno será utilizado.
 
 web\ link=enlace a web
 
 What\ do\ you\ want\ to\ do?=¿Qué desea hacer?
 Whatever\ option\ you\ choose,\ Mr.\ DLib\ may\ share\ its\ data\ with\ research\ partners\ to\ further\ improve\ recommendation\ quality\ as\ part\ of\ a\ 'living\ lab'.\ Mr.\ DLib\ may\ also\ release\ public\ datasets\ that\ may\ contain\ anonymized\ information\ about\ you\ and\ the\ recommendations\ (sensitive\ information\ such\ as\ metadata\ of\ your\ articles\ will\ be\ anonymised\ through\ e.g.\ hashing).\ Research\ partners\ are\ obliged\ to\ adhere\ to\ the\ same\ strict\ data\ protection\ policy\ as\ Mr.\ DLib.=Sea cual sea la opción que elija, Mr. DLib puede compartir sus datos con socios de investigación para mejorar aún más la calidad de las recomendaciones como parte de un "laboratorio vivo". Mr. DLib también puede publicar conjuntos de datos públicos que pueden contener información anónima sobre usted y las recomendaciones (la información confidencial como los metadatos de sus artículos será anonimizada a través de, por ejemplo, hashing). Los socios de investigación están obligados a adherirse a la misma estricta política de protección de datos que Mr. DLib.
 
+Will\ write\ metadata\ to\ the\ PDFs\ linked\ from\ selected\ entries.=Escribirá metadatos en los PDFs enlazados desde entradas seleccionadas.
 
+Write\ BibTeXEntry\ as\ metadata\ to\ PDF.=Escribir entrada BibTeX como metadatos XMP en el PDF.
+Write\ metadata\ for\ all\ PDFs\ in\ current\ library?=¿Escribir metadatos para todos los PDFs de la biblioteca actual?
+Writing\ metadata\ for\ selected\ entries...=Escribiendo metadatos para las entradas seleccionadas...
 
 Write\ BibTeXEntry\ as\ XMP\ metadata\ to\ PDF.=Escribe BibTeXEntry como metadatos XMP en los PDF.
 
@@ -928,10 +978,6 @@ Line\ %0\:\ Found\ corrupted\ citation\ key\ %1\ (comma\ missing).=Renglón %0\:
 No\ full\ text\ document\ found=No se encontró un documento de texto completo
 Download\ from\ URL=Descargar desde URL
 Rename\ field=Renombrar campo
-Append\ field=Añadir campo
-Append\ to\ fields=Añadir a campos
-Rename\ field\ to=Renombrar campo a
-Move\ contents\ of\ a\ field\ into\ a\ field\ with\ a\ different\ name=Mover contenidos de un campo en un campo con nombre diferente
 
 Cannot\ use\ port\ %0\ for\ remote\ operation;\ another\ application\ may\ be\ using\ it.\ Try\ specifying\ another\ port.=No se puede usar el puerto %0 para operación remota\: Puede estar en uso por otra aplicación. Pruebe a especificar otro puerto.
 
@@ -1003,7 +1049,6 @@ Manage\ citations=Administrar citas
 Problem\ modifying\ citation=Problema al modificar cita
 Citation=Cita
 Connecting...=Conectando...
-Could\ not\ resolve\ BibTeX\ entry\ for\ citation\ marker\ '%0'.=No se puede resolver la entrada BibTeX para el marcador de citas '%0'
 Select\ style=Seleccionar estilo
 Journals=Publicaciones
 Cite=Citar
@@ -1015,17 +1060,26 @@ Select\ Writer\ document=Seleccionar documento Writer
 Sync\ OpenOffice/LibreOffice\ bibliography=Sincronizar bibliografía OpenOffice/LibreOffice
 Select\ which\ open\ Writer\ document\ to\ work\ on=Seleccionar el ducomento Writer para trabajar
 Connected\ to\ document=Conectado al documento
+
+
+
 Insert\ a\ citation\ without\ text\ (the\ entry\ will\ appear\ in\ the\ reference\ list)=Insertar una cita sin texto (la entrada aparecerá en la lista de referencias)
 Cite\ selected\ entries\ with\ extra\ information=Citar las entradas seleccionadas con información complementaria
 Ensure\ that\ the\ bibliography\ is\ up-to-date=Asegurar que la bibliografía está actualizada
+
 Your\ OpenOffice/LibreOffice\ document\ references\ the\ citation\ key\ '%0',\ which\ could\ not\ be\ found\ in\ your\ current\ library.=El documento de OpenOffice/LibreOffice contiene la clave de cita «%0», la cual no se encuentra en su biblioteca actual.
+
+
+
+
 Unable\ to\ synchronize\ bibliography=No es posible sincronizar la bibliografía
 Combine\ pairs\ of\ citations\ that\ are\ separated\ by\ spaces\ only=Combinar pares de citas que están separadas únicamente por espacios
 Autodetection\ failed=Falló la autodetección
 Please\ wait...=Por favor, espere...
 Connection\ lost=Se ha perdido la conexión
-The\ paragraph\ format\ is\ controlled\ by\ the\ property\ 'ReferenceParagraphFormat'\ or\ 'ReferenceHeaderParagraphFormat'\ in\ the\ style\ file.=El formato de párrafo está controlado por la propiedad 'ReferenceParagraphFormat' o ' ReferenceHeaderParagraphFormat' en el archivo de estilo.
-The\ character\ format\ is\ controlled\ by\ the\ citation\ property\ 'CitationCharacterFormat'\ in\ the\ style\ file.=El formato de tipo de letra está controlado por la propiedad de la cita 'CitationCharacterFormat0 en el archivo de estilo.
+
+
+
 Automatically\ sync\ bibliography\ when\ inserting\ citations=Sincronizar automáticamente la bibliografía al insertar citas
 Look\ up\ BibTeX\ entries\ in\ the\ active\ tab\ only=Buscar entradas BibTeX sólo en la pestaña activa
 Look\ up\ BibTeX\ entries\ in\ all\ open\ libraries=Buscar entradas BibTeX en todas las bibliotecas abiertas
@@ -1126,6 +1180,7 @@ Toggle\ quality\ assured=Conmutar calidad asegurada
 Toggle\ print\ status=Cambiar estatus de impresión
 Update\ keywords=Actualizar palabras clave
 Connection\ to\ OpenOffice/LibreOffice\ has\ been\ lost.\ Please\ make\ sure\ OpenOffice/LibreOffice\ is\ running,\ and\ try\ to\ reconnect.=La conexión con OpenOffice/LibreOffice se ha perdido. Asegúrese de que OpenOffice/LibreOffice está ejecutándose e intente reconectar.
+
 JabRef\ will\ send\ at\ least\ one\ request\ per\ entry\ to\ a\ publisher.=JabRed enviará al menos una solicitud por entrada al editor
 Correct\ the\ entry,\ and\ reopen\ editor\ to\ display/edit\ source.=Corregir la entrada y reabrir el editor para mostrar/editar fuente.
 Could\ not\ connect\ to\ running\ OpenOffice/LibreOffice.=No se puede conectar a un OpenOffice/LibreOffice en ejecución.
@@ -1138,8 +1193,6 @@ Removed\ all\ subgroups\ of\ group\ "%0".=Eliminados todos los subgrupos del gru
 To\ disable\ the\ memory\ stick\ mode\ rename\ or\ remove\ the\ jabref.xml\ file\ in\ the\ same\ folder\ as\ JabRef.=Para deshabilitar el modo lápiz de memoria, renombre o elimine el archivo jabrf.xml en la misma carpeta que JabRef.
 Unable\ to\ connect.\ One\ possible\ reason\ is\ that\ JabRef\ and\ OpenOffice/LibreOffice\ are\ not\ both\ running\ in\ either\ 32\ bit\ mode\ or\ 64\ bit\ mode.=No es posible conectar. Una posible razón es que JabRef y OpenOffice/LibreOffice no están funcionado en modo 32 bit o 64 bit.
 Delimiter(s)=Separador(es)
-Your\ style\ file\ specifies\ the\ character\ format\ '%0',\ which\ is\ undefined\ in\ your\ current\ OpenOffice/LibreOffice\ document.=Su archivo de estilo especifica el formato de carácter '%0', que no está definido en su documento OpenOffice/LibreOffice actual.
-Your\ style\ file\ specifies\ the\ paragraph\ format\ '%0',\ which\ is\ undefined\ in\ your\ current\ OpenOffice/LibreOffice\ document.=Su archivo de estilo especifica el formato de párrafo '%0', que no está definido en su documento OpenOffice/LibreOffice.
 
 Searching...=Buscando...
 Please\ enter\ a\ search\ string=Introduzca una cadena de búsqueda, por favor
@@ -1174,6 +1227,11 @@ Use\ custom\ proxy\ configuration=Usar configuración de proxy personalizada
 Proxy\ requires\ authentication=El proxi requiere autenticación
 Attention\:\ Password\ is\ stored\ in\ plain\ text\!=Atención\: ¡La contraseña está almacenada como texto plano\!
 Clear\ connection\ settings=Limpiar ajustes de conexión
+Check\ Proxy\ Setting=Comprobar configuración de «proxy»
+Check\ connection=Comprobar conexión
+Connection\ failed\!=Falló la conexión.
+Connection\ successful\!=Conexión correcta.
+
 
 Open\ folder=Abrir pasta
 Export\ sort\ order=Criterio de ordenación para exportación
@@ -1253,9 +1311,7 @@ Save\ changes=Guardar cambios
 Discard\ changes=Descartar cambios
 Library\ '%0'\ has\ changed.=La biblioteca '%0' ha cambiado.
 Print\ entry\ preview=Imprimir vista previa de la entrada
-Copy\ title=Copiar título
-Copy\ \\cite{citation\ key}=Copiar \\cite{citation key}
-Copy\ citation\ key\ and\ title=Copiar clave y título de cita
+
 Invalid\ DOI\:\ '%0'.=DOI no válida\: '%0'.
 Same\ DOI\ used\ in\ multiple\ entries=El mismo DOI usado en múltiples entradas
 should\ start\ with\ a\ name=debería comenzar por un nombre
@@ -1514,6 +1570,11 @@ Export\ cited=Exportar citados
 Unable\ to\ generate\ new\ library=No se puede generar la nueva biblioteca
 
 
+
+
+
+
+
 Note\:\ Use\ the\ placeholder\ %DIR%\ for\ the\ location\ of\ the\ opened\ library\ file.=Nota\: Usar el marcador %DIR% para la ubicación de la biblioteca abierta.
 Error\ occured\ while\ executing\ the\ command\ "%0".=Error durante la ejecución del comando "%0".
 Reformat\ ISSN=Reformatear ISSN
@@ -1575,6 +1636,8 @@ Issue\ report\ successful=Comunicación de problema satisfactoria
 Your\ issue\ was\ reported\ in\ your\ browser.=Su problema fue comunicado a través del navegador
 The\ log\ and\ exception\ information\ was\ copied\ to\ your\ clipboard.=La información de excepción y registro fue copiada a su portapapeles
 Please\ paste\ this\ information\ (with\ Ctrl+V)\ in\ the\ issue\ description.=Por favor, pegue esta información (con Ctrl+V) en la descripción del problema.
+Last\ notification=Última notificación
+Check\ the\ event\ log\ to\ see\ all\ notifications=Revisa el registro de eventos para ver todas las notificaciones
 
 Host=Host/Servidor
 Port=Puerto
@@ -1612,7 +1675,6 @@ Protected\ terms\ file=Archivo de términos protegidos
 Style\ file=Archivo de estilo
 
 Open\ OpenOffice/LibreOffice\ connection=Conexión OpenOffice/LibreOffice
-You\ must\ enter\ at\ least\ one\ field\ name=Debe introducir, al menos, un nombre de campo
 Non-ASCII\ encoded\ character\ found=Se han encontrado caracteres con codificación no-ASCII
 Non-UTF-8\ encoded\ field\ found=Se encontró un campo no codificado en UTF-8
 Toggle\ web\ search\ interface=Cambiar interfaz de búsqueda web
@@ -1658,7 +1720,6 @@ should\ be\ normalized=debería ser normalizado
 
 Empty\ search\ ID=Vaciar ID de búsqueda
 The\ given\ search\ ID\ was\ empty.=La ID de búsqueda está vacía.
-Copy\ citation\ key\ and\ link=Copiar clave de cita y enlace
 biblatex\ field\ only=Sólo campo biblatex
 
 Error\ while\ generating\ fetch\ URL=Error al generar la URL de recolección
@@ -1722,6 +1783,7 @@ Delete\ '%0'=Eliminar '%0'
 Delete\ from\ disk=Eliminar del disco duro
 Remove\ from\ entry=Eliminar de la entrada
 There\ exists\ already\ a\ group\ with\ the\ same\ name.=Ya existe un grupo con el mismo nombre.
+If\ you\ use\ it,\ it\ will\ inherit\ all\ entries\ from\ this\ other\ group.=Si lo utiliza, heredará todas las entradas de este otro grupo.
 
 Copy\ linked\ file=Copiar archivo enlazado
 Copy\ linked\ file\ to\ folder...=Copiar archivo enlazado a la carpeta...
@@ -1750,7 +1812,6 @@ Removes\ all\ hyphenated\ line\ breaks\ in\ the\ field\ content.=Elimina todos l
 Could\ not\ retrieve\ entry\ data\ from\ '%0'.=No se pueden recuperar los datos de la entrada desde '%0'.
 Entry\ from\ %0\ could\ not\ be\ parsed.=No se pudo analizar la entrada de %0.
 Invalid\ identifier\:\ '%0'.=Identificador no válido\: '%0'.
-This\ paper\ has\ been\ withdrawn.=Este artículo ha sido retirado.
 empty\ citation\ key=clave de cita vacía
 Aux\ file=Archivo Aux
 Group\ containing\ entries\ cited\ in\ a\ given\ TeX\ file=Grupo que contiene las entradas citadas en un archivo TeX determinado
@@ -1778,9 +1839,7 @@ Could\ not\ connect\ to\ Vim\ server.\ Make\ sure\ that\ Vim\ is\ running\ with\
 Could\ not\ connect\ to\ a\ running\ gnuserv\ process.\ Make\ sure\ that\ Emacs\ or\ XEmacs\ is\ running,\ and\ that\ the\ server\ has\ been\ started\ (by\ running\ the\ command\ 'server-start'/'gnuserv-start').=No se puede conectar con un proceso gnuserv en ejecución. Asegúrese de que Emacs o XEmacs se está ejecutando y de que el servidor ha sido iniciado (ejecutando el comando 'server-start'/'gnuserv-start').
 Error\ pushing\ entries=Error al enviar entradas
 
-Undefined\ character\ format=Formato de caracteres indefinido
-Undefined\ paragraph\ format=Formato de párrafo indefinido
-
+Preamble=Preámbulo
 Markings=Marcados
 Use\ selected\ instance=Usar la instancia seleccionada
 
@@ -1799,8 +1858,8 @@ Blog=Blog
 Check\ integrity=Verificar integridad
 Cleanup\ URL\ link=Limpiar un enlace URL
 Cleanup\ URL\ link\ by\ removing\ special\ symbols\ and\ extracting\ simple\ link=Limpiar un enlace URL eliminando los símbolos especiales y extrayendo un enlace simple
+Copy\ DOI=Copiar DOI
 Copy\ DOI\ url=Copiar la url del DOI
-Copy\ citation=Copiar cita
 Development\ version=Versión de desarrollo
 Export\ selected\ entries=Exportar registros seleccionados
 Export\ selected\ entries\ to\ clipboard=Exportar las entradas seleccionadas al portapapeles
@@ -1809,6 +1868,8 @@ JabRef\ resources=Recursos sobre JabRef
 Manage\ journal\ abbreviations=Administrar abreviaturas de publicaciones
 Manage\ protected\ terms=gestionar términos protegidos
 New\ entry\ from\ plain\ text=Nueva entrada desde texto sin formato
+Import\ by\ ID=Importar por ID
+Enter\ a\ valid\ ID=Introduzca un ID válido
 New\ sublibrary\ based\ on\ AUX\ file=Nueva subbiblioteca a partir de un archivo AUX
 Push\ entries\ to\ external\ application\ (%0)=Agregar registros a aplicación externa (%0)
 Quit=Salir
@@ -1868,6 +1929,7 @@ Keyword\ separator=Separador de palabras clave
 Remove\ keyword=Eliminar palabra clave
 Are\ you\ sure\ you\ want\ to\ remove\ keyword\:\ "%0"?=¿Está seguro de que desea eliminar la palabra clave\: "%0"?
 Reset\ to\ default=Restablecer los valores por defecto
+String\ constants=Constantes de cadena
 Export\ all\ entries=Exportar todas las entradas
 Generate\ citation\ keys=Generar claves de cita
 Manage\ field\ names\ &\ content=Gestionar nombres y contenido de los campos
@@ -1997,6 +2059,7 @@ Please\ provide\ a\ valid\ aux\ file.=Por favor, proporcione un archivo AUX vál
 Keyword\ delimiter=Separador de palabras clave
 Hierarchical\ keyword\ delimiter=Separador de palabras clave jerárquicas
 Escape\ ampersands=Escape de ampersands
+Escape\ dollar\ sign=Símbolo de escape dólar
 
 Hint\:\n\nTo\ search\ all\ fields\ for\ <b>Smith</b>,\ enter\:\n<tt>smith</tt>\n\nTo\ search\ the\ field\ <b>author</b>\ for\ <b>Smith</b>\ and\ the\ field\ <b>title</b>\ for\ <b>electrical</b>,\ enter\:\n<tt>author\=Smith\ and\ title\=electrical</tt>=Consejo\:\n\nPara buscar <b>Pedro</b> en todos los campos, escriba\:\n<tt>pedro</tt>\n\nPara buscar <b>Pedro</b> en el campo <b>author</b> y <b>eléctrico</b> en el campo <b>title</b>, escriba\:\n<tt>author\=Pedro and title\=eléctrico</tt>
 
@@ -2206,7 +2269,11 @@ Reveal\ in\ file\ explorer=Revelar en el explorador de archivos
 
 Autolink\ files=Enlazar archivos automáticamente
 
+Custom\ editor\ tabs=Pestañas de editor personalizadas
+Custom\ export\ formats=Formatos de exportación personalizados
+Custom\ import\ formats=Formatos de importación personalizados
 
+No\ list\ enabled=No hay lista habilitada
 Protect\ selection=Proteger selección
 
 Customized\ preview\ style=Estilo de previsualización personalizado
@@ -2227,23 +2294,43 @@ Removes\ digits.=Elimina dígitos.
 
 Presets=Preconfiguraciones
 
-Check\ Proxy\ Setting=Comprobar configuración de «proxy»
-Check\ connection=Comprobar conexión
-Connection\ failed\!=Falló la conexión.
-Connection\ successful\!=Conexión correcta.
 Generate\ groups\ from\ keywords\ in\ the\ following\ field=Generar grupos a partir de palabras clave en el campo siguiente
 Generate\ groups\ for\ author\ last\ names=Generar grupos para apellidos de autores
 Regular\ expression=Expresión regular
 
 Error\ importing.\ See\ the\ error\ log\ for\ details.=Error al importar. Consulte el registro de errores para obtener detalles.
 
+Error\ from\ import\:\ %0=Error de importación\: %0
+Error\ reading\ PDF\ content\:\ %0=Error al leer el contenido PDF\: %0
+Importing\ bib\ entry=Importando entrada bibliográfica
+Importing\ using\ extracted\ PDF\ data=Importación usando datos extraídos del PDF
+No\ BibTeX\ data\ found.\ Creating\ empty\ entry\ with\ file\ link=No se encontraron datos BibTeX. Creando entrada vacía con enlace de archivo
+No\ metadata\ found.\ Creating\ empty\ entry\ with\ file\ link=No se encontraron metadatos. Creando entrada vacía con enlace de archivo
+Processing\ file\ %0=Procesando archivo %0
+Export\ selected=Exportar seleccionados
 
+Separate\ merged\ citations=Citas fusionadas separadas
+Separate\ citations=Citas separadas
 
 
 Custom\ DOI\ URI=URI personalizado de DOI
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 New\ entry\ by\ type=Entrada nueva por tipo
 
 
@@ -2252,7 +2339,6 @@ Entry\ Type=Tipo de entrada
 Entry\ types=Tipos de entrada
 Field\ names=Nombre del campo
 Others=Otros
-Overwrite\ existing\ field\ values=Sobreescribir valores de campo existentes
 Recommended=Recomendado
 
 Authors\ and\ Title=Autoría y título
@@ -2278,3 +2364,10 @@ Question=Pregunta
 
 
 
+
+
+
+
+
+
+
diff --git a/src/main/resources/l10n/JabRef_fa.properties b/src/main/resources/l10n/JabRef_fa.properties
index f67fc4b180d..fb60c5076e1 100644
--- a/src/main/resources/l10n/JabRef_fa.properties
+++ b/src/main/resources/l10n/JabRef_fa.properties
@@ -10,7 +10,7 @@ Unable\ to\ monitor\ file\ changes.\ Please\ close\ files\ and\ processes\ and\
 
 
 
-%0\ export\ successful=برون ريزي موفقيت آميز است%0
+
 
 
 
@@ -99,8 +99,6 @@ Case\ sensitive=حساس به کوچکی و بزرگی حروف
 
 Clear=پاکسازی
 
-Clear\ fields=پاک کردن فیلدها
-
 
 
 
@@ -302,6 +300,8 @@ Entry\ editor=ویرایشگر ورودی
 
 
 
+
+
 
 
 
@@ -375,12 +375,15 @@ Open\ terminal\ here=در اینجا پایانه را باز کن
 
 
 
-Library\ saved=کتابخانه ذخیره شد
 
 
 
 
 
+Library\ saved=کتابخانه ذخیره شد
+
+
+
 
 
 
@@ -461,6 +464,17 @@ Will\ write\ metadata\ to\ the\ PDFs\ linked\ from\ selected\ entries.=فراد
 
 
 
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -478,6 +492,7 @@ Manage\ keywords=مدیریت کلیدواژه‌ها
 
 
 
+
 Merge\ entries=ترکیب کردن ورودی‌ها
 
 
@@ -485,6 +500,7 @@ Merge\ entries=ترکیب کردن ورودی‌ها
 
 
 
+
 Open\ folder=بازکردن پوشه
 
 
@@ -497,6 +513,7 @@ Save\ selected\ as\ plain\ BibTeX...=.\=منتخب‌شده را به صورت 
 
 
 
+
 Focus\ entry\ table=تمرکز بر جدول ورودی
 Import\ into\ current\ library=وارد کردن به پایگاه داده‌ی فعلی
 Import\ into\ new\ library=وارد کردن به پایگاه داده‌ی جدید
@@ -562,6 +579,10 @@ Unabbreviate\ journal\ names=برداشتن مخفف نام ژورنال‌ها
 
 
 
+
+
+
+
 
 
 
@@ -623,6 +644,21 @@ Auto\ complete\ enabled.=تکمیل خودکار غیرفعال شد.
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -630,3 +666,9 @@ Auto\ complete\ enabled.=تکمیل خودکار غیرفعال شد.
 
 
 Search\ results\ from\ open\ libraries=جستجوی نتایج از کتابخانه های باز
+
+
+
+
+
+
diff --git a/src/main/resources/l10n/JabRef_fr.properties b/src/main/resources/l10n/JabRef_fr.properties
index 34d54aa4ac8..42edf5e63ee 100644
--- a/src/main/resources/l10n/JabRef_fr.properties
+++ b/src/main/resources/l10n/JabRef_fr.properties
@@ -19,7 +19,9 @@ Unable\ to\ monitor\ file\ changes.\ Please\ close\ files\ and\ processes\ and\
 
 %0/%1\ entries=%0/%1 entrées
 
-%0\ export\ successful=%0 \: Exportation réussie
+Export\ operation\ finished\ successfully.=L'opération d'export s'est terminée avec succès.
+
+Reveal\ in\ File\ Explorer=Montrer dans l'explorateur de fichiers
 
 %0\ matches\ the\ regular\ expression\ <b>%1</b>=%0 correspond à l'expression régulière <b>%1</b>
 
@@ -151,8 +153,6 @@ Cite\ command=Commande Cite
 
 Clear=Vider
 
-Clear\ fields=Vider les champs
-
 Open\ /\ close\ entry\ editor=Ouvrir/fermer l'éditeur d'entrées
 
 Close\ dialog=Fermer la fenêtre
@@ -172,7 +172,13 @@ Copied=Copié
 
 Copy=Copier
 
+Copy\ title=Copier le titre
+Copy\ \\cite{citation\ key}=Copier \\cite{citation key}
+Copy\ citation\ (html)=Copier la citation (html)
+Copy\ citation\ (text)=Copier la citation (texte)
 Copy\ citation\ key=Copier la clef de citation
+Copy\ citation\ key\ and\ link=Copier la clef de citation et le lien
+Copy\ citation\ key\ and\ title=Copier la clef de citation et le titre
 
 Copy\ to\ clipboard=Copier dans le presse-papier
 
@@ -194,7 +200,7 @@ Could\ not\ print\ preview=Échec de l'impression de l'aperçu
 Could\ not\ run\ the\ 'vim'\ program.=Le programme 'vim' n'a pas pu être lancé.
 
 Could\ not\ save\ file.=Le fichier n'a pas pu être enregistré.
-Character\ encoding\ '%0'\ is\ not\ supported.=L'encodage de caractères « %0 » n'est pas supporté.
+Character\ encoding\ '%0'\ is\ not\ supported.=L'encodage de caractères '%0' n'est pas pris en charge.
 
 Create\ custom\ fields\ for\ each\ BibTeX\ entry=Créer des champs personnalisés pour chaque entrée BibTeX
 
@@ -227,7 +233,9 @@ Library\ properties=Propriétés du fichier
 
 Default=Défaut
 
-Default\ encoding=Encodage par défaut
+Character\ encoding\ UTF-8\ is\ not\ supported.=L'encodage de caractères UTF-8 n'est pas pris en charge.
+UTF-8\ could\ not\ be\ used\ to\ encode\ the\ following\ characters\:\ %0=L'UTF-8 n'a pas pu être utilisé pour encoder les caractères suivants \: %0
+The\ chosen\ encoding\ '%0'\ could\ not\ encode\ the\ following\ characters\:=L'encodage « %0 » choisi ne peut pas encoder les caractères suivants \:
 
 Downloading=Téléchargement
 
@@ -287,7 +295,7 @@ Dynamically\ group\ entries\ by\ searching\ a\ field\ for\ a\ keyword=Grouper dy
 
 Each\ line\ must\ be\ of\ the\ following\ form\:\ 'tab\:field1;field2;...;fieldN'.=Chaque ligne doit être au format suivant \: 'tab\:field1;field2;...;fieldN'.
 
-Edit=Éditer
+Edit=Édition
 
 Edit\ file\ type=Modifier le type de fichier
 
@@ -534,6 +542,10 @@ Moved\ group\ "%0".=Groupe « %0 » déplacé.
 
 Mr.\ DLib\ Privacy\ settings=Paramètres de confidentialité de M. DLib
 
+No\ database\ is\ open=Aucune base de données n'est ouverte
+
+We\ need\ a\ database\ to\ export\ from.\ Open\ one.=Il faut une base de données de laquelle exporter. Ouvrez-en une.
+
 No\ recommendations\ received\ from\ Mr.\ DLib\ for\ this\ entry.=Aucune recommandation de Mr. DLib n'a été reçue pour cette entrée.
 
 Error\ while\ fetching\ recommendations\ from\ Mr.DLib.=Erreur lors de la récupération des recommandations de Mr. DLib.
@@ -626,8 +638,6 @@ Path\ to\ %0\ not\ defined=Chemin vers %0 non défini
 
 Path\ to\ LyX\ pipe=Chemin du canal de transmission LyX
 
-PDF\ does\ not\ exist=Le PDF n'existe pas
-
 File\ has\ no\ attached\ annotations=Le fichier n'a pas d'annotations liées
 
 Please\ enter\ a\ name\ for\ the\ group.=Veuillez saisir un nom pour le groupe.
@@ -663,7 +673,7 @@ Processing\ %0=Traitement de %0
 Pull\ changes\ from\ shared\ database=Récupérer les modifications depuis la base de données partagée
 Problem\ finding\ files.\ See\ error\ log\ for\ details.=Problème lors de la recherche des fichiers. Consultez le journal des erreurs pour plus de détails.
 
-Pushed\ citations\ to\ %0=Envoyer les citations vers %0
+Pushed\ citations\ to\ %0=Envoyer les appels à référence vers %0
 
 Push\ applications=Logiciels de rédaction
 
@@ -693,11 +703,25 @@ Remove\ selected\ entries\ from\ this\ group=Supprimer de ce groupe les entrées
 
 Remove\ group=Supprimer le groupe
 
-Remove\ group\ "%0"?=Supprimer le groupe « %0 » ?
+Remove\ group\ and\ subgroups=Supprimer le groupe et les sous-groupes
+
+Remove\ groups\ and\ subgroups=Supprimer les groupes et les sous-groupes
+
+Remove\ all\ selected\ groups\ and\ keep\ their\ subgroups?=Supprimer tous les groupes sélectionnés et conserver leurs sous-groupes ?
+
+Remove\ group\ "%0"\ and\ keep\ its\ subgroups?=Supprimer le groupe « %0 » et conserver ses sous-groupes ?
+
+Remove\ groups=Supprimer les groupes
+
+Removed\ all\ selected\ groups.=Tous les groupes sélectionnés ont été supprimés.
 
 Remove\ group\ "%0"\ and\ its\ subgroups?=Supprimer le groupe « %0 » et ses sous-groupes ?
 
-Remove\ group\ and\ subgroups=Supprimer le groupe et les sous-groupes
+Removed\ group\ "%0"\ and\ its\ subgroups.=Groupe « %0 » et ses sous-groupes supprimés.
+
+Remove\ all\ selected\ groups\ and\ their\ subgroups?=Supprimer tous les groupes sélectionnés et leurs sous-groupes ?
+
+Removed\ all\ selected\ groups\ and\ their\ subgroups.=Tous les groupes sélectionnés et leurs sous-groupes ont été supprimés.
 
 Remove\ link=Supprimer le lien
 
@@ -707,8 +731,6 @@ Remove\ string\ %0=Supprimer la chaîne %0
 
 Removed\ group\ "%0".=Groupe « %0 » supprimé.
 
-Removed\ group\ "%0"\ and\ its\ subgroups.=Groupe « %0 » et ses sous-groupes supprimés.
-
 Removed\ string=Chaîne supprimée
 
 Renamed\ string=Chaîne renommée
@@ -760,7 +782,7 @@ Save\ library\ as...=Enregistrer le fichier sous...
 Saving=Enregistrement en cours
 Saving\ all\ libraries...=Enregistrement de tous les fichiers...
 Saving\ library=Enregistrement du fichier en cours
-Library\ saved=Fichier sauvé
+Library\ saved=Fichier enregistré
 Saved\ selected\ to\ '%0'.=Sélection enregistrée dans « %0 ».
 
 Search=Recherche
@@ -780,9 +802,6 @@ Select\ file\ from\ ZIP-archive=Sélectionner un fichier depuis une archive ZIP
 
 Select\ the\ tree\ nodes\ to\ view\ and\ accept\ or\ reject\ changes=Sélectionner les nœuds de l'arborescence pour voir, et accepter ou rejeter, les modifications
 
-Set\ field=Configurer le champ
-Set\ fields=Configurer les champs
-
 Settings=Paramètres
 
 Shortcut=Raccourci
@@ -815,7 +834,12 @@ Size=Taille
 Skipped\ -\ No\ PDF\ linked=Sauté - Pas de PDF lié
 Skipped\ -\ PDF\ does\ not\ exist=Omis - Le PDF n'existe pas
 
-Skipped\ entry.=Entrée omise.
+JabRef\ skipped\ the\ entry.=JabRef a ignoré l'entrée.
+Import\ error=Erreur d'importation
+Open\ library\ error=Erreur d'ouverture du fichier
+Please\ check\ your\ library\ file\ for\ wrong\ syntax.=Veuillez vérifier la syntaxe de votre fichier bibliographique.
+SourceTab\ error=Erreur de SourceTab
+User\ input\ via\ entry-editor\ in\ `{}bibtex\ source`\ tab\ led\ to\ failure.=La saisie de l'utilisateur via l'éditeur d'entrée dans l'onglet `{}bibtex source` a conduit à un échec.
 
 Sort\ subgroups=Trier les sous-groupes
 
@@ -830,8 +854,6 @@ Sublibrary\ from\ AUX\ to\ BibTeX=Sous-fichier à partir du AUX vers BibTeX
 
 Switches\ between\ full\ and\ abbreviated\ journal\ name\ if\ the\ journal\ name\ is\ known.=Bascule entre les noms de journaux développés et abrégés si le nom de journal est connu.
 
-The\ chosen\ encoding\ '%0'\ could\ not\ encode\ the\ following\ characters\:=L'encodage « %0 » choisi ne peut pas encoder les caractères suivants \:
-
 
 the\ field\ <b>%0</b>=le champ <b>%0</b>
 The\ group\ "%0"\ already\ contains\ the\ selection.=Le groupe « %0 » contient déjà la sélection.
@@ -963,18 +985,14 @@ Line\ %0\:\ Found\ corrupted\ citation\ key\ %1\ (contains\ whitespaces).=Ligne
 Line\ %0\:\ Found\ corrupted\ citation\ key\ %1\ (comma\ missing).=Ligne %0 \: clef de citation corrompue %1 (virgule manquante).
 No\ full\ text\ document\ found=Aucun texte intégral trouvé
 Download\ from\ URL=Télécharger depuis l'URL
-Rename\ field=Renommer le champ
-Append\ field=Ajouter au champ
-Append\ to\ fields=Ajouter aux champs
-Rename\ field\ to=Renommer le champ en
-Move\ contents\ of\ a\ field\ into\ a\ field\ with\ a\ different\ name=Déplacer le contenu d'un champ vers un champ d'un nom différent
+Rename\ field=Renommer
 
 Cannot\ use\ port\ %0\ for\ remote\ operation;\ another\ application\ may\ be\ using\ it.\ Try\ specifying\ another\ port.=Le port %0 ne peut pas être utilisé pour une opération à distance ; un autre logiciel pourrait être en train de l'utiliser. Essayer de spécifier un autre port.
 
 Looking\ for\ full\ text\ document...=Recherche du texte intégral...
 A\ local\ copy\ will\ be\ opened.=Une copie locale sera ouverte.
-Autosave\ local\ libraries=Sauvegarder automatiquement les fichiers locaux
-Automatically\ save\ the\ library\ to=Sauvegarder automatiquement les fichiers dans
+Autosave\ local\ libraries=Enregistrer automatiquement les fichiers locaux
+Automatically\ save\ the\ library\ to=Enregistrer automatiquement les fichiers dans \:
 Please\ enter\ a\ valid\ file\ path.=Veuillez saisir un chemin de fichier valide.
 Error\ opening\ file\ '%0'.=Erreur lors de l'ouverture du fichier « %0 ».
 
@@ -995,7 +1013,7 @@ contains=contient
 search\ expression=expression de recherche
 
 Optional\ fields\ 2=Champs optionnels 2
-Waiting\ for\ save\ operation\ to\ finish=Attente de la fin de l'opération de sauvegarde
+Waiting\ for\ save\ operation\ to\ finish=Attente de la fin de l'opération d'enregistrement
 Waiting\ for\ background\ tasks\ to\ finish.\ Quit\ anyway?=En attente de la fin des tâches en arrière-plan. Quitter quand même ?
 
 Find\ and\ remove\ duplicate\ citation\ keys=Rechercher et supprimer les clefs de citation dupliquées
@@ -1029,39 +1047,58 @@ Output\ file\ missing=Fichier de sortie manquant
 No\ search\ matches.=Recherche sans correspondance.
 The\ output\ option\ depends\ on\ a\ valid\ input\ option.=L'option de sortie dépend d'une option d'entrée valide.
 Linked\ file\ name\ conventions=Conventions pour les noms de fichiers liés
-Filename\ format\ pattern=Modèle de format de nom de fichier
+Filename\ format\ pattern=Modèle de format de nom de fichier 
 Additional\ parameters=Paramètres additionnels
 Cite\ selected\ entries\ between\ parenthesis=Citer les entrées sélectionnées entre parenthèses
 Cite\ selected\ entries\ with\ in-text\ citation=Citer les entrées sélectionnées comme incluse dans le texte
 Cite\ special=Citer (cas particuliers)
 Extra\ information\ (e.g.\ page\ number)=Informations complémentaires (ex \: numéro de page)
-Manage\ citations=Gérer les citations
+Manage\ citations=Gérer les appels à référence
 Problem\ modifying\ citation=Problème lors de la modification de la citation
+Problem\ collecting\ citations=Problème lors de la collecte des appels à référence
 Citation=Citation
 Connecting...=Connexion en cours...
-Could\ not\ resolve\ BibTeX\ entry\ for\ citation\ marker\ '%0'.=L'entrée BibTeX pour le marqueur de citation « %0 » n'a pas pu être traitée.
 Select\ style=Sélectionner le style
 Journals=Journaux
 Cite=Citer entre parenthèses
 Cite\ in-text=Citer directement dans le texte
-Insert\ empty\ citation=Insérer des citations vides
+Insert\ empty\ citation=Insérer des appels à référence vides
 Merge\ citations=Fusionner des citations
 Manual\ connect=Connexion manuelle
 Select\ Writer\ document=Sélectionner le document Writer
 Sync\ OpenOffice/LibreOffice\ bibliography=Synchroniser la bibliographie OpenOffice/LibreOffice
 Select\ which\ open\ Writer\ document\ to\ work\ on=Sélectionner le document Writer ouvert sur lequel travailler
 Connected\ to\ document=Connecté au document
+
+Could\ not\ connect\ to\ any\ Writer\ document.\ Please\ make\ sure\ a\ document\ is\ open\ before\ using\ the\ 'Select\ Writer\ document'\ button\ to\ connect\ to\ it.=Impossible de se connecter à un document Writer. Veuillez vous assurer qu'un document est ouvert avant de vous y connecter en utilisant le bouton « Sélectionner un document Writer ».
+
+No\ Writer\ documents\ found=Aucun document Writer trouvé
+
 Insert\ a\ citation\ without\ text\ (the\ entry\ will\ appear\ in\ the\ reference\ list)=Insérer une citation sans texte (l'entrée apparaîtra dans la liste des références)
 Cite\ selected\ entries\ with\ extra\ information=Citer les entrées sélectionnées avec des informations complémentaires
 Ensure\ that\ the\ bibliography\ is\ up-to-date=Assure que la bibliographie est à jour
+
 Your\ OpenOffice/LibreOffice\ document\ references\ the\ citation\ key\ '%0',\ which\ could\ not\ be\ found\ in\ your\ current\ library.=Votre document OpenOffice/LibreOffice fait référence à la clef de citation '%0', qui n'a pas été trouvée dans votre fichier actuel.
+
+This\ operation\ requires\ a\ bibliography\ database.=Cette opération nécessite une base de données bibliographique.
+
+Your\ OpenOffice/LibreOffice\ document\ references\ at\ least\ %0\ citation\ keys\ which\ could\ not\ be\ found\ in\ your\ current\ library.\ Some\ of\ these\ are\ %1.=Votre document OpenOffice/LibreOffice référence au moins %0 appels à référence qui n'ont pas pu être trouvés dans votre fichier courant. Certains d'entre eux sont %1.
+
+Your\ OpenOffice/LibreOffice\ document\ references\ no\ citation\ keys\ which\ could\ also\ be\ found\ in\ your\ current\ library.=Votre document OpenOffice/LibreOffice ne possède aucun appel à référence qui soit dans votre fichier courant.
+
 Unable\ to\ synchronize\ bibliography=Impossible de synchroniser la bibliographie
-Combine\ pairs\ of\ citations\ that\ are\ separated\ by\ spaces\ only=Combiner les paires de citations qui ne sont séparées que par des espaces
+Combine\ pairs\ of\ citations\ that\ are\ separated\ by\ spaces\ only=Combiner les paires de appels à référence qui ne sont séparées que par des espaces
 Autodetection\ failed=La détection automatique a échoué
 Please\ wait...=Veuillez patienter...
 Connection\ lost=Connexion perdue
-The\ paragraph\ format\ is\ controlled\ by\ the\ property\ 'ReferenceParagraphFormat'\ or\ 'ReferenceHeaderParagraphFormat'\ in\ the\ style\ file.=Le format de paragraphe est contrôlé par le propriété 'ReferenceParagraphFormat' ou 'ReferenceHeaderParagraphFormat' du fichier de style.
-The\ character\ format\ is\ controlled\ by\ the\ citation\ property\ 'CitationCharacterFormat'\ in\ the\ style\ file.=Le format de caractères est contrôlé par la propriété de citation 'CitationCharacterFormat' du fichier de style.
+
+Could\ not\ update\ bibliography=Impossible de mettre à jour la bibliographie
+Not\ connected\ to\ document=Non connecté au document
+Problem\ combining\ cite\ markers=Problème lors de la combinaison des appels à référence
+Unable\ to\ reload\ style\ file=Impossible de recharger le fichier de style
+
+Problem\ during\ separating\ cite\ markers=Problème lors de l'individualisation des appels à référence
+
 Automatically\ sync\ bibliography\ when\ inserting\ citations=Synchroniser automatiquement la bibliographie lors de l'insertion de citations
 Look\ up\ BibTeX\ entries\ in\ the\ active\ tab\ only=Rechercher les entrées BibTeX uniquement dans l'onglet actif
 Look\ up\ BibTeX\ entries\ in\ all\ open\ libraries=Rechercher les entrées BibTeX dans tous les fichiers ouverts
@@ -1099,7 +1136,7 @@ First\ names=Prénoms
 Cleanup\ entries=Nettoyer les entrées
 Automatically\ assign\ new\ entry\ to\ selected\ groups=Assigner automatiquement les nouvelles entrées aux groupes sélectionnés
 %0\ mode=Mode %0
-Move\ DOIs\ from\ note\ and\ URL\ field\ to\ DOI\ field\ and\ remove\ http\ prefix=Déplace les DOIs des champs note et URL vers le champ DOI, et supprime le préfixe http
+Move\ DOIs\ from\ note\ and\ URL\ field\ to\ DOI\ field\ and\ remove\ http\ prefix=Déplacer les DOIs des champs note et URL vers le champ DOI, et supprimer le prefix http
 Make\ paths\ of\ linked\ files\ relative\ (if\ possible)=Rendre relatifs les chemins des fichiers liés (si possible)
 Rename\ PDFs\ to\ given\ filename\ format\ pattern=Renommer les PDF selon le modèle de format de nom de fichier
 Rename\ only\ PDFs\ having\ a\ relative\ path=Renommer uniquement les PDF ayant un chemin relatif
@@ -1163,7 +1200,9 @@ Toggle\ relevance=Changer la pertinence
 Toggle\ quality\ assured=Changer la vérification de qualité
 Toggle\ print\ status=Changer le statut d'impression
 Update\ keywords=Mettre à jour les mots-clefs
+Problem\ connecting=Problème de connexion
 Connection\ to\ OpenOffice/LibreOffice\ has\ been\ lost.\ Please\ make\ sure\ OpenOffice/LibreOffice\ is\ running,\ and\ try\ to\ reconnect.=La connexion à OpenOffice/LibreOffice a été perdue. Assurez-vous qu'OpenOffice/LibreOffice est lancé, et essayez de vous y reconnecter.
+
 JabRef\ will\ send\ at\ least\ one\ request\ per\ entry\ to\ a\ publisher.=JabRef fera au moins une requête par entrée à un éditeur.
 Correct\ the\ entry,\ and\ reopen\ editor\ to\ display/edit\ source.=Corrigez l'entrée et ré-ouvrez l'éditeur pour afficher/éditer la source.
 Could\ not\ connect\ to\ running\ OpenOffice/LibreOffice.=La connexion à OpenOffice/LibreOffice n'a pas pu être lancée.
@@ -1177,8 +1216,6 @@ To\ disable\ the\ memory\ stick\ mode\ rename\ or\ remove\ the\ jabref.xml\ file
 Unable\ to\ connect.\ One\ possible\ reason\ is\ that\ JabRef\ and\ OpenOffice/LibreOffice\ are\ not\ both\ running\ in\ either\ 32\ bit\ mode\ or\ 64\ bit\ mode.=Connexion impossible. Une raison potentielle est que JabRef et OpenOffice/LibreOffice ne fonctionnent pas tous les deux soit en mode 32 bits, soit en mode 64 bits.
 Delimiter(s)=Séparateur(s)
 When\ downloading\ files,\ or\ moving\ linked\ files\ to\ the\ file\ directory,\ use\ the\ bib\ file\ location.=Lors du téléchargement de fichiers ou du déplacement des fichiers liés vers le répertoire de fichiers, utilisez l’emplacement du fichier Bib.
-Your\ style\ file\ specifies\ the\ character\ format\ '%0',\ which\ is\ undefined\ in\ your\ current\ OpenOffice/LibreOffice\ document.=Votre fichier de style spécifie le format de caractère « %0 », qui n'est pas défini dans votre document OpenOffice/LibreOffice actuel.
-Your\ style\ file\ specifies\ the\ paragraph\ format\ '%0',\ which\ is\ undefined\ in\ your\ current\ OpenOffice/LibreOffice\ document.=Votre fichier de style spécifie le format de paragraphe « %0 », qui n'est pas défini dans votre document OpenOffice/LibreOffice actuel.
 
 Searching...=Recherche...
 Please\ enter\ a\ search\ string=Veuillez saisir une chaîne de recherche
@@ -1216,6 +1253,16 @@ Use\ custom\ proxy\ configuration=Utiliser une configuration de proxy personnali
 Proxy\ requires\ authentication=Le proxy nécessite une authentification
 Attention\:\ Password\ is\ stored\ in\ plain\ text\!=Attention \: Le mot de passe est stocké en clair dans du texte brut \!
 Clear\ connection\ settings=Réinitialiser les paramètres de connexion
+Check\ Proxy\ Setting=Vérifier la configuration du proxy
+Check\ connection=Vérifier la connexion
+Connection\ failed\!=Échec de la connexion \!
+Connection\ successful\!=Connexion réussie \!
+
+SSL\ Configuration=Configuration SSL
+SSL\ configuration\ changed=Configuration SSL modifiée
+SSL\ certificate\ file=Fichier de certificat SSL
+Duplicate\ Certificates=Dupliquer les certificats
+You\ already\ added\ this\ certificate=Vous avez déjà ajouté ce certificat
 
 Open\ folder=Ouvrir le répertoire
 Export\ sort\ order=Exporter l'ordre de tri
@@ -1252,6 +1299,7 @@ Please\ open\ %0\ manually.=Veuillez ouvrir manuellement %0 .
 The\ link\ has\ been\ copied\ to\ the\ clipboard.=Le lien a été copié dans le presse-papiers.
 
 Open\ %0\ file=Ouvrir le fichier %0
+Could\ not\ detect\ terminal\ automatically.\ Please\ define\ a\ custom\ terminal\ in\ the\ preferences.=Impossible de détecter le terminal automatiquement. Veuillez définir un terminal personnalisé dans les préférences.
 
 Cannot\ delete\ file=Le fichier ne peut pas être supprimé
 File\ permission\ error=Erreur due aux permissions du fichier
@@ -1297,9 +1345,7 @@ Save\ changes=Enregistrer les modifications
 Discard\ changes=Abandonner les modifications
 Library\ '%0'\ has\ changed.=Le fichier « %0 » a été modifié.
 Print\ entry\ preview=Imprimer la prévisualisation de l'entrée
-Copy\ title=Copier le titre
-Copy\ \\cite{citation\ key}=Copier \\cite{citation key}
-Copy\ citation\ key\ and\ title=Copier la clef de citation et le titre
+
 Invalid\ DOI\:\ '%0'.=DOI invalide \: « %0 ».
 Same\ DOI\ used\ in\ multiple\ entries=Un DOI identique est présent dans plusieurs entrées
 should\ start\ with\ a\ name=Devrait débuter par un nom
@@ -1409,19 +1455,19 @@ Invalid\ style\ selected=Style sélectionné non valide
 Reload=Recharger
 
 Capitalize=Convertir en majuscules
-Capitalize\ all\ words,\ but\ converts\ articles,\ prepositions,\ and\ conjunctions\ to\ lower\ case.=Convertir en majuscules tous les mots, mais convertir les articles, prépositions et conjonctions en minuscules.
+Capitalize\ all\ words,\ but\ converts\ articles,\ prepositions,\ and\ conjunctions\ to\ lower\ case.=Met en majuscules tous les mots, mais met les articles, prépositions et conjonctions en minuscules.
 Capitalize\ the\ first\ word,\ changes\ other\ words\ to\ lower\ case.=Met en majuscule l'initiale du premier mot, et tout le reste en minuscules.
 Changes\ all\ letters\ to\ lower\ case.=Met tout en minuscules.
 Changes\ all\ letters\ to\ upper\ case.=Met tout en majuscules.
 Changes\ the\ first\ letter\ of\ all\ words\ to\ capital\ case\ and\ the\ remaining\ letters\ to\ lower\ case.=Met en majuscule la première lettre de tous les mots, et les autres lettres en minuscules.
 Cleans\ up\ LaTeX\ code.=Nettoyer le code LaTeX.
-Converts\ HTML\ code\ to\ LaTeX\ code.=Convertir le code HTML en code LaTeX.
+Converts\ HTML\ code\ to\ LaTeX\ code.=Convertit le code HTML en code LaTeX.
 HTML\ to\ Unicode=HTML vers Unicode
-Converts\ HTML\ code\ to\ Unicode.=Convertir du code HTML en Unicode.
-Converts\ LaTeX\ encoding\ to\ Unicode\ characters.=Convertir l'encodage LaTeX en caractères Unicode.
-Converts\ Unicode\ characters\ to\ LaTeX\ encoding.=Convertir les caractères Unicode en encodage LaTeX.
-Converts\ ordinals\ to\ LaTeX\ superscripts.=Convertir les numéros ordinaux en exposants LaTeX.
-Converts\ units\ to\ LaTeX\ formatting.=Convertir les unités en code LaTeX.
+Converts\ HTML\ code\ to\ Unicode.=Convertit du code HTML en Unicode.
+Converts\ LaTeX\ encoding\ to\ Unicode\ characters.=Convertit l'encodage LaTeX en caractères Unicode.
+Converts\ Unicode\ characters\ to\ LaTeX\ encoding.=Convertit les caractères Unicode en encodage LaTeX.
+Converts\ ordinals\ to\ LaTeX\ superscripts.=Convertit les numéros ordinaux en exposants LaTeX.
+Converts\ units\ to\ LaTeX\ formatting.=Convertit les unités en code LaTeX.
 HTML\ to\ LaTeX=HTML vers LaTeX
 LaTeX\ cleanup=Nettoyage LaTeX
 LaTeX\ to\ Unicode=LaTeX vers Unicode
@@ -1430,9 +1476,9 @@ Minify\ list\ of\ person\ names=Raccourcir la liste des noms de personne
 Normalize\ date=Harmoniser la date
 Normalize\ en\ dashes=Harmoniser les tirets cadratins
 Normalize\ month=Harmoniser le mois
-Normalize\ month\ to\ BibTeX\ standard\ abbreviation.=Harmoniser le mois au standard abrégé BibTeX.
+Normalize\ month\ to\ BibTeX\ standard\ abbreviation.=Harmonise le mois au standard abrégé BibTeX.
 Normalize\ names\ of\ persons=Harmoniser les noms de personnes
-Normalize\ page\ numbers=Harmonise les numéros de pages
+Normalize\ page\ numbers=Harmoniser les numéros de pages
 Normalize\ pages\ to\ BibTeX\ standard.=Harmonise les pages au standard BibTeX.
 Normalizes\ lists\ of\ persons\ to\ the\ BibTeX\ standard.=Harmonise les listes de personnes au standard BibTeX.
 Normalizes\ the\ date\ to\ ISO\ date\ format.=Harmonise la date au format ISO.
@@ -1536,7 +1582,7 @@ Message=Message
 MathSciNet\ Review=Review MathSciNet
 Reset\ Bindings=Réinitialiser les associations
 
-Decryption\ not\ supported.=Déchiffrement non supporté.
+Decryption\ not\ supported.=Déchiffrement non pris en charge.
 
 Cleared\ '%0'\ for\ %1\ entries=Réinitialisés « %0 » pour %1 entrées
 Set\ '%0'\ to\ '%1'\ for\ %2\ entries=« %0 » mis à « %1 » pour %2 entrées
@@ -1560,6 +1606,22 @@ Custom=Personnalisé
 Export\ cited=Exporter les citées
 Unable\ to\ generate\ new\ library=Impossible de générer un nouveau fichier
 
+The\ cursor\ is\ in\ a\ protected\ area.=Le curseur est dans une zone protégée.
+JabRefException=Exception JabRef
+No\ bibliography\ database\ is\ open\ for\ citation.=Aucune base de données bibliographique n'est ouverte pour les appels à référence.
+
+No\ database\ is\ open\ for\ updating\ citation\ markers\ after\ citing.=Aucune base de données n'est ouverte pour la mise à jour des appels à référence après leur inclusion.
+
+No\ bibliography\ entries\ are\ selected\ for\ citation.=Aucune entrée bibliographique n'est sélectionnée pour l'appel à référence.
+No\ bibliography\ style\ is\ selected\ for\ citation.=Aucun style bibliographique n'est sélectionné pour les appels à référence.
+No\ database=Aucune base de données
+
+No\ entries\ selected\ for\ citation=Aucune entrée sélectionnée pour l'appel à référence
+Open\ one\ before\ citing.=Ouvrez-en un avant d'insérer un appel à référence.
+
+Select\ one\ before\ citing.=Sélectionnez-en un avant d'insérer un appel à référence.
+Select\ some\ before\ citing.=Sélectionnez-en au moins un avant d'insérer un appel à référence.
+
 Found\ identical\ ranges=Plages identiques trouvées
 Found\ overlapping\ ranges=Plages se chevauchant trouvées
 Found\ touching\ ranges=Plages contiguës trouvées
@@ -1625,6 +1687,8 @@ Issue\ report\ successful=Signalement de l'anomalie réussi
 Your\ issue\ was\ reported\ in\ your\ browser.=Votre anomalie a été affichée dans votre navigateur.
 The\ log\ and\ exception\ information\ was\ copied\ to\ your\ clipboard.=Le journal et les informations d'anomalie ont été copiées dans votre presse-papier.
 Please\ paste\ this\ information\ (with\ Ctrl+V)\ in\ the\ issue\ description.=Veuillez coller ces informations (avec Ctrl+V) dans la description de l'anomalie.
+Last\ notification=Dernière notification
+Check\ the\ event\ log\ to\ see\ all\ notifications=Consultez le journal des événements pour voir toutes les notifications
 
 Host=Hôte
 Port=Port
@@ -1662,7 +1726,6 @@ Protected\ terms\ file=Fichier des termes protégés
 Style\ file=Fichier de style
 
 Open\ OpenOffice/LibreOffice\ connection=Ouvrir une connexion OpenOffice/LibreOffice
-You\ must\ enter\ at\ least\ one\ field\ name=Vous devez saisir au moins un nom de champ
 Non-ASCII\ encoded\ character\ found=Caractère ayant un encodage non-ASCII trouvé
 Non-UTF-8\ encoded\ field\ found=Un champ non encodé en UTF-8 a été trouvé
 Toggle\ web\ search\ interface=Afficher/Masquer l'interface de recherche internet
@@ -1708,7 +1771,6 @@ should\ be\ normalized=Devrait être une abréviation standard
 
 Empty\ search\ ID=Identifiant de recherche vide
 The\ given\ search\ ID\ was\ empty.=L'Identifiant de recherche entré était vide.
-Copy\ citation\ key\ and\ link=Copier la clef de citation et le lien
 biblatex\ field\ only=Champ biblatex uniquement
 
 Error\ while\ generating\ fetch\ URL=Erreur lors de la création de l'URL de recherche
@@ -1743,7 +1805,7 @@ journal\ not\ found\ in\ abbreviation\ list=Journal non trouvé dans la liste d'
 Unhandled\ exception\ occurred.=Une exception non gérée est survenue.
 
 strings\ included=chaînes incluses
-Escape\ underscores=Échapper les soulignements
+Escape\ underscores=Échapper les soulignements (_)
 Color=Couleur
 Please\ also\ add\ all\ steps\ to\ reproduce\ this\ issue,\ if\ possible.=Veuillez préciser si possible toutes les étapes permettant de reproduire cette anomalie.
 Fit\ width=Ajuster à la largeur
@@ -1801,7 +1863,6 @@ Removes\ all\ hyphenated\ line\ breaks\ in\ the\ field\ content.=Supprime du con
 Could\ not\ retrieve\ entry\ data\ from\ '%0'.=Impossible de récupérer les données sur l'entrée depuis « %0 ».
 Entry\ from\ %0\ could\ not\ be\ parsed.=Entrée de %0 n’a pas pu être analysée.
 Invalid\ identifier\:\ '%0'.=Identifiant non valide \: « %0 ».
-This\ paper\ has\ been\ withdrawn.=Cet article a été retiré.
 empty\ citation\ key=clef de citation vide
 Aux\ file=Fichier AUX
 Group\ containing\ entries\ cited\ in\ a\ given\ TeX\ file=Groupe contenant les entrées citées dans un fichier TeX spécifique
@@ -1829,9 +1890,6 @@ Could\ not\ connect\ to\ Vim\ server.\ Make\ sure\ that\ Vim\ is\ running\ with\
 Could\ not\ connect\ to\ a\ running\ gnuserv\ process.\ Make\ sure\ that\ Emacs\ or\ XEmacs\ is\ running,\ and\ that\ the\ server\ has\ been\ started\ (by\ running\ the\ command\ 'server-start'/'gnuserv-start').=La connexion au processus actif gnuserv a échoué. Assurez-vous que Emacs ou XEmacs tourne, et que le serveur a été démarré (en lançant la commande 'server-start'/'gnuserv-start').\n\n tourne avec le bon nom de serveur.
 Error\ pushing\ entries=Erreur lors de l'envoi des entrées
 
-Undefined\ character\ format=Format de caractère indéfini
-Undefined\ paragraph\ format=Format de paragraphe indéfini
-
 Preamble=Préambule
 Markings=Étiquettes
 Use\ selected\ instance=Utiliser la fenêtre sélectionnée
@@ -1851,8 +1909,8 @@ Blog=Blog
 Check\ integrity=Vérifier l'intégrité
 Cleanup\ URL\ link=Nettoyer un lien URL
 Cleanup\ URL\ link\ by\ removing\ special\ symbols\ and\ extracting\ simple\ link=Nettoyer un lien URL en en supprimant les symboles spéciaux et en en extrayant un lien simple
-Copy\ DOI\ url=Copier le DOI
-Copy\ citation=Copier la citation
+Copy\ DOI=Copier le DOI
+Copy\ DOI\ url=Copier l'URL du DOI
 Development\ version=Version en développement
 Export\ selected\ entries=Exporter les entrées sélectionnées
 Export\ selected\ entries\ to\ clipboard=Exporter les entrées sélectionnées vers le presse-papiers
@@ -1863,8 +1921,6 @@ Manage\ protected\ terms=Gérer les termes protégés
 New\ entry\ from\ plain\ text=Nouvelle entrée à partir de texte brut
 Import\ by\ ID=Importer par ID
 Enter\ a\ valid\ ID=Entrez un ID valide
-Imported\ one\ entry=Une entrée importée
-Entry\ already\ exists=L'entrée existe déjà
 New\ sublibrary\ based\ on\ AUX\ file=Nouveau sous-fichier à partir du fichier AUX
 Push\ entries\ to\ external\ application\ (%0)=Envoyer l'entrée vers le logiciel externe (%0)
 Quit=Quitter
@@ -1953,7 +2009,7 @@ A\ string\ with\ the\ label\ '%0'\ already\ exists.=Une chaîne avec le nom '%0'
 
 Executing\ command\ "%0"...=Exécution de la commande « %0 »...
 
-Rename\ file\ to\ a\ given\ name=Renommer le fichier selon un nom fourni
+Rename\ file\ to\ a\ given\ name=Renommer le fichier manuellement
 New\ Filename=Nouveau nom de fichier
 Rename\ file\ to\ defined\ pattern=Renommer le fichier selon un modèle défini
 
@@ -1968,14 +2024,14 @@ Same\ as\ --import,\ but\ will\ be\ imported\ to\ the\ opened\ tab=Comme --impor
 Allow\ integers\ in\ 'edition'\ field\ in\ BibTeX\ mode=Autoriser les entiers dans le champ 'edition' en mode BibTeX
 
 Search\ for\ citations\ in\ LaTeX\ files...=Recherche de citations dans les fichiers LaTeX...
-LaTeX\ Citations\ Search\ Results=Résultats de recherche de citations LaTeX
+LaTeX\ Citations\ Search\ Results=Résultats de la recherche des appels à référence LaTeX
 LaTeX\ files\ directory\:=Répertoire des fichiers LaTeX \:
 LaTeX\ files\ found\:=Fichiers LaTeX trouvés \:
 files=fichiers
-Show\ 'LaTeX\ Citations'\ tab=Afficher l'onglet 'Citations LaTeX'
-LaTeX\ Citations=Citations LaTeX
-Search\ citations\ for\ this\ entry\ in\ LaTeX\ files=Rechercher des citations de cette entrée dans les fichiers LaTeX
-No\ citations\ found=Aucune citation trouvée
+Show\ 'LaTeX\ Citations'\ tab=Afficher l'onglet 'Appels à référence LaTeX'
+LaTeX\ Citations=Appels à référence LaTeX
+Search\ citations\ for\ this\ entry\ in\ LaTeX\ files=Rechercher des appels à référence de cette entrée dans les fichiers LaTeX
+No\ citations\ found=Aucun appel à référence trouvé
 No\ LaTeX\ files\ containing\ this\ entry\ were\ found.=Aucun fichier LaTeX contenant cette entrée n'a été trouvé.
 Selected\ entry\ does\ not\ have\ an\ associated\ citation\ key.=L'entrée sélectionnée n'a pas de clef de citation associée.
 Current\ search\ directory\:=Répertoire de recherche actuel \:
@@ -2053,7 +2109,8 @@ Invalid\ regular\ expression.=Expression régulière invalide.
 Please\ provide\ a\ valid\ aux\ file.=Veuillez fournir un fichier AUX valide.
 Keyword\ delimiter=Séparateur de mots-clefs
 Hierarchical\ keyword\ delimiter=Séparateur de mots-clefs hiérarchique
-Escape\ ampersands=Échapper les esperluettes
+Escape\ ampersands=Échapper les esperluettes (&)
+Escape\ dollar\ sign=Échapper le signe dollar ($)
 
 Hint\:\n\nTo\ search\ all\ fields\ for\ <b>Smith</b>,\ enter\:\n<tt>smith</tt>\n\nTo\ search\ the\ field\ <b>author</b>\ for\ <b>Smith</b>\ and\ the\ field\ <b>title</b>\ for\ <b>electrical</b>,\ enter\:\n<tt>author\=Smith\ and\ title\=electrical</tt>=Astuce \:\n\nPour rechercher <b>Smith</b> dans tous les champs, entrer \:\n<tt>Smith</tt>\n\nPour rechercher <b>Smith</b> dans le champ <b>author</b> et <b>electrical</b> dans le champ <b>title</b>, entrer\:\n<tt>author\=Smith and title\=electrical</tt>
 
@@ -2108,7 +2165,7 @@ Search\ ShortScience=Recherche ShortScience
 Unable\ to\ open\ ShortScience.=Impossible de se connecter à ShortScience.
 
 Shared\ database=Base de données partagée
-Lookup=Rechercher
+Lookup=Recherche
 
 Please\ enter\ a\ field\ name\ to\ search\ for\ a\ keyword.=Veuillez entrer le nom du champ dans lequel chercher un mot-clef.
 Access\ date\ of\ the\ address\ specified\ in\ the\ url\ field.=Date d'accès de l'adresse spécifiée dans le champ "url".
@@ -2288,10 +2345,6 @@ Removes\ digits.=Supprime les chiffres.
 
 Presets=Préréglages
 
-Check\ Proxy\ Setting=Vérifier la configuration du proxy
-Check\ connection=Vérifier la connexion
-Connection\ failed\!=Échec de la connexion \!
-Connection\ successful\!=Connexion réussie \!
 Generate\ groups\ from\ keywords\ in\ the\ following\ field=Créer des groupes à partir des mot-clefs du champ suivant
 Generate\ groups\ for\ author\ last\ names=Créer des groupes à partir des noms propres des auteurs
 Regular\ expression=Expression régulière
@@ -2307,19 +2360,47 @@ No\ metadata\ found.\ Creating\ empty\ entry\ with\ file\ link=Aucune métadonn
 Processing\ file\ %0=Traitement du fichier %0
 Export\ selected=Exporter la sélection
 
-Separate\ merged\ citations=Séparer les citations fusionnées
-Separate\ citations=Séparer les citations
+Separate\ merged\ citations=Séparer les appels à référence fusionnés
+Separate\ citations=Séparer les appels à référence
 
 Unprotect\ terms=Déprotéger les termes
-Error\ connecting\ to\ Writer\ document=Erreur de connexion au document Writer
-You\ need\ to\ open\ Writer\ with\ a\ document\ before\ connecting=Vous devez ouvrir Writer avec un document avant de vous connecter
 
 Generate\ a\ new\ key\ for\ imported\ entries\ (overwriting\ their\ default)=Générer une nouvelle clef pour les entrées importées (en écrasant leur valeur par défaut)
+Warn\ about\ duplicates\ on\ import=Avertir des doublons lors de l'importation
 Import\ and\ Export=Importation et exportation
 Custom\ DOI\ URI=URI DOI personnalisée
 Use\ custom\ DOI\ base\ URI\ for\ article\ access=Accéder aux articles par une URI personnalisée se basant sur le DOI
 
 Cited\ on\ pages=Cité sur les pages
+Please\ move\ the\ cursor\ into\ the\ document\ text.=Veuillez déplacer le curseur dans le texte du document.
+To\ get\ the\ visual\ positions\ of\ your\ citations\ I\ need\ to\ move\ the\ cursor\ around,\ but\ could\ not\ get\ it.=Pour obtenir la position visuelle de vos appels à référence, JabRef a besoin de déplacer le curseur, mais n'a pas pu le faire.
+
+I\ cannot\ insert\ to\ the\ cursors\ current\ location.=Insertion impossible à l'emplacement actuel du curseur.
+
+Please\ move\ the\ cursor\ to\ the\ location\ for\ the\ new\ citation.=Veuillez déplacer le curseur à l'emplacement du nouvel appel à référence.
+
+Please\ create\ it\ in\ the\ document\ or\ change\ in\ the\ file\:=Veuillez le créer dans le document ou le modifier dans le fichier \:
+
+Please\ use\ the\ latter\ in\ the\ style\ file\ below\ to\ avoid\ localization\ problems.=Veuillez utiliser ce dernier dans le fichier de style ci-dessous pour éviter des problèmes de positionnement.
+
+The\ %0\ character\ style\ '%1'\ is\ a\ display\ name\ for\ '%2'.=Le style de caractère %0 '%1' est un nom d'affichage pour '%2'.
+
+The\ %0\ character\ style\ '%1'\ is\ missing\ from\ the\ document=Le style de caractère %0 '%1' est manquant dans le document
+
+The\ %0\ paragraph\ style\ '%1'\ is\ a\ display\ name\ for\ '%2'.=Le style de paragraphe %0 '%1' est un nom d'affichage pour '%2'.
+
+The\ %0\ paragraph\ style\ '%1'\ is\ missing\ from\ the\ document=Le style de paragraphe %0 '%1' est manquant dans le document
+
+Error\ while\ checking\ if\ Writer\ is\ recording\ changes\ or\ has\ recorded\ changes.=Erreur lors de la vérification de l'enregistrement des modifications par Writer.
+
+Cannot\ work\ with\ [Edit]/[Track\ Changes]/[Record]\ turned\ on.=Impossible de fonctionner avec [Edit]/[Track Changes]/[Record] activé.
+
+Changes\ by\ JabRef\ could\ result\ in\ unexpected\ interactions\ with\ recorded\ changes.=Les changements effectués par JabRef pourraient entraîner des interactions imprévisibles avec les changements déjà enregistrés.
+
+Recording\ and/or\ Recorded\ changes=Enregistrements et/ou modifications enregistrées
+
+Use\ [Edit]/[Track\ Changes]/[Manage]\ to\ resolve\ them\ first.=Commencez par utiliser [Edit]/[Suivre les modifications]/[Manage] pour les résoudre.
+
 Unable\ to\ find\ valid\ certification\ path\ to\ requested\ target(%0),\ download\ anyway?=Impossible de trouver un chemin de certification valide pour la cible demandée (%0), télécharger quand même ?
 Download\ operation\ canceled.=Opération de téléchargement annulée.
 
@@ -2336,7 +2417,6 @@ Entry\ Type=Type d’entrée
 Entry\ types=Types d'entrée
 Field\ names=Noms de champs
 Others=Autres
-Overwrite\ existing\ field\ values=Écraser les valeurs des champs existants
 Recommended=Usuels
 
 Authors\ and\ Title=Auteurs et titre
@@ -2367,6 +2447,8 @@ Query=Requête
 Question=Question
 Select\ directory=Sélectionner un répertoire
 
+Fulltext\ Index=Indexation des documents
+Automatically\ index\ all\ linked\ files\ for\ fulltext\ search=Indexer automatiquement tous les fichiers liés pour la recherche dans les documents
 Rebuild\ fulltext\ search\ index=Reconstruire l'index de recherche sur les documents
 Rebuild\ fulltext\ search\ index\ for\ current\ library?=Reconstruire l'index de recherche sur les documents pour le fichier courant ?
 Rebuilding\ fulltext\ search\ index...=Reconstruction de l'index de recherche sur les documents...
@@ -2379,6 +2461,9 @@ Grobid\ URL=URL de Grobid
 Remote\ services=Services distants
 Allow\ sending\ PDF\ files\ and\ raw\ citation\ strings\ to\ a\ JabRef\ online\ service\ (Grobid)\ to\ determine\ Metadata.\ This\ produces\ better\ results.=Autoriser l'envoi de fichiers PDF et de chaînes de citation brutes à un service en ligne de JabRef (Grobid) pour déterminer les métadonnées. Cela donne de meilleurs résultats.
 
+Fetcher\ cannot\ be\ tested\!=L'outil de recherche ne peut pas être testé \!
+Fetcher\ unknown\!=Outil de recherche inconnu \!
+
 Character\ by\ character=Caractère par caractère
 Embedded=Intégré
 Entry=Entrée
@@ -2393,3 +2478,43 @@ Search\ across\ libraries\ in\ a\ new\ window=Recherche sur tous les fichiers da
 Keep\ search\ string\ across\ libraries=Conserver la chaîne de recherche pour tous les fichiers
 Keep\ dialog\ always\ on\ top=Toujours garder la fenêtre au premier plan
 Search\ results\ from\ open\ libraries=Résultats de recherche pour les fichiers ouverts
+
+Add\ certificate=Ajouter un certificat
+Serial\ number=Numéro de série
+Issuer=Émetteur
+Valid\ from=Valable à partir de
+Valid\ to=Valide jusqu'au
+Signature\ algorithm=Algorithme de signature
+Version=Version
+
+Error\ downloading=Erreur de téléchargement
+
+Error\ while\ writing\ metadata.\ See\ the\ error\ log\ for\ details.=Erreur lors de l'écriture des métadonnées. Consultez le journal des erreurs pour plus de détails.
+Failed\ to\ write\ metadata,\ file\ %1\ not\ found.=Impossible d'écrire les métadonnées, le fichier %1 est introuvable.
+Success\!\ Finished\ writing\ metadata.=Succès \! Écriture des métadonnées terminée.
+
+Custom\ API\ key=Clef d'API personnalisée
+Check\ %0\ API\ Key\ Setting=Vérifier les paramètres de la clef d'API %0
+
+Edit\ content=Modifier le contenu
+Copy\ or\ Move\ content=Copier ou déplacer le contenu
+Overwrite\ field\ content=Écraser le contenu du champ
+Set=Définir
+Append=Ajouter
+Clear\ field\ content=Effacer le contenu du champ
+Set\ or\ append\ content=Définir ou ajouter du contenu
+Edit\ field\ content\ for\ selected\ entries=Modifier le contenu d'un champ
+Rename=Renommer
+New\ field\ name=Nouveau nom de champ
+Copy\ content=Copier le contenu
+Move\ content=Déplacer le contenu
+Swap\ content=Permuter le contenu
+Copy\ or\ move\ the\ content\ of\ one\ field\ to\ another=Copier ou déplacer le contenu d'un champ vers un autre
+Automatic\ field\ editor=Éditeur automatique de champs
+From=De
+Keep\ Modifications=Enregistrer
+To=Vers
+
+(Note\:\ If\ original\ entries\ lack\ keywords\ to\ qualify\ for\ the\ new\ group\ configuration,\ confirming\ here\ will\ add\ them)=(Note \: si les entrées originales n'ont pas de mots-clefs correspondant à la nouvelle configuration du groupe, confirmer ici les ajoutera)
+Assign=Assigner
+Do\ not\ assign=Ne pas assigner
diff --git a/src/main/resources/l10n/JabRef_in.properties b/src/main/resources/l10n/JabRef_id.properties
similarity index 97%
rename from src/main/resources/l10n/JabRef_in.properties
rename to src/main/resources/l10n/JabRef_id.properties
index 30f978c7e47..6458e06d8e0 100644
--- a/src/main/resources/l10n/JabRef_in.properties
+++ b/src/main/resources/l10n/JabRef_id.properties
@@ -12,7 +12,7 @@
 %0\ doesn't\ contain\ the\ term\ <b>%1</b>=%0 tidak mengandung istilah <b>%1</b>
 
 
-%0\ export\ successful=%0 ekspor berhasil
+
 
 %0\ matches\ the\ regular\ expression\ <b>%1</b>=%0 sesuai dengan Ekspresi Reguler <b>%1</b>
 
@@ -126,8 +126,6 @@ Cite\ command=Perintah acuan
 
 Clear=Bersihkan
 
-Clear\ fields=Bersihkan beberapa bidang
-
 
 Close\ dialog=Tutup dialog
 
@@ -145,6 +143,7 @@ Copied=Disalin
 
 Copy=Salin
 
+Copy\ title=Kopi judul
 
 Copy\ to\ clipboard=Salin ke papan klip
 
@@ -195,7 +194,7 @@ Library\ properties=Properti basisdata
 
 Default=Bawaan
 
-Default\ encoding=Enkoding bawaan
+The\ chosen\ encoding\ '%0'\ could\ not\ encode\ the\ following\ characters\:=Enkoding yang dipilih '%0' tidak bisa digunakan untuk karakter berikut\:
 
 
 
@@ -461,6 +460,8 @@ Moved\ group\ "%0".=Grup dipindah "%0".
 
 
 
+
+
 Name=Nama
 
 Name\ formatter=Pemformat nama
@@ -545,8 +546,6 @@ Path\ to\ %0\ not\ defined=Lokasi %0 tidak ada
 
 Path\ to\ LyX\ pipe=Lokasi pipa LyX
 
-PDF\ does\ not\ exist=PDF tidak ada
-
 File\ has\ no\ attached\ annotations=File tidak memiliki lampiran anotasi
 
 Please\ enter\ a\ name\ for\ the\ group.=Tuliskan nama untuk grup.
@@ -604,11 +603,18 @@ Remove\ selected\ entries\ from\ this\ group=Menghapus entri yang dipilih dari g
 
 Remove\ group=Hapus grup
 
-Remove\ group\ "%0"?=Hapus grup "%0"?
+Remove\ group\ and\ subgroups=Hapus grup dan sub-grup
+
+
+
+
+
 
 Remove\ group\ "%0"\ and\ its\ subgroups?=Hapus grup "%0" dan sub-grup nya?
 
-Remove\ group\ and\ subgroups=Hapus grup dan sub-grup
+Removed\ group\ "%0"\ and\ its\ subgroups.=Hapus grup "%0" dan sub-grup nya.
+
+
 
 Remove\ link=Hapus tautan
 
@@ -617,8 +623,6 @@ Remove\ old\ entry=Hapus entri lama
 
 Removed\ group\ "%0".=Hapus grup "%0".
 
-Removed\ group\ "%0"\ and\ its\ subgroups.=Hapus grup "%0" dan sub-grup nya.
-
 Removed\ string=Hapus string
 
 Renamed\ string=Ganti nama string
@@ -672,9 +676,6 @@ Select\ file\ from\ ZIP-archive=Pilih berkas dari arsip ZIP
 
 Select\ the\ tree\ nodes\ to\ view\ and\ accept\ or\ reject\ changes=Pilih tiga nodal untuk melihat, menerima atau menolak perubahan
 
-Set\ field=Pilih bidang
-Set\ fields=Pilih beberapa bidang
-
 Settings=Pengaturan
 
 Shortcut=Pintasan
@@ -705,7 +706,6 @@ Size=Ukuran
 Skipped\ -\ No\ PDF\ linked=Dilompati - Tanpa tautan PDF
 Skipped\ -\ PDF\ does\ not\ exist=Dilompati - PDF tidak ada
 
-Skipped\ entry.=Entri dilompati.
 
 
 source\ edit=sunting sumber
@@ -718,8 +718,6 @@ Status=Keadaan
 
 Switches\ between\ full\ and\ abbreviated\ journal\ name\ if\ the\ journal\ name\ is\ known.=Menukar antara nama jurnal penuh dan singkatan jika nama jurnal diketahui.
 
-The\ chosen\ encoding\ '%0'\ could\ not\ encode\ the\ following\ characters\:=Enkoding yang dipilih '%0' tidak bisa digunakan untuk karakter berikut\:
-
 
 the\ field\ <b>%0</b>=bidang <b>%0</b>
 The\ group\ "%0"\ already\ contains\ the\ selection.=Grup "%0" sudah mengandung pilihan.
@@ -821,10 +819,6 @@ This\ feature\ lets\ new\ files\ be\ opened\ or\ imported\ into\ an\ already\ ru
 
 Download\ from\ URL=Unduh dari URL
 Rename\ field=Ganti nama bidang
-Append\ field=Tambahkan bidang
-Append\ to\ fields=Tambahkan ke bidang
-Rename\ field\ to=Ganti nama bidang menjadi
-Move\ contents\ of\ a\ field\ into\ a\ field\ with\ a\ different\ name=Pindah isi dari bidang ke bidang lain dengan nama lain
 
 Cannot\ use\ port\ %0\ for\ remote\ operation;\ another\ application\ may\ be\ using\ it.\ Try\ specifying\ another\ port.=Tidak bisa memakai port %0 untuk operasi jauh; aplikasi lain mungkin sedang menggunakan. Coba port lain.
 
@@ -884,7 +878,6 @@ Manage\ citations=Pengelolaan acuan
 Problem\ modifying\ citation=Perubahan acuan bermasalah
 Citation=Acuan
 Connecting...=Menghubungkan...
-Could\ not\ resolve\ BibTeX\ entry\ for\ citation\ marker\ '%0'.=Tidak bisa memperbaiki entri BibTeX untuk penanda acuan '%0'.
 Select\ style=Pilih gaya
 Journals=Jurnal
 Cite=Acuan
@@ -896,16 +889,25 @@ Select\ Writer\ document=Pilih penyunting dokumen
 Sync\ OpenOffice/LibreOffice\ bibliography=Sinkr bibliografi OpenOffice/LibreOffice
 Select\ which\ open\ Writer\ document\ to\ work\ on=Pilih penyunting open Writer yang digunakan
 Connected\ to\ document=Ditautkan ke dokumen
+
+
+
 Insert\ a\ citation\ without\ text\ (the\ entry\ will\ appear\ in\ the\ reference\ list)=Sisipkan acuan tanpa teks (entri akan muncul dalam daftar acuan)
 Cite\ selected\ entries\ with\ extra\ information=Acu entri pilihan dengan informasi ekstra
 Ensure\ that\ the\ bibliography\ is\ up-to-date=Pastikan bahwa bibliografi adalah yang mutakhir
+
+
+
+
+
 Unable\ to\ synchronize\ bibliography=Tidak bisa mensinkronkan bibliografi
 Combine\ pairs\ of\ citations\ that\ are\ separated\ by\ spaces\ only=Menggabungkan pasangan acuan yang dipisahkan hanya dengan spasi
 Autodetection\ failed=Deteksi otomatis gagal
 Please\ wait...=Mohon tunggu...
 Connection\ lost=Sambungan terlepas
-The\ paragraph\ format\ is\ controlled\ by\ the\ property\ 'ReferenceParagraphFormat'\ or\ 'ReferenceHeaderParagraphFormat'\ in\ the\ style\ file.=Format paragraf diatur melalui 'FormatAcuanParagraf' atau 'KepalaAcuan'
-The\ character\ format\ is\ controlled\ by\ the\ citation\ property\ 'CitationCharacterFormat'\ in\ the\ style\ file.=Format karakter iatur melalui pengaturan acauan 'FormatKarakterAcuan' dalam berkas gaya.
+
+
+
 Automatically\ sync\ bibliography\ when\ inserting\ citations=Otomatis sinkr bibliografi ketika menyisipkan acuan
 Look\ up\ BibTeX\ entries\ in\ the\ active\ tab\ only=Mencari entri BibTeX hanya di basisdata yang aktif
 Look\ up\ BibTeX\ entries\ in\ all\ open\ libraries=Mencari entri BibTeX di semua basisdata yang dibuka
@@ -989,6 +991,7 @@ Toggle\ quality\ assured=Kualitas Toggle terjamin
 Toggle\ print\ status=Beralih status cetak
 Update\ keywords=Perbarui katakunci
 Connection\ to\ OpenOffice/LibreOffice\ has\ been\ lost.\ Please\ make\ sure\ OpenOffice/LibreOffice\ is\ running,\ and\ try\ to\ reconnect.=Sambungan ke OpenOffice/LibreOffice terlepas. Pastikan OpenOffice/LibreOffice dijalankan, dan coba menyambung sekali lagi.
+
 JabRef\ will\ send\ at\ least\ one\ request\ per\ entry\ to\ a\ publisher.=JabRef akan mengirimkan minimal satu permintaan per entri ke penerbit.
 Correct\ the\ entry,\ and\ reopen\ editor\ to\ display/edit\ source.=Koreksi entri dan buka editor penunjuk/pengedit sumber sekali lagi.
 Could\ not\ connect\ to\ running\ OpenOffice/LibreOffice.=Tidak bisa menyambung dengan OpenOffice/LibreOffice.
@@ -1000,8 +1003,6 @@ Not\ connected\ to\ any\ Writer\ document.\ Please\ make\ sure\ a\ document\ is\
 Removed\ all\ subgroups\ of\ group\ "%0".=Semua anak grup dari grup "%0" dihapus.
 To\ disable\ the\ memory\ stick\ mode\ rename\ or\ remove\ the\ jabref.xml\ file\ in\ the\ same\ folder\ as\ JabRef.=Untuk mengtidakaktifkan mode pena simpan ubah atau hapus berkas jabref.xml dalam direktori yang sama dengan JabRef.
 Unable\ to\ connect.\ One\ possible\ reason\ is\ that\ JabRef\ and\ OpenOffice/LibreOffice\ are\ not\ both\ running\ in\ either\ 32\ bit\ mode\ or\ 64\ bit\ mode.=Tidak dapat tersambung. Satu kemungkinan alasan adalah bahwa JabRef dan OpenOffice LibreOffice tidak berjalan baik dalam model 32 bit atau model 64 bit.
-Your\ style\ file\ specifies\ the\ character\ format\ '%0',\ which\ is\ undefined\ in\ your\ current\ OpenOffice/LibreOffice\ document.=Berkas gaya anda menspesifikasi format karakter '%0', yang tidak terdefinisi dalam dokumen OpenOffice/LibreOffice terkini anda.
-Your\ style\ file\ specifies\ the\ paragraph\ format\ '%0',\ which\ is\ undefined\ in\ your\ current\ OpenOffice/LibreOffice\ document.=Berkas gaya anda menspesifikasi format paragraf '%0', yang tidak terdefinisi dalam dokumen OpenOffice/LibreOffice terkini anda.
 
 Searching...=Sedang mencari...
 Please\ enter\ a\ search\ string=Tuliskan string pencarian
@@ -1031,6 +1032,7 @@ Proxy\ requires\ authentication=Proxy memerlukan otentikasi
 Attention\:\ Password\ is\ stored\ in\ plain\ text\!=Perhatian\: Kata sandi disimpan sebagai teks biasa\!
 Clear\ connection\ settings=Bersihkan pengaturan koneksi
 
+
 Open\ folder=Buka direktori
 Export\ sort\ order=Ekspor urutan penyortiran
 
@@ -1102,7 +1104,7 @@ Save\ changes=Simpan perubahan
 Discard\ changes=Perubahan dibuang
 Library\ '%0'\ has\ changed.=Basisdata %0 telah berubah.
 Print\ entry\ preview=Cetak pratinjau entri
-Copy\ title=Kopi judul
+
 Invalid\ DOI\:\ '%0'.=DOI salah\: '%0'.
 should\ start\ with\ a\ name=harus bermula dengan nama
 should\ end\ with\ a\ name=harus berakhiran nama
@@ -1335,6 +1337,11 @@ Export\ cited=Ekspor dikutip
 Unable\ to\ generate\ new\ library=Tidak dapat membuat perpustakaan baru
 
 
+
+
+
+
+
 Error\ occured\ while\ executing\ the\ command\ "%0".=Terjadi kesalahan saat menjalankan perintah "%0".
 Reformat\ ISSN=Reformat ISSN
 
@@ -1420,7 +1427,6 @@ Protected\ terms\ file=Istilah yang dilindungi
 Style\ file=File gaya
 
 Open\ OpenOffice/LibreOffice\ connection=Buka koneksi OpenOffice / LibreOffice
-You\ must\ enter\ at\ least\ one\ field\ name=Anda harus memasukkan setidaknya satu nama field
 Non-ASCII\ encoded\ character\ found=Karakter yang dikodekan non-ASCII ditemukan
 Toggle\ web\ search\ interface=Alihkan antarmuka pencarian web
 
@@ -1541,8 +1547,6 @@ Removes\ all\ hyphenated\ line\ breaks\ in\ the\ field\ content.=Menghapus semua
 Could\ not\ retrieve\ entry\ data\ from\ '%0'.=Tidak dapat mengambil data entri dari ' % 0 '.
 Entry\ from\ %0\ could\ not\ be\ parsed.=Entri dari % 0 tidak dapat diuraikan.
 Invalid\ identifier\:\ '%0'.=Pengenal tidak valid\: ' % 0 '.
-This\ paper\ has\ been\ withdrawn.=Makalah ini telah ditarik.
-
 
 
 
@@ -1556,7 +1560,6 @@ The\ group\ name\ contains\ the\ keyword\ separator\ "%0"\ and\ thus\ probably\
 Blog=Blog
 Check\ integrity=Periksa Integritas
 Copy\ DOI\ url=Salin url DOI
-Copy\ citation=Copy kutipan
 Development\ version=Versi pengembangan
 Export\ selected\ entries=Ekspor entri pilihan
 JabRef\ resources=Sumber JabRef
@@ -1605,6 +1608,27 @@ Default\ pattern=Pola bawaan
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
diff --git a/src/main/resources/l10n/JabRef_it.properties b/src/main/resources/l10n/JabRef_it.properties
index 8d5381bce89..2e9126ad31c 100644
--- a/src/main/resources/l10n/JabRef_it.properties
+++ b/src/main/resources/l10n/JabRef_it.properties
@@ -19,7 +19,9 @@ Unable\ to\ monitor\ file\ changes.\ Please\ close\ files\ and\ processes\ and\
 
 %0/%1\ entries=%0/%1 voci
 
-%0\ export\ successful=%0 esportazioni riuscite
+Export\ operation\ finished\ successfully.=L'operazione di esportazione si è conclusa con successo.
+
+Reveal\ in\ File\ Explorer=Mostra nel File Explorer
 
 %0\ matches\ the\ regular\ expression\ <b>%1</b>=%0 corrisponde all'espressione regolare <b>%1</b>
 
@@ -151,8 +153,6 @@ Cite\ command=Comando Cite
 
 Clear=Svuota
 
-Clear\ fields=Annulla i campi
-
 Open\ /\ close\ entry\ editor=Apri / chiudi editor voci
 
 Close\ dialog=Chiudi la finestra di dialogo
@@ -172,7 +172,13 @@ Copied=Copiato
 
 Copy=Copia
 
+Copy\ title=Copia titolo
+Copy\ \\cite{citation\ key}=Copia \\cite{citation key}
+Copy\ citation\ (html)=Copia citazione (html)
+Copy\ citation\ (text)=Copia citazione (testo)
 Copy\ citation\ key=Copia la chiave BibTeX
+Copy\ citation\ key\ and\ link=Copia la chiave BibTeX ed il collegamento
+Copy\ citation\ key\ and\ title=Copia la chiave BibTeX ed il titolo
 
 Copy\ to\ clipboard=Copia negli appunti
 
@@ -227,7 +233,9 @@ Library\ properties=Proprietà della libreria
 
 Default=Predefinito
 
-Default\ encoding=Codifica predefinita
+Character\ encoding\ UTF-8\ is\ not\ supported.=La codifica dei caratteri UTF-8 non è supportata.
+UTF-8\ could\ not\ be\ used\ to\ encode\ the\ following\ characters\:\ %0=UTF-8 non può essere usato per codificare i seguenti caratteri\: %0
+The\ chosen\ encoding\ '%0'\ could\ not\ encode\ the\ following\ characters\:=La codifica scelta '%0' non può codificare i caratteri seguenti\:
 
 Downloading=Download in corso
 
@@ -534,6 +542,8 @@ Moved\ group\ "%0".=Spostato gruppo "%0".
 
 Mr.\ DLib\ Privacy\ settings=Impostazioni Privacy di Mr. DLib
 
+
+
 No\ recommendations\ received\ from\ Mr.\ DLib\ for\ this\ entry.=Nessun suggerimento ricevuto da Mr. DLib per questa voce.
 
 Error\ while\ fetching\ recommendations\ from\ Mr.DLib.=Errore durante il recupero delle raccomandazioni da Mr.DLib.
@@ -626,8 +636,6 @@ Path\ to\ %0\ not\ defined=Percorso per %0 non definito
 
 Path\ to\ LyX\ pipe=Percorso per la pipe LyX
 
-PDF\ does\ not\ exist=Il file PDF non esiste
-
 File\ has\ no\ attached\ annotations=Il file non ha annotazioni allegate
 
 Please\ enter\ a\ name\ for\ the\ group.=Immettere un nome per il gruppo
@@ -693,11 +701,25 @@ Remove\ selected\ entries\ from\ this\ group=Rimuovi da questo gruppo le voci se
 
 Remove\ group=Rimuovi gruppo
 
-Remove\ group\ "%0"?=Rimuovere il gruppo "%0"?
+Remove\ group\ and\ subgroups=Rimuovi gruppo e sottogruppi
+
+Remove\ groups\ and\ subgroups=Rimuovi gruppi e sottogruppi
+
+Remove\ all\ selected\ groups\ and\ keep\ their\ subgroups?=Rimuovere tutti i gruppi selezionati e mantenere i loro sottogruppi?
+
+Remove\ group\ "%0"\ and\ keep\ its\ subgroups?=Rimuovere il gruppo "%0" e mantenere i suoi sottogruppi?
+
+Remove\ groups=Rimuovere i gruppi
+
+Removed\ all\ selected\ groups.=Rimossi tutti i gruppi selezionati.
 
 Remove\ group\ "%0"\ and\ its\ subgroups?=Rimuovere il gruppo "%0" ed i suoi sottogruppi?
 
-Remove\ group\ and\ subgroups=Rimuovi gruppo e sottogruppi
+Removed\ group\ "%0"\ and\ its\ subgroups.=Rimosso gruppo "%0" e suoi sottogruppi.
+
+Remove\ all\ selected\ groups\ and\ their\ subgroups?=Rimuovere tutti i gruppi selezionati e i loro sottogruppi?
+
+Removed\ all\ selected\ groups\ and\ their\ subgroups.=Rimossi tutti i gruppi selezionati e i loro sottogruppi.
 
 Remove\ link=Rimuovere il collegamento
 
@@ -707,8 +729,6 @@ Remove\ string\ %0=Rimuovi la stringa %0
 
 Removed\ group\ "%0".=Rimosso gruppo "%0".
 
-Removed\ group\ "%0"\ and\ its\ subgroups.=Rimosso gruppo "%0" e suoi sottogruppi.
-
 Removed\ string=Stringa rimossa
 
 Renamed\ string=Stringa rinominata
@@ -780,9 +800,6 @@ Select\ file\ from\ ZIP-archive=Seleziona un file da un archivio ZIP
 
 Select\ the\ tree\ nodes\ to\ view\ and\ accept\ or\ reject\ changes=Selezionare i nodi dell'albero per vedere ed accettare o rifiutare le modifiche
 
-Set\ field=Imposta il campo
-Set\ fields=Imposta i campi
-
 Settings=Parametri
 
 Shortcut=Scorciatoia
@@ -815,7 +832,12 @@ Size=Dimensione
 Skipped\ -\ No\ PDF\ linked=Saltato - Nessun file PDF collegato
 Skipped\ -\ PDF\ does\ not\ exist=Saltato - Il file PDF non esiste
 
-Skipped\ entry.=Voce saltata
+JabRef\ skipped\ the\ entry.=JabRef ha saltato la voce.
+Import\ error=Errore di importazione
+Open\ library\ error=Errore di apertura libreria
+Please\ check\ your\ library\ file\ for\ wrong\ syntax.=Controlla il file della tua libreria per sintassi sbagliata.
+SourceTab\ error=Errore SourceTab
+User\ input\ via\ entry-editor\ in\ `{}bibtex\ source`\ tab\ led\ to\ failure.=L'input dell'utente tramite entry-editor nella scheda `{}bibtex source` ha portato al fallimento.
 
 Sort\ subgroups=Ordina sottogruppi
 
@@ -830,8 +852,6 @@ Sublibrary\ from\ AUX\ to\ BibTeX=Sotto-libreria da AUX a BibTeX
 
 Switches\ between\ full\ and\ abbreviated\ journal\ name\ if\ the\ journal\ name\ is\ known.=Alterna nomi completi e nomi abbreviati per le riviste delle quali è noto il nome.
 
-The\ chosen\ encoding\ '%0'\ could\ not\ encode\ the\ following\ characters\:=La codifica scelta '%0' non può codificare i caratteri seguenti\:
-
 
 the\ field\ <b>%0</b>=il campo <b>%0</b>
 The\ group\ "%0"\ already\ contains\ the\ selection.=Il gruppo "%0" contiene già la selezione.
@@ -964,10 +984,6 @@ Line\ %0\:\ Found\ corrupted\ citation\ key\ %1\ (comma\ missing).=Riga %0\: Tro
 No\ full\ text\ document\ found=Nessun documento di testo completo trovato
 Download\ from\ URL=Scarica dall'URL
 Rename\ field=Rinomina il campo
-Append\ field=Aggiungi campo
-Append\ to\ fields=Aggiungi ai campi
-Rename\ field\ to=Rinomina il campo in
-Move\ contents\ of\ a\ field\ into\ a\ field\ with\ a\ different\ name=Sposta il contenuto di un campo in un campo con nome diverso
 
 Cannot\ use\ port\ %0\ for\ remote\ operation;\ another\ application\ may\ be\ using\ it.\ Try\ specifying\ another\ port.=Impossibile utilizzare la porta %0 per operazioni remote; la porta potrebbe essere in uso da parte di un'altra applicazione. Provare a specificare una porta diversa.
 
@@ -1039,7 +1055,6 @@ Manage\ citations=Gestione delle citazioni
 Problem\ modifying\ citation=Problema nella modifica della citazione
 Citation=Citazione
 Connecting...=Connetto...
-Could\ not\ resolve\ BibTeX\ entry\ for\ citation\ marker\ '%0'.=Impossibile risolvere la voce BibTeX per l'identificativo di citazione '%0'.
 Select\ style=Seleziona stile
 Journals=Riviste
 Cite=Cita
@@ -1051,17 +1066,26 @@ Select\ Writer\ document=Selezionare il documento Writer
 Sync\ OpenOffice/LibreOffice\ bibliography=Sincronizza la bibliografia OpenOffice/LibreOffice
 Select\ which\ open\ Writer\ document\ to\ work\ on=Selezionare il documento Writer aperto su cui lavorare
 Connected\ to\ document=Connesso al documento
+
+
+
 Insert\ a\ citation\ without\ text\ (the\ entry\ will\ appear\ in\ the\ reference\ list)=Inserire una citazione senza testo (la voce comparirà nella lista dei riferimenti)
 Cite\ selected\ entries\ with\ extra\ information=Cita le voci selezionate con informazioni aggiuntive
 Ensure\ that\ the\ bibliography\ is\ up-to-date=Assicura che la bibliografia sia aggiornata
+
 Your\ OpenOffice/LibreOffice\ document\ references\ the\ citation\ key\ '%0',\ which\ could\ not\ be\ found\ in\ your\ current\ library.=Il tuo documento OpenOffice/LibreOffice fa riferimento alla chiave BibTeX '%0', non presente nella libreria corrente.
+
+
+
+
 Unable\ to\ synchronize\ bibliography=Impossiblile sincronizzare la bibliografia
 Combine\ pairs\ of\ citations\ that\ are\ separated\ by\ spaces\ only=Combina le coppie di citazioni separate solo da spazi
 Autodetection\ failed=Autorilevamento non riuscito
 Please\ wait...=Attendere...
 Connection\ lost=Connessione perduta
-The\ paragraph\ format\ is\ controlled\ by\ the\ property\ 'ReferenceParagraphFormat'\ or\ 'ReferenceHeaderParagraphFormat'\ in\ the\ style\ file.=Il formato del paragrafo è controllato dalle proprietà 'ReferenceParagraphFormat' o 'ReferenceHeaderParagraphFormat' nel file di stile.
-The\ character\ format\ is\ controlled\ by\ the\ citation\ property\ 'CitationCharacterFormat'\ in\ the\ style\ file.=Il formato del carattere è controllato dalla proprietà della citazione 'CitationCharacterFormat' nel file di stile.
+
+
+
 Automatically\ sync\ bibliography\ when\ inserting\ citations=Sincronizza automaticamente la bibliografia all'inserimento delle citazioni
 Look\ up\ BibTeX\ entries\ in\ the\ active\ tab\ only=Ricerca le voci BibTeX solo nella scheda attiva
 Look\ up\ BibTeX\ entries\ in\ all\ open\ libraries=Ricerca le voci BibTeX in tutte le librerie aperte
@@ -1164,6 +1188,7 @@ Toggle\ quality\ assured=Mostra/Nascondi qualità
 Toggle\ print\ status=Invertito lo stato di stampa
 Update\ keywords=Aggiorna parole chiave
 Connection\ to\ OpenOffice/LibreOffice\ has\ been\ lost.\ Please\ make\ sure\ OpenOffice/LibreOffice\ is\ running,\ and\ try\ to\ reconnect.=Perduta la connessione con OpenOffice/LibreOffice. Assicurarsi che OpenOffice/LibreOffice sia in esecuzione e provare a riconnettersi.
+
 JabRef\ will\ send\ at\ least\ one\ request\ per\ entry\ to\ a\ publisher.=JabRef spedirà almeno una richiesta per voce ad un editore.
 Correct\ the\ entry,\ and\ reopen\ editor\ to\ display/edit\ source.=Correggi la voce e riapri l'editor per mostrare/modificare il codice sorgente.
 Could\ not\ connect\ to\ running\ OpenOffice/LibreOffice.=Impossibile la connessione ad OpenOffice/LibreOffice.
@@ -1177,8 +1202,6 @@ To\ disable\ the\ memory\ stick\ mode\ rename\ or\ remove\ the\ jabref.xml\ file
 Unable\ to\ connect.\ One\ possible\ reason\ is\ that\ JabRef\ and\ OpenOffice/LibreOffice\ are\ not\ both\ running\ in\ either\ 32\ bit\ mode\ or\ 64\ bit\ mode.=Impossibile connettersi. Una possibile ragione è il fatto che JabRef e OpenOffice/LibreOffice non vengono eseguiti nella stessa modalità a 32 o 64 bit.
 Delimiter(s)=Delimitatore(i)
 When\ downloading\ files,\ or\ moving\ linked\ files\ to\ the\ file\ directory,\ use\ the\ bib\ file\ location.=Quando si scaricano i file, o si spostano i file collegati nella directory dei file, utilizzare la posizione del file bib.
-Your\ style\ file\ specifies\ the\ character\ format\ '%0',\ which\ is\ undefined\ in\ your\ current\ OpenOffice/LibreOffice\ document.=Il file di stile specifica il formato di carattere "%0" che non è tuttavia definito nel documento OpenOffice/LibreOffice corrente.
-Your\ style\ file\ specifies\ the\ paragraph\ format\ '%0',\ which\ is\ undefined\ in\ your\ current\ OpenOffice/LibreOffice\ document.=Il file di stile specifica il formato di paragrafo "%0" che non è tuttavia definito nel documento OpenOffice/LibreOffice corrente.
 
 Searching...=Ricerca in corso...
 Please\ enter\ a\ search\ string=Inserire una stringa di ricerca
@@ -1216,6 +1239,12 @@ Use\ custom\ proxy\ configuration=Utilizza una configurazione del proxy personal
 Proxy\ requires\ authentication=Il proxy richiede un'autenticazione
 Attention\:\ Password\ is\ stored\ in\ plain\ text\!=Attenzione\: Password salvata come testo semplice\!
 Clear\ connection\ settings=Reinizializza i parametri di connessione
+Check\ Proxy\ Setting=Controlla Impostazioni Proxy
+Check\ connection=Controlla la connessione
+Connection\ failed\!=Connessione fallita\!
+Connection\ successful\!=Connessione riuscita\!
+
+SSL\ configuration\ changed=Configurazione SSL modificata
 
 Open\ folder=Apri cartella
 Export\ sort\ order=Esporta il modo di ordinamento
@@ -1252,6 +1281,7 @@ Please\ open\ %0\ manually.=Per favore aprire %0 manualmente.
 The\ link\ has\ been\ copied\ to\ the\ clipboard.=Il link è stato copiato negli appunti.
 
 Open\ %0\ file=Apri il file %0
+Could\ not\ detect\ terminal\ automatically.\ Please\ define\ a\ custom\ terminal\ in\ the\ preferences.=Impossibile rilevare il terminale automaticamente. Si prega di definire un terminale personalizzato nelle preferenze.
 
 Cannot\ delete\ file=Non posso cancellare il file
 File\ permission\ error=Errore nei permessi del file
@@ -1297,9 +1327,7 @@ Save\ changes=Salva le modifiche
 Discard\ changes=Scarta le modifiche
 Library\ '%0'\ has\ changed.=La libreria '%0' è stato modificata.
 Print\ entry\ preview=Stampa l'anteprima della voce
-Copy\ title=Copia titolo
-Copy\ \\cite{citation\ key}=Copia \\cite{citation key}
-Copy\ citation\ key\ and\ title=Copia la chiave BibTeX ed il titolo
+
 Invalid\ DOI\:\ '%0'.=DOI non valido\: '%0'.
 Same\ DOI\ used\ in\ multiple\ entries=Stesso DOI usato in più voci
 should\ start\ with\ a\ name=deve cominciare con un nome
@@ -1560,6 +1588,11 @@ Custom=Appopsito
 Export\ cited=Esporta citazioni
 Unable\ to\ generate\ new\ library=Impossibile generare la nuova libreria
 
+
+
+
+
+
 Found\ identical\ ranges=Trovati intervalli identici
 Found\ overlapping\ ranges=Trovati intervalli di sovrapposizione
 Found\ touching\ ranges=Trovati intervalli di contatto
@@ -1625,6 +1658,8 @@ Issue\ report\ successful=Segnalazione del problema avvenuta con successo
 Your\ issue\ was\ reported\ in\ your\ browser.=Il problema è stato segnalato nel browser.
 The\ log\ and\ exception\ information\ was\ copied\ to\ your\ clipboard.=Il log e le informazioni dell'eccezione sono stati copiati negli appunti.
 Please\ paste\ this\ information\ (with\ Ctrl+V)\ in\ the\ issue\ description.=Per favore, incolla questa informazione (con Ctrl+V) nella descrizione del problema.
+Last\ notification=Ultima notifica
+Check\ the\ event\ log\ to\ see\ all\ notifications=Controlla il registro eventi per vedere tutte le notifiche
 
 Host=Host
 Port=Porta
@@ -1662,7 +1697,6 @@ Protected\ terms\ file=File di termini protetti
 Style\ file=File stile
 
 Open\ OpenOffice/LibreOffice\ connection=Apri connessione OpenOffice/LibreOffice
-You\ must\ enter\ at\ least\ one\ field\ name=Devi inserire almeno il nome di un campo
 Non-ASCII\ encoded\ character\ found=Trovato un carattere non codificato ASCII
 Non-UTF-8\ encoded\ field\ found=Trovato campo codificato non-UTF-8
 Toggle\ web\ search\ interface=Inverti la selezione dell'interfaccia di ricerca web
@@ -1708,7 +1742,6 @@ should\ be\ normalized=dovrebbe essere normalizzato
 
 Empty\ search\ ID=ID della ricerca vuoto
 The\ given\ search\ ID\ was\ empty.=L'ID della ricerca usato era vuoto.
-Copy\ citation\ key\ and\ link=Copia la chiave BibTeX ed il collegamento
 biblatex\ field\ only=campo solo biblatex
 
 Error\ while\ generating\ fetch\ URL=Errore generando l'URL per l'estrazione
@@ -1801,7 +1834,6 @@ Removes\ all\ hyphenated\ line\ breaks\ in\ the\ field\ content.=Rimuove tutte l
 Could\ not\ retrieve\ entry\ data\ from\ '%0'.=Impossibile recuperare dati in ingresso da '%0'.
 Entry\ from\ %0\ could\ not\ be\ parsed.=Non è stato possibile analizzare la voce %0.
 Invalid\ identifier\:\ '%0'.=Identificatore non valido\: '%0'.
-This\ paper\ has\ been\ withdrawn.=Questo documento è stato ritirato.
 empty\ citation\ key=chiave BibTeX vuota
 Aux\ file=File aux
 Group\ containing\ entries\ cited\ in\ a\ given\ TeX\ file=Gruppo contenente voci citate in un determinato file TeX
@@ -1829,9 +1861,6 @@ Could\ not\ connect\ to\ Vim\ server.\ Make\ sure\ that\ Vim\ is\ running\ with\
 Could\ not\ connect\ to\ a\ running\ gnuserv\ process.\ Make\ sure\ that\ Emacs\ or\ XEmacs\ is\ running,\ and\ that\ the\ server\ has\ been\ started\ (by\ running\ the\ command\ 'server-start'/'gnuserv-start').=Impossibile connettersi a un processo gnuserv in esecuzione. Assicurarsi che Emacs o XEmacs sia in esecuzione e che il server sia stato avviato (eseguendo il comando 'server-start'/'gnuserv-start').
 Error\ pushing\ entries=Errore nell'invio delle voci
 
-Undefined\ character\ format=Formato del carattere indefinito
-Undefined\ paragraph\ format=Formato del paragrafo indefinito
-
 Preamble=Preambolo
 Markings=Segni
 Use\ selected\ instance=Usa istanza selezionata
@@ -1851,8 +1880,8 @@ Blog=Blog
 Check\ integrity=Verifica di integrità
 Cleanup\ URL\ link=Pulisci URL Link
 Cleanup\ URL\ link\ by\ removing\ special\ symbols\ and\ extracting\ simple\ link=Pulisci l'URL rimuovendo simboli speciali ed estraendo un semplice link
+Copy\ DOI=Copia DOI
 Copy\ DOI\ url=Copia l'url del DOI
-Copy\ citation=Copia la citazione
 Development\ version=Versione di sviluppo
 Export\ selected\ entries=Esporta le voci selezionate
 Export\ selected\ entries\ to\ clipboard=Esportare le voci selezionate negli appunti
@@ -1863,8 +1892,6 @@ Manage\ protected\ terms=Gestione dei termini protetti
 New\ entry\ from\ plain\ text=Nuova voce dal testo in chiaro
 Import\ by\ ID=Importa per ID
 Enter\ a\ valid\ ID=Inserisci un ID valido
-Imported\ one\ entry=Importato una voce
-Entry\ already\ exists=Voce già esistente
 New\ sublibrary\ based\ on\ AUX\ file=Nuova sublibrary basata su file AUX
 Push\ entries\ to\ external\ application\ (%0)=Invia le voci all'applicazione esterna (%0)
 Quit=Esci
@@ -2054,6 +2081,7 @@ Please\ provide\ a\ valid\ aux\ file.=Ti preghiamo di fornire un file aux valido
 Keyword\ delimiter=Delimitatore parole chiave
 Hierarchical\ keyword\ delimiter=Delimitatore di parole chiave gerarchiche
 Escape\ ampersands=Preserva le e commerciali
+Escape\ dollar\ sign=Evita il segno del dollaro
 
 Hint\:\n\nTo\ search\ all\ fields\ for\ <b>Smith</b>,\ enter\:\n<tt>smith</tt>\n\nTo\ search\ the\ field\ <b>author</b>\ for\ <b>Smith</b>\ and\ the\ field\ <b>title</b>\ for\ <b>electrical</b>,\ enter\:\n<tt>author\=Smith\ and\ title\=electrical</tt>=Suggerimento\:\n\nPer cercare tutti i campi per <b>Smith</b>, enter\:\n<tt>smith</tt>\n\nPer cercare il campo <b>author</b> per <b>Smith</b> e il campo <b>title</b> per <b>electrical</b>, enter\:\n<tt>author\=Smith and title\=electrical</tt>
 
@@ -2288,10 +2316,6 @@ Removes\ digits.=Rimuove le cifre.
 
 Presets=Profili
 
-Check\ Proxy\ Setting=Controlla Impostazioni Proxy
-Check\ connection=Controlla la connessione
-Connection\ failed\!=Connessione fallita\!
-Connection\ successful\!=Connessione riuscita\!
 Generate\ groups\ from\ keywords\ in\ the\ following\ field=Genera gruppi da parole chiave nel campo seguente
 Generate\ groups\ for\ author\ last\ names=Genera gruppi in base al cognome dell'autore
 Regular\ expression=Espressione regolare
@@ -2311,15 +2335,28 @@ Separate\ merged\ citations=Citazioni unite separate
 Separate\ citations=Citazioni separate
 
 Unprotect\ terms=Termini non protetti
-Error\ connecting\ to\ Writer\ document=Errore nella connessione al documento Writer
-You\ need\ to\ open\ Writer\ with\ a\ document\ before\ connecting=Devi aprire Writer con un documento prima di connetterti
 
 Generate\ a\ new\ key\ for\ imported\ entries\ (overwriting\ their\ default)=Genera una nuova chiave per le voci importate (sovrascrivendo il valore predefinito)
+Warn\ about\ duplicates\ on\ import=Avverti sui duplicati nell'importazione
 Import\ and\ Export=Importa ed Esporta
 Custom\ DOI\ URI=Uri DOI Personalizzato
 Use\ custom\ DOI\ base\ URI\ for\ article\ access=Usa l'URI di base DOI personalizzato per l'accesso agli articoli
 
 Cited\ on\ pages=Citato sulle pagine
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 Unable\ to\ find\ valid\ certification\ path\ to\ requested\ target(%0),\ download\ anyway?=Impossibile trovare un percorso di certificazione valido per il target richiesto (%0), scaricare comunque?
 Download\ operation\ canceled.=Operazione di download annullata.
 
@@ -2336,7 +2373,6 @@ Entry\ Type=Tipo di voce
 Entry\ types=Tipi di voce
 Field\ names=Nome del campo
 Others=Altri
-Overwrite\ existing\ field\ values=Sovrascrivi i valori esistenti del campo
 Recommended=Consigliato
 
 Authors\ and\ Title=Autori e Titolo
@@ -2367,6 +2403,8 @@ Query=Interrogazione
 Question=Domanda
 Select\ directory=Seleziona cartella
 
+Fulltext\ Index=Indice di testo completo
+Automatically\ index\ all\ linked\ files\ for\ fulltext\ search=Indicizza automaticamente tutti i file collegati per la ricerca di testo completo
 Rebuild\ fulltext\ search\ index=Ricostruisci l'indice di ricerca su tutto il testo
 Rebuild\ fulltext\ search\ index\ for\ current\ library?=Ricostruisci l'indice di ricerca su tutto il testo per la libreria corrente?
 Rebuilding\ fulltext\ search\ index...=Ricostruzione indice di ricerca su tutto il testo...
@@ -2379,6 +2417,9 @@ Grobid\ URL=Url Grobid
 Remote\ services=Servizi remoti
 Allow\ sending\ PDF\ files\ and\ raw\ citation\ strings\ to\ a\ JabRef\ online\ service\ (Grobid)\ to\ determine\ Metadata.\ This\ produces\ better\ results.=Consenti l'invio di file PDF e stringhe di citazione grezze a un servizio online JabRef (Grobid) per determinare i metadati. Questo produce risultati migliori.
 
+Fetcher\ cannot\ be\ tested\!=Il raccoglitore non può essere testato\!
+Fetcher\ unknown\!=Raccoglitore sconosciuto\!
+
 Character\ by\ character=Carattere per carattere
 Embedded=Incorporato
 Entry=Voce
@@ -2393,3 +2434,32 @@ Search\ across\ libraries\ in\ a\ new\ window=Cerca tra le librerie in una nuova
 Keep\ search\ string\ across\ libraries=Mantieni la stringa di ricerca tra le librerie
 Keep\ dialog\ always\ on\ top=Manteni la finestra sempre in primo piano
 Search\ results\ from\ open\ libraries=Risultati della ricerca da librerie aperte
+
+
+
+
+Custom\ API\ key=Chiave API personalizzata
+Check\ %0\ API\ Key\ Setting=Controlla le impostazioni della chiave API %0
+
+Edit\ content=Modifica il contenuto
+Copy\ or\ Move\ content=Copia o Sposta il contenuto
+Overwrite\ field\ content=Sovrascrivi il contenuto del campo
+Set=Imposta
+Append=Accoda
+Clear\ field\ content=Cancella il contenuto del campo
+Set\ or\ append\ content=Imposta o aggiungi il contenuto
+Edit\ field\ content\ for\ selected\ entries=Modifica il contenuto del campo per le voci selezionate
+Rename=Rinomina
+New\ field\ name=Nuovo nome del campo
+Copy\ content=Copia il contenuto
+Move\ content=Sposta il contenuto
+Swap\ content=Scambia il contenuto
+Copy\ or\ move\ the\ content\ of\ one\ field\ to\ another=Copia o sposta il contenuto di un campo in un altro
+Automatic\ field\ editor=Editor automatico dei campi
+From=Da
+Keep\ Modifications=Mantieni le modifiche
+To=A
+
+(Note\:\ If\ original\ entries\ lack\ keywords\ to\ qualify\ for\ the\ new\ group\ configuration,\ confirming\ here\ will\ add\ them)=(Nota\: se le voci originali mancano di parole chiave per qualificarsi per la nuova configurazione di gruppo, confermando qui le aggiungeranno)
+Assign=Assegna
+Do\ not\ assign=Non assegnare
diff --git a/src/main/resources/l10n/JabRef_ja.properties b/src/main/resources/l10n/JabRef_ja.properties
index a975c5b8f8f..580a657d479 100644
--- a/src/main/resources/l10n/JabRef_ja.properties
+++ b/src/main/resources/l10n/JabRef_ja.properties
@@ -19,7 +19,7 @@ Unable\ to\ monitor\ file\ changes.\ Please\ close\ files\ and\ processes\ and\
 
 %0/%1\ entries=%0/%1 項目
 
-%0\ export\ successful=%0個の書き出しに成功しました
+
 
 %0\ matches\ the\ regular\ expression\ <b>%1</b>=%0は正規表現<b>%1</b>に一致します
 
@@ -151,8 +151,6 @@ Cite\ command=Citeコマンド
 
 Clear=消去
 
-Clear\ fields=フィールドを消去
-
 Open\ /\ close\ entry\ editor=項目エディタを開閉する
 
 Close\ dialog=ダイアログを閉じる
@@ -172,7 +170,11 @@ Copied=コピーしました
 
 Copy=コピー
 
+Copy\ title=タイトルをコピー
+Copy\ \\cite{citation\ key}=コピー \\文献{citation key}
 Copy\ citation\ key=文献キーをコピー
+Copy\ citation\ key\ and\ link=文献キーとリンクをコピー
+Copy\ citation\ key\ and\ title=文献キーとタイトルをコピー
 
 Copy\ to\ clipboard=クリップボードにコピーします．
 
@@ -227,7 +229,7 @@ Library\ properties=ライブラリ特性
 
 Default=既定値
 
-Default\ encoding=既定エンコーディング
+The\ chosen\ encoding\ '%0'\ could\ not\ encode\ the\ following\ characters\:=選択したエンコーディング「%0」は，以下の文字をエンコードすることができませんでした：
 
 Downloading=ダウンロードしています
 
@@ -533,6 +535,8 @@ Moved\ group\ "%0".=グループ「%0」を移動しました．
 
 Mr.\ DLib\ Privacy\ settings=Mr. DLibのプライバシー設定
 
+
+
 No\ recommendations\ received\ from\ Mr.\ DLib\ for\ this\ entry.=この項目に対しては，Mr. DLibから推奨文献を受け取ることができませんでした．
 
 Error\ while\ fetching\ recommendations\ from\ Mr.DLib.=Mr. DLibから推奨文献を受け取る際にエラーが発生しました．
@@ -625,8 +629,6 @@ Path\ to\ %0\ not\ defined=%0へのパスは定義されていません
 
 Path\ to\ LyX\ pipe=LyXパイプへのパス
 
-PDF\ does\ not\ exist=PDFが存在しません
-
 File\ has\ no\ attached\ annotations=ファイルには註釈が付けられていません
 
 Please\ enter\ a\ name\ for\ the\ group.=このグループ用の名称を入力してください．
@@ -692,11 +694,18 @@ Remove\ selected\ entries\ from\ this\ group=このグループから選択項
 
 Remove\ group=グループを削除
 
-Remove\ group\ "%0"?=グループ「%0」を削除しますか？
+Remove\ group\ and\ subgroups=グループと下層グループを削除
+
+
+
+
+
 
 Remove\ group\ "%0"\ and\ its\ subgroups?=グループ「%0」とその下層グループを削除しますか？
 
-Remove\ group\ and\ subgroups=グループと下層グループを削除
+Removed\ group\ "%0"\ and\ its\ subgroups.=グループ「%0」とその下層グループを削除しました．
+
+
 
 Remove\ link=リンクを削除
 
@@ -706,8 +715,6 @@ Remove\ string\ %0=文字列 %0 を削除
 
 Removed\ group\ "%0".=グループ「%0」を削除しました．
 
-Removed\ group\ "%0"\ and\ its\ subgroups.=グループ「%0」とその下層グループを削除しました．
-
 Removed\ string=文字列を削除しました
 
 Renamed\ string=文字列を改名しました
@@ -776,9 +783,6 @@ Select\ file\ from\ ZIP-archive=ZIP書庫からファイルを選択してくだ
 
 Select\ the\ tree\ nodes\ to\ view\ and\ accept\ or\ reject\ changes=ツリーノードを選択して表示させ，変更を受諾ないし拒否してください
 
-Set\ field=フィールドを設定
-Set\ fields=フィールドを設定
-
 Settings=設定
 
 Shortcut=ショートカット
@@ -811,7 +815,6 @@ Size=サイズ
 Skipped\ -\ No\ PDF\ linked=跳ばしました - PDFがリンクされていません
 Skipped\ -\ PDF\ does\ not\ exist=跳ばしました - PDFが存在しません
 
-Skipped\ entry.=項目を跳ばしました．
 
 Sort\ subgroups=サブグループのソート
 
@@ -826,8 +829,6 @@ Sublibrary\ from\ AUX\ to\ BibTeX=AUXからBibTexへ変換した下位ライブ
 
 Switches\ between\ full\ and\ abbreviated\ journal\ name\ if\ the\ journal\ name\ is\ known.=学術誌名が既知の場合は，完全な学術誌名と短縮形を切り替える．
 
-The\ chosen\ encoding\ '%0'\ could\ not\ encode\ the\ following\ characters\:=選択したエンコーディング「%0」は，以下の文字をエンコードすることができませんでした：
-
 
 the\ field\ <b>%0</b>=フィールド<b>%0</b>
 The\ group\ "%0"\ already\ contains\ the\ selection.=グループ「%0」には既に選択したものが含まれています．
@@ -959,10 +960,6 @@ Line\ %0\:\ Found\ corrupted\ citation\ key\ %1\ (comma\ missing).=%0行目\: 
 No\ full\ text\ document\ found=文書本体が見つかりません
 Download\ from\ URL=URLからダウンロード
 Rename\ field=フィールドを改名しました
-Append\ field=フィールドを追加
-Append\ to\ fields=フィールドに追加
-Rename\ field\ to=フィールド名を以下に変更
-Move\ contents\ of\ a\ field\ into\ a\ field\ with\ a\ different\ name=フィールドの内容を別名のフィールドに移動する
 
 Cannot\ use\ port\ %0\ for\ remote\ operation;\ another\ application\ may\ be\ using\ it.\ Try\ specifying\ another\ port.=リモート操作用に%0ポートを使用することができません．別のアプリケーションが使用している可能性があります．別のポートを指定してみてください．
 
@@ -1034,7 +1031,6 @@ Manage\ citations=引用を管理
 Problem\ modifying\ citation=引用を修正するのに問題発生
 Citation=引用
 Connecting...=接続中...
-Could\ not\ resolve\ BibTeX\ entry\ for\ citation\ marker\ '%0'.=引用標識「%0」に対してBibTeX項目を当てはめられませんでした．
 Select\ style=様式の選択
 Journals=学術誌
 Cite=引用
@@ -1046,17 +1042,26 @@ Select\ Writer\ document=Writer文書を選択
 Sync\ OpenOffice/LibreOffice\ bibliography=OpenOffice/LibreOffice書誌情報を同期
 Select\ which\ open\ Writer\ document\ to\ work\ on=作業にどのWriter文書を開くか選択してください
 Connected\ to\ document=文書に接続しました
+
+
+
 Insert\ a\ citation\ without\ text\ (the\ entry\ will\ appear\ in\ the\ reference\ list)=表示なしで引用を挿入（項目は参考文献一覧にのみ表示されます）
 Cite\ selected\ entries\ with\ extra\ information=選択した項目を追加情報とともに引用
 Ensure\ that\ the\ bibliography\ is\ up-to-date=書誌情報が最新であることを確認する
+
 Your\ OpenOffice/LibreOffice\ document\ references\ the\ citation\ key\ '%0',\ which\ could\ not\ be\ found\ in\ your\ current\ library.=OpenOffice/LibreOffice ドキュメントは文献キー '%0' を参照していますが，現在のライブラリに見つかりませんでした．
+
+
+
+
 Unable\ to\ synchronize\ bibliography=書誌情報を同期することができませんでした
 Combine\ pairs\ of\ citations\ that\ are\ separated\ by\ spaces\ only=空白で区切られている引用のペアのみを連結してください
 Autodetection\ failed=自動検出に失敗しました
 Please\ wait...=お待ちください...
 Connection\ lost=接続が失われました
-The\ paragraph\ format\ is\ controlled\ by\ the\ property\ 'ReferenceParagraphFormat'\ or\ 'ReferenceHeaderParagraphFormat'\ in\ the\ style\ file.=段落様式は，様式ファイル内の「ReferenceParagraphFormat」特性もしくは「ReferenceHeaderParagraphFormat」特性で制御されています．
-The\ character\ format\ is\ controlled\ by\ the\ citation\ property\ 'CitationCharacterFormat'\ in\ the\ style\ file.=文字書式は，書式ファイル内の引用特性「CitationCharacterFormat」で制御されています．
+
+
+
 Automatically\ sync\ bibliography\ when\ inserting\ citations=引用を挿入する際，書誌情報を自動的に同期
 Look\ up\ BibTeX\ entries\ in\ the\ active\ tab\ only=アクティブなタブのBibTeX項目のみを検索
 Look\ up\ BibTeX\ entries\ in\ all\ open\ libraries=開かれているデータベースすべてのBibTeX項目を検索
@@ -1159,6 +1164,7 @@ Toggle\ quality\ assured=品質検査済情報を変更
 Toggle\ print\ status=印刷済情報を変更
 Update\ keywords=キーワードを更新
 Connection\ to\ OpenOffice/LibreOffice\ has\ been\ lost.\ Please\ make\ sure\ OpenOffice/LibreOffice\ is\ running,\ and\ try\ to\ reconnect.=OpenOffice/LibreOfficeへの接続が失われました．OpenOffice/LibreOfficeが実行されていることを確認して再接続を試みてください．
+
 JabRef\ will\ send\ at\ least\ one\ request\ per\ entry\ to\ a\ publisher.=JabRefは，項目あたり少なくとも一つのリクエストを出版社に送ります．
 Correct\ the\ entry,\ and\ reopen\ editor\ to\ display/edit\ source.=項目を修正してエディタを再度開き，ソースを表示もしくは編集してください．
 Could\ not\ connect\ to\ running\ OpenOffice/LibreOffice.=実行中のOpenOffice/LibreOfficeに接続できませんでした．
@@ -1172,8 +1178,6 @@ To\ disable\ the\ memory\ stick\ mode\ rename\ or\ remove\ the\ jabref.xml\ file
 Unable\ to\ connect.\ One\ possible\ reason\ is\ that\ JabRef\ and\ OpenOffice/LibreOffice\ are\ not\ both\ running\ in\ either\ 32\ bit\ mode\ or\ 64\ bit\ mode.=接続ができません．一つの可能性としては，JabRefとOpenOffice/LibreOfficeが，ともに32ビットモードか64ビットモードで実行されていないせいかもしれません．
 Delimiter(s)=区切り文字
 When\ downloading\ files,\ or\ moving\ linked\ files\ to\ the\ file\ directory,\ use\ the\ bib\ file\ location.=ファイルをダウンロードしたり，リンクされたファイルをファイルディレクトリに移動したりするときは，bib ファイルの場所を使用します．
-Your\ style\ file\ specifies\ the\ character\ format\ '%0',\ which\ is\ undefined\ in\ your\ current\ OpenOffice/LibreOffice\ document.=お使いの様式ファイルは，文字様式「%0」を指定していますが，これは，現在のOpenOffice/LibreOffice文書には定義されていません．
-Your\ style\ file\ specifies\ the\ paragraph\ format\ '%0',\ which\ is\ undefined\ in\ your\ current\ OpenOffice/LibreOffice\ document.=お使いの様式ファイルは，段落様式「%0」を指定していますが，これは，現在のOpenOffice/LibreOffice文書には定義されていません．
 
 Searching...=検索中...
 Please\ enter\ a\ search\ string=検索文字列を入力してください
@@ -1211,6 +1215,11 @@ Use\ custom\ proxy\ configuration=ユーザー定義のプロキシ設定を用
 Proxy\ requires\ authentication=プロキシには認証が必要
 Attention\:\ Password\ is\ stored\ in\ plain\ text\!=警告：パスワードは平文で保管されます！
 Clear\ connection\ settings=接続設定を消去する
+Check\ Proxy\ Setting=プロキシ設定を確認
+Check\ connection=接続を確認
+Connection\ failed\!=接続に失敗しました！
+Connection\ successful\!=接続に成功しました ！
+
 
 Open\ folder=フォルダを開く
 Export\ sort\ order=書き出し整序順
@@ -1292,9 +1301,7 @@ Save\ changes=変更点を保存
 Discard\ changes=変更を放棄
 Library\ '%0'\ has\ changed.=ライブラリ「%0」に変更が加えられました．
 Print\ entry\ preview=項目プレビューを印刷
-Copy\ title=タイトルをコピー
-Copy\ \\cite{citation\ key}=コピー \\文献{citation key}
-Copy\ citation\ key\ and\ title=文献キーとタイトルをコピー
+
 Invalid\ DOI\:\ '%0'.=無効なDOIです：'%0'.
 Same\ DOI\ used\ in\ multiple\ entries=複数のエントリーで同じDOIを使用
 should\ start\ with\ a\ name=始まりは名前でなくてはなりません
@@ -1555,6 +1562,11 @@ Custom=カスタム
 Export\ cited=引用を書き出す
 Unable\ to\ generate\ new\ library=新しいライブラリを生成することができませんでした
 
+
+
+
+
+
 Found\ identical\ ranges=同じ範囲が見つかりました
 Found\ overlapping\ ranges=重複する範囲が見つかりました
 Found\ touching\ ranges=タッチ範囲が見つかりました
@@ -1657,7 +1669,6 @@ Protected\ terms\ file=予約語ファイル
 Style\ file=スタイルファイル
 
 Open\ OpenOffice/LibreOffice\ connection=OpenOffice/LibreOffice接続を開く
-You\ must\ enter\ at\ least\ one\ field\ name=少なくとも一つのフィールド名を入力する必要があります
 Non-ASCII\ encoded\ character\ found=ASCIIエンコードでない文字が検出されました
 Non-UTF-8\ encoded\ field\ found=UTF-8でエンコードされていないフィールドが見つかりました
 Toggle\ web\ search\ interface=ウェブ検索インタフェースを入切
@@ -1703,7 +1714,6 @@ should\ be\ normalized=標準化されたものでなくてはなりません
 
 Empty\ search\ ID=検索IDが空
 The\ given\ search\ ID\ was\ empty.=提示された検索IDが空です．
-Copy\ citation\ key\ and\ link=文献キーとリンクをコピー
 biblatex\ field\ only=biblatexフィールドのみ
 
 Error\ while\ generating\ fetch\ URL=取得URLを生成中にエラー発生
@@ -1796,7 +1806,6 @@ Removes\ all\ hyphenated\ line\ breaks\ in\ the\ field\ content.=フィールド
 Could\ not\ retrieve\ entry\ data\ from\ '%0'.='%0' から項目データを取得することができませんでした．
 Entry\ from\ %0\ could\ not\ be\ parsed.=%0 からの項目を解析することができませんでした．
 Invalid\ identifier\:\ '%0'.=「%0」は識別子として無効です．
-This\ paper\ has\ been\ withdrawn.=この論文は撤回されました．
 empty\ citation\ key=空の文献キー
 Aux\ file=auxファイル
 Group\ containing\ entries\ cited\ in\ a\ given\ TeX\ file=特定のTeXファイルでの引用項目を集めたグループ
@@ -1824,9 +1833,6 @@ Could\ not\ connect\ to\ Vim\ server.\ Make\ sure\ that\ Vim\ is\ running\ with\
 Could\ not\ connect\ to\ a\ running\ gnuserv\ process.\ Make\ sure\ that\ Emacs\ or\ XEmacs\ is\ running,\ and\ that\ the\ server\ has\ been\ started\ (by\ running\ the\ command\ 'server-start'/'gnuserv-start').=実行中のgnuservプロセスに接続できませんでした．EmacsあるいはXEmacsが実行中であることを確認し，(「server-start」または「gnuserv-start」コマンドを実行して)サーバーが起動していることてください．
 Error\ pushing\ entries=項目のプッシュ時にエラー発生
 
-Undefined\ character\ format=定義されていない文字書式
-Undefined\ paragraph\ format=定義されていない段落書式
-
 Preamble=まえがき
 Markings=標識
 Use\ selected\ instance=選択したインスタンスを使用
@@ -1847,7 +1853,6 @@ Check\ integrity=整合性検査
 Cleanup\ URL\ link=URLリンクを清掃
 Cleanup\ URL\ link\ by\ removing\ special\ symbols\ and\ extracting\ simple\ link=特殊記号を削除し簡素化されたリンクを抽出してURLを清掃
 Copy\ DOI\ url=DOIのURLをコピー
-Copy\ citation=引用をコピー
 Development\ version=開発版
 Export\ selected\ entries=選択した項目を書き出す
 Export\ selected\ entries\ to\ clipboard=選択した項目をクリップボードに書き出す
@@ -1858,8 +1863,6 @@ Manage\ protected\ terms=予約語の管理
 New\ entry\ from\ plain\ text=平文から新規項目
 Import\ by\ ID=ID で読み込み
 Enter\ a\ valid\ ID=有効なIDを入力してください
-Imported\ one\ entry=1つの項目を読み込みました
-Entry\ already\ exists=項目はすでに存在します
 New\ sublibrary\ based\ on\ AUX\ file=AUXファイルから新規下位ライブラリ
 Push\ entries\ to\ external\ application\ (%0)=項目を外部アプリケーション(%0)に転送
 Quit=終了
@@ -2137,10 +2140,6 @@ Removes\ digits.=数字を削除します。
 
 Presets=プリセット
 
-Check\ Proxy\ Setting=プロキシ設定を確認
-Check\ connection=接続を確認
-Connection\ failed\!=接続に失敗しました！
-Connection\ successful\!=接続に成功しました ！
 Generate\ groups\ from\ keywords\ in\ the\ following\ field=次のフィールドのキーワードからグループを生成する
 Generate\ groups\ for\ author\ last\ names=著者の姓でグループを生成する
 Regular\ expression=正規表現
@@ -2163,6 +2162,20 @@ Import\ and\ Export=読み込みと書き出し
 Custom\ DOI\ URI=カスタムDOI URI
 Use\ custom\ DOI\ base\ URI\ for\ article\ access=記事アクセスにカスタムDOIのURIを使用する
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 Download\ operation\ canceled.=ダウンロード操作をキャンセルしました．
 
 
@@ -2172,7 +2185,6 @@ Entry\ Type=項目型
 Entry\ types=項目型
 Field\ names=フィールド名\:
 Others=その他
-Overwrite\ existing\ field\ values=既存のフィールド値を上書き
 Recommended=推奨
 
 Authors\ and\ Title=著者とタイトル
@@ -2214,6 +2226,7 @@ Grobid\ URL=Grobid URL
 Remote\ services=リモートサービス
 Allow\ sending\ PDF\ files\ and\ raw\ citation\ strings\ to\ a\ JabRef\ online\ service\ (Grobid)\ to\ determine\ Metadata.\ This\ produces\ better\ results.=JabRefのオンラインサービス (Grobid) にPDFファイルや生の文献文字列を送信してメタデータを決定できるようにしました．これにより，さらに良い結果を得ることができます．
 
+
 Embedded=埋め込み
 Entry=項目
 Parse\ Metadata\ from\ PDF.=PDFからメタデータを解析する．
@@ -2224,3 +2237,9 @@ Search\ across\ libraries\ in\ a\ new\ window=新規ウィンドウでライブ
 Keep\ search\ string\ across\ libraries=検索文字列をライブラリ間で保持する
 Keep\ dialog\ always\ on\ top=ダイアログを常にトップで表示
 Search\ results\ from\ open\ libraries=オープンライブラリからの検索結果
+
+
+
+
+
+
diff --git a/src/main/resources/l10n/JabRef_ko.properties b/src/main/resources/l10n/JabRef_ko.properties
index 65a3b9896b5..90f720b7e6f 100644
--- a/src/main/resources/l10n/JabRef_ko.properties
+++ b/src/main/resources/l10n/JabRef_ko.properties
@@ -19,7 +19,7 @@ Unable\ to\ monitor\ file\ changes.\ Please\ close\ files\ and\ processes\ and\
 
 %0/%1\ entries=%0/%1 항목
 
-%0\ export\ successful=%0 내보내기 성공
+
 
 %0\ matches\ the\ regular\ expression\ <b>%1</b>=%0은 정규식 <b>%1</b>와 일치합니다.
 
@@ -151,8 +151,6 @@ Cite\ command=인용 명령
 
 Clear=초기화
 
-Clear\ fields=필드 초기화
-
 Open\ /\ close\ entry\ editor=항목 편집기 열기/닫기
 
 Close\ dialog=대화상자 닫기
@@ -172,7 +170,11 @@ Copied=복사 완료
 
 Copy=복사
 
+Copy\ title=제목 복사
+Copy\ \\cite{citation\ key}=\\cite{citation key} 복사
 Copy\ citation\ key=인용 키 복사
+Copy\ citation\ key\ and\ link=인용 키와 링크 복사
+Copy\ citation\ key\ and\ title=인용 키와 제목 복사
 
 Copy\ to\ clipboard=클립보드에 복사
 
@@ -226,7 +228,7 @@ Library\ properties=라이브러리 속성
 
 Default=기본값
 
-Default\ encoding=기본 인코딩 방식
+The\ chosen\ encoding\ '%0'\ could\ not\ encode\ the\ following\ characters\:=선택한 인코딩 '%0'은 다음 문자를 인코딩할 수 없습니다.
 
 Downloading=다운로드 중
 
@@ -531,6 +533,8 @@ Moved\ group\ "%0".=그룹 "%0"을 이동했습니다.
 
 Mr.\ DLib\ Privacy\ settings=Mr. DLib 개인 정보 설정
 
+
+
 No\ recommendations\ received\ from\ Mr.\ DLib\ for\ this\ entry.=이 항목에 대해 Mr. DLib로부터 받은 추천이 없습니다.
 
 Error\ while\ fetching\ recommendations\ from\ Mr.DLib.=Mr.DLib에서 추천을 가져오는 동안 오류가 발생했습니다.
@@ -623,8 +627,6 @@ Path\ to\ %0\ not\ defined=%0에 대한 경로가 정의되지 않았습니다.
 
 Path\ to\ LyX\ pipe=LyX 파이프 경로
 
-PDF\ does\ not\ exist=PDF 파일이 존재하지 않습니다
-
 File\ has\ no\ attached\ annotations=파일에 첨부된 주석이 없습니다.
 
 Please\ enter\ a\ name\ for\ the\ group.=그룹 이름을 입력하세요.
@@ -690,11 +692,18 @@ Remove\ selected\ entries\ from\ this\ group=이 그룹에서 선택한 항목 
 
 Remove\ group=그룹 삭제
 
-Remove\ group\ "%0"?=그룹 "%0"을 삭제하겠습니까?
+Remove\ group\ and\ subgroups=그룹 및 하위 그룹 제거
+
+
+
+
+
 
 Remove\ group\ "%0"\ and\ its\ subgroups?=그룹 "%0" 및 해당 하위 그룹을 제거하시겠습니까?
 
-Remove\ group\ and\ subgroups=그룹 및 하위 그룹 제거
+Removed\ group\ "%0"\ and\ its\ subgroups.=그룹 "%0" 및 해당 하위 그룹을 제거했습니다.
+
+
 
 Remove\ link=링크 삭제
 
@@ -704,8 +713,6 @@ Remove\ string\ %0=문자열 %0 삭제
 
 Removed\ group\ "%0".=그룹 %0 삭제
 
-Removed\ group\ "%0"\ and\ its\ subgroups.=그룹 "%0" 및 해당 하위 그룹을 제거했습니다.
-
 Removed\ string=문자열 삭제 완료
 
 Renamed\ string=문자열 이름 변경 완료
@@ -773,9 +780,6 @@ Select\ file\ from\ ZIP-archive=ZIP 아카이브에서 파일 선택
 
 Select\ the\ tree\ nodes\ to\ view\ and\ accept\ or\ reject\ changes=변경 사항을 보고 수락하거나 거부할 트리 노드를 선택합니다.
 
-Set\ field=필드 설정
-Set\ fields=필드 설정
-
 Settings=설정
 
 Shortcut=단축키
@@ -808,7 +812,6 @@ Size=크기
 Skipped\ -\ No\ PDF\ linked=건너뜀 - 연결된 PDF 없음
 Skipped\ -\ PDF\ does\ not\ exist=건너뜀 - PDF가 존재하지 않습니다
 
-Skipped\ entry.=항목을 건너뛰었습니다.
 
 Sort\ subgroups=하위 그룹 정렬
 
@@ -823,8 +826,6 @@ Sublibrary\ from\ AUX\ to\ BibTeX=AUX에서 BibTeX로의 서브 라이브러리
 
 Switches\ between\ full\ and\ abbreviated\ journal\ name\ if\ the\ journal\ name\ is\ known.=저널 이름을 알고 있는 경우 전체 저널 이름과 약식 저널 이름 사이를 전환합니다.
 
-The\ chosen\ encoding\ '%0'\ could\ not\ encode\ the\ following\ characters\:=선택한 인코딩 '%0'은 다음 문자를 인코딩할 수 없습니다.
-
 
 the\ field\ <b>%0</b>=필드 <b>%0</b>
 The\ group\ "%0"\ already\ contains\ the\ selection.=그룹 "%0"에 이미 선택 항목이 포함되어 있습니다.
@@ -954,10 +955,6 @@ Line\ %0\:\ Found\ corrupted\ citation\ key\ %1\ (comma\ missing).=%0행\: 손
 No\ full\ text\ document\ found=전체 텍스트 문서를 찾을 수 없습니다.
 Download\ from\ URL=URL에서 다운로드
 Rename\ field=필드 이름 변경
-Append\ field=필드 추가
-Append\ to\ fields=필드에 추가
-Rename\ field\ to=필드 이름 변경
-Move\ contents\ of\ a\ field\ into\ a\ field\ with\ a\ different\ name=필드 내용을 다른 이름의 필드로 이동
 
 Cannot\ use\ port\ %0\ for\ remote\ operation;\ another\ application\ may\ be\ using\ it.\ Try\ specifying\ another\ port.=원격 작업에 포트 %0을 사용할 수 없습니다. 다른 응용 프로그램에서 사용 중일 수 있습니다. 다른 포트를 지정해 보십시오.
 
@@ -1029,7 +1026,6 @@ Manage\ citations=인용 관리
 Problem\ modifying\ citation=인용 수정 문제
 Citation=인용
 Connecting...=연결 중…
-Could\ not\ resolve\ BibTeX\ entry\ for\ citation\ marker\ '%0'.=인용 표시자 '%0'에 대한 BibTeX 항목을 해결할 수 없습니다.
 Select\ style=스타일 선택
 Journals=저널
 Cite=인용하다
@@ -1041,17 +1037,26 @@ Select\ Writer\ document=작성자 문서 선택
 Sync\ OpenOffice/LibreOffice\ bibliography=OpenOffice/LibreOffice 참고 문헌 동기화
 Select\ which\ open\ Writer\ document\ to\ work\ on=작업할 열려 있는 Writer 문서 선택
 Connected\ to\ document=문서에 연결됨
+
+
+
 Insert\ a\ citation\ without\ text\ (the\ entry\ will\ appear\ in\ the\ reference\ list)=텍스트 없이 인용 삽입(항목이 참조 목록에 표시됨)
 Cite\ selected\ entries\ with\ extra\ information=추가 정보와 함께 선택한 항목 인용
 Ensure\ that\ the\ bibliography\ is\ up-to-date=참고 문헌이 최신 상태인지 확인
+
 Your\ OpenOffice/LibreOffice\ document\ references\ the\ citation\ key\ '%0',\ which\ could\ not\ be\ found\ in\ your\ current\ library.=OpenOffice/LibreOffice 문서 참조 인용키 %0를 현재 라이브러리에서 찾을 수 없습니다.
+
+
+
+
 Unable\ to\ synchronize\ bibliography=참고 문헌을 동기화할 수 없습니다.
 Combine\ pairs\ of\ citations\ that\ are\ separated\ by\ spaces\ only=공백으로만 구분된 인용 쌍 결합
 Autodetection\ failed=자동 검색 실패
 Please\ wait...=잠시 기다려 주십시오...
 Connection\ lost=연결 실패
-The\ paragraph\ format\ is\ controlled\ by\ the\ property\ 'ReferenceParagraphFormat'\ or\ 'ReferenceHeaderParagraphFormat'\ in\ the\ style\ file.=단락 형식은 스타일 파일의 'ReferenceParagraphFormat' 또는 'ReferenceHeaderParagraphFormat' 속성에 의해 제어됩니다.
-The\ character\ format\ is\ controlled\ by\ the\ citation\ property\ 'CitationCharacterFormat'\ in\ the\ style\ file.=문자 형식은 스타일 파일의 인용 속성 'CitationCharacterFormat'에 의해 제어됩니다.
+
+
+
 Automatically\ sync\ bibliography\ when\ inserting\ citations=인용 삽입 시 참고 문헌 자동 동기화
 Look\ up\ BibTeX\ entries\ in\ the\ active\ tab\ only=활성 탭에서만 BibTeX 항목을 찾습니다.
 Look\ up\ BibTeX\ entries\ in\ all\ open\ libraries=열려 있는 모든 라이브러리에서 BibTeX 항목 검색
@@ -1154,6 +1159,7 @@ Toggle\ quality\ assured=토글 품질 보증
 Toggle\ print\ status=인쇄 상태 전환
 Update\ keywords=키워드 업데이트
 Connection\ to\ OpenOffice/LibreOffice\ has\ been\ lost.\ Please\ make\ sure\ OpenOffice/LibreOffice\ is\ running,\ and\ try\ to\ reconnect.=OpenOffice/LibreOffice에 대한 연결이 끊어졌습니다. OpenOffice/LibreOffice가 실행 중인지 확인하고 다시 연결하십시오.
+
 JabRef\ will\ send\ at\ least\ one\ request\ per\ entry\ to\ a\ publisher.=JabRef는 게시자에게 항목당 하나 이상의 요청을 보냅니다.
 Correct\ the\ entry,\ and\ reopen\ editor\ to\ display/edit\ source.=항목을 수정하고 편집기를 다시 열어 소스를 표시/편집하십시오.
 Could\ not\ connect\ to\ running\ OpenOffice/LibreOffice.=동작하고 있는 OpenOffice/LibreOffice에 연결할 수 없습니다
@@ -1167,8 +1173,6 @@ To\ disable\ the\ memory\ stick\ mode\ rename\ or\ remove\ the\ jabref.xml\ file
 Unable\ to\ connect.\ One\ possible\ reason\ is\ that\ JabRef\ and\ OpenOffice/LibreOffice\ are\ not\ both\ running\ in\ either\ 32\ bit\ mode\ or\ 64\ bit\ mode.=연결할 수 없습니다. 한 가지 가능한 이유는 JabRef와 OpenOffice/LibreOffice가 모두 32비트 모드나 64비트 모드에서 실행되고 있지 않기 때문입니다.
 Delimiter(s)=구분 기호
 When\ downloading\ files,\ or\ moving\ linked\ files\ to\ the\ file\ directory,\ use\ the\ bib\ file\ location.=파일을 다운로드하거나 링크된 파일을 파일 디렉터리로 이동할 때 bib 파일 위치를 사용하십시오.
-Your\ style\ file\ specifies\ the\ character\ format\ '%0',\ which\ is\ undefined\ in\ your\ current\ OpenOffice/LibreOffice\ document.=스타일 파일은 현재 OpenOffice/LibreOffice 문서에서 정의되지 않은 문자 형식 '%0'을 지정합니다.
-Your\ style\ file\ specifies\ the\ paragraph\ format\ '%0',\ which\ is\ undefined\ in\ your\ current\ OpenOffice/LibreOffice\ document.=스타일 파일은 현재 OpenOffice/LibreOffice 문서에서 정의되지 않은 단락 형식 '%0'을 지정합니다.
 
 Searching...=검색 중...
 Please\ enter\ a\ search\ string=검색할 내용을 입력하세요
@@ -1206,6 +1210,11 @@ Use\ custom\ proxy\ configuration=사용자 지정 프록시 구성 사용
 Proxy\ requires\ authentication=프록시에 인증이 필요합니다.
 Attention\:\ Password\ is\ stored\ in\ plain\ text\!=주의\: 비밀번호는 일반 텍스트로 저장됩니다\!
 Clear\ connection\ settings=연결 설정 지우기
+Check\ Proxy\ Setting=프록시 설정 확인
+Check\ connection=연결 확인
+Connection\ failed\!=연결 실패\!
+Connection\ successful\!=연결 성공\!
+
 
 Open\ folder=폴더 열기
 Export\ sort\ order=정렬 순서 내보내기
@@ -1287,9 +1296,7 @@ Save\ changes=변경사항 저장
 Discard\ changes=변경 내용 취소
 Library\ '%0'\ has\ changed.=라이브러리 '%0'이 변경되었습니다.
 Print\ entry\ preview=항목 미리보기 인쇄
-Copy\ title=제목 복사
-Copy\ \\cite{citation\ key}=\\cite{citation key} 복사
-Copy\ citation\ key\ and\ title=인용 키와 제목 복사
+
 Invalid\ DOI\:\ '%0'.=유효하지 않은 DOI \: %0
 Same\ DOI\ used\ in\ multiple\ entries=여러 항목에 동일한 DOI 사용
 should\ start\ with\ a\ name=이름으로 시작해야 합니다
@@ -1550,6 +1557,11 @@ Custom=사용자 정의
 Export\ cited=사이트 전하기
 Unable\ to\ generate\ new\ library=새 라이브러리를 만들 수 없습니다.
 
+
+
+
+
+
 Found\ identical\ ranges=동일한 범위를 찾았습니다.
 Found\ overlapping\ ranges=겹치는 범위를 찾았습니다.
 Found\ touching\ ranges=접촉 범위를 찾았습니다.
@@ -1652,7 +1664,6 @@ Protected\ terms\ file=보호된 용어 파일
 Style\ file=파일 스타일
 
 Open\ OpenOffice/LibreOffice\ connection=OpenOffice/LibreOffice 연결 열기
-You\ must\ enter\ at\ least\ one\ field\ name=하나 이상의 필드 이름을 입력해야 합니다.
 Non-ASCII\ encoded\ character\ found=ASCII가 아닌 인코딩된 문자를 찾았습니다.
 Non-UTF-8\ encoded\ field\ found=UTF-8이 아닌 인코딩 필드를 찾았습니다.
 Toggle\ web\ search\ interface=웹 검색 인터페이스 전환
@@ -1698,7 +1709,6 @@ should\ be\ normalized=정규화되어야 합니다
 
 Empty\ search\ ID=탐색 ID 없음
 The\ given\ search\ ID\ was\ empty.=주어진 탐색 ID가 없습니다
-Copy\ citation\ key\ and\ link=인용 키와 링크 복사
 biblatex\ field\ only=biblatex 필드만
 
 Error\ while\ generating\ fetch\ URL=가져오기 URL을 생성하는 동안 오류가 발생했습니다.
@@ -1791,7 +1801,6 @@ Removes\ all\ hyphenated\ line\ breaks\ in\ the\ field\ content.=필드 내용
 Could\ not\ retrieve\ entry\ data\ from\ '%0'.='%0'에서 항목 데이터를 검색할 수 없습니다.
 Entry\ from\ %0\ could\ not\ be\ parsed.=%0의 항목을 구문 분석할 수 없습니다.
 Invalid\ identifier\:\ '%0'.=잘못된 식별자\: '%0'.
-This\ paper\ has\ been\ withdrawn.=이 논문은 철회되었습니다.
 empty\ citation\ key=빈 인용 키
 Aux\ file=AUX 파일
 Group\ containing\ entries\ cited\ in\ a\ given\ TeX\ file=주어진 TeX 파일에서 인용된 항목을 포함하는 그룹
@@ -1819,9 +1828,6 @@ Could\ not\ connect\ to\ Vim\ server.\ Make\ sure\ that\ Vim\ is\ running\ with\
 Could\ not\ connect\ to\ a\ running\ gnuserv\ process.\ Make\ sure\ that\ Emacs\ or\ XEmacs\ is\ running,\ and\ that\ the\ server\ has\ been\ started\ (by\ running\ the\ command\ 'server-start'/'gnuserv-start').=실행 중인 gnuserv 프로세스에 연결할 수 없습니다. Emacs 또는 XEmacs가 실행 중이고 서버가 시작되었는지 확인하십시오('server-start'/'gnuserv-start' 명령을 실행하여).
 Error\ pushing\ entries=항목을 푸시하는 동안 오류가 발생했습니다.
 
-Undefined\ character\ format=정의되지 않은 문자 형식
-Undefined\ paragraph\ format=정의되지 않은 문단 형식
-
 Markings=마킹
 Use\ selected\ instance=선택한 인스턴스 사용
 
@@ -1841,7 +1847,6 @@ Check\ integrity=무결성 확인
 Cleanup\ URL\ link=URL 링크 정리
 Cleanup\ URL\ link\ by\ removing\ special\ symbols\ and\ extracting\ simple\ link=특수기호를 제거하고 단순링크를 추출하여 URL링크 정리
 Copy\ DOI\ url=DOI URL 복사
-Copy\ citation=인용 복사
 Development\ version=개발 버전
 Export\ selected\ entries=선택한 항목 내보내기
 Export\ selected\ entries\ to\ clipboard=선택한 항목을 클립보드로 내보내기
@@ -1852,8 +1857,6 @@ Manage\ protected\ terms=보호 용어 관리
 New\ entry\ from\ plain\ text=텍스트로부터 새 항목 추가
 Import\ by\ ID=ID로 가져오기
 Enter\ a\ valid\ ID=유효한 ID를 입력하세요
-Imported\ one\ entry=항목 1개를 가져왔습니다.
-Entry\ already\ exists=항목이 이미 있습니다.
 New\ sublibrary\ based\ on\ AUX\ file=AUX 파일 기반의 새 서브라이브러리
 Push\ entries\ to\ external\ application\ (%0)=외부 응용 프로그램에 항목 푸시(%0)
 Quit=종료
@@ -2276,10 +2279,6 @@ Removes\ digits.=숫자 제거
 
 Presets=프리셋
 
-Check\ Proxy\ Setting=프록시 설정 확인
-Check\ connection=연결 확인
-Connection\ failed\!=연결 실패\!
-Connection\ successful\!=연결 성공\!
 Generate\ groups\ from\ keywords\ in\ the\ following\ field=다음 필드의 키워드에서 그룹 생성
 Generate\ groups\ for\ author\ last\ names=작가의 성씨를 가지고 그룹 생성
 Regular\ expression=정규식
@@ -2299,8 +2298,6 @@ Separate\ merged\ citations=병합된 인용 분리
 Separate\ citations=별도 인용문
 
 Unprotect\ terms=약관 보호 해제
-Error\ connecting\ to\ Writer\ document=Writer 문서에 연결하는 동안 오류가 발생했습니다.
-You\ need\ to\ open\ Writer\ with\ a\ document\ before\ connecting=연결하기 전에 문서와 함께 Writer를 열어야 합니다.
 
 Generate\ a\ new\ key\ for\ imported\ entries\ (overwriting\ their\ default)=가져온 항목에 대한 새 키 생성(기본값 덮어쓰기)
 Import\ and\ Export=가져오기 및 내보내기
@@ -2308,6 +2305,20 @@ Custom\ DOI\ URI=사용자 지정 DOI URI
 Use\ custom\ DOI\ base\ URI\ for\ article\ access=기사 접근을 위해 사용자 정의 DOI 기본 URI 사용
 
 Cited\ on\ pages=페이지에 인용됨
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 Unable\ to\ find\ valid\ certification\ path\ to\ requested\ target(%0),\ download\ anyway?=요청하신 (%0)에서 유효한 인증 경로를 발견하지 못했습니다. 그래도 다운로드 하시겠습니까?
 Download\ operation\ canceled.=다운로드 취소
 
@@ -2324,7 +2335,6 @@ Entry\ Type=목록 유형
 Entry\ types=목록 유형들
 Field\ names=필드 이름
 Others=기타
-Overwrite\ existing\ field\ values=기존의 필드 값 덮어쓰기
 Recommended=권장
 
 Authors\ and\ Title=작가와 제목
@@ -2367,6 +2377,7 @@ Grobid\ URL=Grobid 주소(URL)
 Remote\ services=원격 서비스
 Allow\ sending\ PDF\ files\ and\ raw\ citation\ strings\ to\ a\ JabRef\ online\ service\ (Grobid)\ to\ determine\ Metadata.\ This\ produces\ better\ results.=더 좋은 결과를 위해서 JabRef의 온라인 서비스(Grobid)에 전송한 PDF 파일과 인용 문구들이 메타데이터를 결정할 수 있도록 하세요.
 
+
 Character\ by\ character=한 문자씩
 Embedded=내장
 Entry=목록
@@ -2380,3 +2391,9 @@ Could\ not\ extract\ Metadata\ from\:\ %0=%0 에서 메타데이터를 가져오
 Search\ across\ libraries\ in\ a\ new\ window=새 창에서 검색 결과 확인
 Keep\ search\ string\ across\ libraries=라이브러리 내에서 문자열 검색
 Keep\ dialog\ always\ on\ top=대화창 위로 고정
+
+
+
+
+
+
diff --git a/src/main/resources/l10n/JabRef_nl.properties b/src/main/resources/l10n/JabRef_nl.properties
index 88b01a3ad4e..312e3c7e358 100644
--- a/src/main/resources/l10n/JabRef_nl.properties
+++ b/src/main/resources/l10n/JabRef_nl.properties
@@ -1,3 +1,4 @@
+Could\ not\ delete\ empty\ entries.=Kan lege invoer niet verwijderen.
 
 
 
@@ -12,7 +13,7 @@
 %0\ doesn't\ contain\ the\ term\ <b>%1</b>=%0 bevat de term <b>%1</b> niet
 
 
-%0\ export\ successful=%0 export succesvol
+
 
 %0\ matches\ the\ regular\ expression\ <b>%1</b>=%0 komt overeen met de standaard-uitdruk <b>%1</b>
 
@@ -136,8 +137,6 @@ Cite\ command=Citeer opdracht
 
 Clear=Wissen
 
-Clear\ fields=Velden wissen
-
 
 Close\ dialog=Sluit dialoog
 
@@ -156,6 +155,7 @@ Copied=Gekopieerd
 
 Copy=Kopiëren
 
+Copy\ title=Titel kopiëren
 Copy\ citation\ key=Kopiëer citatiesleutel
 
 Copy\ to\ clipboard=Kopiëren naar klembord
@@ -208,7 +208,7 @@ Library\ properties=Bibliotheek eigenschappen
 
 Default=Standaard
 
-Default\ encoding=Standaard encodering
+The\ chosen\ encoding\ '%0'\ could\ not\ encode\ the\ following\ characters\:=De gekozen codering '%0' kan de volgende tekens niet coderen\:
 
 Downloading=Downloaden
 
@@ -490,6 +490,8 @@ Moved\ group\ "%0".=Verplaatste Groep "%0".
 
 
 
+
+
 Name=Naam
 
 Name\ formatter=Naam formateerder
@@ -575,8 +577,6 @@ Path\ to\ %0\ not\ defined=Pad naar %0 niet gedefinieerd
 
 Path\ to\ LyX\ pipe=Pad naar LyX-pipe
 
-PDF\ does\ not\ exist=PDF bestaat niet
-
 File\ has\ no\ attached\ annotations=Bestand heeft geen gekoppelde aantekeningen
 
 Please\ enter\ a\ name\ for\ the\ group.=Geef a.u.b. een naam voor de groep.
@@ -638,11 +638,18 @@ Remove\ selected\ entries\ from\ this\ group=Geselecteerde items uit deze groep
 
 Remove\ group=Verwijder groep
 
-Remove\ group\ "%0"?=Verwijder groep "%0"?
+Remove\ group\ and\ subgroups=Verwijder groep en subgroepen
+
+
+
+
+
 
 Remove\ group\ "%0"\ and\ its\ subgroups?=Verwijder groep "%0" en zijn subgroepen?
 
-Remove\ group\ and\ subgroups=Verwijder groep en subgroepen
+Removed\ group\ "%0"\ and\ its\ subgroups.=Groep "%0" en zijn subgroepen verwijderd.
+
+
 
 Remove\ link=Verwijder link
 
@@ -651,8 +658,6 @@ Remove\ old\ entry=Verwijder oude invoer
 
 Removed\ group\ "%0".=Groep "%0" verwijderd.
 
-Removed\ group\ "%0"\ and\ its\ subgroups.=Groep "%0" en zijn subgroepen verwijderd.
-
 Removed\ string=Tekenreeks verwijderd
 
 Renamed\ string=Tekenreeks hernoemd
@@ -719,9 +724,6 @@ Select\ file\ from\ ZIP-archive=Selecteer bestand van ZIP-archief
 
 Select\ the\ tree\ nodes\ to\ view\ and\ accept\ or\ reject\ changes=Selecteer de boom knopen om veranderingen te tonen en te accepteren of afwijzen
 
-Set\ field=Veld instellen
-Set\ fields=Velden instellen
-
 Settings=Instellingen
 
 Shortcut=Snelkoppeling
@@ -754,7 +756,6 @@ Size=Grootte
 Skipped\ -\ No\ PDF\ linked=Overgeslagen - Geen PDF gelinkt
 Skipped\ -\ PDF\ does\ not\ exist=Overgeslagen - PDF bestaat niet
 
-Skipped\ entry.=Overgeslagen invoer.
 
 
 source\ edit=broncode aanpassen
@@ -767,8 +768,6 @@ Status=Status
 
 Switches\ between\ full\ and\ abbreviated\ journal\ name\ if\ the\ journal\ name\ is\ known.=Schakelt tussen volledige en afgekorte logboeknaam als het logboek bekend is.
 
-The\ chosen\ encoding\ '%0'\ could\ not\ encode\ the\ following\ characters\:=De gekozen codering '%0' kan de volgende tekens niet coderen\:
-
 
 the\ field\ <b>%0</b>=het veld <b>%0</b>
 The\ group\ "%0"\ already\ contains\ the\ selection.=De groep "%0" bevat reeds de selectie.
@@ -874,10 +873,6 @@ MIME\ type=MIME type
 No\ full\ text\ document\ found=Geen volledig tekstdocument gevonden
 Download\ from\ URL=Download vanaf URL
 Rename\ field=Veld hernoemen
-Append\ field=Veld toevoegen
-Append\ to\ fields=Toevoegen aan velden
-Rename\ field\ to=Veld hernoemen naar
-Move\ contents\ of\ a\ field\ into\ a\ field\ with\ a\ different\ name=Verplaats de inhoud van een veld naar een veld met een andere naam
 
 Cannot\ use\ port\ %0\ for\ remote\ operation;\ another\ application\ may\ be\ using\ it.\ Try\ specifying\ another\ port.=Kan poort %0 niet gebruiken voor bediening op afstand; een andere applicatie heeft deze mogelijk in gebruik. Probeer een andere poort op te geven.
 
@@ -937,7 +932,6 @@ Manage\ citations=Citaten beheren
 Problem\ modifying\ citation=Probleem met citaat wijzigen
 Citation=Citaat
 Connecting...=Verbinden...
-Could\ not\ resolve\ BibTeX\ entry\ for\ citation\ marker\ '%0'.=Kon BibTeX item for citaat marker '%0' niet oplossen.
 Select\ style=Selecteer stijl
 Journals=Logboeken
 Cite=Citeren
@@ -949,16 +943,25 @@ Select\ Writer\ document=Selecteer Writer document
 Sync\ OpenOffice/LibreOffice\ bibliography=Synchroniseren OpenOffice/LibreOffice bibliografie
 Select\ which\ open\ Writer\ document\ to\ work\ on=Selecteer aan welk open Writer document u wilt werken
 Connected\ to\ document=Verbonden met document
+
+
+
 Insert\ a\ citation\ without\ text\ (the\ entry\ will\ appear\ in\ the\ reference\ list)=Invoegen van een citaat zonder tekst (de vermelding wordt weergegeven in de referentielijst)
 Cite\ selected\ entries\ with\ extra\ information=Citeer geselecteerde invoergegevens met extra informatie
 Ensure\ that\ the\ bibliography\ is\ up-to-date=Zorg ervoor dat de bibliografie actueel is
+
+
+
+
+
 Unable\ to\ synchronize\ bibliography=Niet in staat om bibliografie te synchroniseren
 Combine\ pairs\ of\ citations\ that\ are\ separated\ by\ spaces\ only=Combineer citaat-koppels die alleen door spaties worden gescheiden
 Autodetection\ failed=Autodetectie mislukt
 Please\ wait...=Even geduld...
 Connection\ lost=Verbinding verbroken
-The\ paragraph\ format\ is\ controlled\ by\ the\ property\ 'ReferenceParagraphFormat'\ or\ 'ReferenceHeaderParagraphFormat'\ in\ the\ style\ file.=De alinea-opmaak wordt bepaald door de eigenschap 'ReferentieAlineaOpmaak' of 'ReferentieRubriekAlineaOpmaak' in het stijlbestand.
-The\ character\ format\ is\ controlled\ by\ the\ citation\ property\ 'CitationCharacterFormat'\ in\ the\ style\ file.=De tekenopmaak wordt beheerd door de citatie-eigenschap 'CitatieTekenOpmaak' in het stijlbestand.
+
+
+
 Automatically\ sync\ bibliography\ when\ inserting\ citations=Synchroniseer bibliografie automatisch bij het invoegen van citaten
 Look\ up\ BibTeX\ entries\ in\ the\ active\ tab\ only=BibTeX invoergegevens enkel in het actieve tabblad opzoeken
 Look\ up\ BibTeX\ entries\ in\ all\ open\ libraries=BibTex invoergegevens in alle open bibliotheken opzoeken
@@ -1043,6 +1046,7 @@ Toggle\ quality\ assured=Kwaliteit in-/uitschakelen
 Toggle\ print\ status=Printstatus in-/uitschakelen
 Update\ keywords=Sleutelwoorden bijwerken
 Connection\ to\ OpenOffice/LibreOffice\ has\ been\ lost.\ Please\ make\ sure\ OpenOffice/LibreOffice\ is\ running,\ and\ try\ to\ reconnect.=De verbinding met OpenOffice/LibreOffice is verbroken. Controleer of OpenOffice/LibreOffice draait, en probeer opnieuw verbinding te maken.
+
 JabRef\ will\ send\ at\ least\ one\ request\ per\ entry\ to\ a\ publisher.=JabRef stuurt ten minste één verzoek per invoer naar een uitgever.
 Correct\ the\ entry,\ and\ reopen\ editor\ to\ display/edit\ source.=Corrigeer de invoer en open de editor opnieuw om de bron weer te geven/te bewerken.
 Could\ not\ connect\ to\ running\ OpenOffice/LibreOffice.=Verbinden met actieve OpenOffice/LibreOffice mislukt.
@@ -1054,8 +1058,6 @@ Not\ connected\ to\ any\ Writer\ document.\ Please\ make\ sure\ a\ document\ is\
 Removed\ all\ subgroups\ of\ group\ "%0".=Alle subgroepen van groep "%0" verwijderd.
 To\ disable\ the\ memory\ stick\ mode\ rename\ or\ remove\ the\ jabref.xml\ file\ in\ the\ same\ folder\ as\ JabRef.=Om de geheugenstick modus in te schakelen, hernoem of verwijder het jabref.xml bestand in dezelfde folder als JabRef.
 Unable\ to\ connect.\ One\ possible\ reason\ is\ that\ JabRef\ and\ OpenOffice/LibreOffice\ are\ not\ both\ running\ in\ either\ 32\ bit\ mode\ or\ 64\ bit\ mode.=Verbinden niet mogelijk. Een mogelijke reden is, dat JabRef en OpenOffice/LibreOffice niet beiden in 32 bit modus ofwel 64 bit modus draaien.
-Your\ style\ file\ specifies\ the\ character\ format\ '%0',\ which\ is\ undefined\ in\ your\ current\ OpenOffice/LibreOffice\ document.=Uw stijlbestand specificeert de tekenopmaak '%0', die in huw huidige OpenOffice/LibreOffice document ongedefinieerd is.
-Your\ style\ file\ specifies\ the\ paragraph\ format\ '%0',\ which\ is\ undefined\ in\ your\ current\ OpenOffice/LibreOffice\ document.=Uw stijlbestand specificeert de alinea-opmaak '%0', die in uw huidige OpenOffice/LibreOffice document ongedefinieerd is.
 
 Searching...=Zoeken...
 Please\ enter\ a\ search\ string=Voer een zoekterm in
@@ -1085,6 +1087,7 @@ Proxy\ requires\ authentication=Proxy vereist authenticatie
 Attention\:\ Password\ is\ stored\ in\ plain\ text\!=Opgelet\: Wachtwoord wordt opgeslagen in platte tekst\!
 Clear\ connection\ settings=Verbindingsinstellingen wissen
 
+
 Open\ folder=Map openen
 Export\ sort\ order=Sorteervolgorde exporteren
 
@@ -1157,7 +1160,7 @@ Save\ changes=Wijzigingen opslaan
 Discard\ changes=Verwerp wijzigingen
 Library\ '%0'\ has\ changed.=Bibliotheek '%0' is veranderd.
 Print\ entry\ preview=Afdrukvoorbeeld printen
-Copy\ title=Titel kopiëren
+
 Invalid\ DOI\:\ '%0'.=Ongeldig DOI\: '%0'.
 should\ start\ with\ a\ name=moet beginnen met een naam
 should\ end\ with\ a\ name=moet eindigen met een naam
@@ -1398,6 +1401,11 @@ Export\ cited=Citatie exporteren
 Unable\ to\ generate\ new\ library=Niet mogelijk om een nieuwe bibliotheek te genereren
 
 
+
+
+
+
+
 Error\ occured\ while\ executing\ the\ command\ "%0".=Er is een fout opgetreden tijdens het uitvoeren van commando "%0".
 Reformat\ ISSN=ISSN formatteren
 
@@ -1484,7 +1492,6 @@ Protected\ terms\ file=Beschermde voorwaarden bestand
 Style\ file=Bestandsstijl
 
 Open\ OpenOffice/LibreOffice\ connection=OpenOffice/LibreOffice verbinding openen
-You\ must\ enter\ at\ least\ one\ field\ name=U moet ten minste één veldnaam opgeven
 Non-ASCII\ encoded\ character\ found=Niet-ASCII gecodeerd teken gevonden
 Toggle\ web\ search\ interface=Web zoek interface in-/uitschakelen
 
@@ -1605,7 +1612,6 @@ Removes\ all\ hyphenated\ line\ breaks\ in\ the\ field\ content.=Verwijdert alle
 Could\ not\ retrieve\ entry\ data\ from\ '%0'.=Kon geen data ophalen van '%0'.
 Entry\ from\ %0\ could\ not\ be\ parsed.=Invoer van %0 kon niet worden geparseerd.
 Invalid\ identifier\:\ '%0'.=Ongeldig Id\: '%0'.
-This\ paper\ has\ been\ withdrawn.=Dit artikel is ingetrokken.
 Aux\ file=Aux bestand
 Group\ containing\ entries\ cited\ in\ a\ given\ TeX\ file=Groep bevat invoergegevens aangehaald in een bepaald TeX-bestand
 
@@ -1631,9 +1637,6 @@ Could\ not\ connect\ to\ Vim\ server.\ Make\ sure\ that\ Vim\ is\ running\ with\
 Could\ not\ connect\ to\ a\ running\ gnuserv\ process.\ Make\ sure\ that\ Emacs\ or\ XEmacs\ is\ running,\ and\ that\ the\ server\ has\ been\ started\ (by\ running\ the\ command\ 'server-start'/'gnuserv-start').=Kan geen verbinding maken met een lopend proces van gnuserv. Zorg ervoor dat Emacs of XEmacs wordt uitgevoerd, en dat de server is gestart (door het uitvoeren van de opdracht 'server-start' / 'gnuserv-start').
 Error\ pushing\ entries=Foutieve invoergegevens ingevoerd
 
-Undefined\ character\ format=Ongedefinieerde tekenopmaak
-Undefined\ paragraph\ format=Ongedefinieerde alineaopmaak
-
 Markings=Markeringen
 Use\ selected\ instance=Gebruik geselecteerd exemplaar
 
@@ -1653,7 +1656,6 @@ Check\ integrity=Integriteitscontrole
 Cleanup\ URL\ link=Opschonen URL-koppeling
 Cleanup\ URL\ link\ by\ removing\ special\ symbols\ and\ extracting\ simple\ link=URL-koppeling opschonen door speciale symbolen te verwijderen en een eenvoudige koppeling te extraheren
 Copy\ DOI\ url=DOI url kopiëren
-Copy\ citation=Citatie kopiëren
 Development\ version=Onwikkelingsversie
 Export\ selected\ entries=Exporteer geseleteerde records
 Export\ selected\ entries\ to\ clipboard=Exporteer geselecteerde invoergegevens naar het klembord
@@ -1721,6 +1723,27 @@ Default\ pattern=Standaard patroon
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
diff --git a/src/main/resources/l10n/JabRef_no.properties b/src/main/resources/l10n/JabRef_no.properties
index a9833054749..d8de347be33 100644
--- a/src/main/resources/l10n/JabRef_no.properties
+++ b/src/main/resources/l10n/JabRef_no.properties
@@ -12,7 +12,7 @@
 %0\ doesn't\ contain\ the\ term\ <b>%1</b>=%0 inneholder ikke uttrykket <b>%1</b>
 
 
-%0\ export\ successful=%0-eksport lyktes
+
 
 %0\ matches\ the\ regular\ expression\ <b>%1</b>=%0 matcher regulæruttrykket <b>%1</b>
 
@@ -127,8 +127,6 @@ Cite\ command=Siteringskommando
 
 Clear=Opphev
 
-Clear\ fields=Slett felter
-
 
 Close\ dialog=Lukk dialog
 
@@ -197,7 +195,7 @@ Library\ properties=Egenskaper for bibliotek
 
 Default=Tilbakestill
 
-Default\ encoding=Standard koding
+The\ chosen\ encoding\ '%0'\ could\ not\ encode\ the\ following\ characters\:=Den valgte tegnkodingen '%0' kunne ikke kode følgende tegn\:
 
 
 Execute\ default\ action\ in\ dialog=Utfør standardhandlingen i dialogen
@@ -466,6 +464,8 @@ Moved\ group\ "%0".=Flyttet gruppen "%0".
 
 
 
+
+
 Name=Navn
 
 Name\ formatter=Navneformaterer
@@ -552,8 +552,6 @@ Path\ to\ %0\ not\ defined=Sti til %0 ikke definert
 
 Path\ to\ LyX\ pipe=Sti til LyX-pipe
 
-PDF\ does\ not\ exist=PDF-filen finnes ikke
-
 
 Please\ enter\ a\ name\ for\ the\ group.=Skriv inn et navn for gruppen.
 
@@ -605,11 +603,18 @@ Remove\ selected\ entries\ from\ this\ group=Fjern valgte oppføringer fra denne
 
 Remove\ group=Fjern gruppe
 
-Remove\ group\ "%0"?=Fjern gruppen "%0"?
+Remove\ group\ and\ subgroups=Fjern gruppe og undergrupper
+
+
+
+
+
 
 Remove\ group\ "%0"\ and\ its\ subgroups?=Fjern gruppen "%0" og dens undergrupper?
 
-Remove\ group\ and\ subgroups=Fjern gruppe og undergrupper
+Removed\ group\ "%0"\ and\ its\ subgroups.=Fjernet gruppen "%0" og dens undergrupper
+
+
 
 Remove\ link=Slett link
 
@@ -618,8 +623,6 @@ Remove\ old\ entry=Fjern gammel enhet
 
 Removed\ group\ "%0".=Fjernet gruppen "%0"
 
-Removed\ group\ "%0"\ and\ its\ subgroups.=Fjernet gruppen "%0" og dens undergrupper
-
 Removed\ string=Fjernet streng
 
 Renamed\ string=Endret navn på streng
@@ -682,9 +685,6 @@ Select\ file\ from\ ZIP-archive=Velg fil fra ZIP-fil
 
 Select\ the\ tree\ nodes\ to\ view\ and\ accept\ or\ reject\ changes=Velg trenodene for å inspisere og akseptere eller avslå endringer
 
-Set\ field=Sett felt
-Set\ fields=Sett felter
-
 Settings=Innstillinger
 
 Shortcut=Snarvei
@@ -715,7 +715,6 @@ Size=Størrelse
 Skipped\ -\ No\ PDF\ linked=Hoppet over - ingen PDF-fil linket
 Skipped\ -\ PDF\ does\ not\ exist=Hoppet over - PDF-filen finnes ikke
 
-Skipped\ entry.=Hoppet over enhet.
 
 
 source\ edit=redigering av kilde
@@ -728,8 +727,6 @@ Status=Status
 
 Switches\ between\ full\ and\ abbreviated\ journal\ name\ if\ the\ journal\ name\ is\ known.=Bytter mellom fullt og forkortet journalnavn dersom navnet er kjent.
 
-The\ chosen\ encoding\ '%0'\ could\ not\ encode\ the\ following\ characters\:=Den valgte tegnkodingen '%0' kunne ikke kode følgende tegn\:
-
 
 the\ field\ <b>%0</b>=feltet <b>%0</b>
 The\ group\ "%0"\ already\ contains\ the\ selection.=Gruppen "%0" inneholder allerede de valgte enhetene.
@@ -831,8 +828,6 @@ This\ feature\ lets\ new\ files\ be\ opened\ or\ imported\ into\ an\ already\ ru
 
 Download\ from\ URL=Last ned fra URL
 Rename\ field=Endre navn på felt
-Rename\ field\ to=Endre navn på felt til
-Move\ contents\ of\ a\ field\ into\ a\ field\ with\ a\ different\ name=Flytt innholdet i et felt til et annet felt
 
 Cannot\ use\ port\ %0\ for\ remote\ operation;\ another\ application\ may\ be\ using\ it.\ Try\ specifying\ another\ port.=Kan ikke bruke port %0 for fjernstyring; den kan være i bruk av et annet program. Pr¸v å spesifisere en annen port.
 
@@ -888,7 +883,6 @@ Manage\ citations=Administrer referanser
 Problem\ modifying\ citation=Det oppsto et problem ved endring av referansen
 Citation=Referanse
 Connecting...=Kobler til...
-Could\ not\ resolve\ BibTeX\ entry\ for\ citation\ marker\ '%0'.=Kunne ikke finne BibTeX-enhet for referansen '%0'.
 Select\ style=Velg stil
 Journals=Tidsskrifter
 Cite=Referer
@@ -900,16 +894,25 @@ Select\ Writer\ document=Velg Writer-dokument
 Sync\ OpenOffice/LibreOffice\ bibliography=Synkroniser OpenOffice/LibreOffice-bibliografi
 Select\ which\ open\ Writer\ document\ to\ work\ on=Velg hvilket åpent Writer-dokument du vil jobbe med
 Connected\ to\ document=Koblet til dokument
+
+
+
 Insert\ a\ citation\ without\ text\ (the\ entry\ will\ appear\ in\ the\ reference\ list)=Sett inn en referanse uten tekst (enheten vil bli med i referanselisten)
 Cite\ selected\ entries\ with\ extra\ information=Referer valgte enheter med ekstra informasjon
 Ensure\ that\ the\ bibliography\ is\ up-to-date=Sørg for at bibliografien er oppdatert
+
+
+
+
+
 Unable\ to\ synchronize\ bibliography=Kunne ikke synkronisere bibliografien
 Combine\ pairs\ of\ citations\ that\ are\ separated\ by\ spaces\ only=Slå sammen par av referanser som bare er adskilt av mellomrom
 Autodetection\ failed=Autodeteksjon mislyktes
 Please\ wait...=Vennligst vent...
 Connection\ lost=Mistet forbindelsen
-The\ paragraph\ format\ is\ controlled\ by\ the\ property\ 'ReferenceParagraphFormat'\ or\ 'ReferenceHeaderParagraphFormat'\ in\ the\ style\ file.=Dette avsnittsformatet styres av innstillingen 'ReferenceParagraphFormat' eller 'ReferenceHeaderParagraphFormat' i stilfilen.
-The\ character\ format\ is\ controlled\ by\ the\ citation\ property\ 'CitationCharacterFormat'\ in\ the\ style\ file.=Tegnformatet styres av referanseinnstillingen 'CitationCharacterFormat' i stilfilen.
+
+
+
 Automatically\ sync\ bibliography\ when\ inserting\ citations=Sykroniser automatisk bibliografien når nye referanser legges til
 Look\ up\ BibTeX\ entries\ in\ the\ active\ tab\ only=Se etter BibTeX-oppføringer bare i det aktive biblioteket
 Look\ up\ BibTeX\ entries\ in\ all\ open\ libraries=Se etter BibTeX-oppføringer i alle åpne biblioteker
@@ -948,6 +951,7 @@ Manage\ keywords=Administrer nøkkelord
 
 
 
+
 Merge\ entries=Slå sammen oppføringer
 
 
@@ -956,6 +960,7 @@ Finished\ automatically\ setting\ external\ links.=Fullførte automatisk setting
 
 
 
+
 Open\ folder=Åpne mapp
 Export\ sort\ order=Sorteringsrekkefølge ved eksport
 
@@ -969,6 +974,7 @@ Path\ to\ %0=Sti til %0
 
 
 Could\ not\ connect\ to\ %0=Kunne ikke koble til %0
+
 Invalid\ DOI\:\ '%0'.=Ugyldig DOI\: '%0'.
 
 
@@ -1011,6 +1017,11 @@ Unable\ to\ generate\ new\ library=Kan ikke generere det nye biblioteket
 
 
 
+
+
+
+
+
 Host=Vert
 Port=Port
 Library=Bibliotek
@@ -1077,8 +1088,6 @@ Restore\ from\ backup=Gjenopprett fra sikkerhetskopi
 
 
 
-Undefined\ paragraph\ format=Udefinert avsnittsformat
-
 Markings=Markeringer
 
 Open\ file\ %0=Åpne fil %0
@@ -1157,6 +1166,27 @@ Default\ pattern=Standardmønster
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
diff --git a/src/main/resources/l10n/JabRef_pl.properties b/src/main/resources/l10n/JabRef_pl.properties
index f9c0c9001cd..e8a82418acc 100644
--- a/src/main/resources/l10n/JabRef_pl.properties
+++ b/src/main/resources/l10n/JabRef_pl.properties
@@ -13,6 +13,7 @@
 
 
 
+
 Abbreviation=Skrót
 
 About\ JabRef=O JabRef
@@ -95,8 +96,6 @@ Change\ entry\ type=Zmień typ wpisu
 
 Clear=Wyczyść
 
-Clear\ fields=Wyczyść pola
-
 
 Close\ dialog=Zamknij okno
 
@@ -114,6 +113,7 @@ Copied=Skopiowano
 
 Copy=Kopiuj
 
+Copy\ title=Kopiuj tytuł
 
 Copy\ to\ clipboard=Skopiuj do schowka
 
@@ -151,7 +151,6 @@ Library\ properties=Właściwości biblioteki
 
 Default=Domyślne
 
-Default\ encoding=Domyślne kodowanie
 
 Downloading=Pobieranie
 
@@ -368,6 +367,8 @@ Moved\ group\ "%0".=Przeniesiono grupę "%0".
 
 
 
+
+
 Name=Nazwa
 
 
@@ -430,8 +431,6 @@ paste\ entries=wklej wpisy
 
 
 
-PDF\ does\ not\ exist=PDF nie istnieje
-
 
 
 
@@ -472,9 +471,16 @@ Remove\ subgroups=Usuń podgrupy
 
 Remove\ group=Usuń grupę
 
+Remove\ group\ and\ subgroups=Usuń grupę i podgrupy
+
+
+
+
+
+
+
 
 
-Remove\ group\ and\ subgroups=Usuń grupę i podgrupy
 
 Remove\ link=Usuń łącze
 
@@ -484,7 +490,6 @@ Remove\ old\ entry=Usuń stary wpis
 
 
 
-
 Replace=Zamień
 Replace\ With\:=Zamień na\:
 Find\:=Znajdź\:
@@ -529,7 +534,6 @@ Select\ entry\ type=Wybierz typ wpisu
 
 
 
-
 Settings=Ustawienia
 
 Shortcut=Skrót
@@ -551,7 +555,6 @@ Simple\ HTML=Uproszczony HTML
 Size=Rozmiar
 
 
-Skipped\ entry.=Pominięty wpis.
 
 
 
@@ -571,7 +574,6 @@ Status=Status
 
 
 
-
 Time\ stamp=Znacznik czasu
 
 
@@ -628,7 +630,6 @@ MIME\ type=Typ MIME
 
 Download\ from\ URL=Pobierz z adresu URL
 Rename\ field=Zmień nazwę pola
-Append\ to\ fields=Dołącz do pól
 
 
 Please\ enter\ a\ valid\ file\ path.=Wprowadź prawidłową ścieżkę do pliku.
@@ -653,10 +654,21 @@ Citation=Cytowanie
 Connecting...=Łączenie...
 Select\ style=Wybierz styl
 Journals=Czasopisma
+
+
+
+
+
+
+
+
 Unable\ to\ synchronize\ bibliography=Nie można zsynchronizować bibliografii
 Combine\ pairs\ of\ citations\ that\ are\ separated\ by\ spaces\ only=Połącz pary cytatów oddzielonych tylko spacjami
 Please\ wait...=Proszę czekać...
 Connection\ lost=Utracono połączenie
+
+
+
 Select\ document=Wybierz dokument
 HTML\ list=Lista HTML
 Could\ not\ open\ %0=Nie można otworzyć %0
@@ -687,6 +699,7 @@ Priority\ low=Niski priorytet
 Priority\ medium=Średni priorytet
 Quality=Jakość
 Update\ keywords=Aktualizuj słowa kluczowe
+
 Error\ message\:=Komunikat o błędzie\:
 
 Searching...=Wyszukiwanie...
@@ -706,6 +719,7 @@ Hostname=Nazwa hosta
 
 Proxy\ configuration=Konfiguracja proxy
 
+
 Open\ folder=Otwórz folder
 
 Parsing\ error=Błąd parsowania
@@ -747,7 +761,7 @@ No\ problems\ found.=Nie znaleziono problemów.
 Save\ changes=Zapisz zmiany
 Discard\ changes=Odrzuć zmiany
 Print\ entry\ preview=Drukuj podgląd wpisu
-Copy\ title=Kopiuj tytuł
+
 No\ results\ found.=Nie znaleziono wyników.
 plain\ text=czysty tekst
 
@@ -846,6 +860,11 @@ Custom=Niestandardowe
 
 
 
+
+
+
+
+
 Enabled=Włączone
 undefined=niezdefiniowano
 
@@ -950,10 +969,8 @@ Overwrite\ file=Nadpisz plik
 
 
 
-
 Open\ file\ %0=Otwórz plik %0
 Blog=Blog
-Copy\ citation=Kopiuj cytat
 Manage\ journal\ abbreviations=Zarządzaj skrótami czasopism
 Quit=Wyjdź
 
@@ -1047,3 +1064,24 @@ Reset=Reset
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/resources/l10n/JabRef_pt.properties b/src/main/resources/l10n/JabRef_pt.properties
index a1a78112486..6fd581ffae8 100644
--- a/src/main/resources/l10n/JabRef_pt.properties
+++ b/src/main/resources/l10n/JabRef_pt.properties
@@ -12,7 +12,7 @@
 %0\ doesn't\ contain\ the\ term\ <b>%1</b>=%0 não contém o termo <b>%1</b>
 
 
-%0\ export\ successful=%0 exportado com sucesso
+
 
 %0\ matches\ the\ regular\ expression\ <b>%1</b>=%0 encontrada a expressão regular <b>%1</b>
 
@@ -131,8 +131,6 @@ Cite\ command=Comando citar
 
 Clear=Limpar
 
-Clear\ fields=Limpar campos
-
 
 Close\ dialog=Fechar janela de diálogo
 
@@ -151,6 +149,7 @@ Copied=Copiado
 
 Copy=Copiar
 
+Copy\ title=Copiar título
 
 Copy\ to\ clipboard=Copiar para a área de transferência
 
@@ -202,7 +201,7 @@ Library\ properties=Propriedades da base de dados
 
 Default=Padrão
 
-Default\ encoding=Codificação padrão
+The\ chosen\ encoding\ '%0'\ could\ not\ encode\ the\ following\ characters\:=A codificação '%0' não pode codificar os seguintes caracteres\:
 
 
 Execute\ default\ action\ in\ dialog=Executar a acão padrão na caixa de diálogo
@@ -478,6 +477,8 @@ move\ group=mover grupo
 Moved\ group\ "%0".=Grupo "%0" movido
 
 
+
+
 No\ recommendations\ received\ from\ Mr.\ DLib\ for\ this\ entry.=Não foram recebidas recomendações do Sr. DLib para esta entrada.
 
 Error\ while\ fetching\ recommendations\ from\ Mr.DLib.=Erro durante a procura de recomendações do Sr. DLib.
@@ -568,8 +569,6 @@ Path\ to\ %0\ not\ defined=Caminho para %0 não definido
 
 Path\ to\ LyX\ pipe=Caminho para o canal de transmissão LyX
 
-PDF\ does\ not\ exist=O PDF não existe
-
 File\ has\ no\ attached\ annotations=Arquivo não tem notas anexas
 
 Please\ enter\ a\ name\ for\ the\ group.=Por favor, digite um nome para o grupo.
@@ -629,11 +628,18 @@ Remove\ entry\ from\ import=Remover referência da importação
 
 Remove\ group=Remover grupo
 
-Remove\ group\ "%0"?=Remover grupo "%0"?
+Remove\ group\ and\ subgroups=Remover grupos e subgrupos
+
+
+
+
+
 
 Remove\ group\ "%0"\ and\ its\ subgroups?=Remover grupo "%0" e seus subgrupos?
 
-Remove\ group\ and\ subgroups=Remover grupos e subgrupos
+Removed\ group\ "%0"\ and\ its\ subgroups.=Grupo "%0" e seus subgrupos removidos.
+
+
 
 Remove\ link=Remover link
 
@@ -642,8 +648,6 @@ Remove\ old\ entry=Remover referência antiga
 
 Removed\ group\ "%0".=Grupo "%0" removido.
 
-Removed\ group\ "%0"\ and\ its\ subgroups.=Grupo "%0" e seus subgrupos removidos.
-
 Removed\ string=String removida
 
 Renamed\ string=String renomeada
@@ -696,9 +700,6 @@ Select\ file\ from\ ZIP-archive=Selecionar arquivo a partir de um arquivo ZIP
 
 Select\ the\ tree\ nodes\ to\ view\ and\ accept\ or\ reject\ changes=Selecione os nós da árvore para visualizar e aceitar ou rejeitar mudanças
 
-Set\ field=Configurar campo
-Set\ fields=Configurar campos
-
 Settings=Configurações
 
 Shortcut=Atalho
@@ -729,7 +730,6 @@ Size=Tamanho
 Skipped\ -\ No\ PDF\ linked=Omitido - Nenhum PDF linkado
 Skipped\ -\ PDF\ does\ not\ exist=Omitido - O PDF não existe
 
-Skipped\ entry.=Referência omitida.
 
 
 source\ edit=edição de fonte
@@ -741,8 +741,6 @@ Statically\ group\ entries\ by\ manual\ assignment=Agrupar referências manualme
 
 Switches\ between\ full\ and\ abbreviated\ journal\ name\ if\ the\ journal\ name\ is\ known.=Alterna entre nomes de periódicos abreviados e completos se o nome do periódico é conhecido.
 
-The\ chosen\ encoding\ '%0'\ could\ not\ encode\ the\ following\ characters\:=A codificação '%0' não pode codificar os seguintes caracteres\:
-
 
 the\ field\ <b>%0</b>=o campo <b>%0</b>
 The\ group\ "%0"\ already\ contains\ the\ selection.=O grupo "%0" já contém a seleção.
@@ -842,8 +840,6 @@ Unable\ to\ open\ link.=Não foi possível abrir link.
 This\ feature\ lets\ new\ files\ be\ opened\ or\ imported\ into\ an\ already\ running\ instance\ of\ JabRef\ instead\ of\ opening\ a\ new\ instance.\ For\ instance,\ this\ is\ useful\ when\ you\ open\ a\ file\ in\ JabRef\ from\ your\ web\ browser.\ Note\ that\ this\ will\ prevent\ you\ from\ running\ more\ than\ one\ instance\ of\ JabRef\ at\ a\ time.=Esta funcionalidade permite que novos arquivos sejam abertos ou importados para uma instância do JabRef já aberta ao invés de abrir uma nova instância. Por exemplo, isto é útil quando você abre um arquivo no JabRef a partir de ser navegador web. Note que isto irá previnir que você execute uma ou mais instâncias do JabRef ao mesmo tempo.
 
 Rename\ field=Renomear campo
-Rename\ field\ to=Renomear campo para
-Move\ contents\ of\ a\ field\ into\ a\ field\ with\ a\ different\ name=Mover conteúdo de um campo para um campo com nome diferente
 
 Cannot\ use\ port\ %0\ for\ remote\ operation;\ another\ application\ may\ be\ using\ it.\ Try\ specifying\ another\ port.=Não é possível utilizar a porta %0 para operação remota; outra aplicação pode estar usando-a. Tente utilizar uma outra porta.
 
@@ -901,7 +897,6 @@ Extra\ information\ (e.g.\ page\ number)=Informação adicional (e.g.) número d
 Manage\ citations=Gerenciar citações
 Problem\ modifying\ citation=Problema ao modificar citação
 Citation=Citação
-Could\ not\ resolve\ BibTeX\ entry\ for\ citation\ marker\ '%0'.=Não foi possível resolver a referência BibTeX para o marcador de citação '%0'.
 Select\ style=Selecionar estilo
 Journals=Periódicos
 Cite=Citar
@@ -913,16 +908,25 @@ Select\ Writer\ document=Selecionar documento Writer
 Sync\ OpenOffice/LibreOffice\ bibliography=Sincronizar bibliografia OpenOffice/LibreOffice
 Select\ which\ open\ Writer\ document\ to\ work\ on=Selecionar o documento Writer aberto a se trabalhar
 Connected\ to\ document=Conectado ao documento
+
+
+
 Insert\ a\ citation\ without\ text\ (the\ entry\ will\ appear\ in\ the\ reference\ list)=Inserir uma citação sem texto (a referência aparecerá na lista de referências)
 Cite\ selected\ entries\ with\ extra\ information=Citar as referências selecionadas com informações adicionais
 Ensure\ that\ the\ bibliography\ is\ up-to-date=Certifique-se que a bibliografia está atualizada
+
+
+
+
+
 Unable\ to\ synchronize\ bibliography=Não foi possível sincronizar a bibliografia
 Combine\ pairs\ of\ citations\ that\ are\ separated\ by\ spaces\ only=Combinar pares de citações que são separados apenas por espaços
 Autodetection\ failed=Falha na detecção automática
 Please\ wait...=Por favor, aguarde...
 Connection\ lost=Conexão perdida
-The\ paragraph\ format\ is\ controlled\ by\ the\ property\ 'ReferenceParagraphFormat'\ or\ 'ReferenceHeaderParagraphFormat'\ in\ the\ style\ file.=O formato de parágrafo é controlado pela propriedade 'ReferenceParagraphFormat' ou Reference HeaderParagraphFormat' no arquivo de estilos.
-The\ character\ format\ is\ controlled\ by\ the\ citation\ property\ 'CitationCharacterFormat'\ in\ the\ style\ file.=O formato do caracter é controlado pela propriedade de citação 'CitationCharacterFormat' no arquivo de estilos.
+
+
+
 Automatically\ sync\ bibliography\ when\ inserting\ citations=Sincronizar bibliografia automaticamente ao inserir citações
 Look\ up\ BibTeX\ entries\ in\ the\ active\ tab\ only=Pesquisar por referências BibTeX apenas na aba ativa
 Look\ up\ BibTeX\ entries\ in\ all\ open\ libraries=Pesquisar referências BibTeX em todas as bases de dados abertas
@@ -1006,6 +1010,7 @@ Toggle\ quality\ assured=Alteranar qualidade garantida
 Toggle\ print\ status=Status de leitura alternado
 Update\ keywords=Atualizar palavras-chave
 Connection\ to\ OpenOffice/LibreOffice\ has\ been\ lost.\ Please\ make\ sure\ OpenOffice/LibreOffice\ is\ running,\ and\ try\ to\ reconnect.=Conexão com o OpenOffice/LibreOffice foi perdida. Por favor certifique-se de que o OpenOffice/LibreOffice está rodando, e tente reconectar
+
 Correct\ the\ entry,\ and\ reopen\ editor\ to\ display/edit\ source.=Corrija a referência, e abra o editor novamente para mostrar/editar o fonte
 Could\ not\ connect\ to\ running\ OpenOffice/LibreOffice.=Não foi possível conectar ao OpenOffice/LibreOffice.
 Make\ sure\ you\ have\ installed\ OpenOffice/LibreOffice\ with\ Java\ support.=Assegure-se que o OpenOffice/LibreOffice está instalado com suporte Java.
@@ -1016,8 +1021,6 @@ Not\ connected\ to\ any\ Writer\ document.\ Please\ make\ sure\ a\ document\ is\
 Removed\ all\ subgroups\ of\ group\ "%0".=Todos os subgrupos do grupo "%0" foram removidos.
 To\ disable\ the\ memory\ stick\ mode\ rename\ or\ remove\ the\ jabref.xml\ file\ in\ the\ same\ folder\ as\ JabRef.=Para desabilitar o modo memory stick renomeie ou remova o arquivo jabref.xml no mesmo diretório que o JabRef
 Unable\ to\ connect.\ One\ possible\ reason\ is\ that\ JabRef\ and\ OpenOffice/LibreOffice\ are\ not\ both\ running\ in\ either\ 32\ bit\ mode\ or\ 64\ bit\ mode.=Não possível conectar. Uma possível razão é que o JabRef e o OpenOffice/LibreOffice não estão rodando no mesmo modo\: 32 bits ou 64 bits.
-Your\ style\ file\ specifies\ the\ character\ format\ '%0',\ which\ is\ undefined\ in\ your\ current\ OpenOffice/LibreOffice\ document.=Seu arquivo de estilo especifica o formato de caracter '%0', que não está definido no seu documento OpenOffice/LibreOffice atual
-Your\ style\ file\ specifies\ the\ paragraph\ format\ '%0',\ which\ is\ undefined\ in\ your\ current\ OpenOffice/LibreOffice\ document.=Seu arquivo de estilo especifica o formato de parágrafo '%0', que não está definido no seu documento OpenOffice/LibreOffice atual
 
 Searching...=Buscando...
 Please\ enter\ a\ search\ string=Favor digitar uma string de busca
@@ -1045,6 +1048,7 @@ Use\ custom\ proxy\ configuration=Usar configurações personalizadas de proxy
 Attention\:\ Password\ is\ stored\ in\ plain\ text\!=Atenção\: A senha é armazenada em texto simples\!
 Clear\ connection\ settings=Limpar configurações da conexão
 
+
 Open\ folder=Abrir diretório
 Export\ sort\ order=Exportar ordenação
 
@@ -1116,7 +1120,7 @@ Save\ changes=Salvar mudanças.
 Discard\ changes=Descartar mudanças
 Library\ '%0'\ has\ changed.=Base de dados '%0' mudou.
 Print\ entry\ preview=Imprimir preview da referência
-Copy\ title=Copiar título
+
 Invalid\ DOI\:\ '%0'.=DOI inválida\: '%0'.
 should\ start\ with\ a\ name=deve iniciar com um nome
 should\ end\ with\ a\ name=deve terminar com um nome
@@ -1225,6 +1229,11 @@ Online\ help\ forum=Forum de ajuda online
 
 
 
+
+
+
+
+
 Connect=Conectar
 
 
@@ -1259,12 +1268,10 @@ Existing\ file=Arquivo existente
 
 
 
-
 
 
 Check\ integrity=Verificação de integridade
 Copy\ DOI\ url=Copiar URL do DOI
-Copy\ citation=Copiar citação
 Development\ version=Versão de desenvolvimento
 Export\ selected\ entries=Exportar referências selecionadas
 JabRef\ resources=Recursos do JabRef
@@ -1311,6 +1318,27 @@ Default\ pattern=Ppadrão predefinido
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
diff --git a/src/main/resources/l10n/JabRef_pt_BR.properties b/src/main/resources/l10n/JabRef_pt_BR.properties
index 728fb357337..179f7dd8128 100644
--- a/src/main/resources/l10n/JabRef_pt_BR.properties
+++ b/src/main/resources/l10n/JabRef_pt_BR.properties
@@ -19,7 +19,7 @@ Unable\ to\ monitor\ file\ changes.\ Please\ close\ files\ and\ processes\ and\
 
 %0/%1\ entries=%0/%1 entradas
 
-%0\ export\ successful=%0 exportado com sucesso
+
 
 %0\ matches\ the\ regular\ expression\ <b>%1</b>=%0 encontrada a expressão regular <b>%1</b>
 
@@ -66,6 +66,7 @@ Added\ string=Adicionada string
 
 All\ entries=Todas as referências
 
+Also\ remove\ subgroups=Também remover subgrupos
 
 Always\ reformat\ BIB\ file\ on\ save\ and\ export=Reformatar sempre o arquivo BIB durante o salvar ou exportar
 
@@ -150,8 +151,6 @@ Cite\ command=Comando citar
 
 Clear=Limpar
 
-Clear\ fields=Limpar campos
-
 Open\ /\ close\ entry\ editor=Abrir / fechar o editor de referências
 
 Close\ dialog=Fechar janela de diálogo
@@ -171,7 +170,13 @@ Copied=Copiado
 
 Copy=Copiar
 
+Copy\ title=Copiar título
+Copy\ \\cite{citation\ key}=Copiar \\cite{citation key}
+Copy\ citation\ (html)=Copiar citação (html)
+Copy\ citation\ (text)=Copiar citação (texto)
 Copy\ citation\ key=Copiar chave de citação
+Copy\ citation\ key\ and\ link=Copiar chave de citação e link
+Copy\ citation\ key\ and\ title=Copiar chave de citação e título
 
 Copy\ to\ clipboard=Copiar para a área de transferência
 
@@ -222,10 +227,13 @@ DOI\ not\ found=DOI não encontrado
 Library\ encoding=Codificação da base de dados
 
 Library\ properties=Propriedades da base de dados
+%0\ -\ Library\ properties=%0 - Propriedades da biblioteca
 
 Default=Padrão
 
-Default\ encoding=Codificação padrão
+Character\ encoding\ UTF-8\ is\ not\ supported.=A codificação UTF-8 não é suportada.
+UTF-8\ could\ not\ be\ used\ to\ encode\ the\ following\ characters\:\ %0=UTF-8 não pode ser usado para codificar os seguintes caracteres\: %0
+The\ chosen\ encoding\ '%0'\ could\ not\ encode\ the\ following\ characters\:=A codificação '%0' não pode codificar os seguintes caracteres\:
 
 Downloading=Baixando
 
@@ -273,6 +281,7 @@ Downloaded\ website\ as\ an\ HTML\ file.=Site baixado como arquivo HTML.
 
 duplicate\ removal=remoção de duplicatas
 
+Duplicate\ fields=Duplicar campos
 
 Duplicate\ string\ name=Duplicar nome da string
 
@@ -456,6 +465,7 @@ Independent\ group\:\ When\ selected,\ view\ only\ this\ group's\ entries=Grupo
 I\ Agree=Concordo
 
 Indexing\ pdf\ files=Indexando arquivos pdf
+Indexing\ for\ %0=Indexando %0
 %0\ of\ %1\ linked\ files\ added\ to\ the\ index=%0 de %1 arquivos vinculados adicionados ao índice
 
 Invalid\ citation\ key=Chave de citação inválida
@@ -507,6 +517,7 @@ Main\ file\ directory=Diretório de arquivos principal
 Manage\ custom\ exports=Gerenciar exportações personalizadas
 
 Manage\ custom\ imports=Gerenciar importações personalizadas
+External\ file\ types=Tipos de arquivo externos
 
 Mark\ new\ entries\ with\ owner\ name=Marcar novas referências com o nome do usuário
 
@@ -529,6 +540,10 @@ Moved\ group\ "%0".=Grupo "%0" movido
 
 Mr.\ DLib\ Privacy\ settings=Configurações de privacidade do Mr. DLib
 
+No\ database\ is\ open=Nenhum banco de dados está aberto
+
+We\ need\ a\ database\ to\ export\ from.\ Open\ one.=Precisamos de um banco de dados para exportar. Abrir um.
+
 No\ recommendations\ received\ from\ Mr.\ DLib\ for\ this\ entry.=Não foram recebidas recomendações do Mr. DLib para esta referência.
 
 Error\ while\ fetching\ recommendations\ from\ Mr.DLib.=Erro durante a procura de recomendações do Mr. DLib.
@@ -621,8 +636,6 @@ Path\ to\ %0\ not\ defined=Caminho para %0 não definido
 
 Path\ to\ LyX\ pipe=Caminho para o canal de transmissão LyX
 
-PDF\ does\ not\ exist=O PDF não existe
-
 File\ has\ no\ attached\ annotations=Arquivo não tem notas anexas
 
 Please\ enter\ a\ name\ for\ the\ group.=Por favor, digite um nome para o grupo.
@@ -688,11 +701,18 @@ Remove\ selected\ entries\ from\ this\ group=Remover as referências selecionada
 
 Remove\ group=Remover grupo
 
-Remove\ group\ "%0"?=Remover grupo "%0"?
+Remove\ group\ and\ subgroups=Remover grupos e subgrupos
+
+
+
+
+
 
 Remove\ group\ "%0"\ and\ its\ subgroups?=Remover grupo "%0" e seus subgrupos?
 
-Remove\ group\ and\ subgroups=Remover grupos e subgrupos
+Removed\ group\ "%0"\ and\ its\ subgroups.=Grupo "%0" e seus subgrupos removidos.
+
+
 
 Remove\ link=Remover link
 
@@ -702,8 +722,6 @@ Remove\ string\ %0=Remover string %0
 
 Removed\ group\ "%0".=Grupo "%0" removido.
 
-Removed\ group\ "%0"\ and\ its\ subgroups.=Grupo "%0" e seus subgrupos removidos.
-
 Removed\ string=String removida
 
 Renamed\ string=String renomeada
@@ -726,6 +744,8 @@ Replaces\ Unicode\ ligatures\ with\ their\ expanded\ form=Substitui caracteres e
 
 Required\ fields=Campos obrigatórios
 
+Do\ not\ resolve\ BibTeX\ strings=Não resolver frases BibTeX
+Resolve\ BibTeX\ strings\ for\ the\ following\ fields=Resolver textos BibTeX para os seguintes campos
 
 resolved=resolvido
 
@@ -739,6 +759,7 @@ Review=Revisar
 Review\ changes=Revisar mudanças
 Review\ Field\ Migration=Revisar Migração de Campo
 
+Loading=Carregando
 
 Save=Salvar
 Save\ all\ finished.=Salvar todos os concluídos.
@@ -752,6 +773,7 @@ Save\ library\ as...=Salvar base de dados como...
 Saving=Salvando...
 Saving\ all\ libraries...=Salvando todas as bases de dados...
 Saving\ library=Salvando base de dados...
+Library\ saved=Biblioteca salva
 Saved\ selected\ to\ '%0'.=Seleção salva para '%0'.
 
 Search=Pesquisar
@@ -771,9 +793,6 @@ Select\ file\ from\ ZIP-archive=Selecionar arquivo a partir de um arquivo ZIP
 
 Select\ the\ tree\ nodes\ to\ view\ and\ accept\ or\ reject\ changes=Selecione os nós da árvore para visualizar e aceitar ou rejeitar mudanças
 
-Set\ field=Configurar campo
-Set\ fields=Configurar campos
-
 Settings=Configurações
 
 Shortcut=Atalho
@@ -806,7 +825,6 @@ Size=Tamanho
 Skipped\ -\ No\ PDF\ linked=Omitido - Nenhum PDF linkado
 Skipped\ -\ PDF\ does\ not\ exist=Omitido - O PDF não existe
 
-Skipped\ entry.=Referência omitida.
 
 Sort\ subgroups=Ordenar subgrupos
 
@@ -821,8 +839,6 @@ Sublibrary\ from\ AUX\ to\ BibTeX=Subbiblioteca de AUX para BibTeX
 
 Switches\ between\ full\ and\ abbreviated\ journal\ name\ if\ the\ journal\ name\ is\ known.=Alterna entre nomes de periódicos abreviados e completos se o nome do periódico é conhecido.
 
-The\ chosen\ encoding\ '%0'\ could\ not\ encode\ the\ following\ characters\:=A codificação '%0' não pode codificar os seguintes caracteres\:
-
 
 the\ field\ <b>%0</b>=o campo <b>%0</b>
 The\ group\ "%0"\ already\ contains\ the\ selection.=O grupo "%0" já contém a seleção.
@@ -839,6 +855,7 @@ The\ search\ is\ case\ insensitive.=A busca não é sensível ao caso.
 
 The\ search\ is\ case\ sensitive.=A busca é sensível ao caso.
 
+There\ are\ possible\ duplicates\ that\ haven't\ been\ resolved.\ Continue?=Existem possíveis duplicatas que não foram resolvidas. Continuar?
 
 This\ operation\ requires\ all\ selected\ entries\ to\ have\ citation\ keys\ defined.=Esta operação requer que todas as referências selecionadas tenham chaves de citação definidas.
 
@@ -896,12 +913,14 @@ Warning=Alerta
 
 Warnings=Alertas
 
+Warning\:\ You\ added\ field\ "%0"\ twice.\ Only\ one\ will\ be\ kept.=Aviso\: Você adicionou o campo "%0" duas vezes. Apenas um será mantido.
 
 web\ link=link web
 
 What\ do\ you\ want\ to\ do?=O que você deseja fazer?
 Whatever\ option\ you\ choose,\ Mr.\ DLib\ may\ share\ its\ data\ with\ research\ partners\ to\ further\ improve\ recommendation\ quality\ as\ part\ of\ a\ 'living\ lab'.\ Mr.\ DLib\ may\ also\ release\ public\ datasets\ that\ may\ contain\ anonymized\ information\ about\ you\ and\ the\ recommendations\ (sensitive\ information\ such\ as\ metadata\ of\ your\ articles\ will\ be\ anonymised\ through\ e.g.\ hashing).\ Research\ partners\ are\ obliged\ to\ adhere\ to\ the\ same\ strict\ data\ protection\ policy\ as\ Mr.\ DLib.=Seja qual for a opção que você escolher, o Mr. DLib pode compartilhar seus dados com parceiros de pesquisa para melhorar a qualidade das recomendações como parte de um "laboratório vivo". O Mr. DLib também pode lançar conjuntos de dados públicos que possam conter informações anônimas sobre você e as recomendações (informações confidenciais, como os metadados dos seus artigos, serão anonimizados através de, por exemplo, hashing). Os parceiros de investigação são obrigados a respeitar a mesma política rigorosa de protecção de dados que o Mr. DLib.
 
+Will\ write\ metadata\ to\ the\ PDFs\ linked\ from\ selected\ entries.=Irá gravar os metadados nos PDFs vinculados a partir de entradas selecionadas.
 
 Write\ BibTeXEntry\ as\ metadata\ to\ PDF.=Escrever BibTeXEntry como metadados para PDF.
 Write\ metadata\ for\ all\ PDFs\ in\ current\ library?=Escrever metadados para todos os PDFs na biblioteca atual?
@@ -909,6 +928,7 @@ Writing\ metadata\ for\ selected\ entries...=Escrevendo metadados para as entrad
 Writing\ metadata...=Escrevendo metadados...
 
 Embed\ BibTeXEntry\ in\ PDF.=Incorporar BibTeXEntry ao PDF.
+File\ '%0'\ is\ write\ protected.=O arquivo '%0' está protegido contra escrita.
 Write\ BibTeXEntry\ as\ XMP\ metadata\ to\ PDF.=Escrever o BibTeXEntry como metadado XMP no PDF.
 Write\ BibTeXEntry\ metadata\ to\ PDF.=Escrever metadados BibTeXEntry no PDF.
 Write\ metadata\ to\ PDF\ files=Escrever metadados para arquivos PDF
@@ -921,6 +941,8 @@ You\ must\ restart\ JabRef\ for\ this\ to\ come\ into\ effect.=Você deve reinic
 The\ following\ fetchers\ are\ available\:=As seguintes ferramentas de pesquisa estão disponíveis\:
 Could\ not\ find\ fetcher\ '%0'=Não foi possível encontrar a ferramenta de pesquisa '%0'
 Running\ query\ '%0'\ with\ fetcher\ '%1'.=Executando consulta '%0' com ferramenta de pesquisa '%1'.
+Invalid\ query.\ Check\ position\ %0.=Consulta inválida. Verifique a posição %0.
+Invalid\ query\ element\ '%0'\ at\ position\ %1=Elemento de consulta '%0' na posição %1 inválido
 
 Move\ file=Mover arquivo
 Rename\ file=Renomear arquivo
@@ -949,10 +971,6 @@ Line\ %0\:\ Found\ corrupted\ citation\ key\ %1\ (comma\ missing).=Linha %0\: En
 No\ full\ text\ document\ found=Nenhum documento encontrado
 Download\ from\ URL=Baixar da URL
 Rename\ field=Renomear campo
-Append\ field=Acrescentar campo
-Append\ to\ fields=Acrescentar aos campos
-Rename\ field\ to=Renomear campo para
-Move\ contents\ of\ a\ field\ into\ a\ field\ with\ a\ different\ name=Mover conteúdo de um campo para um campo com nome diferente
 
 Cannot\ use\ port\ %0\ for\ remote\ operation;\ another\ application\ may\ be\ using\ it.\ Try\ specifying\ another\ port.=Não é possível utilizar a porta %0 para operação remota; outra aplicação pode estar usando-a. Tente utilizar uma outra porta.
 
@@ -1022,9 +1040,9 @@ Cite\ special=Citar especial
 Extra\ information\ (e.g.\ page\ number)=Informação adicional (e.g.) número de páginas)
 Manage\ citations=Gerenciar citações
 Problem\ modifying\ citation=Problema ao modificar citação
+Problem\ collecting\ citations=Problema ao coletar citações
 Citation=Citação
 Connecting...=Conectando...
-Could\ not\ resolve\ BibTeX\ entry\ for\ citation\ marker\ '%0'.=Não foi possível resolver a referência BibTeX para o marcador de citação '%0'.
 Select\ style=Selecionar estilo
 Journals=Periódicos
 Cite=Citar
@@ -1036,17 +1054,35 @@ Select\ Writer\ document=Selecionar documento Writer
 Sync\ OpenOffice/LibreOffice\ bibliography=Sincronizar bibliografia OpenOffice/LibreOffice
 Select\ which\ open\ Writer\ document\ to\ work\ on=Selecionar o documento Writer aberto a se trabalhar
 Connected\ to\ document=Conectado ao documento
+
+
+No\ Writer\ documents\ found=Nenhum documento do Writer encontrado
+
 Insert\ a\ citation\ without\ text\ (the\ entry\ will\ appear\ in\ the\ reference\ list)=Inserir uma citação sem texto (a referência aparecerá na lista de referências)
 Cite\ selected\ entries\ with\ extra\ information=Citar as referências selecionadas com informações adicionais
 Ensure\ that\ the\ bibliography\ is\ up-to-date=Certifique-se que a bibliografia está atualizada
+
 Your\ OpenOffice/LibreOffice\ document\ references\ the\ citation\ key\ '%0',\ which\ could\ not\ be\ found\ in\ your\ current\ library.=Seu documento OpenOffice/LibreOffice faz referência à chave de citação '%0', que não foi encontrada em sua biblioteca atual.
+
+This\ operation\ requires\ a\ bibliography\ database.=Esta operação requer um banco de dados bibliográfico.
+
+Your\ OpenOffice/LibreOffice\ document\ references\ at\ least\ %0\ citation\ keys\ which\ could\ not\ be\ found\ in\ your\ current\ library.\ Some\ of\ these\ are\ %1.=Seu documento OpenOffice/LibreOffice faz referência a pelo menos %0 chaves de citação que não puderam ser encontradas na sua biblioteca atual. Algumas delas são %1.
+
+Your\ OpenOffice/LibreOffice\ document\ references\ no\ citation\ keys\ which\ could\ also\ be\ found\ in\ your\ current\ library.=Seu documento OpenOffice/LibreOffice não faz referência a chaves de citação que também podem ser encontradas em sua biblioteca atual.
+
 Unable\ to\ synchronize\ bibliography=Não foi possível sincronizar a bibliografia
 Combine\ pairs\ of\ citations\ that\ are\ separated\ by\ spaces\ only=Combinar pares de citações que são separados apenas por espaços
 Autodetection\ failed=Falha na detecção automática
 Please\ wait...=Por favor, aguarde...
 Connection\ lost=Conexão perdida
-The\ paragraph\ format\ is\ controlled\ by\ the\ property\ 'ReferenceParagraphFormat'\ or\ 'ReferenceHeaderParagraphFormat'\ in\ the\ style\ file.=O formato de parágrafo é controlado pela propriedade 'ReferenceParagraphFormat' ou Reference HeaderParagraphFormat' no arquivo de estilos.
-The\ character\ format\ is\ controlled\ by\ the\ citation\ property\ 'CitationCharacterFormat'\ in\ the\ style\ file.=O formato do caracter é controlado pela propriedade de citação 'CitationCharacterFormat' no arquivo de estilos.
+
+Could\ not\ update\ bibliography=Não foi possível atualizar a bibliografia
+Not\ connected\ to\ document=Não conectado ao documento
+Problem\ combining\ cite\ markers=Problema ao combinar marcadores de citação
+Unable\ to\ reload\ style\ file=Não foi possível recarregar o arquivo de estilo
+
+Problem\ during\ separating\ cite\ markers=Problema ao separar marcadores de citação
+
 Automatically\ sync\ bibliography\ when\ inserting\ citations=Sincronizar bibliografia automaticamente ao inserir citações
 Look\ up\ BibTeX\ entries\ in\ the\ active\ tab\ only=Pesquisar por referências BibTeX apenas na aba ativa
 Look\ up\ BibTeX\ entries\ in\ all\ open\ libraries=Pesquisar referências BibTeX em todas as bases de dados abertas
@@ -1105,6 +1141,7 @@ Collapse\ all=Reduzir todos
 Searches\ the\ selected\ directory\ for\ unlinked\ files.=Buscar arquivos não referenciados no diretório selecionado
 Starts\ the\ import\ of\ BibTeX\ entries.=Iniciar a importação de entradas BibTeX
 Last\ edited\:=Última edição\:
+All\ time=Por todo o tempo
 last\ edited=última edição
 Last\ day=Dia anterior
 Last\ week=Semana anterior
@@ -1147,7 +1184,9 @@ Toggle\ relevance=Alternar relevância
 Toggle\ quality\ assured=Alteranar qualidade garantida
 Toggle\ print\ status=Status de leitura alternado
 Update\ keywords=Atualizar palavras-chave
+Problem\ connecting=Problema ao conectar
 Connection\ to\ OpenOffice/LibreOffice\ has\ been\ lost.\ Please\ make\ sure\ OpenOffice/LibreOffice\ is\ running,\ and\ try\ to\ reconnect.=Conexão com o OpenOffice/LibreOffice foi perdida. Por favor certifique-se de que o OpenOffice/LibreOffice está rodando, e tente reconectar
+
 JabRef\ will\ send\ at\ least\ one\ request\ per\ entry\ to\ a\ publisher.=JabRef enviará pelo menos um pedido por referências para uma editora.
 Correct\ the\ entry,\ and\ reopen\ editor\ to\ display/edit\ source.=Corrija a referência, e abra o editor novamente para mostrar/editar o fonte
 Could\ not\ connect\ to\ running\ OpenOffice/LibreOffice.=Não foi possível conectar ao OpenOffice/LibreOffice.
@@ -1161,8 +1200,6 @@ To\ disable\ the\ memory\ stick\ mode\ rename\ or\ remove\ the\ jabref.xml\ file
 Unable\ to\ connect.\ One\ possible\ reason\ is\ that\ JabRef\ and\ OpenOffice/LibreOffice\ are\ not\ both\ running\ in\ either\ 32\ bit\ mode\ or\ 64\ bit\ mode.=Não possível conectar. Uma possível razão é que o JabRef e o OpenOffice/LibreOffice não estão rodando no mesmo modo\: 32 bits ou 64 bits.
 Delimiter(s)=Delimitador(es)
 When\ downloading\ files,\ or\ moving\ linked\ files\ to\ the\ file\ directory,\ use\ the\ bib\ file\ location.=Quando estiver baixando arquivos, ou movendo arquivos vinculados para o diretório de arquivos, use o local do arquivo bib.
-Your\ style\ file\ specifies\ the\ character\ format\ '%0',\ which\ is\ undefined\ in\ your\ current\ OpenOffice/LibreOffice\ document.=Seu arquivo de estilo especifica o formato de caracter '%0', que não está definido no seu documento OpenOffice/LibreOffice atual
-Your\ style\ file\ specifies\ the\ paragraph\ format\ '%0',\ which\ is\ undefined\ in\ your\ current\ OpenOffice/LibreOffice\ document.=Seu arquivo de estilo especifica o formato de parágrafo '%0', que não está definido no seu documento OpenOffice/LibreOffice atual
 
 Searching...=Buscando...
 Please\ enter\ a\ search\ string=Favor digitar uma string de busca
@@ -1171,12 +1208,15 @@ Please\ open\ or\ start\ a\ new\ library\ before\ searching=Por favor, abra ou i
 Canceled\ merging\ entries=União das referências cancelada
 
 Merge\ entries=Unir entradas
+Merged\ entry=Referência mesclada
 Merged\ entries=Mesclou referências em uma nova e manteve a antiga
 None=Nenhum
 Parse=Interpretar
 Result=Resultado
 You\ have\ to\ choose\ exactly\ two\ entries\ to\ merge.=Você deve escolher exatamente duas referências para mesclar
 
+Add\ timestamp\ to\ modified\ entries\ (field\ "modificationdate")=Adicionar timestamp nas entradas modificadas (campo "modificationdate")
+Add\ timestamp\ to\ new\ entries\ (field\ "creationdate")=Adicionar timestamp às novas entradas (campo "modificationdate")
 All\ key\ bindings\ will\ be\ reset\ to\ their\ defaults.=Todas as teclas de atalho serão reconfiguradas para seus valores padrão.
 
 Automatically\ set\ file\ links=Definir links para os arquivos automaticamente
@@ -1197,6 +1237,11 @@ Use\ custom\ proxy\ configuration=Usar configurações personalizadas de proxy
 Proxy\ requires\ authentication=Proxy requer autenticação
 Attention\:\ Password\ is\ stored\ in\ plain\ text\!=Atenção\: A senha é armazenada em texto simples\!
 Clear\ connection\ settings=Limpar configurações da conexão
+Check\ Proxy\ Setting=Verificar Configuração de Proxy
+Check\ connection=Verificar conexão
+Connection\ failed\!=Falha na conexão\!
+Connection\ successful\!=Conexão bem-sucedida\!
+
 
 Open\ folder=Abrir diretório
 Export\ sort\ order=Exportar ordenação
@@ -1278,9 +1323,7 @@ Save\ changes=Salvar mudanças.
 Discard\ changes=Descartar mudanças
 Library\ '%0'\ has\ changed.=Base de dados '%0' mudou.
 Print\ entry\ preview=Imprimir preview da referência
-Copy\ title=Copiar título
-Copy\ \\cite{citation\ key}=Copiar \\cite{citation key}
-Copy\ citation\ key\ and\ title=Copiar chave de citação e título
+
 Invalid\ DOI\:\ '%0'.=DOI inválida\: '%0'.
 Same\ DOI\ used\ in\ multiple\ entries=Mesmo DOI usado em múltiplas entradas
 should\ start\ with\ a\ name=deve iniciar com um nome
@@ -1366,6 +1409,7 @@ Display\ keywords\ appearing\ in\ ALL\ entries=Mostrar palavras-chave aparecendo
 Display\ keywords\ appearing\ in\ ANY\ entry=Exibir palavras-chave aparecendo em QUALQUER referência
 None\ of\ the\ selected\ entries\ have\ titles.=Nenhuma das entradas selecionadas tem títulos.
 None\ of\ the\ selected\ entries\ have\ citation\ keys.=Nenhuma das referências selecionadas tem chaves de citação.
+None\ of\ the\ selected\ entries\ have\ DOIs.=Nenhuma das entradas selecionadas tem DOIs.
 Unabbreviate\ journal\ names=Reverter abreviações de nomes de periódicos
 Unabbreviating...=Revertendo abreviação
 Usage=Utilização
@@ -1423,6 +1467,7 @@ Add\ enclosing\ braces=Adicionar chaves de fechamento
 Add\ braces\ encapsulating\ the\ complete\ field\ content.=Adicionar chaves encapsulando o conteúdo completo do campo.
 Remove\ enclosing\ braces=Remover chaves de fechamento
 Removes\ braces\ encapsulating\ the\ complete\ field\ content.=Remove chaves encapsulando o conteúdo completo do campo.
+Removes\ all\ balanced\ {}\ braces\ around\ words.=Remove todas as chaves balanceadas {} em torno das palavras.
 Shorten\ DOI=Encurtar DOI
 Shortens\ DOI\ to\ more\ human\ readable\ form.=Encurta DOI para uma forma mais legível e humana.
 Sentence\ case=Muda Iniciais
@@ -1435,7 +1480,10 @@ Does\ nothing.=Não faz nada.
 Identity=Identidade
 Clears\ the\ field\ completely.=Limpa completamente o campo.
 Directory\ not\ found=Diretório não encontrado
+Main\ file\ directory\ not\ set.\ Check\ the\ preferences\ (linked\ files)\ or\ the\ library\ properties.=Diretório principal de arquivo não definido. Verifique as preferências (arquivos vinculados) ou as propriedades da biblioteca.
 This\ operation\ requires\ exactly\ one\ item\ to\ be\ selected.=Esta operação requer que exatamente um item seja selecionado.
+Opening\ large\ number\ of\ files=Abrindo grande número de arquivos
+You\ are\ about\ to\ open\ %0\ files.\ Continue?=Você está prestes a abrir %0 arquivos. Continuar?
 Continue=Continuar
 Importing\ in\ %0\ format=Importando no formato %0
 Female\ name=Nome feminino
@@ -1536,6 +1584,17 @@ Custom=Personalizar
 Export\ cited=Exportação citada
 Unable\ to\ generate\ new\ library=Não foi possível gerar nova biblioteca
 
+The\ cursor\ is\ in\ a\ protected\ area.=O cursor está em uma área protegida.
+No\ bibliography\ database\ is\ open\ for\ citation.=Nenhum banco de dados bibliográfico está aberto para citação.
+
+No\ database\ is\ open\ for\ updating\ citation\ markers\ after\ citing.=Nenhum banco de dados está aberto para a atualização de marcadores de citação após a citação.
+
+
+
+
+Found\ identical\ ranges=Intervalos idênticos encontrados
+Found\ overlapping\ ranges=Intervalos sobrepostos encontrados
+Found\ touching\ ranges=Intervalos que se tocam foram encontrados
 
 Note\:\ Use\ the\ placeholder\ %DIR%\ for\ the\ location\ of\ the\ opened\ library\ file.=Nota\: Use o %DIR% para definir a localização do arquivo da biblioteca aberta.
 Error\ occured\ while\ executing\ the\ command\ "%0".=Ocorreu um erro ao executar o comando "%0".
@@ -1545,6 +1604,7 @@ Countries\ and\ territories\ in\ English=Países e territórios em inglês
 Electrical\ engineering\ terms=Termos da engenharia elétrica
 Enabled=Ativado
 Internal\ list=Lista interna
+Protected\ terms\ files=Arquivo de termos protegidos
 Months\ and\ weekdays\ in\ English=Meses e dias úteis em inglês
 The\ text\ after\ the\ last\ line\ starting\ with\ \#\ will\ be\ used=O texto após a última linha iniciando com \# será usado
 Add\ protected\ terms\ file=Adicionar arquivo de termos protegidos
@@ -1634,8 +1694,8 @@ Protected\ terms\ file=Arquivo de termos protegidos
 Style\ file=Arquivo de estilo
 
 Open\ OpenOffice/LibreOffice\ connection=Abrir conexão com OpenOffice/LibreOffice
-You\ must\ enter\ at\ least\ one\ field\ name=Você deve digitar pelo menos um nome de campo
 Non-ASCII\ encoded\ character\ found=Caractere não-ASCII encontrado
+Non-UTF-8\ encoded\ field\ found=Campo não-UTF-8 encontrado
 Toggle\ web\ search\ interface=Alternar interface de busca na web
 
 Migration\ help\ information=Informação sobre ajuda para a migração
@@ -1679,7 +1739,6 @@ should\ be\ normalized=deve ser normalizado
 
 Empty\ search\ ID=ID de pesquisa vazio
 The\ given\ search\ ID\ was\ empty.=O ID de pesquisa fornecido estava vazio.
-Copy\ citation\ key\ and\ link=Copiar chave de citação e link
 biblatex\ field\ only=apenas campo biblatex
 
 Error\ while\ generating\ fetch\ URL=Erro ao gerar URL de busca
@@ -1743,6 +1802,7 @@ Delete\ '%0'=Remover '%0'
 Delete\ from\ disk=Remover do disco
 Remove\ from\ entry=Remover da referência
 There\ exists\ already\ a\ group\ with\ the\ same\ name.=Já existe um grupo com o mesmo nome.
+If\ you\ use\ it,\ it\ will\ inherit\ all\ entries\ from\ this\ other\ group.=Se você usá-lo, herdará todas as entradas deste outro grupo.
 
 Copy\ linked\ file=Copiar arquivo vinculado
 Copy\ linked\ file\ to\ folder...=Copiar arquivo vinculado para o diretório...
@@ -1771,7 +1831,6 @@ Removes\ all\ hyphenated\ line\ breaks\ in\ the\ field\ content.=Remove todas as
 Could\ not\ retrieve\ entry\ data\ from\ '%0'.=Não foi possível recuperar dados de referência a partir de '%0'.
 Entry\ from\ %0\ could\ not\ be\ parsed.=Não foi possível analisar a referência a partir de %0.
 Invalid\ identifier\:\ '%0'.=Identificador inválido\: '%0'.
-This\ paper\ has\ been\ withdrawn.=Este documento foi retirado.
 empty\ citation\ key=chave de citação vazia
 Aux\ file=Arquivo Aux
 Group\ containing\ entries\ cited\ in\ a\ given\ TeX\ file=Grupo contendo referências citadas em um arquivo TeX
@@ -1799,9 +1858,7 @@ Could\ not\ connect\ to\ Vim\ server.\ Make\ sure\ that\ Vim\ is\ running\ with\
 Could\ not\ connect\ to\ a\ running\ gnuserv\ process.\ Make\ sure\ that\ Emacs\ or\ XEmacs\ is\ running,\ and\ that\ the\ server\ has\ been\ started\ (by\ running\ the\ command\ 'server-start'/'gnuserv-start').=Não foi possível conectar a um processo gnuserv. Certifique-se de que o Emacs ou XEmacs está rodando, e que o servidor foi iniciado (executando o comando 'server-start'/'gnuserv-start').
 Error\ pushing\ entries=Erro ao fazer push das referências
 
-Undefined\ character\ format=Formato de caractere indefinido
-Undefined\ paragraph\ format=Formato de parágrafo indefinido
-
+Preamble=Preâmbulo
 Markings=Marcações
 Use\ selected\ instance=Usar instância selecionada
 
@@ -1820,8 +1877,8 @@ Blog=Blog
 Check\ integrity=Verificação de integridade
 Cleanup\ URL\ link=Limpar URL
 Cleanup\ URL\ link\ by\ removing\ special\ symbols\ and\ extracting\ simple\ link=Limpar URL removendo símbolos especiais e extraindo um link simples
+Copy\ DOI=Copiar DOI
 Copy\ DOI\ url=Copiar URL do DOI
-Copy\ citation=Copiar citação
 Development\ version=Versão de desenvolvimento
 Export\ selected\ entries=Exportar referências selecionadas
 Export\ selected\ entries\ to\ clipboard=Exportar referências selecionadas para área de transferência
@@ -1870,6 +1927,7 @@ Cancel\ import=Cancelar Importação
 Continue\ with\ import=Continuar com a importação
 Import\ canceled=Importação cancelada
 Select\ all\ new\ entries=Selecionar todas as novas referências
+Select\ all\ entries=Selecionar todas as entradas
 Total\ items\ found\:=Total de itens encontrados\:
 Selected\ items\:=Itens selecionados\:
 Download\ linked\ online\ files=Baixar arquivos online vinculados
@@ -1890,6 +1948,7 @@ Keyword\ separator=Separador da palavra-chave
 Remove\ keyword=Remover palavra-chave
 Are\ you\ sure\ you\ want\ to\ remove\ keyword\:\ "%0"?=Tem certeza que deseja remover a palavra-chave\: "%0"?
 Reset\ to\ default=Restaurar padrão
+String\ constants=Constantes do texto
 Export\ all\ entries=Exportar todas as referências
 Generate\ citation\ keys=Gerar chaves de citação
 Manage\ field\ names\ &\ content=Gerenciar nomes e conteúdo dos campos
@@ -2020,6 +2079,7 @@ Keyword\ delimiter=Delimitador de palavra-chave
 Hierarchical\ keyword\ delimiter=Delimitador hierárquico de palavra-chave
 Escape\ ampersands="Escapar" ampersands (&)
 
+Hint\:\n\nTo\ search\ all\ fields\ for\ <b>Smith</b>,\ enter\:\n<tt>smith</tt>\n\nTo\ search\ the\ field\ <b>author</b>\ for\ <b>Smith</b>\ and\ the\ field\ <b>title</b>\ for\ <b>electrical</b>,\ enter\:\n<tt>author\=Smith\ and\ title\=electrical</tt>=Dica\:\n\nPara pesquisar todos os campos por <b>Smith</b>, digite\:\n<tt>smith</tt>\n\nPara procurar por <b>Smith</b> no campo <b>autor</b> e <b>eletrico</b> no campo <b>título</b>, digite\:\n<tt>author\=Ferreiro e title\=eletrico</tt>
 
 Copied\ '%0'\ to\ clipboard.='%0' copiado(s) para área de transferência.
 This\ operation\ requires\ an\ open\ library.=Esta operação requer uma biblioteca aberta.
@@ -2140,8 +2200,22 @@ This\ field\ may\ be\ useful\ when\ implementing\ a\ style\ for\ annotated\ bibl
 Subtitle\ related\ to\ the\ "Booktitle".=Subtítulo relacionado ao "Booktitle".
 Annex\ to\ the\ "Booktitle",\ to\ be\ printed\ in\ a\ different\ font.=Anexo ao "Título do do livro" para ser impresso em uma fonte diferente.
 Comment\ to\ this\ entry.=Comentar esta referência.
+Secondary\ editor\ performing\ a\ different\ editorial\ role,\ such\ as\ compiling,\ redacting,\ etc.=Editor secundário realizando uma função editorial diferente, como compilação, redação, etc.
+Another\ secondary\ editor\ performing\ a\ different\ role.=Outro editor secundário realizando um papel diferente.
+Type\ of\ editorial\ role\ performed\ by\ the\ "Editor".=Tipo de papel editorial desempenhado pelo "Editor".
+Type\ of\ editorial\ role\ performed\ by\ the\ "Editora".=Tipo de papel editorial desempenhado pelo "EditorA".
+Type\ of\ editorial\ role\ performed\ by\ the\ "Editorb".=Tipo de papel editorial desempenhado pelo "EditorB".
+Type\ of\ editorial\ role\ performed\ by\ the\ "Editorc".=Tipo de papel editorial desempenhado pelo "EditorC".
+Author(s)\ of\ a\ foreword\ to\ the\ work.=Autor(es) de um prefácio do trabalho.
+International\ Standard\ Technical\ Report\ Number\ of\ a\ technical\ report.=Número de Relatório Técnico Padrão Internacional (International Standard Technical Report Number) de um Relatório Técnico.
+International\ Standard\ Serial\ Number\ of\ a\ periodical.=International Standard Serial Number (ISBN) de um livro.
+Subtitle\ of\ a\ journal,\ a\ newspaper,\ or\ some\ other\ periodical.=Subtítulo de uma revista, de um jornal ou de outro periódico.
+Language(s)\ of\ the\ work.\ Languages\ may\ be\ specified\ literally\ or\ as\ localisation\ keys.=Idioma(s) do trabalho. Idiomas podem ser especificados literalmente ou como chaves de localização.
 Subtitle\ related\ to\ the\ "Maintitle".=Subtítulo relacionado ao "Maintitle".
 Annex\ to\ the\ "Maintitle",\ to\ be\ printed\ in\ a\ different\ font.=Anexo ao "Maintitle", a ser impresso em uma fonte diferente.
+Addon\ to\ be\ printed\ immediately\ after\ the\ author\ name\ in\ the\ bibliography.=Addon a ser impresso imediatamente após o nome do autor na bibliografia.
+If\ the\ work\ is\ a\ translation,\ a\ reprint,\ or\ something\ similar,\ the\ publication\ date\ of\ the\ original\ edition.=Se o trabalho é uma tradução, uma reimpressão, ou algo semelhante, a data de publicação da edição original.
+If\ the\ work\ is\ a\ translation,\ the\ language(s)\ of\ the\ original\ work.=Se o trabalho é uma tradução, o(s) idioma(s) da(s) da obra original.
 Pagination\ of\ the\ work.\ The\ key\ should\ be\ given\ in\ the\ singular\ form.=Paginação do trabalho. A chave deve ser inserida de forma singular.
 Number\ of\ a\ partial\ volume.\ This\ field\ applies\ to\ books\ only,\ not\ to\ journals.\ It\ may\ be\ used\ when\ a\ logical\ volume\ consists\ of\ two\ or\ more\ physical\ ones.=Número de um volume parcial. Este campo se aplica somente aos livros, não aos periódicos. Pode ser usado quando um volume lógico consiste em dois ou mais volumes físicos.
 Title\ in\ an\ abridged\ form.=Título em forma abreviada.
@@ -2149,23 +2223,61 @@ Annex\ to\ the\ "Title",\ to\ be\ printed\ in\ a\ different\ font.=Anexo ao "Tit
 Translator(s)\ of\ the\ "Title"\ or\ "Booktitle",\ depending\ on\ the\ entry\ type.\ If\ the\ translator\ is\ identical\ to\ the\ "Editor",\ the\ standard\ styles\ will\ automatically\ concatenate\ these\ fields\ in\ the\ bibliography.=Tradutores(s) do "Title" ou "Booktitle", dependendo do tipo de referência. Se o tradutor for idêntico ao "Editor", os estilos padrão concatenarão automaticamente esses campos na bibliografia.
 Type\ of\ a\ "Manual",\ "Patent",\ "Report",\ or\ "Thesis".=Tipo de "Manual", "Patent", "Report", or "Thesis".
 This\ field\ holds\ an\ entry\ key\ for\ the\ cross-referencing\ feature.\ Child\ entries\ with\ a\ "Crossref"\ field\ inherit\ data\ from\ the\ parent\ entry\ specified\ in\ the\ "Crossref"\ field.=Este campo contém uma chave de entrada para o recurso de referência cruzada. Referências filhas com um campo "Crossref" herdam dados da referência pai especificada no campo "Crossref".
+Gender\ of\ the\ author\ or\ gender\ of\ the\ editor,\ if\ there\ is\ no\ author.=Gênero do autor ou gênero do editor, se não houver autor.
 Citation\ keys\ of\ other\ entries\ which\ have\ a\ relationship\ to\ this\ entry.=Chaves de citação de outras referências que tenham uma relação com esta referência.
 This\ field\ is\ an\ alternative\ cross-referencing\ mechanism.\ It\ differs\ from\ "Crossref"\ in\ that\ the\ child\ entry\ will\ not\ inherit\ any\ data\ from\ the\ parent\ entry\ specified\ in\ the\ "Xref"\ field.=Este campo é um mecanismo alternativo de referência cruzada. Difere de "Crossref" em que a referência filho não herdará nenhum dado da referência pai especificada no campo "Xref".
 Owner/creator\ of\ this\ entry.=Proprietário/criador desta referência.
 Timestamp\ of\ this\ entry,\ when\ it\ has\ been\ created\ or\ last\ modified.=Registro de data/hora desta referência, quando ela foi criada ou modificada pela última vez.
 User-specific\ printed\ flag,\ in\ case\ the\ entry\ has\ been\ printed.=Indicação impressa específica do usuário, no caso da referência ter sido impressa.
+User-specific\ priority.=Prioridade específica do usuário.
+User-specific\ quality\ flag,\ in\ case\ its\ quality\ is\ assured.=Sinalizador de qualidade específico do usuário, caso a qualidade seja garantida.
+User-specific\ ranking.=Ranking específico do usuário.
+User-specific\ read\ status.=Status de leitura específico do usuário.
 User-specific\ relevance\ flag,\ in\ case\ the\ entry\ is\ relevant.=Indicação de relevância específica do usuário, caso a referência seja relevante.
 
-
-
+Auto\ complete\ disabled.=Auto completar desativado.
+Auto\ complete\ enabled.=Auto completar ativado.
+
+Remove\ formatter\ for\ %0=Remover formatador para %0
+Remove\ formatter\ '%0'=Remover formatador '%0'
+
+An\ article\ in\ a\ journal,\ magazine,\ newspaper,\ or\ other\ periodical\ which\ forms\ a\ self-contained\ unit\ with\ its\ own\ title.=Um artigo de revista, jornal ou outro periódico que forma uma unidade auto-contida com seu próprio título.
+A\ single-volume\ book\ with\ one\ or\ more\ authors\ where\ the\ authors\ share\ credit\ for\ the\ work\ as\ a\ whole.=Um livro de volume único com um ou mais autores em que os autores compartilham crédito pelo trabalho como um todo.
+A\ book-like\ work\ without\ a\ formal\ publisher\ or\ sponsoring\ institution.=Um trabalho semelhante a um livro sem um editor formal ou uma instituição patrocinadora.
+A\ single-volume\ collection\ with\ multiple,\ self-contained\ contributions\ by\ distinct\ authors\ which\ have\ their\ own\ title.\ The\ work\ as\ a\ whole\ has\ no\ overall\ author\ but\ it\ will\ usually\ have\ an\ editor.=Uma coleção de volume único com múltiplas contribuições auto-contidas de autores distintos que tenham seu próprio título. O trabalho como um todo não tem um autor, mas geralmente tem um editor.
+A\ legacy\ alias\ for\ "InProceedings".=Um nome legado para "InProceedings".
+A\ part\ of\ a\ book\ which\ forms\ a\ self-contained\ unit\ with\ its\ own\ title.=Uma parte de um livro que forma uma unidade auto-contida com seu próprio título.
+A\ contribution\ to\ a\ collection\ which\ forms\ a\ self-contained\ unit\ with\ a\ distinct\ author\ and\ title.=Uma contribuição para uma coleção que forma uma unidade auto-contida, tendo um autor e título distintos.
+An\ article\ in\ a\ conference\ proceedings.=Um artigo em anais de conferência.
+Technical\ or\ other\ documentation,\ not\ necessarily\ in\ printed\ form.=Documentação técnica não necessariamente na forma impressa.
+A\ fallback\ type\ for\ entries\ which\ do\ not\ fit\ into\ any\ other\ category.=Um tipo para entradas que não se encaixam em nenhuma outra categoria.
+Similar\ to\ "Thesis"\ except\ that\ the\ type\ field\ is\ optional\ and\ defaults\ to\ the\ localised\ term\ \ Master's\ thesis.=Semelhante a "Thesis", exceto que o campo 'type' é opcional e o padrão é a Dissertação de Mestrado.
+Similar\ to\ "Thesis"\ except\ that\ the\ type\ field\ is\ optional\ and\ defaults\ to\ the\ localised\ term\ PhD\ thesis.=Semelhante a "Thesis", exceto que o campo 'type' é opcional e o padrão é a Tese de Doutorado.
+A\ single-volume\ conference\ proceedings.\ This\ type\ is\ very\ similar\ to\ "Collection".=Anais de conferência de volume único. Este tipo é muito semelhante à "Collection".
+Similar\ to\ "Report"\ except\ that\ the\ type\ field\ is\ optional\ and\ defaults\ to\ the\ localised\ term\ technical\ report.=Semelhante a "Report", exceto que o campo 'type' é opcional e o padrão é Technical Report.
+A\ work\ with\ an\ author\ and\ a\ title\ which\ has\ not\ been\ formally\ published,\ such\ as\ a\ manuscript\ or\ the\ script\ of\ a\ talk.=Um trabalho com um autor e um título que não foi formalmente publicado, como um manuscrito ou o script de uma conversa.
+This\ type\ is\ similar\ to\ "InBook"\ but\ intended\ for\ works\ originally\ published\ as\ a\ stand-alone\ book.=Este tipo é semelhante ao "InBook", mas destinado a trabalhos originalmente publicados como um livro independente.
 An\ article\ in\ a\ work\ of\ reference.\ This\ is\ a\ more\ specific\ variant\ of\ the\ generic\ "InCollection"\ entry\ type.=Um artigo em um trabalho de referência. Esta é uma variante mais específica do tipo de referência genérico de "InCollection".
+A\ multi-volume\ "Book".=Um livro (Book) de vários volumes.
+A\ multi-volume\ "Collection".=Uma "Collection" de vários volumes.
 A\ multi-volume\ "Proceedings"\ entry.=Uma referência "Proceedings" com vários volumes.
 A\ multi-volume\ "Reference"\ entry.\ The\ standard\ styles\ will\ treat\ this\ entry\ type\ as\ an\ alias\ for\ "MvCollection".=Uma referência "Reference" de vários volumes. Os estilos padrão tratarão este tipo de referência como um apelido para "MvCollection".
 This\ entry\ type\ is\ intended\ for\ sources\ such\ as\ web\ sites\ which\ are\ intrinsically\ online\ resources.=Este tipo de referência é destinado a fontes como sites que são recursos intrinsecamente on-line.
+A\ single-volume\ work\ of\ reference\ such\ as\ an\ encyclopedia\ or\ a\ dictionary.=Uma obra de referência em volume único, como uma enciclopédia ou um dicionário.
+A\ technical\ report,\ research\ report,\ or\ white\ paper\ published\ by\ a\ university\ or\ some\ other\ institution.=Um relatório técnico, um relatório de pesquisa ou "White Paper" publicado por uma universidade ou outra instituição.
 An\ entry\ set\ is\ a\ group\ of\ entries\ which\ are\ cited\ as\ a\ single\ reference\ and\ listed\ as\ a\ single\ item\ in\ the\ bibliography.=Um conjunto de referências é um grupo de referências que são citadas como uma única referência e listadas como um único item na bibliografia.
+Supplemental\ material\ in\ a\ "Book".\ This\ type\ is\ provided\ for\ elements\ such\ as\ prefaces,\ introductions,\ forewords,\ afterwords,\ etc.\ which\ often\ have\ a\ generic\ title\ only.=Material suplementar em um Livro. Este tipo é fornecido para elementos como prefácios, introduções, posfácios, etc. que muitas vezes têm um título genérico apenas.
+Supplemental\ material\ in\ a\ "Collection".=Material suplementar em uma "Collection".
 Supplemental\ material\ in\ a\ "Periodical".\ This\ type\ may\ be\ useful\ when\ referring\ to\ items\ such\ as\ regular\ columns,\ obituaries,\ letters\ to\ the\ editor,\ etc.\ which\ only\ have\ a\ generic\ title.=Material suplementar em um "Periodical". Este tipo pode ser útil quando se refere a itens como colunas regulares, obituários, cartas para o editor, etc. que têm apenas um título genérico.
+A\ thesis\ written\ for\ an\ educational\ institution\ to\ satisfy\ the\ requirements\ for\ a\ degree.=Uma tese escrita para uma instituição educacional para satisfazer os requisitos para graduação
+An\ alias\ for\ "Online",\ provided\ for\ jurabib\ compatibility.=Um apelido para "Online", fornecido para a compatibilidade com jurabib.
 Computer\ software.\ The\ standard\ styles\ will\ treat\ this\ entry\ type\ as\ an\ alias\ for\ "Misc".=Software de computador. Os estilos padrão tratarão esse tipo de entrada como um apelido para "Misc".
+A\ data\ set\ or\ a\ similar\ collection\ of\ (mostly)\ raw\ data.=Um conjunto de dados ou uma coleção semelhante de dados (na maioria) brutos.
 
+Display\ count\ of\ items\ in\ group=Mostrar a contagem de itens no grupo
+Remove\ the\ following\ characters\:=Remover os seguintes caracteres\:
+Truncate=Truncar
+Truncates\ a\ string\ after\ a\ given\ index.=Trunca uma sequência de caracteres após um determinado índice.
 Close=Fechar
 Close\ all=Fechar Tudo
 Close\ all\ libraries=Fechar todas as bibliotecas
@@ -2173,11 +2285,22 @@ Close\ other\ libraries=Fechar outras bibliotecas
 Close\ others=Fechar outros
 Reveal\ in\ file\ explorer=Mostrar no explorador de arquivos
 
+Autolink\ files=Autovincular arquivos
 
+Custom\ editor\ tabs=Guias do editor personalizadas
+Custom\ export\ formats=Formatos de exportação personalizados
+Custom\ import\ formats=Formatos de importação personalizados
 
+No\ list\ enabled=Nenhuma lista habilitada
+Protect\ selection=Proteger a seleção
 
+Customized\ preview\ style=Estilo de visualização personalizado
+Next\ preview\ style=Próximo estilo de preview
+Previous\ preview\ style=Estilo de preview anterior
 
+(\ Note\:\ Press\ return\ to\ commit\ changes\ in\ the\ table\!\ )=( Nota\: Pressione enter para fazer commit das alterações na tabela)
 Reset=Reset
+New\ inproceedings=Novo anais
 Reset\ entry\ types\ and\ fields\ to\ defaults=Redefinir tipos de entrada e campos para o padrão
 This\ will\ reset\ all\ entry\ types\ to\ their\ default\ values\ and\ remove\ all\ custom\ entry\ types=Isso redefinirá todos os tipos de referências aos seus valores padrão e removerá todos os tipos de entrada personalizados
 Replace\ tabs\ with\ space=Substituir tabs por espaços
@@ -2189,19 +2312,31 @@ Removes\ digits.=Remove dígitos.
 
 Presets=Predefinições
 
-Check\ Proxy\ Setting=Verificar Configuração de Proxy
-Check\ connection=Verificar conexão
-Connection\ failed\!=Falha na conexão\!
-Connection\ successful\!=Conexão bem-sucedida\!
+Generate\ groups\ from\ keywords\ in\ the\ following\ field=Gerar grupos de palavras-chave no campo seguinte
+Generate\ groups\ for\ author\ last\ names=Gerar grupos para os últimos nomes dos autores
+Regular\ expression=Expressão regular
 
+Error\ importing.\ See\ the\ error\ log\ for\ details.=Erro ao importar. Veja o log de erros para detalhes.
 
+Error\ from\ import\:\ %0=Erro de importação\: %0
+Error\ reading\ PDF\ content\:\ %0=Erro ao ler conteúdo do PDF\: %0
+Importing\ bib\ entry=Importando entrada bib
+Importing\ using\ extracted\ PDF\ data=Importando usando dados extraídos do PDF
+No\ BibTeX\ data\ found.\ Creating\ empty\ entry\ with\ file\ link=Nenhum dado BibTeX encontrado. Criando uma referência vazia com link do arquivo
+No\ metadata\ found.\ Creating\ empty\ entry\ with\ file\ link=Nenhum metadado encontrado. Criando uma entrada vazia com link de arquivo
+Processing\ file\ %0=Processando arquivo %0
 Export\ selected=Exportar selecionado
 
+Separate\ merged\ citations=Separar citações mescladas
 Separate\ citations=Separar citações
 
 Unprotect\ terms=Desproteger termos
 
+Generate\ a\ new\ key\ for\ imported\ entries\ (overwriting\ their\ default)=Gerar uma nova chave para entradas importadas (sobrescrevendo o padrão)
+Warn\ about\ duplicates\ on\ import=Avisar sobre duplicatas na importação
 Import\ and\ Export=Importar e Exportar
+Custom\ DOI\ URI=URI DOI personalizado
+Use\ custom\ DOI\ base\ URI\ for\ article\ access=Acessar o artigo utilizando uma URI personalizada baseada no DOI
 
 Cited\ on\ pages=Citado nas páginas
 
@@ -2209,15 +2344,93 @@ Cited\ on\ pages=Citado nas páginas
 
 
 
+
+
+
+
+
+
+
+
+
+Unable\ to\ find\ valid\ certification\ path\ to\ requested\ target(%0),\ download\ anyway?=Não foi possível encontrar um caminho de certificação válido para o destino solicitado (%0), baixar mesmo assim?
+Download\ operation\ canceled.=Operação de download cancelada.
+
+Convert\ timestamp\ field\ to\ field\ 'creationdate'=Converter campo timestamp para o campo 'creationdate'
+Convert\ timestamp\ field\ to\ field\ 'modificationdate'=Converter campo timestamp para campo 'modificationdate'
+
+New\ entry\ by\ type=Nova entrada por tipo
+
+File\ '%1'\ is\ a\ duplicate\ of\ '%0'.\ Keeping\ '%0'=Arquivo '%1' é uma duplicata de '%0'. Mantendo '%0'
+File\ '%1'\ is\ a\ duplicate\ of\ '%0'.\ Keeping\ both\ due\ to\ deletion\ error=Arquivo '%1' é uma duplicata de '%0'. Mantendo ambos devido a um erro de exclusão
+
+Enable\ field\ formatters=Ativar formatadores de campo
+Entry\ Type=Tipo de referência
+Entry\ types=Tipos de referência
+Field\ names=Nomes dos campos
+Others=Outros
+Recommended=Recomendado
+
+Authors\ and\ Title=Autores e Título
 Database=Banco de dados
 Databases=Bancos de dados
+Manage\ study\ definition=Gerenciar definição de estudo
 Add\ Author\:=Adicionar Autor\:
 Add\ Database\:=Adicionar banco de dados\:
+Add\ Query\:=Adicionar Consulta\:
+Add\ Research\ Question\:=Adicionar Questões de Pesquisa\:
+Perform\ search\ for\ existing\ systematic\ literature\ review=Realizar pesquisa para revisão sistemática de literatura existente
+Queries=Consultas
+Research\ Questions=Questões de pesquisa
 Searching=Buscando
+Start\ new\ systematic\ literature\ review=Iniciar nova revisão sistemática da literatura
+Study\ Title\:=Título do Estudo\:
+Study\ repository\ could\ not\ be\ created=Não foi possível criar o repositório de estudo
 
+All\ query\ terms\ are\ joined\ using\ the\ logical\ AND,\ and\ OR\ operators=Todos os termos de consulta são unidos usando os operadores lógicos AND e OR
 Finalize=Finalizar
+If\ the\ sequence\ of\ terms\ is\ relevant\ wrap\ them\ in\ double\ quotes =Se a sequência de termos for relevante, envolva-os em aspas duplas
+Query\ terms\ are\ separated\ by\ spaces.=Os termos da consulta são separados por espaços.
+Select\ the\ study\ directory\:=Selecione o diretório do estudo\:
+An\ example\:=Um exemplo\:
+Define\ study\ parameters=Definir parâmetros de estudo
+Start\ survey=Iniciar o survey
+Query=Consulta
+Question=Questão
+Select\ directory=Selecione o diretório
+
+Fulltext\ Index=Índices para texto completo
+Automatically\ index\ all\ linked\ files\ for\ fulltext\ search=Indexar automaticamente todos os arquivos vinculados para pesquisa em texto completo
+Rebuild\ fulltext\ search\ index=Recriar índice da pesquisa completa
+Rebuild\ fulltext\ search\ index\ for\ current\ library?=Recriar o índice de pesquisa completa para a biblioteca atual?
+Rebuilding\ fulltext\ search\ index...=Recriando índice de busca completa...
+Failed\ to\ access\ fulltext\ search\ index=Falha ao acessar o índice da pesquisa completa
+Found\ match\ in\ %0=Correspondência encontrada em %0
+On\ page\ %0=Na página %0
+Found\ matches\ in\ Annotations\:=Encontradas partidas em anotações (Annotations)\:
+
+Grobid\ URL=URL Grobid
+Remote\ services=Serviços remotos
+Allow\ sending\ PDF\ files\ and\ raw\ citation\ strings\ to\ a\ JabRef\ online\ service\ (Grobid)\ to\ determine\ Metadata.\ This\ produces\ better\ results.=Permite enviar arquivos PDF e strings de citação bruta para um serviço JabRef on-line (Grobid) para determinar Metadados. Isto produz melhores resultados.
+
+
+Character\ by\ character=Caractere por Caractere
+Embedded=Incorporado
+Entry=Entrada
+Parse\ Metadata\ from\ PDF.=Importar metadados do PDF.
+Symmetric\ character\ by\ character=Simétrico caractere por caractere
+Symmetric\ word\ by\ word=Simétrico palavra por palavra
+Verbatim=Verbatim
+Word\ by\ word=Palavra por palavra
+Could\ not\ extract\ Metadata\ from\:\ %0=Não foi possível extrair metadados de\: %0
+
+Search\ across\ libraries\ in\ a\ new\ window=Pesquisar entre bibliotecas em uma nova janela
+Keep\ search\ string\ across\ libraries=Manter textos de busca para todas as bibliotecas
+Keep\ dialog\ always\ on\ top=Manter a caixa de diálogo sempre no topo
+Search\ results\ from\ open\ libraries=Resultados da pesquisa para as bibliotecas abertas
+
+
 
 
 
-Word\ by\ word=Palavra por palavra
 
diff --git a/src/main/resources/l10n/JabRef_ru.properties b/src/main/resources/l10n/JabRef_ru.properties
index 1bdaaa94975..0999c1ddcb0 100644
--- a/src/main/resources/l10n/JabRef_ru.properties
+++ b/src/main/resources/l10n/JabRef_ru.properties
@@ -19,7 +19,9 @@ Unable\ to\ monitor\ file\ changes.\ Please\ close\ files\ and\ processes\ and\
 
 %0/%1\ entries=%0/%1 записей
 
-%0\ export\ successful=%0 успешно экспортировано
+Export\ operation\ finished\ successfully.=Операция экспорта выполнена успешно.
+
+Reveal\ in\ File\ Explorer=Открыть в Проводнике
 
 %0\ matches\ the\ regular\ expression\ <b>%1</b>=%0 соответствует регулярному выражению <b>%1</b>
 
@@ -151,8 +153,6 @@ Cite\ command=Команда цитирования
 
 Clear=Очистить
 
-Clear\ fields=Очистить поля
-
 Open\ /\ close\ entry\ editor=Открыть / закрыть редактор записей
 
 Close\ dialog=Закрыть диалоговое окно
@@ -172,7 +172,13 @@ Copied=Скопированное
 
 Copy=Копировать
 
+Copy\ title=Копировать заглавие
+Copy\ \\cite{citation\ key}=Копировать \\ цитировать{citation key}
+Copy\ citation\ (html)=Копировать цитирование (html)
+Copy\ citation\ (text)=Копировать цитирование (текст)
 Copy\ citation\ key=Копировать ключ цитаты
+Copy\ citation\ key\ and\ link=Скопировать ключ цитаты и ссылку
+Copy\ citation\ key\ and\ title=Копировать ключ цитаты и заголовок
 
 Copy\ to\ clipboard=Копировать в буфер обмена
 
@@ -227,7 +233,9 @@ Library\ properties=Свойства БД
 
 Default=По умолчанию
 
-Default\ encoding=Кодировка по умолчанию
+Character\ encoding\ UTF-8\ is\ not\ supported.=Кодировка UTF-8 не поддерживается.
+UTF-8\ could\ not\ be\ used\ to\ encode\ the\ following\ characters\:\ %0=Не удалось использовать UTF-8 для кодирования следующих символов\: %0
+The\ chosen\ encoding\ '%0'\ could\ not\ encode\ the\ following\ characters\:=В выбранной кодировке '%0' невозможно прочитать следующие символы\:
 
 Downloading=Загрузка …
 
@@ -275,6 +283,7 @@ Downloaded\ website\ as\ an\ HTML\ file.=Загружен сайт в форма
 
 duplicate\ removal=удаление дубликатов
 
+Duplicate\ fields=Дубликаты полей
 
 Duplicate\ string\ name=Дубликат имени строки
 
@@ -533,6 +542,10 @@ Moved\ group\ "%0".=Перемещенная группа "%0".
 
 Mr.\ DLib\ Privacy\ settings=Настройки конфиденциальности сервиса "Mr. DLib"
 
+No\ database\ is\ open=База данных не открыта
+
+We\ need\ a\ database\ to\ export\ from.\ Open\ one.=Нам требуется база данных для экспорта. Откройте её.
+
 No\ recommendations\ received\ from\ Mr.\ DLib\ for\ this\ entry.=Веб сервис "Mr. DLib" не предлагает рекомендаций для этой записи.
 
 Error\ while\ fetching\ recommendations\ from\ Mr.DLib.=Ошибка при получении рекомендаций от сервиса "Mr. DLib".
@@ -625,8 +638,6 @@ Path\ to\ %0\ not\ defined=Не задан путь к %0
 
 Path\ to\ LyX\ pipe=Путь к каналу LyX
 
-PDF\ does\ not\ exist=PDF не существует
-
 File\ has\ no\ attached\ annotations=Файл не содержит приложенных аннотаций
 
 Please\ enter\ a\ name\ for\ the\ group.=Введите имя для группы.
@@ -692,11 +703,25 @@ Remove\ selected\ entries\ from\ this\ group=Удалить выбранные 
 
 Remove\ group=Удалить группу
 
-Remove\ group\ "%0"?=Удалить группу "%0"?
+Remove\ group\ and\ subgroups=Удалить группу и подгруппы
+
+Remove\ groups\ and\ subgroups=Удалить группы и подгруппы
+
+Remove\ all\ selected\ groups\ and\ keep\ their\ subgroups?=Удалить все выбранные группы, сохранив их подгруппы?
+
+Remove\ group\ "%0"\ and\ keep\ its\ subgroups?=Удалить группу "%0", сохранив её подгруппы?
+
+Remove\ groups=Удалить группы
+
+Removed\ all\ selected\ groups.=Все выбранные группы удалены.
 
 Remove\ group\ "%0"\ and\ its\ subgroups?=Удалить группу "%0" и ее подгруппы?
 
-Remove\ group\ and\ subgroups=Удалить группу и подгруппы
+Removed\ group\ "%0"\ and\ its\ subgroups.=Группа "%0" и ее подгруппы удалены.
+
+Remove\ all\ selected\ groups\ and\ their\ subgroups?=Удалить все выбранные группы и их подгруппы?
+
+Removed\ all\ selected\ groups\ and\ their\ subgroups.=Все выбранные группы и их подгруппы удалены.
 
 Remove\ link=Удалить ссылку
 
@@ -706,8 +731,6 @@ Remove\ string\ %0=Удалить строку %0
 
 Removed\ group\ "%0".=Группа "%0" удалена.
 
-Removed\ group\ "%0"\ and\ its\ subgroups.=Группа "%0" и ее подгруппы удалены.
-
 Removed\ string=Строка удалена
 
 Renamed\ string=Строка переименована
@@ -730,6 +753,8 @@ Replaces\ Unicode\ ligatures\ with\ their\ expanded\ form=Заменяет ли
 
 Required\ fields=Обязательные поля
 
+Do\ not\ resolve\ BibTeX\ strings=Не разрешать строки BibTeX
+Resolve\ BibTeX\ strings\ for\ the\ following\ fields=Разрешить строки BibTeX для следующих полей
 
 resolved=разрешено
 
@@ -737,11 +762,13 @@ Restart=Перезапустить
 
 Restart\ required=Требуется перезапуск
 
+Return\ to\ dialog=Вернуться в диалоговое окно
 
 Review=Просмотр
 Review\ changes=Просмотр изменений
 Review\ Field\ Migration=Перемещение поля обзора
 
+Loading=Загрузка
 
 Save=Сохранить
 Save\ all\ finished.=Сохранить все завершенные.
@@ -775,9 +802,6 @@ Select\ file\ from\ ZIP-archive=Выбрать файл из ZIP-архива
 
 Select\ the\ tree\ nodes\ to\ view\ and\ accept\ or\ reject\ changes=Выбрать узлы дерева для просмотра и применения/отклонения изменений
 
-Set\ field=Настройка поля
-Set\ fields=Настройка полей
-
 Settings=Параметры
 
 Shortcut=Ярлык
@@ -810,7 +834,12 @@ Size=Размер
 Skipped\ -\ No\ PDF\ linked=Пропущено - Без ссылок на PDF
 Skipped\ -\ PDF\ does\ not\ exist=Пропущено - PDF не существует
 
-Skipped\ entry.=Запись пропущена.
+JabRef\ skipped\ the\ entry.=JabRef пропустил запись.
+Import\ error=Ошибка импортирования
+Open\ library\ error=Ошибка при открытии библиотеки
+Please\ check\ your\ library\ file\ for\ wrong\ syntax.=Пожалуйста, проверьте ваш файл библиотеки на правильность синтаксиса.
+SourceTab\ error=Ошибка SourceTab
+User\ input\ via\ entry-editor\ in\ `{}bibtex\ source`\ tab\ led\ to\ failure.=Пользовательский ввод посредством редактора записей во вкладке `{}bibtex source` привёл к возникновению ошибки.
 
 Sort\ subgroups=Сортировать подгруппы
 
@@ -825,8 +854,6 @@ Sublibrary\ from\ AUX\ to\ BibTeX=Библиотека для перехода 
 
 Switches\ between\ full\ and\ abbreviated\ journal\ name\ if\ the\ journal\ name\ is\ known.=Переключение полного/сокращенного имени журнала для известных имен журналов.
 
-The\ chosen\ encoding\ '%0'\ could\ not\ encode\ the\ following\ characters\:=В выбранной кодировке '%0' невозможно прочитать следующие символы\:
-
 
 the\ field\ <b>%0</b>=поле <b>%0</b>
 The\ group\ "%0"\ already\ contains\ the\ selection.=Группа "%0" уже содержит выбранное.
@@ -901,6 +928,7 @@ Warning=Предупреждение
 
 Warnings=Предупреждения
 
+Warning\:\ You\ added\ field\ "%0"\ twice.\ Only\ one\ will\ be\ kept.=Внимание\: Вы добавили поле "%0" дважды. Только одно из них будет сохранено.
 
 web\ link=веб-ссылки
 
@@ -958,10 +986,6 @@ Line\ %0\:\ Found\ corrupted\ citation\ key\ %1\ (comma\ missing).=Строка
 No\ full\ text\ document\ found=Не найдено полнотекстовых документов
 Download\ from\ URL=Загрузить из URL-адреса
 Rename\ field=Переименовать поле
-Append\ field=Добавить поле
-Append\ to\ fields=Добавить к полям
-Rename\ field\ to=Переименовать поле в
-Move\ contents\ of\ a\ field\ into\ a\ field\ with\ a\ different\ name=Переместить содержимое поля в поле с другим именем
 
 Cannot\ use\ port\ %0\ for\ remote\ operation;\ another\ application\ may\ be\ using\ it.\ Try\ specifying\ another\ port.=Невозможно использовать порт %0 для удаленного подключения; another application may be using it. Try specifying another port.
 
@@ -1031,9 +1055,9 @@ Cite\ special=Особое цитирование
 Extra\ information\ (e.g.\ page\ number)=Дополнительные сведения (напр., номер страницы)
 Manage\ citations=Управление цитированием
 Problem\ modifying\ citation=Ошибка при модификации цитаты
+Problem\ collecting\ citations=Возникла проблема при сборе ссылок
 Citation=Цитата
 Connecting...=Подключение...
-Could\ not\ resolve\ BibTeX\ entry\ for\ citation\ marker\ '%0'.=Не удалось разрешить записи BibTeX для метки цитаты '%0'.
 Select\ style=Выбор стиля
 Journals=Журналы
 Cite=Цитировать (в круглых скобках)
@@ -1045,17 +1069,36 @@ Select\ Writer\ document=Выбор документа OpenOffice/LibreOffice Wr
 Sync\ OpenOffice/LibreOffice\ bibliography=Синхронизация библиографии OpenOffice/LibreOffice
 Select\ which\ open\ Writer\ document\ to\ work\ on=Выберите открытый документ OpenOffice/LibreOffice Writer для работы
 Connected\ to\ document=Подключено к документу
+
+Could\ not\ connect\ to\ any\ Writer\ document.\ Please\ make\ sure\ a\ document\ is\ open\ before\ using\ the\ 'Select\ Writer\ document'\ button\ to\ connect\ to\ it.=Не удалось выполнить подключение к документу Writer. Убедитесь, что документ открыт перед использованием кнопки 'Выбрать документ Writer', чтобы выполнить подключение.
+
+No\ Writer\ documents\ found=Документы Writer не найдены
+
 Insert\ a\ citation\ without\ text\ (the\ entry\ will\ appear\ in\ the\ reference\ list)=Вставка цитаты без текста (запись отображается в списке ссылок)
 Cite\ selected\ entries\ with\ extra\ information=Цитировать выбранные записи с дополнительными сведениями
 Ensure\ that\ the\ bibliography\ is\ up-to-date=Проверьте актуальность библиографии
+
 Your\ OpenOffice/LibreOffice\ document\ references\ the\ citation\ key\ '%0',\ which\ could\ not\ be\ found\ in\ your\ current\ library.=Ваш документ OpenOffice/LibreOffice ссылается на ключ цитирования '%0', который не найден в вашей текущей библиотеке.
+
+This\ operation\ requires\ a\ bibliography\ database.=Этой операции требуется библиографическая база данных.
+
+Your\ OpenOffice/LibreOffice\ document\ references\ at\ least\ %0\ citation\ keys\ which\ could\ not\ be\ found\ in\ your\ current\ library.\ Some\ of\ these\ are\ %1.=Ссылки в вашем документе OpenOffice/LibreOffice содержат не менее %0 ключей цитирования, которые не удалось найти в текущей библиотеке. Некоторые из них %1.
+
+Your\ OpenOffice/LibreOffice\ document\ references\ no\ citation\ keys\ which\ could\ also\ be\ found\ in\ your\ current\ library.=В вашем документе OpenOffice/LibreOffice отсутствуют какие-либо ключи цитирования, которые также можно найти в вашей текущей библиотеке.
+
 Unable\ to\ synchronize\ bibliography=Не удалось выполнить синхронизацию библиографии
 Combine\ pairs\ of\ citations\ that\ are\ separated\ by\ spaces\ only=Объединить пары цитат, разделенные только пробелом
 Autodetection\ failed=Ошибка автоопределения
 Please\ wait...=Подождите...
 Connection\ lost=Соединение прервано
-The\ paragraph\ format\ is\ controlled\ by\ the\ property\ 'ReferenceParagraphFormat'\ or\ 'ReferenceHeaderParagraphFormat'\ in\ the\ style\ file.=Формат абзаца задается с помощью свойства 'ReferenceParagraphFormat' или 'ReferenceHeaderParagraphFormat' в файле стиля.
-The\ character\ format\ is\ controlled\ by\ the\ citation\ property\ 'CitationCharacterFormat'\ in\ the\ style\ file.=Формат символа задается с помощью свойства цитаты 'CitationCharacterFormat' в файле стиля.
+
+Could\ not\ update\ bibliography=Не удалось обновить библиографию
+Not\ connected\ to\ document=Нет подключения к документу
+Problem\ combining\ cite\ markers=Проблема при объединении отметок цитирования
+Unable\ to\ reload\ style\ file=Не удалось перезагрузить файл оформления
+
+Problem\ during\ separating\ cite\ markers=Проблема при разделении отметок цитирования
+
 Automatically\ sync\ bibliography\ when\ inserting\ citations=Автоматически синхронизировать библиографию при вставке цитат
 Look\ up\ BibTeX\ entries\ in\ the\ active\ tab\ only=Поиск записей BibTeX только в активной вкладке
 Look\ up\ BibTeX\ entries\ in\ all\ open\ libraries=Поиск записей BibTeX во всех открытых БД
@@ -1074,6 +1117,7 @@ Style\ selection=Выбор стиля
 No\ valid\ style\ file\ defined=Не определен допустимый файл стиля
 Choose\ pattern=Выбор шаблона
 Search\ and\ store\ files\ relative\ to\ library\ file\ location=Поиск и хранение файлов относительно файла библиотеки
+File\ directory=Каталог файлов
 Could\ not\ run\ the\ gnuclient/emacsclient\ program.\ Make\ sure\ you\ have\ the\ emacsclient/gnuclient\ program\ installed\ and\ available\ in\ the\ PATH.=Не удалось запустить приложение gnuclient/emacsclient. Убедитесь, что приложение gnuclient/emacsclient установлено и доступно по указанному пути PATH.
 You\ must\ select\ either\ a\ valid\ style\ file,\ or\ use\ one\ of\ the\ default\ styles.=Необходимо использовать допустимый файл стиля или один из стилей по умолчанию.
 
@@ -1156,7 +1200,9 @@ Toggle\ relevance=Показать/скрыть релевантность
 Toggle\ quality\ assured=Прказать/скрыть проверку контроля качества
 Toggle\ print\ status=Изменить статус 'печать'
 Update\ keywords=Изменить ключевые слова
+Problem\ connecting=Проблема при подключении
 Connection\ to\ OpenOffice/LibreOffice\ has\ been\ lost.\ Please\ make\ sure\ OpenOffice/LibreOffice\ is\ running,\ and\ try\ to\ reconnect.=Соединение с OpenOffice/LibreOffice прервано. Убедитесь, что приложение OpenOffice/LibreOffice запущено и повторите соединение.
+
 JabRef\ will\ send\ at\ least\ one\ request\ per\ entry\ to\ a\ publisher.=JabRef отправляет по крайней мере один запрос для заметки издателю.
 Correct\ the\ entry,\ and\ reopen\ editor\ to\ display/edit\ source.=Исправить запись и повторно открыть редактор для отображения/изменения исходника.
 Could\ not\ connect\ to\ running\ OpenOffice/LibreOffice.=Не удалось подключиться к работающему приложению OpenOffice/LibreOffice.
@@ -1169,8 +1215,7 @@ Removed\ all\ subgroups\ of\ group\ "%0".=Все подгруппы группы
 To\ disable\ the\ memory\ stick\ mode\ rename\ or\ remove\ the\ jabref.xml\ file\ in\ the\ same\ folder\ as\ JabRef.=Для отключения режима флеш-памяти переименуйте или удалите файл jabref.xml в каталоге JabRef.
 Unable\ to\ connect.\ One\ possible\ reason\ is\ that\ JabRef\ and\ OpenOffice/LibreOffice\ are\ not\ both\ running\ in\ either\ 32\ bit\ mode\ or\ 64\ bit\ mode.=Не удалось выполнить подключение. Возможная причина\: JabRef и OpenOffice/LibreOffice не запущены в режиме 32-х или 64-х битного приложения.
 Delimiter(s)=Разделитель(и)
-Your\ style\ file\ specifies\ the\ character\ format\ '%0',\ which\ is\ undefined\ in\ your\ current\ OpenOffice/LibreOffice\ document.=В пользовательском файле стиля указан формат знака '%0', не определенный в текущем документе OpenOffice/LibreOffice.
-Your\ style\ file\ specifies\ the\ paragraph\ format\ '%0',\ which\ is\ undefined\ in\ your\ current\ OpenOffice/LibreOffice\ document.=В пользовательском файле стиля указан формат абзаца '%0', не определенный в текущем документе OpenOffice/LibreOffice.
+When\ downloading\ files,\ or\ moving\ linked\ files\ to\ the\ file\ directory,\ use\ the\ bib\ file\ location.=При загрузке файлов или перемещении связанных файлов в каталог файлов используйте расположение файла bib.
 
 Searching...=Выполняется поиск...
 Please\ enter\ a\ search\ string=Введите строку для поиска
@@ -1208,6 +1253,16 @@ Use\ custom\ proxy\ configuration=Использовать пользовате
 Proxy\ requires\ authentication=Для прокси-сервера требуется авторизация
 Attention\:\ Password\ is\ stored\ in\ plain\ text\!=Внимание. Пароль сохранен в виде простого текста.
 Clear\ connection\ settings=Удалить настройки подключения
+Check\ Proxy\ Setting=Проверить настройки прокси
+Check\ connection=Проверить подключение
+Connection\ failed\!=Соединение потеряно\!
+Connection\ successful\!=Соединение успешно\!
+
+SSL\ Configuration=Конфигурация SSL
+SSL\ configuration\ changed=Конфигурация SSL изменена
+SSL\ certificate\ file=Файл сертификата SSL
+Duplicate\ Certificates=Дубликаты сертификатов
+You\ already\ added\ this\ certificate=Вы уже добавили этот сертификат
 
 Open\ folder=Открыть папку
 Export\ sort\ order=Экспорт в порядке сортировки
@@ -1244,6 +1299,7 @@ Please\ open\ %0\ manually.=Откройте %0 вручную.
 The\ link\ has\ been\ copied\ to\ the\ clipboard.=Ссылка скопирована в буфер обмена.
 
 Open\ %0\ file=Открыть файл %0
+Could\ not\ detect\ terminal\ automatically.\ Please\ define\ a\ custom\ terminal\ in\ the\ preferences.=Не удалось обнаружить терминал автоматически. Пожалуйста, укажите пользовательский терминал в настройках.
 
 Cannot\ delete\ file=Невозможно удалить файл
 File\ permission\ error=Ошибка прав доступа для файла
@@ -1289,9 +1345,7 @@ Save\ changes=Сохранить изменения
 Discard\ changes=Отменить изменения
 Library\ '%0'\ has\ changed.=БД '%0' изменена.
 Print\ entry\ preview=Предварительный просмотр записи для печати
-Copy\ title=Копировать заглавие
-Copy\ \\cite{citation\ key}=Копировать \\ цитировать{citation key}
-Copy\ citation\ key\ and\ title=Копировать ключ цитаты и заголовок
+
 Invalid\ DOI\:\ '%0'.=Недопустимый DOI-адрес\: '%0'.
 Same\ DOI\ used\ in\ multiple\ entries=Один и тот же DOI используется в нескольких записях
 should\ start\ with\ a\ name=должно начинаться с имени
@@ -1552,6 +1606,22 @@ Custom=Определено пользователем
 Export\ cited=Экспорт цитированного
 Unable\ to\ generate\ new\ library=Не удалось создать новую БД
 
+The\ cursor\ is\ in\ a\ protected\ area.=Курсор находится в защищённой области.
+JabRefException=JabRefException
+No\ bibliography\ database\ is\ open\ for\ citation.=Не открыто библиографических баз данных для цитирования.
+
+No\ database\ is\ open\ for\ updating\ citation\ markers\ after\ citing.=Не открыто библиографических баз данных для обновления отметок ссылок после цитирования.
+
+No\ bibliography\ entries\ are\ selected\ for\ citation.=Не выбраны библиографические записи для выполнения цитирования.
+No\ bibliography\ style\ is\ selected\ for\ citation.=Не выбрано оформление библиографии для выполнения цитирования.
+No\ database=Нет базы данных
+
+No\ entries\ selected\ for\ citation=Не выбрано записей для выполнения цитирования
+Open\ one\ before\ citing.=Откройте одну из них перед цитированием.
+
+Select\ one\ before\ citing.=Выберите одну из них перед цитированием.
+Select\ some\ before\ citing.=Выберите несколько перед выполнением цитирования.
+
 Found\ identical\ ranges=Найдены идентичные диапазоны
 Found\ overlapping\ ranges=Найдены пересекающиеся диапазоны
 Found\ touching\ ranges=Найдены соприкасающиеся диапазоны
@@ -1617,6 +1687,8 @@ Issue\ report\ successful=Отчёт об ошибке успешно отпра
 Your\ issue\ was\ reported\ in\ your\ browser.=Отчет о проблеме был отправлен в браузер.
 The\ log\ and\ exception\ information\ was\ copied\ to\ your\ clipboard.=Лог и информация об ошибке успешно скопированы.
 Please\ paste\ this\ information\ (with\ Ctrl+V)\ in\ the\ issue\ description.=Пожалуйста, вставьте эту информацию (с помощью Ctrl+V) в описание проблемы.
+Last\ notification=Последнее уведомление
+Check\ the\ event\ log\ to\ see\ all\ notifications=Проверьте журнал событий для просмотра всех уведомлений
 
 Host=Хост
 Port=Порт
@@ -1654,7 +1726,6 @@ Protected\ terms\ file=Файл с защищенными терминами
 Style\ file=Файл стиля
 
 Open\ OpenOffice/LibreOffice\ connection=Установить подключение к Open OpenOffice/LibreOffice
-You\ must\ enter\ at\ least\ one\ field\ name=Необходимо ввести минимум одно имя поля
 Non-ASCII\ encoded\ character\ found=Обнаружен символ не в кодировке ASCII
 Non-UTF-8\ encoded\ field\ found=Найдено поле НЕ в кодировке UTF-8
 Toggle\ web\ search\ interface=Переключение интерфейса веб-поиска
@@ -1700,7 +1771,6 @@ should\ be\ normalized=должно быть нормализовано
 
 Empty\ search\ ID=Пустой поисковый запрос
 The\ given\ search\ ID\ was\ empty.=Указанный поисковый ID был пустым.
-Copy\ citation\ key\ and\ link=Скопировать ключ цитаты и ссылку
 biblatex\ field\ only=только поле типа biblatex
 
 Error\ while\ generating\ fetch\ URL=Ошибка генерации URL адреса загрузки
@@ -1793,7 +1863,6 @@ Removes\ all\ hyphenated\ line\ breaks\ in\ the\ field\ content.=Удаляет
 Could\ not\ retrieve\ entry\ data\ from\ '%0'.=Не удалось получить данные из записи '%0'.
 Entry\ from\ %0\ could\ not\ be\ parsed.=Данные в %0 не могут быть обработаны.
 Invalid\ identifier\:\ '%0'.=Неверный идентификатор\: '%0'.
-This\ paper\ has\ been\ withdrawn.=Настоящий документ был отозван.
 empty\ citation\ key=пустой ключ цитаты
 Aux\ file=Aux файл
 Group\ containing\ entries\ cited\ in\ a\ given\ TeX\ file=Группа, содержащая записи в заданном TeX файле
@@ -1821,9 +1890,7 @@ Could\ not\ connect\ to\ Vim\ server.\ Make\ sure\ that\ Vim\ is\ running\ with\
 Could\ not\ connect\ to\ a\ running\ gnuserv\ process.\ Make\ sure\ that\ Emacs\ or\ XEmacs\ is\ running,\ and\ that\ the\ server\ has\ been\ started\ (by\ running\ the\ command\ 'server-start'/'gnuserv-start').=Не удалось подключиться к запущенному процессу gnuserv. Убедитесь, что приложение Emacs или XEmacsи сервер запущены(с помощью команды 'server-start'/'gnuserv-start').
 Error\ pushing\ entries=Ошибка при отправке записей
 
-Undefined\ character\ format=Неопределенный символьный формат
-Undefined\ paragraph\ format=Неопределенный формат абзаца
-
+Preamble=Преамбула
 Markings=Маркировка
 Use\ selected\ instance=Использовать выбранный экземпляр
 
@@ -1842,8 +1909,8 @@ Blog=Блог
 Check\ integrity=Проверка целостности
 Cleanup\ URL\ link=Очистить URL ссылку
 Cleanup\ URL\ link\ by\ removing\ special\ symbols\ and\ extracting\ simple\ link=Очистка URL ссылку, удалив специальные символы, чтобы получился простой URL
+Copy\ DOI=Копировать DOI
 Copy\ DOI\ url=Копировать URL-адрес DOI
-Copy\ citation=Копировать цитату
 Development\ version=Версия для разработчиков
 Export\ selected\ entries=Экспорт выбранных записей
 Export\ selected\ entries\ to\ clipboard=Копировать выбранные записи в буфер обмена
@@ -1852,6 +1919,8 @@ JabRef\ resources=Ресурсы JabRef
 Manage\ journal\ abbreviations=Настроить аббревиатуры журналов
 Manage\ protected\ terms=Управление защищенными терминами
 New\ entry\ from\ plain\ text=Новая запись из обычного текста
+Import\ by\ ID=Импортировать по ID
+Enter\ a\ valid\ ID=Введите действительный ID
 New\ sublibrary\ based\ on\ AUX\ file=Новая под-библиотека из файла AUX
 Push\ entries\ to\ external\ application\ (%0)=Передать записи во внешнее приложение (%0)
 Quit=Выход
@@ -1911,6 +1980,7 @@ Keyword\ separator=Разделитель ключевых слов
 Remove\ keyword=Удалить слово
 Are\ you\ sure\ you\ want\ to\ remove\ keyword\:\ "%0"?=Вы уверены, что вы хотите удалить слово\: "%0"?
 Reset\ to\ default=Сбросить настройки
+String\ constants=Строковые постоянные
 Export\ all\ entries=Экспорт всех записей
 Generate\ citation\ keys=Генерировать ключи цитирования
 Manage\ field\ names\ &\ content=Управлять названиями полей и контентом
@@ -2040,6 +2110,7 @@ Please\ provide\ a\ valid\ aux\ file.=Пожалуйста, предоставь
 Keyword\ delimiter=Разделитель ключевых слов
 Hierarchical\ keyword\ delimiter=Разделитель иерархических ключевых слов
 Escape\ ampersands=Экранировка амперсандов
+Escape\ dollar\ sign=Экранированный символ доллара
 
 Hint\:\n\nTo\ search\ all\ fields\ for\ <b>Smith</b>,\ enter\:\n<tt>smith</tt>\n\nTo\ search\ the\ field\ <b>author</b>\ for\ <b>Smith</b>\ and\ the\ field\ <b>title</b>\ for\ <b>electrical</b>,\ enter\:\n<tt>author\=Smith\ and\ title\=electrical</tt>=Подсказка\:\nдля поиска всех полей со значением <b>Smith</b>, введите\:\n<p><tt>smith</tt><p>\nДля поиска в поле <b>Автор</b> значения <b>Smith</b> а в поле <b>Заголовок</b> значения <b>electrical</b>, введите\:\n<p><tt>author\=smith and title\=electrical</tt>
 
@@ -2274,10 +2345,6 @@ Removes\ digits.=Удаляет цифры.
 
 Presets=Предустановки
 
-Check\ Proxy\ Setting=Проверить настройки прокси
-Check\ connection=Проверить подключение
-Connection\ failed\!=Соединение потеряно\!
-Connection\ successful\!=Соединение успешно\!
 Generate\ groups\ from\ keywords\ in\ the\ following\ field=Создать группы из ключевых слов в следующем поле
 Generate\ groups\ for\ author\ last\ names=Создание групп для фамилий авторов
 Regular\ expression=Регулярное выражение
@@ -2297,15 +2364,43 @@ Separate\ merged\ citations=Разделить выбранные цитаты
 Separate\ citations=Разделить цитаты
 
 Unprotect\ terms=Незащищенные термины
-Error\ connecting\ to\ Writer\ document=Ошибка подключения к документу Writer
-You\ need\ to\ open\ Writer\ with\ a\ document\ before\ connecting=Вам нужно Writer с документом перед подключением
 
 Generate\ a\ new\ key\ for\ imported\ entries\ (overwriting\ their\ default)=Создать новый ключ для импортированных записей (взамен существующих)
+Warn\ about\ duplicates\ on\ import=Предупреждать о дубликатах при импорте
 Import\ and\ Export=Импорт и экспорт
 Custom\ DOI\ URI=Пользовательский DOI URI
 Use\ custom\ DOI\ base\ URI\ for\ article\ access=Использовать пользовательский базовый URI от DOI для доступа к материалам
 
 Cited\ on\ pages=Цитаты на страницах
+Please\ move\ the\ cursor\ into\ the\ document\ text.=Пожалуйста, переместите курсов в текст документа.
+To\ get\ the\ visual\ positions\ of\ your\ citations\ I\ need\ to\ move\ the\ cursor\ around,\ but\ could\ not\ get\ it.=Для получения информации о зрительном положении ваших цитат, мне необходимо передвинуть курсор, однако мне не удалось его захватить.
+
+I\ cannot\ insert\ to\ the\ cursors\ current\ location.=Я не могу осуществить вставку в текущее положение курсора.
+
+Please\ move\ the\ cursor\ to\ the\ location\ for\ the\ new\ citation.=Пожалуйста, переместите курсор в положение нового цитирования.
+
+Please\ create\ it\ in\ the\ document\ or\ change\ in\ the\ file\:=Пожалуйста, создайте его в документе или измените в файле\:
+
+Please\ use\ the\ latter\ in\ the\ style\ file\ below\ to\ avoid\ localization\ problems.=Пожалуйста, используйте последний вариант в файле оформления ниже во избежание проблем локализации.
+
+The\ %0\ character\ style\ '%1'\ is\ a\ display\ name\ for\ '%2'.=Стиль '%1' символа %0 является отображаемым именем для '%2'.
+
+The\ %0\ character\ style\ '%1'\ is\ missing\ from\ the\ document=Стиль '%1' символа %0 отсутствует в документе
+
+The\ %0\ paragraph\ style\ '%1'\ is\ a\ display\ name\ for\ '%2'.=Стиль '%1' абзаца %0 является отображаемым именем для '%2'.
+
+The\ %0\ paragraph\ style\ '%1'\ is\ missing\ from\ the\ document=Стиль '%1' абзаца %0 отсутствует в документе
+
+Error\ while\ checking\ if\ Writer\ is\ recording\ changes\ or\ has\ recorded\ changes.=Ошибка при проверке того, записывает ли Writer изменения или содержит записанные изменения.
+
+Cannot\ work\ with\ [Edit]/[Track\ Changes]/[Record]\ turned\ on.=Невозможно выполнить при включённом [Edit]/[Track Changes]/[Record].
+
+Changes\ by\ JabRef\ could\ result\ in\ unexpected\ interactions\ with\ recorded\ changes.=Изменения, выполненные JabRef, могут привести к неожиданным взаимодействиям с записанными изменениями.
+
+Recording\ and/or\ Recorded\ changes=Изменения записываются и/или записаны
+
+Use\ [Edit]/[Track\ Changes]/[Manage]\ to\ resolve\ them\ first.=Сперва используйте [Edit]/[Track Changes]/[Manage], чтобы их разрешить.
+
 Unable\ to\ find\ valid\ certification\ path\ to\ requested\ target(%0),\ download\ anyway?=Не удается найти действительный путь сертификации к запрошенной цели (%0), все равно загрузить?
 Download\ operation\ canceled.=Операция загрузки отменена.
 
@@ -2322,7 +2417,6 @@ Entry\ Type=Тип записи
 Entry\ types=Типы записей
 Field\ names=Названия полей
 Others=Другие
-Overwrite\ existing\ field\ values=Перезаписать текущие значения полей
 Recommended=Рекомендованный
 
 Authors\ and\ Title=Авторы и Заголовок
@@ -2353,6 +2447,8 @@ Query=Запрос
 Question=Вопрос
 Select\ directory=Выберите каталог
 
+Fulltext\ Index=Полнотекстовое индексирование
+Automatically\ index\ all\ linked\ files\ for\ fulltext\ search=Автоматически индексировать все связанные файлы для полнотекстового поиска
 Rebuild\ fulltext\ search\ index=Перестроить полнотекствой индекс
 Rebuild\ fulltext\ search\ index\ for\ current\ library?=Перестроить полнотекстовой индекс для текущей библиотеки?
 Rebuilding\ fulltext\ search\ index...=Перестроить полнотекствой индекс...
@@ -2365,6 +2461,9 @@ Grobid\ URL=Grobid URL
 Remote\ services=Удаленные сервисы
 Allow\ sending\ PDF\ files\ and\ raw\ citation\ strings\ to\ a\ JabRef\ online\ service\ (Grobid)\ to\ determine\ Metadata.\ This\ produces\ better\ results.=Разрешить отправку PDF-файлов и цитат в онлайн сервис JabRef (Grobid) для определения метаданных. Это приводит к улучшению результатов.
 
+Fetcher\ cannot\ be\ tested\!=Невозможно проверить сборщик данных\!
+Fetcher\ unknown\!=Неизвестный сборщик данных\!
+
 Character\ by\ character=Посимвольно
 Embedded=Встроенный
 Entry=Запись
@@ -2378,3 +2477,31 @@ Could\ not\ extract\ Metadata\ from\:\ %0=Не удалось извлечь м
 Search\ across\ libraries\ in\ a\ new\ window=Поиск по библиотекам в новом окне
 Keep\ search\ string\ across\ libraries=Сохранить строку поиска по библиотекам
 Keep\ dialog\ always\ on\ top=Показывать диалог поверх всех окон
+Search\ results\ from\ open\ libraries=Результаты поиска в открытых библиотеках
+
+Add\ certificate=Добавить сертификат
+Serial\ number=Серийный номер
+Issuer=Издатель
+Valid\ from=Действителен с
+Valid\ to=Действителен до
+Signature\ algorithm=Алгоритм подписи
+Version=Версия
+
+Error\ downloading=Ошибка загрузки
+
+Error\ while\ writing\ metadata.\ See\ the\ error\ log\ for\ details.=Ошибка при записи метаданных. Смотрите журнал ошибок для подробностей.
+Failed\ to\ write\ metadata,\ file\ %1\ not\ found.=Не удалось записать метаданные, файл %1 не найден.
+Success\!\ Finished\ writing\ metadata.=Успех\! Запись метаданных завершена.
+
+Custom\ API\ key=Пользовательский ключ API
+Check\ %0\ API\ Key\ Setting=Проверьте настройку ключа API %0
+
+Set=Задать
+Append=Присоединить
+Rename=Переименовать
+New\ field\ name=Новое имя поля
+Automatic\ field\ editor=Автоматический редактор поля
+
+(Note\:\ If\ original\ entries\ lack\ keywords\ to\ qualify\ for\ the\ new\ group\ configuration,\ confirming\ here\ will\ add\ them)=(Примечание\: Если в исходных записях отсутствуют ключевые слова, подходящие для конфигурации новой группы, то при подтверждении здесь они будут добавлены)
+Assign=Назначить
+Do\ not\ assign=Не назначать
diff --git a/src/main/resources/l10n/JabRef_sv.properties b/src/main/resources/l10n/JabRef_sv.properties
index 5e9c6f1c023..ae4d6c18d10 100644
--- a/src/main/resources/l10n/JabRef_sv.properties
+++ b/src/main/resources/l10n/JabRef_sv.properties
@@ -1,7 +1,12 @@
+Could\ not\ delete\ empty\ entries.=Kunde inte ta bort tomma poster.
 
+Delete\ empty\ entries=Ta bort tomma poster
 
+Empty\ entries=Tomma poster
 
+Keep\ empty\ entries=Behåll tomma poster
 
+Library\ '%0'\ has\ empty\ entries.\ Do\ you\ want\ to\ delete\ them?=Biblioteket '%0' har tomma poster. Vill du ta bort dem?
 
 %0\ contains\ the\ regular\ expression\ <b>%1</b>=%0 innehåller det reguljära uttrycket <b>%1</b>
 
@@ -11,8 +16,9 @@
 
 %0\ doesn't\ contain\ the\ term\ <b>%1</b>=%0 innehåller inte termen <b>%1</b>
 
+%0/%1\ entries=%0/%1 poster
+
 
-%0\ export\ successful=%0-export lyckades
 
 %0\ matches\ the\ regular\ expression\ <b>%1</b>=%0 matchar det reguljära uttrycket <b>%1</b>
 
@@ -43,6 +49,7 @@ Add=Lägg till
 Add\ a\ (compiled)\ custom\ Importer\ class\ from\ a\ class\ path.=Lägg till en (kompilerad) Importer-klass från en sökväg till en klass.
 
 
+Add\ entry\ manually=Lägg till post manuellt
 
 Add\ selected\ entries\ to\ this\ group=Lägg till valda poster till denna grupp
 
@@ -132,8 +139,7 @@ Cite\ command=Citeringskommando
 
 Clear=Rensa
 
-Clear\ fields=Rensa fält
-
+Open\ /\ close\ entry\ editor=Öppna / stäng postredigerare
 
 Close\ dialog=Stäng dialog
 
@@ -152,7 +158,9 @@ Copied=Kopierade
 
 Copy=Kopiera
 
+Copy\ title=Kopiera titel
 Copy\ citation\ key=Kopiera referensnyckel
+Copy\ citation\ key\ and\ title=Kopiera referensnyckel och titel
 
 Copy\ to\ clipboard=Kopiera till urklipp
 
@@ -176,6 +184,7 @@ Could\ not\ run\ the\ 'vim'\ program.=Kunde inte köra 'vim'.
 Could\ not\ save\ file.=Kunde inte spara fil.
 Character\ encoding\ '%0'\ is\ not\ supported.=Teckenkodningen '%0' stöds inte.
 
+Create\ custom\ fields\ for\ each\ BibTeX\ entry=Skapa anpassade fält för varje BibTeX-post
 
 crossreferenced\ entries\ included=korsrefererade poster inkluderade
 
@@ -203,7 +212,7 @@ Library\ properties=Bibliotekets egenskaper
 
 Default=Standard
 
-Default\ encoding=Standardteckenkodning
+The\ chosen\ encoding\ '%0'\ could\ not\ encode\ the\ following\ characters\:=Den valde teckenkodningen '%0' kan inte representera följande tecken
 
 Downloading=Laddar ner
 
@@ -469,6 +478,8 @@ Mr.\ DLib\ Privacy\ settings=Mr. DLib sekretessinställningar
 
 
 
+
+
 Name=Namn
 
 Name\ formatter=Namnformattering
@@ -550,8 +561,6 @@ Path\ to\ %0\ not\ defined=Sökväg till %0 är inte angiven
 
 Path\ to\ LyX\ pipe=Sökväg till LyX-pipe
 
-PDF\ does\ not\ exist=PDF finns inte
-
 
 Please\ enter\ a\ name\ for\ the\ group.=Ange ett namn för gruppen.
 
@@ -608,11 +617,18 @@ Remove\ selected\ entries\ from\ this\ group=Ta bort valda poster från denna gr
 
 Remove\ group=Ta bort grupp
 
-Remove\ group\ "%0"?=Ta bort gruppen "%0"?
+Remove\ group\ and\ subgroups=Ta bort grupp och dess undergrupper
+
+
+
+
+
 
 Remove\ group\ "%0"\ and\ its\ subgroups?=Ta bort gruppen "%0" och dess undergrupper?
 
-Remove\ group\ and\ subgroups=Ta bort grupp och dess undergrupper
+Removed\ group\ "%0"\ and\ its\ subgroups.=Tog bort gruppen "%0" och dess undergrupper.
+
+
 
 Remove\ link=Ta bort länk
 
@@ -622,8 +638,6 @@ Remove\ string\ %0=Ta bort sträng %0
 
 Removed\ group\ "%0".=Tog bort gruppen "%0".
 
-Removed\ group\ "%0"\ and\ its\ subgroups.=Tog bort gruppen "%0" och dess undergrupper.
-
 Removed\ string=Tog bort sträng
 
 Renamed\ string=Bytte namn på sträng
@@ -675,9 +689,6 @@ Select\ entry\ type=Välj posttyp
 Select\ file\ from\ ZIP-archive=Välj fil från ZIP-arkiv
 
 
-Set\ field=Sätt fält
-Set\ fields=Sätt fält
-
 Settings=Alternativ
 
 Shortcut=Genväg
@@ -708,7 +719,6 @@ Size=Storlek
 Skipped\ -\ No\ PDF\ linked=Hoppade över - Ingen PDF länkad
 Skipped\ -\ PDF\ does\ not\ exist=Hoppade över - PDF fanns ej
 
-Skipped\ entry.=Hoppade över post.
 
 
 source\ edit=ändring av källkod
@@ -720,8 +730,6 @@ Statically\ group\ entries\ by\ manual\ assignment=Gruppera poster genom att man
 
 Switches\ between\ full\ and\ abbreviated\ journal\ name\ if\ the\ journal\ name\ is\ known.=Växlar mellan fullt och förkortat tidskiftsnamn om tidskriften är känd.
 
-The\ chosen\ encoding\ '%0'\ could\ not\ encode\ the\ following\ characters\:=Den valde teckenkodningen '%0' kan inte representera följande tecken
-
 
 the\ field\ <b>%0</b>=fältet <b>%0</b>
 The\ group\ "%0"\ already\ contains\ the\ selection.=Gruppen "%0" innehåller redan de valda posterna.
@@ -820,8 +828,6 @@ Line\ %0\:\ Found\ corrupted\ citation\ key\ %1\ (contains\ whitespaces).=Rad %0
 Line\ %0\:\ Found\ corrupted\ citation\ key\ %1\ (comma\ missing).=Rad %0\: Hittade korrupt referensnyckel %1 (kommatecken saknas).
 Download\ from\ URL=Ladda ned från URL
 Rename\ field=Byt namn på fält
-Rename\ field\ to=Byt namn på fält till
-Move\ contents\ of\ a\ field\ into\ a\ field\ with\ a\ different\ name=Flytta innehållet i ett fält till ett fält med ett annat namn
 
 Cannot\ use\ port\ %0\ for\ remote\ operation;\ another\ application\ may\ be\ using\ it.\ Try\ specifying\ another\ port.=Kan inte använda port "%0" för fjärråtkomst; ett annat program kanske använder den. Försök med en annan port.
 
@@ -878,7 +884,6 @@ Manage\ citations=Hantera referenser
 Problem\ modifying\ citation=Problem att modifiera citering
 Citation=Referens
 Connecting...=Ansluter...
-Could\ not\ resolve\ BibTeX\ entry\ for\ citation\ marker\ '%0'.=Kunde inte hitta en BibTeX-post för referensmarkören '%0'.
 Select\ style=Välj stil
 Journals=Tidskrifter
 Cite=Referera
@@ -890,14 +895,25 @@ Select\ Writer\ document=Välj Writer-dokument
 Sync\ OpenOffice/LibreOffice\ bibliography=Synka OpenOffic/LibreOffice-bibliografi
 Select\ which\ open\ Writer\ document\ to\ work\ on=Välj vilket öppet Writer-dokument som ska användas
 Connected\ to\ document=Ansluten till dokument
+
+
+
 Insert\ a\ citation\ without\ text\ (the\ entry\ will\ appear\ in\ the\ reference\ list)=Infoga en citering utan text (posten kommer visas i referenslistan)
 Cite\ selected\ entries\ with\ extra\ information=Referera till valda poster och lägg till extra information
 Ensure\ that\ the\ bibliography\ is\ up-to-date=Se till att bibliografin är uppdaterad
+
+
+
+
+
 Unable\ to\ synchronize\ bibliography=Kan inte synkronisera bibliografi
 Combine\ pairs\ of\ citations\ that\ are\ separated\ by\ spaces\ only=Slå ihop citeringar som bara separareras av mellanslag
 Autodetection\ failed=Kunde inte detektera sökvägar
 Please\ wait...=Vänta...
 Connection\ lost=Tappade anslutning
+
+
+
 Automatically\ sync\ bibliography\ when\ inserting\ citations=Synkronisera bibliografin automatiskt när citeringar infogas
 Look\ up\ BibTeX\ entries\ in\ the\ active\ tab\ only=Leta bara efter BibTeX-poster i aktiv flik
 Look\ up\ BibTeX\ entries\ in\ all\ open\ libraries=Leta efter BibTeX-poster i alla öppna libraryr
@@ -976,6 +992,7 @@ Toggle\ quality\ assured=Växla kvalitetssäkring
 Toggle\ print\ status=Växla utskriftsstatus
 Update\ keywords=Uppdatera nyckelord
 Connection\ to\ OpenOffice/LibreOffice\ has\ been\ lost.\ Please\ make\ sure\ OpenOffice/LibreOffice\ is\ running,\ and\ try\ to\ reconnect.=Anslutningen till OpenOffice/LibreOffice försvann. Se till att OpenOffice/LibreOffice körs och anslut på nytt.
+
 JabRef\ will\ send\ at\ least\ one\ request\ per\ entry\ to\ a\ publisher.=JabRef ska sända minst en begäran för varje post till en förläggare.
 Could\ not\ connect\ to\ running\ OpenOffice/LibreOffice.=Kunde inte ansluta till OpenOffice/LibreOffice.
 Make\ sure\ you\ have\ installed\ OpenOffice/LibreOffice\ with\ Java\ support.=Kontrollera att du har installerat OpenOffice/LibreOffice med Java-stöd.
@@ -983,8 +1000,6 @@ If\ connecting\ manually,\ please\ verify\ program\ and\ library\ paths.=Om du a
 Error\ message\:=Felmeddelande\:
 Removed\ all\ subgroups\ of\ group\ "%0".=Tog bort alla undergrupper för gruppen "%0".
 To\ disable\ the\ memory\ stick\ mode\ rename\ or\ remove\ the\ jabref.xml\ file\ in\ the\ same\ folder\ as\ JabRef.=För att inaktivera minnessticksläget, byta namn eller ta bort jabref.xml-filen i samma mapp som JabRef.
-Your\ style\ file\ specifies\ the\ character\ format\ '%0',\ which\ is\ undefined\ in\ your\ current\ OpenOffice/LibreOffice\ document.=Din stilfil anger bokstavsformatet '%0', som är odefinierat i ditt nuvarande OpenOffice/LibreOffice-dokument.
-Your\ style\ file\ specifies\ the\ paragraph\ format\ '%0',\ which\ is\ undefined\ in\ your\ current\ OpenOffice/LibreOffice\ document.=Din stilfil anger styckesformatet '%0', som är odefinierat i ditt nuvarande OpenOffice/LibreOffice-dokument.
 
 Searching...=Söker...
 Please\ enter\ a\ search\ string=Ange en söksträng
@@ -1012,6 +1027,7 @@ Proxy\ requires\ authentication=Proxyn kräver autentisering
 Attention\:\ Password\ is\ stored\ in\ plain\ text\!=OBS\! Lösenordet sparas i klartext\!
 Clear\ connection\ settings=Rensa anslutningsinställningar
 
+
 Open\ folder=Öppna mapp
 Export\ sort\ order=Soteringsordning vid export
 
@@ -1078,8 +1094,7 @@ Save\ changes=Spara ändringar
 Discard\ changes=Ignorera ändringar
 Library\ '%0'\ has\ changed.=Biblioteket '%0' har ändrats.
 Print\ entry\ preview=Skriv ut postvisning
-Copy\ title=Kopiera titel
-Copy\ citation\ key\ and\ title=Kopiera referensnyckel och titel
+
 Invalid\ DOI\:\ '%0'.=Ogiltig DOI\: '%0'.
 Same\ DOI\ used\ in\ multiple\ entries=Samma DOI används i flera poster
 should\ start\ with\ a\ name=ska börja med ett namn
@@ -1286,6 +1301,11 @@ Export\ cited=Exportera citerade
 Unable\ to\ generate\ new\ library=Kunde inte skapa nytt bibliotek
 
 
+
+
+
+
+
 Error\ occured\ while\ executing\ the\ command\ "%0".=Fel när kommandot "%0" kördes.
 Reformat\ ISSN=Formattera om ISSN
 
@@ -1349,7 +1369,6 @@ Protected\ terms\ file=Fil med skyddade termer
 Style\ file=Stilfil för OpenOffice/LibreOffice
 
 Open\ OpenOffice/LibreOffice\ connection=Öppna OpenOffice/LibreOffice-anslutning
-You\ must\ enter\ at\ least\ one\ field\ name=Du måste ange minst ett fältnamn
 Non-ASCII\ encoded\ character\ found=Bokstäver som inte är ASCII-kodade hittades
 Toggle\ web\ search\ interface=Växla webbsökning
 
@@ -1400,7 +1419,6 @@ Shared\ database\ connection=Anslutning till delad databas
 Error\ pushing\ entries=Fel vid pushning av poster
 
 
-
 Hide\ panel=Dölj panel
 Move\ panel\ up=Flytta panelen uppåt
 Move\ panel\ down=Flytta panelen nedåt
@@ -1535,3 +1553,24 @@ Previous\ preview\ style=Föregående förhandsgranskningsstil
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/resources/l10n/JabRef_tl.properties b/src/main/resources/l10n/JabRef_tl.properties
index 3daa7c12be8..de37b3f268a 100644
--- a/src/main/resources/l10n/JabRef_tl.properties
+++ b/src/main/resources/l10n/JabRef_tl.properties
@@ -12,7 +12,7 @@
 %0\ doesn't\ contain\ the\ term\ <b>%1</b>=%0 hindi naglalaman ng termeno <b>%1</b>
 
 
-%0\ export\ successful=%0 ang pag-export ay matagumpay
+
 
 %0\ matches\ the\ regular\ expression\ <b>%1</b>=%0 nag tugma sa regular na ekspresyon <b>%1</b>
 
@@ -127,8 +127,6 @@ Cite\ command=Utos na nabanggit
 
 Clear=Malinaw
 
-Clear\ fields=Malinaw na patlang
-
 
 Close\ dialog=Isara ang dialog
 
@@ -147,6 +145,7 @@ Copied=Na kopya
 
 Copy=Kopya
 
+Copy\ title=Kopyahin ang pamagat
 
 Copy\ to\ clipboard=Kopyahin sa clipboad
 
@@ -197,7 +196,7 @@ Library\ properties=Katangian ng library
 
 Default=Default
 
-Default\ encoding=Default encoding
+The\ chosen\ encoding\ '%0'\ could\ not\ encode\ the\ following\ characters\:=Ang napiling encoding na '%0' ay hindi ma-encode ang mga sumusunod na character\:
 
 
 
@@ -461,6 +460,8 @@ Moved\ group\ "%0".=Nagalaw ang grupo "%0".
 
 
 
+
+
 Name=Pangalan
 
 Name\ formatter=Pangalan ng taga-format
@@ -542,8 +543,6 @@ Path\ to\ %0\ not\ defined=Ang landas sa %0 ay hindi natukoy
 
 Path\ to\ LyX\ pipe=Ang landas ng LyX pipe
 
-PDF\ does\ not\ exist=Ang PDF ay hindi umiiral
-
 File\ has\ no\ attached\ annotations=Ang file ay walang anotasyon
 
 Please\ enter\ a\ name\ for\ the\ group.=Pakiusap magpasok ng pangalan para sa grupo.
@@ -600,11 +599,18 @@ Remove\ selected\ entries\ from\ this\ group=Tanggalin ang napiling entries mula
 
 Remove\ group=Tanggaling ang grupo
 
-Remove\ group\ "%0"?=Tanggalin ang grupo "%0"?
+Remove\ group\ and\ subgroups=Tanggalin ang grupo at mga mababang grupo
+
+
+
+
+
 
 Remove\ group\ "%0"\ and\ its\ subgroups?=Tanggalin ang grupo "%0" at ang mababang grupo?
 
-Remove\ group\ and\ subgroups=Tanggalin ang grupo at mga mababang grupo
+Removed\ group\ "%0"\ and\ its\ subgroups.=Na tanggal ang grupo "%0"at ang mababang mga grupo.
+
+
 
 Remove\ link=Tanggalin ang link
 
@@ -613,8 +619,6 @@ Remove\ old\ entry=Tanggalin ang lumang entry
 
 Removed\ group\ "%0".=Tanggalin ang grupo "%0".
 
-Removed\ group\ "%0"\ and\ its\ subgroups.=Na tanggal ang grupo "%0"at ang mababang mga grupo.
-
 Removed\ string=Na tanggal ang string
 
 Renamed\ string=Palitan ulit ng pangalan ang string
@@ -671,9 +675,6 @@ Select\ file\ from\ ZIP-archive=Piliin ang file mula sa na arkiba na ZIP
 
 Select\ the\ tree\ nodes\ to\ view\ and\ accept\ or\ reject\ changes=Piliin ang nodes na puno para makita at matanggap o matanggihan ang pagbabago
 
-Set\ field=Ihanda ang patlang
-Set\ fields=Ihanda ang patlang
-
 Settings=Mga settings
 
 Shortcut=Shortcut
@@ -706,7 +707,6 @@ Size=Laki
 Skipped\ -\ No\ PDF\ linked=Nilaktawan - Walang PDF ang na linked
 Skipped\ -\ PDF\ does\ not\ exist=Nilaktawan - PDF ay hindi umiiral
 
-Skipped\ entry.=Nilaktawan ang entry.
 
 
 source\ edit=i-edit ang pinagmulan
@@ -719,8 +719,6 @@ Status=Katayuan
 
 Switches\ between\ full\ and\ abbreviated\ journal\ name\ if\ the\ journal\ name\ is\ known.=Lilipat sa pagitan ng buong at dinaglat na pangalan ng journal kung kulala ang pangalan ng journal.
 
-The\ chosen\ encoding\ '%0'\ could\ not\ encode\ the\ following\ characters\:=Ang napiling encoding na '%0' ay hindi ma-encode ang mga sumusunod na character\:
-
 
 the\ field\ <b>%0</b>=ang patlang na <b>%0</b>
 The\ group\ "%0"\ already\ contains\ the\ selection.=Ang grupo na '%0' ay naglalaman na ng pagpili.
@@ -822,10 +820,6 @@ This\ feature\ lets\ new\ files\ be\ opened\ or\ imported\ into\ an\ already\ ru
 
 Download\ from\ URL=I-download mula sa URL
 Rename\ field=Palitan ang pangalan ng patlang
-Append\ field=Ilagay ang field
-Append\ to\ fields=Ilagay sa mga patlang
-Rename\ field\ to=Palitan ang pangalan ng patlang sa
-Move\ contents\ of\ a\ field\ into\ a\ field\ with\ a\ different\ name=Ilipat ang mga nilalaman ng isang patlang sa isang patlang na may ibang pangalan
 
 Cannot\ use\ port\ %0\ for\ remote\ operation;\ another\ application\ may\ be\ using\ it.\ Try\ specifying\ another\ port.=Hindi magagamit ang port %0 para sa remote na operasyon; maaaring gamitin ng isa pang application. Subukan ang pagtukoy ng isa pang port.
 
@@ -884,7 +878,6 @@ Extra\ information\ (e.g.\ page\ number)=Dagdag na impormasyon (hal. numero ng p
 Manage\ citations=Pamahalaan ng mga pagsipi
 Problem\ modifying\ citation=Problema sa pagbabago ng pagsipi
 Citation=Pagsipi
-Could\ not\ resolve\ BibTeX\ entry\ for\ citation\ marker\ '%0'.=Hindi malutas ang entry ng BibTeX para sa marker ng pagsipi '%0'.
 Select\ style=Pumili ng estilo
 Journals=Mga journal
 Cite=Cite
@@ -896,16 +889,25 @@ Select\ Writer\ document=Piliin ang dokumento ng Writer
 Sync\ OpenOffice/LibreOffice\ bibliography=I-sync ang OpenOffice/LibreOffice bibliography
 Select\ which\ open\ Writer\ document\ to\ work\ on=Piliin kung aling bukas na dokumento ng writer upang magtrabaho
 Connected\ to\ document=Nakakonekta sa dokumento
+
+
+
 Insert\ a\ citation\ without\ text\ (the\ entry\ will\ appear\ in\ the\ reference\ list)=Magsingit ng isang sipi na walang teksto (ang entry ay lilitaw sa listahan ng sanggunian)
 Cite\ selected\ entries\ with\ extra\ information=Sipiin ang napiling mga entry na may dagdag na impormasyon
 Ensure\ that\ the\ bibliography\ is\ up-to-date=Tiyaking napapanahon ang bibliograpiya
+
+
+
+
+
 Unable\ to\ synchronize\ bibliography=Hindi ma-synchronize ang bibliograpiya
 Combine\ pairs\ of\ citations\ that\ are\ separated\ by\ spaces\ only=Pagsamahin ang mga pares ng mga pagsipi na pinaghihiwalay ng mga puwang lamang
 Autodetection\ failed=Nabigo ang autodetection
 Please\ wait...=Mangyaring maghintay...
 Connection\ lost=Nawala ang koneksyon
-The\ paragraph\ format\ is\ controlled\ by\ the\ property\ 'ReferenceParagraphFormat'\ or\ 'ReferenceHeaderParagraphFormat'\ in\ the\ style\ file.=Ang format ng talata ay kinokontrol ng 'ReferenceParagraphFormat' o 'ReferenceHeaderParagraphFormat' sa estilo ng file.
-The\ character\ format\ is\ controlled\ by\ the\ citation\ property\ 'CitationCharacterFormat'\ in\ the\ style\ file.=Ang format ng karakter ay kinokontrol ng property ng pagsipi 'CitationCharacterFormat' sa estilo ng file.
+
+
+
 Automatically\ sync\ bibliography\ when\ inserting\ citations=Awtomatikong i-sync ang bibliograpiya kapag nagpapasok ng mga pagsipi
 Look\ up\ BibTeX\ entries\ in\ the\ active\ tab\ only=Hanapin ang mga entry sa BibTeX sa aktibong tab lamang
 Look\ up\ BibTeX\ entries\ in\ all\ open\ libraries=Hanapin ang mga entry sa BibTeX sa lahat ng bukas na mga aklatan
@@ -987,6 +989,7 @@ Toggle\ quality\ assured=I-toggle ang siguradong kalidad
 Toggle\ print\ status=I-toggle ang katayuan ng print
 Update\ keywords=I-update ang keywords
 Connection\ to\ OpenOffice/LibreOffice\ has\ been\ lost.\ Please\ make\ sure\ OpenOffice/LibreOffice\ is\ running,\ and\ try\ to\ reconnect.=Koneksyon sa OpenOffice/LibreOffice ay nawala. Pakiusap na isigurado ang OpenOffie/LibreOffice ay tumatakbo, at subukang magkonek ulit.
+
 JabRef\ will\ send\ at\ least\ one\ request\ per\ entry\ to\ a\ publisher.=Ang JabRef ay magpapadala ng isang hiling bawat entry sa isang publisher.
 Correct\ the\ entry,\ and\ reopen\ editor\ to\ display/edit\ source.=Itama ang entry, at buksan ulit ang editor para maipakita/edit ang pinagmulan.
 Could\ not\ connect\ to\ running\ OpenOffice/LibreOffice.=Hindi makakonekta sa tumatakbo na OpenOffice/LibreOffice.
@@ -998,8 +1001,6 @@ Not\ connected\ to\ any\ Writer\ document.\ Please\ make\ sure\ a\ document\ is\
 Removed\ all\ subgroups\ of\ group\ "%0".=Tanggalin ang lahat ng mga mababang grupo sa grupo "%0".
 To\ disable\ the\ memory\ stick\ mode\ rename\ or\ remove\ the\ jabref.xml\ file\ in\ the\ same\ folder\ as\ JabRef.=Para di paganahin ang memory stick mode palitan ulit ng pangalan o tanggalin ang jabref.xml na file sa ka parehong folder bilang JabRef.
 Unable\ to\ connect.\ One\ possible\ reason\ is\ that\ JabRef\ and\ OpenOffice/LibreOffice\ are\ not\ both\ running\ in\ either\ 32\ bit\ mode\ or\ 64\ bit\ mode.=Hindi makakonek. Isang posibleng rason ay ang JabRef at OpenOffice/LibreOffice ay parehong hindi tumatakbo o anumang 32 bit na mode o 64 bit na mode.
-Your\ style\ file\ specifies\ the\ character\ format\ '%0',\ which\ is\ undefined\ in\ your\ current\ OpenOffice/LibreOffice\ document.=Ang iyong estilo ng file ay nakatukoy sa karakter na format '%0', kung saan hindi natukoy ang iyong kasalukuyang OpenOffice/LibreOffice na dokumento.
-Your\ style\ file\ specifies\ the\ paragraph\ format\ '%0',\ which\ is\ undefined\ in\ your\ current\ OpenOffice/LibreOffice\ document.=Ang iyong estilo ng file ay nakatukoy sa nakatalata na format '%0', kung saan hindi natukoy ang iyong kasalukuyang OpenOffice/LibreOffice na dokumento.
 
 Searching...=Naghahanap...
 Please\ enter\ a\ search\ string=Pakiusap sa pagpapasok ng string sa paghahanap
@@ -1028,6 +1029,7 @@ Proxy\ requires\ authentication=Kinakailangan ng proxy ang pagpapatunay
 Attention\:\ Password\ is\ stored\ in\ plain\ text\!=Pansin\: Ang password ay naka-imbak sa plain text\!
 Clear\ connection\ settings=I-clear ang mga setting ng koneksyon
 
+
 Export\ sort\ order=Mag-export ng uri ng order
 
 Show\ extra\ columns=Magpakita ng mga dagdag na haligi
@@ -1098,7 +1100,7 @@ Save\ changes=I-save ang mga pagbabago
 Discard\ changes=Itapon ang mga pagbabago
 Library\ '%0'\ has\ changed.=Binago ang Library '%0'.
 Print\ entry\ preview=I-print ang preview ng entry
-Copy\ title=Kopyahin ang pamagat
+
 Invalid\ DOI\:\ '%0'.=Di-wastong DOI\: '%0'.
 should\ start\ with\ a\ name=dapat magsimula sa isang pangalan
 should\ end\ with\ a\ name=dapat magtapos sa isang pangalan
@@ -1170,6 +1172,11 @@ Show\ debug\ level\ messages=Ipakita ang debug na antas ng mensahe
 
 
 
+
+
+
+
+
 
 
 
@@ -1196,7 +1203,6 @@ Protected\ terms\ file=Protektadong mga tuntunin na file
 Style\ file=Estilo ng file
 
 Open\ OpenOffice/LibreOffice\ connection=Buksan ang OpenOffice/LibreOffice na koneksyon
-You\ must\ enter\ at\ least\ one\ field\ name=Dapat kang magpasok ng hindi bababa sa isang pangalan ng field
 Non-ASCII\ encoded\ character\ found=Natagpuan ang naka-encode na karakter na hindi-ASCII
 Toggle\ web\ search\ interface=I-toggle ang interface ng paghahanap sa web
 
@@ -1266,7 +1272,6 @@ Removes\ all\ hyphenated\ line\ breaks\ in\ the\ field\ content.=Tinanggal ang l
 Could\ not\ retrieve\ entry\ data\ from\ '%0'.=Hindi makuha ang data mula sa entry '%0'.
 Entry\ from\ %0\ could\ not\ be\ parsed.=Ang entry mula sa %0 ay hindi ma-parse.
 Invalid\ identifier\:\ '%0'.=Di-wastong identifier\: '%0'.
-This\ paper\ has\ been\ withdrawn.=Ang papel na ito ay na-withdraw.
 Aux\ file=Aux file
 Group\ containing\ entries\ cited\ in\ a\ given\ TeX\ file=Grupo na naglalaman ng mga entry na binanggit sa isang ibinigay na file ng TeX
 
@@ -1278,7 +1283,6 @@ Any\ file=Anumang file
 
 
 
-
 The\ group\ name\ contains\ the\ keyword\ separator\ "%0"\ and\ thus\ probably\ does\ not\ work\ as\ expected.=Ang pangalan ng grupo ay naglalaman ng tagatala ng keyword na "%0" at sa gayon ay marahil ay hindi gumagana gaya ng inaasahan.
 
 Override\ default\ font\ settings=I-override ang mga default na font settings
@@ -1319,6 +1323,27 @@ Default\ pattern=Default na pattern
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
diff --git a/src/main/resources/l10n/JabRef_tr.properties b/src/main/resources/l10n/JabRef_tr.properties
index d0cd850d335..fc09ebe0ce1 100644
--- a/src/main/resources/l10n/JabRef_tr.properties
+++ b/src/main/resources/l10n/JabRef_tr.properties
@@ -19,7 +19,7 @@ Unable\ to\ monitor\ file\ changes.\ Please\ close\ files\ and\ processes\ and\
 
 %0/%1\ entries=%0/%1 girdi
 
-%0\ export\ successful=%0 dışa aktarım başarılı
+
 
 %0\ matches\ the\ regular\ expression\ <b>%1</b>=%0 şu Düzenli İfadeyle eşleşiyor <b>%1</b>
 
@@ -151,8 +151,6 @@ Cite\ command=Alıntı komutu
 
 Clear=Sil
 
-Clear\ fields=Alanları sil
-
 Open\ /\ close\ entry\ editor=Girdi düzenleyicisini aç/kapat
 
 Close\ dialog=Dialoğu kapat
@@ -172,7 +170,13 @@ Copied=Kopyalandı
 
 Copy=Kopyala
 
+Copy\ title=Başlığı kopyala
+Copy\ \\cite{citation\ key}=\\cite{citation key}''nı kopyala
+Copy\ citation\ (html)=Atfı kopyala (html)
+Copy\ citation\ (text)=Atfı kopyala (metin)
 Copy\ citation\ key=Atıf anahtarını kopyala
+Copy\ citation\ key\ and\ link=Atıf anahtarı ve bağlantısını kopyala
+Copy\ citation\ key\ and\ title=Atıf anahtarı ve başlığını kopyala
 
 Copy\ to\ clipboard=Panoya kopyala
 
@@ -227,7 +231,9 @@ Library\ properties=Veritabanı özellikleri
 
 Default=Öntanımlı
 
-Default\ encoding=Öntanımlı kodlama
+Character\ encoding\ UTF-8\ is\ not\ supported.=UTF-8 karakter kodlaması desteklenmiyor.
+UTF-8\ could\ not\ be\ used\ to\ encode\ the\ following\ characters\:\ %0=UTF-8, şu karakterleri kodlamada kullanılamıyor\: %0
+The\ chosen\ encoding\ '%0'\ could\ not\ encode\ the\ following\ characters\:=Seçilen '%0' kodlaması şu karakterleri kodlayamıyor\:
 
 Downloading=İndiriliyor
 
@@ -275,6 +281,7 @@ Downloaded\ website\ as\ an\ HTML\ file.=Web sitesi bir HTML dosyası olarak ind
 
 duplicate\ removal=çift nüsha silme
 
+Duplicate\ fields=Yinelenen Alan
 
 Duplicate\ string\ name=Çift nüsha dizge adı
 
@@ -533,6 +540,10 @@ Moved\ group\ "%0".="%0" grubu taşındı.
 
 Mr.\ DLib\ Privacy\ settings=Mr. DLib Kişisel gizlilik ayarları
 
+No\ database\ is\ open=Açık veri tabanı yok
+
+We\ need\ a\ database\ to\ export\ from.\ Open\ one.=Dışa aktarmak için bir veri tabanı gerekiyor. Bir tane açınız.
+
 No\ recommendations\ received\ from\ Mr.\ DLib\ for\ this\ entry.=Bu girdi için Mr. Dlib'den bir öneri alınmadı.
 
 Error\ while\ fetching\ recommendations\ from\ Mr.DLib.=Mr. DLib'den öneri getirmede hata.
@@ -625,8 +636,6 @@ Path\ to\ %0\ not\ defined=%0'in yolu tanımlanmamış
 
 Path\ to\ LyX\ pipe=LyX hattının yolu
 
-PDF\ does\ not\ exist=PDF mevcut değil
-
 File\ has\ no\ attached\ annotations=Dosyanın eklenmiş açıklama notu yok
 
 Please\ enter\ a\ name\ for\ the\ group.=Lütfen grup için bir isim giriniz.
@@ -692,11 +701,18 @@ Remove\ selected\ entries\ from\ this\ group=Seçili girdileri bu gruptan çıka
 
 Remove\ group=Grubu sil
 
-Remove\ group\ "%0"?="%0" grubu silinsin mi?
+Remove\ group\ and\ subgroups=Grubu ve altgrupları sil
+
+
+
+
+
 
 Remove\ group\ "%0"\ and\ its\ subgroups?="%0" grubu ve altgrupları silinsin mi?
 
-Remove\ group\ and\ subgroups=Grubu ve altgrupları sil
+Removed\ group\ "%0"\ and\ its\ subgroups.="%0" grubu ve altgrupları silindi.
+
+
 
 Remove\ link=Linki sil
 
@@ -706,8 +722,6 @@ Remove\ string\ %0=%0 Dizgesini sil
 
 Removed\ group\ "%0".="%0" grubu silindi.
 
-Removed\ group\ "%0"\ and\ its\ subgroups.="%0" grubu ve altgrupları silindi.
-
 Removed\ string=Dizge silindi
 
 Renamed\ string=Dizge yeniden adlandırıldı
@@ -730,6 +744,8 @@ Replaces\ Unicode\ ligatures\ with\ their\ expanded\ form=Unicode bitişik harfl
 
 Required\ fields=Zorunlu alanlar
 
+Do\ not\ resolve\ BibTeX\ strings=BibTeX dizgelerini çözümleme
+Resolve\ BibTeX\ strings\ for\ the\ following\ fields=BibTeX dizgelerini aşağıdaki alanlar için çözümle
 
 resolved=çözümlendi
 
@@ -743,6 +759,7 @@ Review=Gözden geçir
 Review\ changes=Değişklikleri incele
 Review\ Field\ Migration=Alan Birleştirmeyi İncele
 
+Loading=Yükleniyor
 
 Save=Kaydet
 Save\ all\ finished.=Tüm bitenleri kaydet.
@@ -776,9 +793,6 @@ Select\ file\ from\ ZIP-archive=ZIP arşivinden dosyayı seçiniz
 
 Select\ the\ tree\ nodes\ to\ view\ and\ accept\ or\ reject\ changes=Değişiklikleri görmek ve kabul ya da reddetmek için ağaç düğümlerini seçiniz
 
-Set\ field=Alanı ata
-Set\ fields=Alanları ata
-
 Settings=Ayarlar
 
 Shortcut=Kısayol
@@ -811,7 +825,6 @@ Size=Boyut
 Skipped\ -\ No\ PDF\ linked=Atlandı - PDF eklenmedi
 Skipped\ -\ PDF\ does\ not\ exist=Atlandı - PDF mevcut değil
 
-Skipped\ entry.=Girdi atlandı.
 
 Sort\ subgroups=Alt grupları sırala
 
@@ -826,8 +839,6 @@ Sublibrary\ from\ AUX\ to\ BibTeX=AUX'tan BibTeX'e alt-kütüphane
 
 Switches\ between\ full\ and\ abbreviated\ journal\ name\ if\ the\ journal\ name\ is\ known.=Dergi adı biliniyorsa tam ve kısaltılmış dergi adı arasında geçiş yapar.
 
-The\ chosen\ encoding\ '%0'\ could\ not\ encode\ the\ following\ characters\:=Seçilen '%0' kodlaması şu karakterleri kodlayamıyor\:
-
 
 the\ field\ <b>%0</b>=alan <b>%0</b>
 The\ group\ "%0"\ already\ contains\ the\ selection.="%0" grubu seçimi zaten kapsıyor.
@@ -902,6 +913,7 @@ Warning=Uyarı
 
 Warnings=Uyarılar
 
+Warning\:\ You\ added\ field\ "%0"\ twice.\ Only\ one\ will\ be\ kept.=Uyarı\: "%0" alanını iki kez eklediniz. Yalnızca bir tanesi tutulacak.
 
 web\ link=sanaldoku linki
 
@@ -959,10 +971,6 @@ Line\ %0\:\ Found\ corrupted\ citation\ key\ %1\ (comma\ missing).=Satır %0\: B
 No\ full\ text\ document\ found=Tam metin belge bulunamadı
 Download\ from\ URL=URL'den indir
 Rename\ field=Alanın adını değiştir
-Append\ field=Alan ekle
-Append\ to\ fields=Alanlara ekle
-Rename\ field\ to=Alan adını şuna değiştir
-Move\ contents\ of\ a\ field\ into\ a\ field\ with\ a\ different\ name=Alan içeriğini başka isimli bir alanın içine taşı
 
 Cannot\ use\ port\ %0\ for\ remote\ operation;\ another\ application\ may\ be\ using\ it.\ Try\ specifying\ another\ port.=Uzak operasyon için bağlantı noktası %0 kullanılamıyor; bir başka program kullanıyor olabilir. Başka bir bağlantı noktası deneyin.
 
@@ -1032,9 +1040,9 @@ Cite\ special=Özel atıfla
 Extra\ information\ (e.g.\ page\ number)=Ek bilgi (örnek\: sayfa numarası)
 Manage\ citations=Atıfları yönet
 Problem\ modifying\ citation=Alıntı değiştirmede sorun
+Problem\ collecting\ citations=Atıf toplamada sorun
 Citation=Atıf
 Connecting...=Bağlanıyor...
-Could\ not\ resolve\ BibTeX\ entry\ for\ citation\ marker\ '%0'.=Atıf belirteci '%0' için BibTeX girdisi çözümlenemedi.
 Select\ style=Stil seç
 Journals=Dergiler
 Cite=Alıntıla
@@ -1046,17 +1054,36 @@ Select\ Writer\ document=Writer belgesi seç
 Sync\ OpenOffice/LibreOffice\ bibliography=Kaynakça 00 güncelle
 Select\ which\ open\ Writer\ document\ to\ work\ on=Hangi açık Writer belgesi üzerinde çalışılacağını seç
 Connected\ to\ document=Belgeye bağlandı
+
+Could\ not\ connect\ to\ any\ Writer\ document.\ Please\ make\ sure\ a\ document\ is\ open\ before\ using\ the\ 'Select\ Writer\ document'\ button\ to\ connect\ to\ it.=Herhangi bir Writer belgesine bağlanılamadı. Bağlanmak için "Writer belgesini seç" düğmesini kullanmadan önce lütfen bir belgenin açık olduğuna emin olun.
+
+No\ Writer\ documents\ found=Bir Writer belgesi bulunamadı
+
 Insert\ a\ citation\ without\ text\ (the\ entry\ will\ appear\ in\ the\ reference\ list)=Metinsiz bir atıf seç (girdi kaynak listesinde görünecek)
 Cite\ selected\ entries\ with\ extra\ information=Seçili girdileri ek bilgiyle alıntıla
 Ensure\ that\ the\ bibliography\ is\ up-to-date=Kaynakçanın güncel olduğuna emin ol
+
 Your\ OpenOffice/LibreOffice\ document\ references\ the\ citation\ key\ '%0',\ which\ could\ not\ be\ found\ in\ your\ current\ library.=OpenOffice/LibreOffice belgeniz mevcut veri tabanında bulunamayan '%0' atıf anahtarını kaynak gösteriyor.
+
+This\ operation\ requires\ a\ bibliography\ database.=Bu işlem bir kaynakça veritabanı gerektirir.
+
+Your\ OpenOffice/LibreOffice\ document\ references\ at\ least\ %0\ citation\ keys\ which\ could\ not\ be\ found\ in\ your\ current\ library.\ Some\ of\ these\ are\ %1.=OpenOffice/LibreOffice belgeniz mevcut veri tabanında bulunamayan en az %0 atıf anahtarını kaynak gösteriyor. Bunlardan bazıları %1'dir.
+
+Your\ OpenOffice/LibreOffice\ document\ references\ no\ citation\ keys\ which\ could\ also\ be\ found\ in\ your\ current\ library.=OpenOffice/LibreOffice belgeniz mevcut veri tabanında bulunan herhangi bir atıf anahtarını kaynak göstermiyor.
+
 Unable\ to\ synchronize\ bibliography=Kaynakça güncellenemiyor
 Combine\ pairs\ of\ citations\ that\ are\ separated\ by\ spaces\ only=Yalnızca boşlukla ayrılmış atıf çiftlerini birleştir
 Autodetection\ failed=Otomatik algılama başarısız
 Please\ wait...=Lütfen bekleyin...
 Connection\ lost=Bağlantı koptu
-The\ paragraph\ format\ is\ controlled\ by\ the\ property\ 'ReferenceParagraphFormat'\ or\ 'ReferenceHeaderParagraphFormat'\ in\ the\ style\ file.=Paragraf biçimi stil dosyasında 'KaynakParagrafBiçimi' ya da 'KaynakBaşlığıParagrafBiçimi' özelliği tarafından kontrol edilir.
-The\ character\ format\ is\ controlled\ by\ the\ citation\ property\ 'CitationCharacterFormat'\ in\ the\ style\ file.=Karakter biçimi stil dosyasında 'AtıfKarakterBiçimi' alıntı özelliği tarafından kontrol edilir.
+
+Could\ not\ update\ bibliography=Kaynakça güncellenemedi
+Not\ connected\ to\ document=Belgeye bağlı değil
+Problem\ combining\ cite\ markers=Atıf belirteçlerini birleştirmede sorun
+Unable\ to\ reload\ style\ file=Stil dosyası yeniden yüklenemedi
+
+Problem\ during\ separating\ cite\ markers=Atıf belirteçlerini ayırmada sorun
+
 Automatically\ sync\ bibliography\ when\ inserting\ citations=Atıf eklenirken kaynakçayı otomatikman güncelle
 Look\ up\ BibTeX\ entries\ in\ the\ active\ tab\ only=BibTeX girdilerini yalnızca etkin sekmede ara
 Look\ up\ BibTeX\ entries\ in\ all\ open\ libraries=BibTeX girdilerini tüm açık veri tabanlarında ara
@@ -1158,7 +1185,9 @@ Toggle\ relevance=İlgi düzeyini değiştir
 Toggle\ quality\ assured=Kalite güvencesini değiştir
 Toggle\ print\ status=Yazdırma statüsünü değiştir
 Update\ keywords=Anahtar sözcükleri güncelle
+Problem\ connecting=Bağlanmada sorun
 Connection\ to\ OpenOffice/LibreOffice\ has\ been\ lost.\ Please\ make\ sure\ OpenOffice/LibreOffice\ is\ running,\ and\ try\ to\ reconnect.=OpenOffice/LibreOffice bağlantısı koptu. Lütfen OpenOffice/LibreOffice'in açık olduğunu teyid edin, ve tekrar bağlanmayı deneyin.
+
 JabRef\ will\ send\ at\ least\ one\ request\ per\ entry\ to\ a\ publisher.=JabRef bir yayıncıya en az bir istem gönderecek.
 Correct\ the\ entry,\ and\ reopen\ editor\ to\ display/edit\ source.=Girdiyi düzeltin, ve kaynağı görmek/düzenlemek için düzenleyiciyi tekrar açın.
 Could\ not\ connect\ to\ running\ OpenOffice/LibreOffice.=Çalışan OpenOffice/LibreOffice'e bağlanılamıyor.
@@ -1172,8 +1201,6 @@ To\ disable\ the\ memory\ stick\ mode\ rename\ or\ remove\ the\ jabref.xml\ file
 Unable\ to\ connect.\ One\ possible\ reason\ is\ that\ JabRef\ and\ OpenOffice/LibreOffice\ are\ not\ both\ running\ in\ either\ 32\ bit\ mode\ or\ 64\ bit\ mode.=Bağlanılamadı. Bir olası neden JabRef ve OpenOffice/LibreOffice'in birlikte 32 bit ya da 64 bit kipinde çalışmamasıdır.
 Delimiter(s)=Sınırlayıcı(lar)
 When\ downloading\ files,\ or\ moving\ linked\ files\ to\ the\ file\ directory,\ use\ the\ bib\ file\ location.=Dosyaları indirirken, ya da bağlantılı dosyaları dizine taşırken, bib dosya konumunu kullan.
-Your\ style\ file\ specifies\ the\ character\ format\ '%0',\ which\ is\ undefined\ in\ your\ current\ OpenOffice/LibreOffice\ document.=Stil dosyanız, mevcut OpenOffice/LibreOffice belgenizde tanımlanmamış olan '%0' karakter formatını belirtiyor.
-Your\ style\ file\ specifies\ the\ paragraph\ format\ '%0',\ which\ is\ undefined\ in\ your\ current\ OpenOffice/LibreOffice\ document.=Stil dosyanız, mevcut OpenOffice/LibreOffice belgenizde tanımlanmamış olan '%0' paragraf formatını belirtiyor.
 
 Searching...=Arıyor...
 Please\ enter\ a\ search\ string=Lütfen bir arama dizgesi girin
@@ -1211,6 +1238,15 @@ Use\ custom\ proxy\ configuration=Özelleştirilmiş vekil konfigürasyonu kulla
 Proxy\ requires\ authentication=Vekil sunucu kimlik denetleme gerektiriyor
 Attention\:\ Password\ is\ stored\ in\ plain\ text\!=Dikkat\: Parola salt metin olarak kaydedildi\!
 Clear\ connection\ settings=Bağlantı ayarlarını sil
+Check\ Proxy\ Setting=Vekil Ayarını Kontrol Et
+Check\ connection=Bağlantıyı kontrol et
+Connection\ failed\!=Bağlantı başarısız\!
+Connection\ successful\!=Bağlantı başarılı\!
+
+SSL\ Configuration=SSL Yapılandırması
+SSL\ certificate\ file=SSL sertifika dosyası
+Duplicate\ Certificates=Çift nüsha Sertifikalar
+You\ already\ added\ this\ certificate=Bu sertifikayı zaten eklediniz
 
 Open\ folder=Klasörü aç
 Export\ sort\ order=Sıralama kriterlerini dışa aktar
@@ -1292,9 +1328,7 @@ Save\ changes=Değişiklikleri kaydet
 Discard\ changes=Değişiklikleri sil
 Library\ '%0'\ has\ changed.=Veri tabanı '%0' değişti.
 Print\ entry\ preview=Girdi yazdırma önizleme
-Copy\ title=Başlığı kopyala
-Copy\ \\cite{citation\ key}=\\cite{citation key}''nı kopyala
-Copy\ citation\ key\ and\ title=Atıf anahtarı ve başlığını kopyala
+
 Invalid\ DOI\:\ '%0'.=Geçersiz DOI\: '%0'.
 Same\ DOI\ used\ in\ multiple\ entries=Aynı DOI birçok girdide kullanıldı
 should\ start\ with\ a\ name=bir isimle başlamalı
@@ -1555,6 +1589,22 @@ Custom=Özel
 Export\ cited=Başvurulanları dışa aktar
 Unable\ to\ generate\ new\ library=Yeni veritabanı oluşturulamadı
 
+The\ cursor\ is\ in\ a\ protected\ area.=İmleç korunmuş bir alanda.
+JabRefException=JabRefException
+No\ bibliography\ database\ is\ open\ for\ citation.=Atıfta bulumak için bir kaynakça dosyası açık değil.
+
+No\ database\ is\ open\ for\ updating\ citation\ markers\ after\ citing.=Atıfta bulunduktan sonra atıf belirteçlerini güncellemek için açık bir veri tabanı yok.
+
+No\ bibliography\ entries\ are\ selected\ for\ citation.=Atıf için seçilmiş bir kaynakça girdisi yok.
+No\ bibliography\ style\ is\ selected\ for\ citation.=Atıf için seçilmiş bir kaynakça stili yok.
+No\ database=Veri tabanı yok
+
+No\ entries\ selected\ for\ citation=Atıf için bir girdi seçilmedi
+Open\ one\ before\ citing.=Atıfta bulunmadan önce birini açın.
+
+Select\ one\ before\ citing.=Atıfta bulunmadan önce birini seçin.
+Select\ some\ before\ citing.=Atıfta bulunmadan önce bazılarını seçin.
+
 Found\ identical\ ranges=Özdeş aralıklar bulundu
 Found\ overlapping\ ranges=Örtüşen aralıklar bulundu
 Found\ touching\ ranges=Birbirine komşu aralıklar bulundu
@@ -1657,7 +1707,6 @@ Protected\ terms\ file=Korunmuş terimler dosyası
 Style\ file=Stil dosyası
 
 Open\ OpenOffice/LibreOffice\ connection=OpenOffice/LibreOffice bağlantısı aç
-You\ must\ enter\ at\ least\ one\ field\ name=En az bir alan adı girmelisiniz
 Non-ASCII\ encoded\ character\ found=ASCII koduyla kodlanmamış karakter bulundu
 Non-UTF-8\ encoded\ field\ found=UTF-8 ile kodlanmamış alan bulundu
 Toggle\ web\ search\ interface=Ağ arama arayüzünü değiştir
@@ -1703,7 +1752,6 @@ should\ be\ normalized=normalleştirilmelidir
 
 Empty\ search\ ID=Boş arama IDsi
 The\ given\ search\ ID\ was\ empty.=Verilen arama IDsi boştu.
-Copy\ citation\ key\ and\ link=Atıf anahtarı ve bağlantısını kopyala
 biblatex\ field\ only=Yalnızca biblatex alanı
 
 Error\ while\ generating\ fetch\ URL=URL'den getirme oluşturulurken hata
@@ -1796,7 +1844,6 @@ Removes\ all\ hyphenated\ line\ breaks\ in\ the\ field\ content.=Alan içeriğin
 Could\ not\ retrieve\ entry\ data\ from\ '%0'.='%0' dan girdi verileri alınamadı.
 Entry\ from\ %0\ could\ not\ be\ parsed.=%0'dan girdi çözümlenemedi.
 Invalid\ identifier\:\ '%0'.=Geçersiz tanımlayıcı\: '%0 '.
-This\ paper\ has\ been\ withdrawn.=Bu yayın geri çekildi.
 empty\ citation\ key=boş atıf anahtarı
 Aux\ file=Aux dosya
 Group\ containing\ entries\ cited\ in\ a\ given\ TeX\ file=Belirli bir TeX dosyasında alıntılanmış girdileri içeren grup
@@ -1824,9 +1871,6 @@ Could\ not\ connect\ to\ Vim\ server.\ Make\ sure\ that\ Vim\ is\ running\ with\
 Could\ not\ connect\ to\ a\ running\ gnuserv\ process.\ Make\ sure\ that\ Emacs\ or\ XEmacs\ is\ running,\ and\ that\ the\ server\ has\ been\ started\ (by\ running\ the\ command\ 'server-start'/'gnuserv-start').=Çalışan bir gnuserv sürecine bağlanılamadı. Emacs ya da XEmacs'ın çalıştığına ve sunucunun başlatıldığına ('server-start'/'gnuserv-start' komutu çalıştırılarak) emin olun.
 Error\ pushing\ entries=Girdileri itelemede hata
 
-Undefined\ character\ format=Tanımlanmamış karakter biçimi
-Undefined\ paragraph\ format=Tanımlanmamış paragraf biçimi
-
 Preamble=Öncül
 Markings=İşaretler
 Use\ selected\ instance=Seçili örneği kullan
@@ -1846,8 +1890,8 @@ Blog=Ağ güncesi
 Check\ integrity=Bütünlük kontrolü
 Cleanup\ URL\ link=URL bağlantısını temizle
 Cleanup\ URL\ link\ by\ removing\ special\ symbols\ and\ extracting\ simple\ link=URL bağlantısını özel simgeleri kaldırarak ve basit bağlantı çıkararak temizle
+Copy\ DOI=DOI'i kopyala
 Copy\ DOI\ url=DOI url'sini kopyala
-Copy\ citation=Atıf'ı kopyala
 Development\ version=Geliştirme sürümü
 Export\ selected\ entries=Seçili girdileri dışa aktar
 Export\ selected\ entries\ to\ clipboard=Seçili girdileri panoya aktar
@@ -1858,8 +1902,6 @@ Manage\ protected\ terms=Korunmuş terimleri yönet
 New\ entry\ from\ plain\ text=Düz metinden yeni girdi
 Import\ by\ ID=ID ile içe aktar
 Enter\ a\ valid\ ID=Geçerli bir ID girin
-Imported\ one\ entry=Bir girdi içe aktarıldı
-Entry\ already\ exists=Girdi zaten mevcut
 New\ sublibrary\ based\ on\ AUX\ file=AUX dosyasını temel alan yeni alt-kütüphane
 Push\ entries\ to\ external\ application\ (%0)=Girdileri harici uygulamaya itele (%0)
 Quit=Çıkış
@@ -2049,6 +2091,7 @@ Please\ provide\ a\ valid\ aux\ file.=Lütfen geçerli bir aux dosyası belirtin
 Keyword\ delimiter=Anahtar sözcük sınırlayıcı
 Hierarchical\ keyword\ delimiter=Hiyerarşik anahtar sözcük sınırlayıcı
 Escape\ ampersands=Ve simgelerini (ampersand) öncele
+Escape\ dollar\ sign=Dolar işaretini önceleyin
 
 Hint\:\n\nTo\ search\ all\ fields\ for\ <b>Smith</b>,\ enter\:\n<tt>smith</tt>\n\nTo\ search\ the\ field\ <b>author</b>\ for\ <b>Smith</b>\ and\ the\ field\ <b>title</b>\ for\ <b>electrical</b>,\ enter\:\n<tt>author\=Smith\ and\ title\=electrical</tt>=İpucu\:\n\nTüm alanlarda <b>Smith</b>'i aramak için şunu girin\:\n<tt>smith</tt>\n\n<b>yazar</b> alanında <b>Smith</b>'i ve <b>başlık</b> alanında <b>elektriksel</b>'i aramak için şunu girin\:\n<tt>author\=Smith and title\=elektriksel</tt>
 
@@ -2283,10 +2326,6 @@ Removes\ digits.=Rakamları siler.
 
 Presets=Ön ayarlar
 
-Check\ Proxy\ Setting=Vekil Ayarını Kontrol Et
-Check\ connection=Bağlantıyı kontrol et
-Connection\ failed\!=Bağlantı başarısız\!
-Connection\ successful\!=Bağlantı başarılı\!
 Generate\ groups\ from\ keywords\ in\ the\ following\ field=Aşağıdaki alandaki anahtar sözcüklerden gruplar oluştur
 Generate\ groups\ for\ author\ last\ names=Yazar soyadları için gruplar oluştur
 Regular\ expression=Düzenli ifade
@@ -2306,15 +2345,43 @@ Separate\ merged\ citations=Birleştirilmiş atıfları ayır
 Separate\ citations=Atıfları ayır
 
 Unprotect\ terms=Terimlerin korumasını kaldır
-Error\ connecting\ to\ Writer\ document=Writer belgesine bağlantıda hata
-You\ need\ to\ open\ Writer\ with\ a\ document\ before\ connecting=Bağlanmadan önce bir Writer belgesi açmalısınız
 
 Generate\ a\ new\ key\ for\ imported\ entries\ (overwriting\ their\ default)=İçe aktarılmış girdiler için yeni bir anahtar oluştur (öntanımlılarının üzerine yaz)
+Warn\ about\ duplicates\ on\ import=İçe aktarmada çift sürümler hakkında uyar
 Import\ and\ Export=İçe ve Dışa aktar
 Custom\ DOI\ URI=Özel DOI URI
 Use\ custom\ DOI\ base\ URI\ for\ article\ access=Makale girişi için özel DOI temel URI kullan
 
 Cited\ on\ pages=Atıfta bulunulduğu sayfalar
+Please\ move\ the\ cursor\ into\ the\ document\ text.=Lütfen imleci belge metnine taşıyın.
+To\ get\ the\ visual\ positions\ of\ your\ citations\ I\ need\ to\ move\ the\ cursor\ around,\ but\ could\ not\ get\ it.=Atıflarınızın görsel konumlarını elde etmek için imleci hareket ettirmeliyim, fakat yapamıyorum.
+
+I\ cannot\ insert\ to\ the\ cursors\ current\ location.=İmlecin mevcut konumuna ekleyemiyorum.
+
+Please\ move\ the\ cursor\ to\ the\ location\ for\ the\ new\ citation.=Lütfen imleci yeni atfın konumuna taşıyın.
+
+Please\ create\ it\ in\ the\ document\ or\ change\ in\ the\ file\:=Lütfen belgede oluşturun ya da dosyada değiştirin\:
+
+Please\ use\ the\ latter\ in\ the\ style\ file\ below\ to\ avoid\ localization\ problems.=Yerelleştirme sorunlarından kaçınmak için lütfen sonrakini aşağıdaki stil dosyasında kullanın.
+
+The\ %0\ character\ style\ '%1'\ is\ a\ display\ name\ for\ '%2'.=%0 karakter stili '%1', '%2' için bir görüntü adı.
+
+The\ %0\ character\ style\ '%1'\ is\ missing\ from\ the\ document=%0 karakter stili '%1' belgede yok
+
+The\ %0\ paragraph\ style\ '%1'\ is\ a\ display\ name\ for\ '%2'.=%0 paragraf stili '%1', '%2' için bir görüntü adı.
+
+The\ %0\ paragraph\ style\ '%1'\ is\ missing\ from\ the\ document=%0 paragraf stili '%1' belgede yok
+
+Error\ while\ checking\ if\ Writer\ is\ recording\ changes\ or\ has\ recorded\ changes.=Writer'ın değişiklikleri kaydediyor ya da kaydetmiş olduğunu kontrol etmede hata.
+
+Cannot\ work\ with\ [Edit]/[Track\ Changes]/[Record]\ turned\ on.=[Edit]/[Track Changes]/[Record] açıkken çalışılamıyor.
+
+Changes\ by\ JabRef\ could\ result\ in\ unexpected\ interactions\ with\ recorded\ changes.=JabRef tarafından yapılan değişiklikler, kaydedilmiş değişikliklerle beklenmedik etkileşimlere yol açabilir.
+
+Recording\ and/or\ Recorded\ changes=Değişiklikler kaydediliyor ve/ya da kaydedildi
+
+Use\ [Edit]/[Track\ Changes]/[Manage]\ to\ resolve\ them\ first.=İlk önce çözümlemek için [Edit]/[Track Changes]/[Manage] kullanın.
+
 Unable\ to\ find\ valid\ certification\ path\ to\ requested\ target(%0),\ download\ anyway?=İstenen hedef (%0) için geçerli sertifika yolu bulunamadı, yine de indirilsin mi?
 Download\ operation\ canceled.=İndirme işlemi iptal edildi.
 
@@ -2331,7 +2398,6 @@ Entry\ Type=Girdi Türü
 Entry\ types=Girdi türleri
 Field\ names=Alan adları
 Others=Diğerleri
-Overwrite\ existing\ field\ values=Mevcut alan değerlerinin üzerine yaz
 Recommended=Önerilen
 
 Authors\ and\ Title=Yazarlar ve Başlık
@@ -2362,6 +2428,8 @@ Query=Sorgu
 Question=Soru
 Select\ directory=Dizin seç
 
+Fulltext\ Index=Tam metin Dizini
+Automatically\ index\ all\ linked\ files\ for\ fulltext\ search=Tüm bağlantılı dosyaları tam metin araması için otomatikman dizinle
 Rebuild\ fulltext\ search\ index=Tam metin arama dizinini yeniden oluştur
 Rebuild\ fulltext\ search\ index\ for\ current\ library?=Tam metin arama dizini mevcut veri tabanı için yeniden oluşturulsun mu?
 Rebuilding\ fulltext\ search\ index...=Tam metin arama dizini yeniden oluşturuluyor...
@@ -2374,6 +2442,9 @@ Grobid\ URL=Grobid URL
 Remote\ services=Uzak servisler
 Allow\ sending\ PDF\ files\ and\ raw\ citation\ strings\ to\ a\ JabRef\ online\ service\ (Grobid)\ to\ determine\ Metadata.\ This\ produces\ better\ results.=Metaverisini belirlemek için PDF dosyalarını ve ham atıf dizgelerini bir JabRef çevrim içi servisine (Grobid) göndermeye izin ver. Bu daha iyi sonuçlara yol açar.
 
+Fetcher\ cannot\ be\ tested\!=Getirici test edilemiyor\!
+Fetcher\ unknown\!=Getirici bilinmiyor\!
+
 Character\ by\ character=Karakter karakter
 Embedded=Gömülü
 Entry=Girdi
@@ -2388,3 +2459,22 @@ Search\ across\ libraries\ in\ a\ new\ window=Veri tabanlarında, yeni bir pence
 Keep\ search\ string\ across\ libraries=Arama dizgesini (değişik) veri tabanlarında (sabit) tut
 Keep\ dialog\ always\ on\ top=İletişim penceresini her zaman üstte tut
 Search\ results\ from\ open\ libraries=Açık kütüphanelerden sonuçları ara
+
+Add\ certificate=Sertifika ekle
+Serial\ number=Seri numarası
+Issuer=Veren makam
+Valid\ from=Geçerlilik tarihi
+Valid\ to=Son kullanma tarihi
+Signature\ algorithm=İmza algoritması
+Version=Sürüm
+
+Error\ downloading=İndirmede hata
+
+Error\ while\ writing\ metadata.\ See\ the\ error\ log\ for\ details.=Metaverisi yazılırken hata. Ayrıntılar için hata kayıtlarına bakın.
+Failed\ to\ write\ metadata,\ file\ %1\ not\ found.=Metaverisi yazma başarısız, %1 dosyası bulunamadı.
+Success\!\ Finished\ writing\ metadata.=Başarılı\! Metaverisi yazma bitirildi.
+
+Custom\ API\ key=Özel API anahtarı
+Check\ %0\ API\ Key\ Setting=%0 API Anahtar Ayarlarını Kontrol Edin
+
+
diff --git a/src/main/resources/l10n/JabRef_vi.properties b/src/main/resources/l10n/JabRef_vi.properties
index d81484184dd..d82df8e5422 100644
--- a/src/main/resources/l10n/JabRef_vi.properties
+++ b/src/main/resources/l10n/JabRef_vi.properties
@@ -12,7 +12,7 @@
 %0\ doesn't\ contain\ the\ term\ <b>%1</b>=%0 không chứa thuật ngữ <b>%1</b>
 
 
-%0\ export\ successful=%0 xuất thành công
+
 
 %0\ matches\ the\ regular\ expression\ <b>%1</b>=%0 khớp biểu thức chính tắc <b>%1</b>
 
@@ -134,8 +134,6 @@ Cite\ command=Lệnh trích dẫn
 
 Clear=Xóa
 
-Clear\ fields=Xóa các dữ liệu
-
 
 Close\ dialog=Đóng hộp thoại
 
@@ -205,7 +203,7 @@ Library\ properties=Tính chất của CSDL
 
 Default=Mặc định
 
-Default\ encoding=Mã hóa mặc định
+The\ chosen\ encoding\ '%0'\ could\ not\ encode\ the\ following\ characters\:=Mã hóa đã chọn '%0' không thể mã hóa được các ký tự sau\:
 
 
 
@@ -473,6 +471,8 @@ Moved\ group\ "%0".=Đã chuyển nhóm "%0".
 
 
 
+
+
 Name=Tên
 
 Name\ formatter=Trình định dạng tên
@@ -557,8 +557,6 @@ Path\ to\ %0\ not\ defined=Đường dẫn đến %0 không được định ngh
 
 Path\ to\ LyX\ pipe=Đường dẫn đến ống dẫn LyX
 
-PDF\ does\ not\ exist=PDF không tồn tại
-
 
 Please\ enter\ a\ name\ for\ the\ group.=Vui lòng nhập tên cho nhóm.
 
@@ -613,11 +611,18 @@ Remove\ entry\ from\ import=Loại bỏ mục khỏi lệnh nhập
 
 Remove\ group=Loại bỏ nhóm
 
-Remove\ group\ "%0"?=Loại bỏ nhóm "%0"?
+Remove\ group\ and\ subgroups=Loại bỏ nhóm và các nhóm con
+
+
+
+
+
 
 Remove\ group\ "%0"\ and\ its\ subgroups?=Loại bỏ nhóm "%0" và các nhóm con của nó?
 
-Remove\ group\ and\ subgroups=Loại bỏ nhóm và các nhóm con
+Removed\ group\ "%0"\ and\ its\ subgroups.=Đã loại bỏ nhóm "%0" và các nhóm con của nó.
+
+
 
 Remove\ link=Loại bỏ liên kết
 
@@ -626,8 +631,6 @@ Remove\ old\ entry=Loại bỏ mục cũ
 
 Removed\ group\ "%0".=Đã loại bỏ nhóm "%0".
 
-Removed\ group\ "%0"\ and\ its\ subgroups.=Đã loại bỏ nhóm "%0" và các nhóm con của nó.
-
 Removed\ string=Đã loại bỏ chuỗi
 
 Renamed\ string=Chuỗi được đặt tên lại
@@ -680,9 +683,6 @@ Select\ file\ from\ ZIP-archive=Chọn tập tin từ tập tin ZIP
 
 Select\ the\ tree\ nodes\ to\ view\ and\ accept\ or\ reject\ changes=Chọn các nốt trên sơ đồ hình cây để xem và chấp nhận hoặc từ chối thay đổi
 
-Set\ field=Thiết lập dữ liệu
-Set\ fields=Thiết lập các dữ liệu
-
 Settings=Các thiết lập
 
 Shortcut=Phím tắt
@@ -713,7 +713,6 @@ Size=Kích thước
 Skipped\ -\ No\ PDF\ linked=Bị bỏ qua - Không có tập tin PDF được liên kết
 Skipped\ -\ PDF\ does\ not\ exist=Bỏ qua - tập tin PDF không tồn tại
 
-Skipped\ entry.=Mục bị bỏ qua.
 
 
 source\ edit=chỉnh sửa nguồn
@@ -726,8 +725,6 @@ Status=Trạng thái
 
 Switches\ between\ full\ and\ abbreviated\ journal\ name\ if\ the\ journal\ name\ is\ known.=Chuyển đổi giữa tên đầy đủ và tên viết tắt tạp chí nếu biết tên tạp chí đó.
 
-The\ chosen\ encoding\ '%0'\ could\ not\ encode\ the\ following\ characters\:=Mã hóa đã chọn '%0' không thể mã hóa được các ký tự sau\:
-
 
 the\ field\ <b>%0</b>=dữ liệu <b>%0</b>
 The\ group\ "%0"\ already\ contains\ the\ selection.=Nhóm "%0" đã chứa phép chọn.
@@ -829,8 +826,6 @@ This\ feature\ lets\ new\ files\ be\ opened\ or\ imported\ into\ an\ already\ ru
 
 Download\ from\ URL=Kéo từ URL
 Rename\ field=Đổi tên dữ liệu
-Rename\ field\ to=Đổi tên dữ liệu thành
-Move\ contents\ of\ a\ field\ into\ a\ field\ with\ a\ different\ name=Di chuyển nội dung của một dữ liệu sang một dữ liệu có tên khác
 
 Cannot\ use\ port\ %0\ for\ remote\ operation;\ another\ application\ may\ be\ using\ it.\ Try\ specifying\ another\ port.=Không thể dùng cổng %0 cho lệnh chạy từ xa; một ứng dụng khác có thể đang dùng nó. Hãy thử chỉ định một cổng khác.
 
@@ -867,7 +862,18 @@ Search\ failed\:\ illegal\ search\ expression=Tìm kiếm thất bại\: biểu
 
 Send\ as\ email=Gửi bằng email
 Connecting...=Đang kết nối...
+
+
+
+
+
+
+
+
 Please\ wait...=Vui lòng chờ...
+
+
+
 Web\ search=Tìm kiếm trên web
 
 
@@ -881,6 +887,7 @@ Rank=Xếp hạng
 
 
 
+
 Merge\ entries=Phối các mục vào
 None=Không có
 
@@ -891,6 +898,7 @@ Finished\ automatically\ setting\ external\ links.=Thiết lập tự động c
 
 
 
+
 Open\ folder=Mở thư mục
 
 
@@ -905,6 +913,7 @@ Path\ to\ %0=Đường dẫn đến %0
 
 
 Could\ not\ connect\ to\ %0=Không thể kết nối đến %0
+
 Invalid\ DOI\:\ '%0'.=DOI không hợp lệ\: '%0'.
 
 
@@ -972,6 +981,11 @@ Online\ help\ forum=Diễn đàn trợ giúp trực tuyến
 
 
 
+
+
+
+
+
 Host=Máy chủ
 Port=Cổng
 Library=CSDL
@@ -1034,7 +1048,6 @@ Do\ you\ want\ to\ recover\ the\ library\ from\ the\ backup\ file?=Bạn có mu
 
 
 
-
 
 
 Check\ integrity=Kiểm tra tính nguyên vẹn
@@ -1085,6 +1098,27 @@ Default\ pattern=Kiểu mặc định
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
diff --git a/src/main/resources/l10n/JabRef_zh_CN.properties b/src/main/resources/l10n/JabRef_zh_CN.properties
index 7a090bb2e84..baca5d6da46 100644
--- a/src/main/resources/l10n/JabRef_zh_CN.properties
+++ b/src/main/resources/l10n/JabRef_zh_CN.properties
@@ -19,7 +19,9 @@ Unable\ to\ monitor\ file\ changes.\ Please\ close\ files\ and\ processes\ and\
 
 %0/%1\ entries=%0/%1 条目
 
-%0\ export\ successful=%0 导出成功
+Export\ operation\ finished\ successfully.=导出成功。
+
+Reveal\ in\ File\ Explorer=在文件夹中显示
 
 %0\ matches\ the\ regular\ expression\ <b>%1</b>=%0 匹配正则表达式 <b>%1</b>
 
@@ -29,7 +31,7 @@ Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (DEFAULT\ abbreviation)=
 Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (MEDLINE\ abbreviation)=缩写选中记录的期刊名 (MEDLINE 格式缩写)
 Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (SHORTEST\ UNIQUE\ abbreviation)=缩写选中记录的期刊名 (最短唯一 (SHORTEST UNIQUE) 格式缩写)
 
-Abbreviate\ names=缩写名
+Abbreviate\ names=缩写名（J. Smith）
 Abbreviated\ %0\ journal\ names.=缩写的 %0 期刊名称。
 
 Abbreviation=缩写
@@ -151,8 +153,6 @@ Cite\ command=引用命令
 
 Clear=清除
 
-Clear\ fields=清除字段内容
-
 Open\ /\ close\ entry\ editor=打开/关闭条目编辑器
 
 Close\ dialog=关闭对话框
@@ -172,7 +172,13 @@ Copied=已复制
 
 Copy=复制
 
-Copy\ citation\ key=复制Citationkey
+Copy\ title=复制标题
+Copy\ \\cite{citation\ key}=复制 \\cite{citation key}
+Copy\ citation\ (html)=复制引用 (html)
+Copy\ citation\ (text)=复制引用 (text)
+Copy\ citation\ key=复制 citationkey
+Copy\ citation\ key\ and\ link=复制 citationkey 和链接
+Copy\ citation\ key\ and\ title=复制 citationkey 和标题
 
 Copy\ to\ clipboard=复制到剪贴板
 
@@ -196,7 +202,7 @@ Could\ not\ run\ the\ 'vim'\ program.=无法运行 'vim' 程序。
 Could\ not\ save\ file.=无法保存文件
 Character\ encoding\ '%0'\ is\ not\ supported.=，不支持编码 '%0'。
 
-Create\ custom\ fields\ for\ each\ BibTeX\ entry=为每个 BibTeX 条目创建自定义字段
+Create\ custom\ fields\ for\ each\ BibTeX\ entry=Create custom fields for each BibTeX entry
 
 crossreferenced\ entries\ included=包含交叉引用的记录
 
@@ -227,7 +233,9 @@ Library\ properties=文献库属性
 
 Default=默认
 
-Default\ encoding=默认编码
+Character\ encoding\ UTF-8\ is\ not\ supported.=不支持UTF-8编码。
+UTF-8\ could\ not\ be\ used\ to\ encode\ the\ following\ characters\:\ %0=无法使用 UTF-8 编码字符 %0
+The\ chosen\ encoding\ '%0'\ could\ not\ encode\ the\ following\ characters\:=选择的编码 '%0' 无法支持下列字符\:
 
 Downloading=正在下载
 
@@ -258,7 +266,7 @@ Display\ help\ on\ command\ line\ options=用命令行选项显示帮助
 Display\ only\ entries\ belonging\ to\ all\ selected\ groups=仅显示所选分组的交集条目
 Display\ version=显示版本
 
-Do\ not\ abbreviate\ names=不要缩写姓名
+Do\ not\ abbreviate\ names=不缩写名（John Smith）
 
 Do\ not\ import\ entry=不导入记录
 
@@ -369,9 +377,9 @@ First\ select\ the\ entries\ you\ want\ keys\ to\ be\ generated\ for.=首先选
 Fit\ table\ horizontally\ on\ screen=列表宽度填满屏幕宽度
 
 Float=浮动 (结果上浮到最前)
-Format\:\ Tab\:field;field;...\ (e.g.\ General\:url;pdf;note...)=格式\: 选项卡\: 字段; 字段; ...(例如 General\:url;pdf;note...)
+Format\:\ Tab\:field;field;...\ (e.g.\ General\:url;pdf;note...)=格式：选项卡\:字段;字段;...（例如：General\:url;pdf;note...）
 
-Format\ of\ author\ and\ editor\ names=作者和编者的姓名格式
+Format\ of\ author\ and\ editor\ names=author和editor的姓名格式
 Format\ string=格式化简写字串
 
 Format\ used=使用的格式
@@ -485,7 +493,7 @@ Key\ bindings=热键
 
 Key\ bindings\ changed=热键已更改
 
-Key\ pattern=键值表达式
+Key\ pattern=Key pattern
 
 keys\ in\ library=文献库中的键值
 
@@ -534,15 +542,19 @@ Moved\ group\ "%0".=移动了分组 "%0"。
 
 Mr.\ DLib\ Privacy\ settings=Mr. DLib 隐私设置
 
+No\ database\ is\ open=No database is open
+
+We\ need\ a\ database\ to\ export\ from.\ Open\ one.=We need a database to export from. Open one.
+
 No\ recommendations\ received\ from\ Mr.\ DLib\ for\ this\ entry.=没有收到 Mr. DLib 对于本条目的建议。
 
 Error\ while\ fetching\ recommendations\ from\ Mr.DLib.=在接收 Mr. DLib 的建议时发生了一个错误。
 
 Name=名称
 
-Name\ formatter=姓名格式化器
+Name\ formatter=姓名格式化
 
-Natbib\ style=Natbib 格式
+Natbib\ style=Natbib样式
 
 nested\ AUX\ files=nested AUX 文件
 
@@ -626,8 +638,6 @@ Path\ to\ %0\ not\ defined=到 %0 的路径未定义
 
 Path\ to\ LyX\ pipe=到 LyX 管道的路径
 
-PDF\ does\ not\ exist=PDF 不存在
-
 File\ has\ no\ attached\ annotations=文件没有附加批注
 
 Please\ enter\ a\ name\ for\ the\ group.=请为该分组输入一个名字
@@ -693,11 +703,25 @@ Remove\ selected\ entries\ from\ this\ group=从这个组里移除选定记录
 
 Remove\ group=移除分组
 
-Remove\ group\ "%0"?=移除分组 "%0"?
+Remove\ group\ and\ subgroups=移除分组和子分组
+
+Remove\ groups\ and\ subgroups=移除分组和子分组
+
+Remove\ all\ selected\ groups\ and\ keep\ their\ subgroups?=移除所有选定的分组但保留其子分组？
+
+Remove\ group\ "%0"\ and\ keep\ its\ subgroups?=移除分组 "%0" 但保留其子分组？
+
+Remove\ groups=移除分组
+
+Removed\ all\ selected\ groups.=移除选中的分组
 
 Remove\ group\ "%0"\ and\ its\ subgroups?=移除分组 "%0" 和它的子分组？
 
-Remove\ group\ and\ subgroups=移除分组和子分组
+Removed\ group\ "%0"\ and\ its\ subgroups.=已移除分组 "%0" 和它的子分组。
+
+Remove\ all\ selected\ groups\ and\ their\ subgroups?=移除所有选定的分组及其子分组？
+
+Removed\ all\ selected\ groups\ and\ their\ subgroups.=移除所有选定的分组及其子分组
 
 Remove\ link=移除链接
 
@@ -707,8 +731,6 @@ Remove\ string\ %0=移除字符串 %0
 
 Removed\ group\ "%0".=已移除分组 "%0"。
 
-Removed\ group\ "%0"\ and\ its\ subgroups.=已移除分组 "%0" 和它的子分组。
-
 Removed\ string=已移除简写字串
 
 Renamed\ string=重命名简写字串
@@ -746,7 +768,7 @@ Review=评论
 Review\ changes=复查修改
 Review\ Field\ Migration=查看字段迁移
 
-Loading=加载中
+Loading=启动
 
 Save=保存
 Save\ all\ finished.=完成保存全部。
@@ -757,10 +779,10 @@ Save\ before\ closing=关闭前保存
 
 Save\ library=保存
 Save\ library\ as...=另存为
-Saving=保存中
+Saving=保存
 Saving\ all\ libraries...=正在保存所有数据库...
 Saving\ library=正在保存文献库
-Library\ saved=Library saved
+Library\ saved=文献库已保存
 Saved\ selected\ to\ '%0'.=保存选中到 '%0'.
 
 Search=查找
@@ -780,24 +802,21 @@ Select\ file\ from\ ZIP-archive=从 ZIP-压缩包中选择文件
 
 Select\ the\ tree\ nodes\ to\ view\ and\ accept\ or\ reject\ changes=选择树节点查看和接受/拒绝修改
 
-Set\ field=设置字段内容
-Set\ fields=设置字段内容
-
 Settings=设置
 
 Shortcut=快捷键
 
 Show/edit\ %0\ source=显示/编辑 %0 源代码
 
-Show\ 'Firstname\ Lastname'=显示 '名 (Firstname) 姓 (Lastname)'
+Show\ 'Firstname\ Lastname'=名在前，姓在后（John Smith）
 
-Show\ 'Lastname,\ Firstname'=显示 '姓 (Lastname), 名 (Firstname)'
+Show\ 'Lastname,\ Firstname'=姓在前，名在后（Smith, John）
 
 Show\ BibTeX\ source\ by\ default=默认显示 BibTeX 源代码
 
 Show\ confirmation\ dialog\ when\ deleting\ entries=删除多条记录时发出警告
 
-Show\ last\ names\ only=只显示“姓 (Lastname)”
+Show\ last\ names\ only=仅显示姓（Smith）
 
 Show\ names\ unchanged=显示原始姓名字串
 
@@ -815,12 +834,17 @@ Size=大小
 Skipped\ -\ No\ PDF\ linked=跳过 - 没有 PDF 链接
 Skipped\ -\ PDF\ does\ not\ exist=跳过 - PDF 不存在
 
-Skipped\ entry.=已跳过记录
+JabRef\ skipped\ the\ entry.=JabRef 跳过了条目。
+Import\ error=导入错误
+Open\ library\ error=打开文献库出错
+Please\ check\ your\ library\ file\ for\ wrong\ syntax.=请检查您的库文件是否存在语法错误。
+SourceTab\ error=SourceTab错误
+User\ input\ via\ entry-editor\ in\ `{}bibtex\ source`\ tab\ led\ to\ failure.=通过条目编辑器的 "{}bibtex source" 标签中输入时出错。
 
 Sort\ subgroups=排序子组
 
 source\ edit=源代码编辑
-Special\ name\ formatters=特殊的姓名格式化器
+Special\ name\ formatters=姓名格式化
 
 Statically\ group\ entries\ by\ manual\ assignment=手动创建静态分组
 
@@ -830,8 +854,6 @@ Sublibrary\ from\ AUX\ to\ BibTeX=Sublibrary from AUX to BibTeX
 
 Switches\ between\ full\ and\ abbreviated\ journal\ name\ if\ the\ journal\ name\ is\ known.=在已知的期刊名简写和全称之间切换。
 
-The\ chosen\ encoding\ '%0'\ could\ not\ encode\ the\ following\ characters\:=选择的编码 '%0' 无法支持下列字符\:
-
 
 the\ field\ <b>%0</b>=字段 <b>%0</b>
 The\ group\ "%0"\ already\ contains\ the\ selection.=分组 "%0" 中已经包含选中的项。
@@ -951,7 +973,7 @@ Refuse\ to\ save\ the\ library\ before\ external\ changes\ have\ been\ reviewed.
 Library\ protection=文献库保护
 Unable\ to\ save\ library=无法保存文献库
 
-Citation\ key\ generator=Citationkey生成器
+Citation\ key\ generator=Citationkey
 Unable\ to\ open\ link.=无法打开链接。
 MIME\ type=MIME 类型
 
@@ -964,10 +986,6 @@ Line\ %0\:\ Found\ corrupted\ citation\ key\ %1\ (comma\ missing).=第 %0 行\:
 No\ full\ text\ document\ found=未发现完整的文档
 Download\ from\ URL=从 URL 下载
 Rename\ field=重命名字段
-Append\ field=添加字段
-Append\ to\ fields=追加到字段
-Rename\ field\ to=重命名字段为
-Move\ contents\ of\ a\ field\ into\ a\ field\ with\ a\ different\ name=将某个字段的内容移动到另一个字段中
 
 Cannot\ use\ port\ %0\ for\ remote\ operation;\ another\ application\ may\ be\ using\ it.\ Try\ specifying\ another\ port.=无法使用端口 %0 进行远程操作;该端口可能被其它应用程序占用，请使用其它端口。
 
@@ -1037,9 +1055,9 @@ Cite\ special=引用特殊
 Extra\ information\ (e.g.\ page\ number)=额外信息（例如：页码）
 Manage\ citations=管理文献引用
 Problem\ modifying\ citation=修改文献引用存在问题
+Problem\ collecting\ citations=Problem collecting citations
 Citation=文献引用
 Connecting...=连接中...
-Could\ not\ resolve\ BibTeX\ entry\ for\ citation\ marker\ '%0'.=文献引用标记 "%0" 无法解析到 BibTeX 记录
 Select\ style=选择引用样式
 Journals=期刊
 Cite=引用
@@ -1051,17 +1069,36 @@ Select\ Writer\ document=选择 Writer 文档
 Sync\ OpenOffice/LibreOffice\ bibliography=同步 OpenOffice/LibreOffice 参考文献
 Select\ which\ open\ Writer\ document\ to\ work\ on=选择使用哪个打开的 Writer 文档
 Connected\ to\ document=连接到文档
+
+Could\ not\ connect\ to\ any\ Writer\ document.\ Please\ make\ sure\ a\ document\ is\ open\ before\ using\ the\ 'Select\ Writer\ document'\ button\ to\ connect\ to\ it.=Could not connect to any Writer document. Please make sure a document is open before using the 'Select Writer document' button to connect to it.
+
+No\ Writer\ documents\ found=No Writer documents found
+
 Insert\ a\ citation\ without\ text\ (the\ entry\ will\ appear\ in\ the\ reference\ list)=插入一条没有内容的引用（这条记录将会出现在引用列表中）
 Cite\ selected\ entries\ with\ extra\ information=引用包含额外信息的选中记录
 Ensure\ that\ the\ bibliography\ is\ up-to-date=保证参考文献是最新的
+
 Your\ OpenOffice/LibreOffice\ document\ references\ the\ citation\ key\ '%0',\ which\ could\ not\ be\ found\ in\ your\ current\ library.=您的OpenOffice/LibreOffice文档引用了 citationkey "%0"，但未在当前库中找到。
+
+This\ operation\ requires\ a\ bibliography\ database.=This operation requires a bibliography database.
+
+Your\ OpenOffice/LibreOffice\ document\ references\ at\ least\ %0\ citation\ keys\ which\ could\ not\ be\ found\ in\ your\ current\ library.\ Some\ of\ these\ are\ %1.=Your OpenOffice/LibreOffice document references at least %0 citation keys which could not be found in your current library. Some of these are %1.
+
+Your\ OpenOffice/LibreOffice\ document\ references\ no\ citation\ keys\ which\ could\ also\ be\ found\ in\ your\ current\ library.=Your OpenOffice/LibreOffice document references no citation keys which could also be found in your current library.
+
 Unable\ to\ synchronize\ bibliography=无法同步参考文献
 Combine\ pairs\ of\ citations\ that\ are\ separated\ by\ spaces\ only=合并仅仅由空格分隔的两段引文
 Autodetection\ failed=自动检测失败
 Please\ wait...=请稍候...
 Connection\ lost=连接丢失
-The\ paragraph\ format\ is\ controlled\ by\ the\ property\ 'ReferenceParagraphFormat'\ or\ 'ReferenceHeaderParagraphFormat'\ in\ the\ style\ file.=段落格式由样式文件中的 'ReferenceParagraphFormat' 或者 'ReferenceHeaderParagraphFormat' 属性控制。
-The\ character\ format\ is\ controlled\ by\ the\ citation\ property\ 'CitationCharacterFormat'\ in\ the\ style\ file.=字符格式由样式文件中的 'CitationCharacterFormat' 引文属性控制。
+
+Could\ not\ update\ bibliography=Could not update bibliography
+Not\ connected\ to\ document=Not connected to document
+Problem\ combining\ cite\ markers=Problem combining cite markers
+Unable\ to\ reload\ style\ file=Unable to reload style file
+
+Problem\ during\ separating\ cite\ markers=Problem during separating cite markers
+
 Automatically\ sync\ bibliography\ when\ inserting\ citations=当插入文献引用时自动同步参考文献
 Look\ up\ BibTeX\ entries\ in\ the\ active\ tab\ only=在当前标签查找 BibTeX 记录
 Look\ up\ BibTeX\ entries\ in\ all\ open\ libraries=在所有打开的数据库中查找 BibTeX 记录
@@ -1163,7 +1200,9 @@ Toggle\ relevance=标记为相关
 Toggle\ quality\ assured=标记为质量已确认
 Toggle\ print\ status=标记打印状态
 Update\ keywords=更新关键词
+Problem\ connecting=Problem connecting
 Connection\ to\ OpenOffice/LibreOffice\ has\ been\ lost.\ Please\ make\ sure\ OpenOffice/LibreOffice\ is\ running,\ and\ try\ to\ reconnect.=与OpenOffice/LibreOffice的连接已丢失。请确保OpenOffice/LibreOffice正在运行，并尝试重新连接。
+
 JabRef\ will\ send\ at\ least\ one\ request\ per\ entry\ to\ a\ publisher.=JabRef 将会为每个条目发送至少一个请求至发布者。
 Correct\ the\ entry,\ and\ reopen\ editor\ to\ display/edit\ source.=更正条目，并重新打开编辑器以显示/编辑源代码。
 Could\ not\ connect\ to\ running\ OpenOffice/LibreOffice.=无法连接到运行中的OpenOffice/LibreOffice。
@@ -1177,8 +1216,6 @@ To\ disable\ the\ memory\ stick\ mode\ rename\ or\ remove\ the\ jabref.xml\ file
 Unable\ to\ connect.\ One\ possible\ reason\ is\ that\ JabRef\ and\ OpenOffice/LibreOffice\ are\ not\ both\ running\ in\ either\ 32\ bit\ mode\ or\ 64\ bit\ mode.=无法连接。一个可能的原因是, JabRef 和 OpenOffice/LibreOffice 不是同时在32位模式或64位模式下运行。
 Delimiter(s)=Delimiter(s)
 When\ downloading\ files,\ or\ moving\ linked\ files\ to\ the\ file\ directory,\ use\ the\ bib\ file\ location.=当下载文件或移动链接文件到文件目录时，使用 bib文件路径。
-Your\ style\ file\ specifies\ the\ character\ format\ '%0',\ which\ is\ undefined\ in\ your\ current\ OpenOffice/LibreOffice\ document.=您的样式文件指定字符格式为 "%0', 它在您当前的 OpenOffice/LibreOffice 文档中未定义。
-Your\ style\ file\ specifies\ the\ paragraph\ format\ '%0',\ which\ is\ undefined\ in\ your\ current\ OpenOffice/LibreOffice\ document.=您的样式文件指定段落格式为 "%0', 它在您当前的 OpenOffice/LibreOffice 文档中未定义。
 
 Searching...=正在搜索...
 Please\ enter\ a\ search\ string=请输入一个搜索字符串
@@ -1216,6 +1253,16 @@ Use\ custom\ proxy\ configuration=使用自定义 HTTP 代理
 Proxy\ requires\ authentication=代理服务器需要密码
 Attention\:\ Password\ is\ stored\ in\ plain\ text\!=注意\: 密码以明文形式保存\!
 Clear\ connection\ settings=清除连接设置
+Check\ Proxy\ Setting=检查代理设置
+Check\ connection=检查连接
+Connection\ failed\!=连接失败！
+Connection\ successful\!=连接成功！
+
+SSL\ Configuration=SSL配置
+SSL\ configuration\ changed=SSL配置已更改
+SSL\ certificate\ file=SSL证书文件
+Duplicate\ Certificates=复制证书
+You\ already\ added\ this\ certificate=您已经添加了此证书
 
 Open\ folder=打开文件夹
 Export\ sort\ order=导出顺序
@@ -1252,6 +1299,7 @@ Please\ open\ %0\ manually.=请手动打开 %0。
 The\ link\ has\ been\ copied\ to\ the\ clipboard.=链接已复制到剪贴板
 
 Open\ %0\ file=打开文件 %0
+Could\ not\ detect\ terminal\ automatically.\ Please\ define\ a\ custom\ terminal\ in\ the\ preferences.=无法自动检测终端。请在首选项中自定义一个终端。
 
 Cannot\ delete\ file=无法删除文件
 File\ permission\ error=文件权限错误
@@ -1297,9 +1345,7 @@ Save\ changes=保存修改
 Discard\ changes=放弃修改
 Library\ '%0'\ has\ changed.=文献库 '%0' 已修改。
 Print\ entry\ preview=打印记录预览
-Copy\ title=复制标题
-Copy\ \\cite{citation\ key}=复制 \\cite{citation key}
-Copy\ citation\ key\ and\ title=复制 ciationkey 和标题
+
 Invalid\ DOI\:\ '%0'.=不合法的 DOI\:
 Same\ DOI\ used\ in\ multiple\ entries=多个条目重复使用了相同的 DOI
 should\ start\ with\ a\ name=请以名称开头
@@ -1355,7 +1401,7 @@ Automatically\ setting\ file\ links=自动设置文件链接
 Regenerating\ citation\ keys\ according\ to\ metadata=根据元数据重新生成 citationkey
 Regenerate\ all\ keys\ for\ the\ entries\ in\ a\ BibTeX\ file=重新生成 BibTeX 文件中所有记录的键值
 Show\ debug\ level\ messages=显示调试级别消息
-Default\ library\ mode=Default library mode
+Default\ library\ mode=默认文献库模式
 Show\ only\ preferences\ deviating\ from\ their\ default\ value=只显示与默认值不同的首选项
 default=默认
 key=键值
@@ -1560,6 +1606,22 @@ Custom=自定义
 Export\ cited=导出已被引用的
 Unable\ to\ generate\ new\ library=无法生成新库
 
+The\ cursor\ is\ in\ a\ protected\ area.=The cursor is in a protected area.
+JabRefException=JabRefException
+No\ bibliography\ database\ is\ open\ for\ citation.=No bibliography database is open for citation.
+
+No\ database\ is\ open\ for\ updating\ citation\ markers\ after\ citing.=No database is open for updating citation markers after citing.
+
+No\ bibliography\ entries\ are\ selected\ for\ citation.=No bibliography entries are selected for citation.
+No\ bibliography\ style\ is\ selected\ for\ citation.=No bibliography style is selected for citation.
+No\ database=No database
+
+No\ entries\ selected\ for\ citation=No entries selected for citation
+Open\ one\ before\ citing.=Open one before citing.
+
+Select\ one\ before\ citing.=Select one before citing.
+Select\ some\ before\ citing.=Select some before citing.
+
 Found\ identical\ ranges=Found identical ranges
 Found\ overlapping\ ranges=Found overlapping ranges
 Found\ touching\ ranges=Found touching ranges
@@ -1606,7 +1668,7 @@ Remove\ list=删除列表
 Add\ abbreviation=添加缩写
 Full\ journal\ name=期刊全称
 Abbreviation\ name=缩写名
-Shortest\ unique\ abbreviation=Shortest unique abbreviation
+Shortest\ unique\ abbreviation=最简缩写
 
 No\ abbreviation\ files\ loaded=缩写文件未加载
 
@@ -1625,6 +1687,8 @@ Issue\ report\ successful=问题报告成功
 Your\ issue\ was\ reported\ in\ your\ browser.=您的问题已在浏览器中报告。
 The\ log\ and\ exception\ information\ was\ copied\ to\ your\ clipboard.=日志和异常信息已复制到剪贴板中。
 Please\ paste\ this\ information\ (with\ Ctrl+V)\ in\ the\ issue\ description.=请将此信息粘贴至问题描述中 (用 Ctrl + V)。
+Last\ notification=最新通知
+Check\ the\ event\ log\ to\ see\ all\ notifications=在事件日志中查看所有通知
 
 Host=主机
 Port=端口
@@ -1662,7 +1726,6 @@ Protected\ terms\ file=受保护的术语文件
 Style\ file=样式文件
 
 Open\ OpenOffice/LibreOffice\ connection=打开 OpenOffice/LibreOffice 连接
-You\ must\ enter\ at\ least\ one\ field\ name=您至少需要输入一个字段名
 Non-ASCII\ encoded\ character\ found=发现Non-ASCII编码字符
 Non-UTF-8\ encoded\ field\ found=未找到 UTF-8 编码的字段
 Toggle\ web\ search\ interface=切换网页搜索面板
@@ -1708,7 +1771,6 @@ should\ be\ normalized=应当被规范化
 
 Empty\ search\ ID=清空搜索ID
 The\ given\ search\ ID\ was\ empty.=给定的搜索 ID 为空。
-Copy\ citation\ key\ and\ link=复制 citationkey 和链接
 biblatex\ field\ only=仅限 biblatex 字段
 
 Error\ while\ generating\ fetch\ URL=生成提取 URL 时出错
@@ -1744,7 +1806,7 @@ Unhandled\ exception\ occurred.=发生了无法处理的异常。
 
 strings\ included=包含的字符串
 Escape\ underscores=转义下划线
-Color=色彩
+Color=颜色
 Please\ also\ add\ all\ steps\ to\ reproduce\ this\ issue,\ if\ possible.=如果可能的话，也请添加所有步骤以重现这个问题。
 Fit\ width=适应宽度
 Fit\ a\ single\ page=适应单页
@@ -1801,7 +1863,6 @@ Removes\ all\ hyphenated\ line\ breaks\ in\ the\ field\ content.=移除字段内
 Could\ not\ retrieve\ entry\ data\ from\ '%0'.=无法从 "%0" 中检索条目数据。
 Entry\ from\ %0\ could\ not\ be\ parsed.=无法解析 %0 中的条目。
 Invalid\ identifier\:\ '%0'.=无效的标识符：'%0'。
-This\ paper\ has\ been\ withdrawn.=这篇论文已被撤回。
 empty\ citation\ key=Citationkey为空
 Aux\ file=Aux 文件
 Group\ containing\ entries\ cited\ in\ a\ given\ TeX\ file=包含给定TeX文件中引用的条目组
@@ -1829,9 +1890,6 @@ Could\ not\ connect\ to\ Vim\ server.\ Make\ sure\ that\ Vim\ is\ running\ with\
 Could\ not\ connect\ to\ a\ running\ gnuserv\ process.\ Make\ sure\ that\ Emacs\ or\ XEmacs\ is\ running,\ and\ that\ the\ server\ has\ been\ started\ (by\ running\ the\ command\ 'server-start'/'gnuserv-start').=无法连接到正在运行的 gnuserv 进程。请确定 Emacs 或 XEmacs 正在运行, 并确保已启动服务器 (通过运行命令 'server-start'/'gnuserv-start')。
 Error\ pushing\ entries=推送条目时出错
 
-Undefined\ character\ format=未定义的字符格式
-Undefined\ paragraph\ format=未定义的段落格式
-
 Preamble=导言
 Markings=标识
 Use\ selected\ instance=使用所选的例子
@@ -1851,8 +1909,8 @@ Blog=博客
 Check\ integrity=检查完整性
 Cleanup\ URL\ link=清理 URL 链接
 Cleanup\ URL\ link\ by\ removing\ special\ symbols\ and\ extracting\ simple\ link=通过删除特殊符号和提取简单链接来清理 URL 链接
+Copy\ DOI=复制DOI
 Copy\ DOI\ url=复制 DOI
-Copy\ citation=复制引用
 Development\ version=开发中版本
 Export\ selected\ entries=导出选中记录
 Export\ selected\ entries\ to\ clipboard=将选定条目导出到剪贴板
@@ -1863,8 +1921,6 @@ Manage\ protected\ terms=管理受保护的术语
 New\ entry\ from\ plain\ text=新建记录自纯文本
 Import\ by\ ID=通过ID导入
 Enter\ a\ valid\ ID=输入一个有效的ID
-Imported\ one\ entry=导入了一个条目
-Entry\ already\ exists=条目已经存在
 New\ sublibrary\ based\ on\ AUX\ file=基于AUX文件创建子文献库
 Push\ entries\ to\ external\ application\ (%0)=推送选中记录到外部程序 (%0)
 Quit=退出
@@ -1874,7 +1930,7 @@ View\ change\ log=查看变更记录
 View\ event\ log=查看事件日志
 Website=网站
 
-Override\ default\ font\ settings=跳过默认字体设置
+Override\ default\ font\ settings=覆盖默认的字体设置
 Clear\ search=清除搜索
 
 Click\ help\ to\ learn\ about\ the\ migration\ of\ pre-3.6\ databases.=点击帮助了解 pre-3.6 数据库的迁移情况。
@@ -1984,47 +2040,47 @@ Import\ entries\ from\ LaTeX\ files=Import entries from LaTeX files
 Import\ new\ entries=Import new entries
 Group\ color=分组颜色
 
-Columns=Columns
+Columns=列
 File\ type=File type
 IEEE=IEEE
 Internal=Internal
 Special=Special
 Remove\ column=Remove column
-Add\ custom\ column=Add custom column
-Update\ to\ current\ column\ order=Update to current column order
-Sort\ column\ one\ step\ upwards=Sort column one step upwards
-Sort\ column\ one\ step\ downwards=Sort column one step downwards
+Add\ custom\ column=添加自定义列
+Update\ to\ current\ column\ order=更新到当前的列顺序
+Sort\ column\ one\ step\ upwards=上移一位
+Sort\ column\ one\ step\ downwards=下移一位
 List\ must\ not\ be\ empty.=List must not be empty.
 
-Order=Order
+Order=排序
 
-Add\ field\ to\ filter\ list=Add field to filter list
+Add\ field\ to\ filter\ list=添加字段到过滤列表
 Add\ formatter\ to\ list=Add formatter to list
 Filter\ List=Filter List
 Open\ files...=打开文件...
 
 Affected\ fields\:=补全字段
-Show\ preview\ as\ a\ tab\ in\ entry\ editor=Show preview as a tab in entry editor
-Font=Font
-Visual\ theme=Visual theme
+Show\ preview\ as\ a\ tab\ in\ entry\ editor=在条目编辑器中以标签形式显示预览
+Font=字体
+Visual\ theme=主题风格
 Light\ theme=明亮主题
 Dark\ theme=暗色主题
 Custom\ theme=自定义
 Overwrite\ existing\ keys=覆盖该字段的内容
-Key\ patterns=不同类型条目的键值风格
+Key\ patterns=Citationkey样式
 Font\ settings=Font settings
 Please\ specify\ a\ css\ theme\ file.=请指定一个 css 主题文件。
 You\ must\ enter\ an\ integer\ value\ higher\ than\ 8.=You must enter an integer value higher than 8.
 Letters\ after\ duplicate\ generated\ keys=为重复的Citationkey添加字母后缀
-Start\ on\ second\ duplicate\ key\ with\ letter\ A\ (a,\ b,\ ...)=在重复的键值后添加字母 A (a, b, ...)
-Start\ on\ second\ duplicate\ key\ with\ letter\ B\ (b,\ c,\ ...)=在重复的键值后添加字母 B (b, c, ...)
+Start\ on\ second\ duplicate\ key\ with\ letter\ A\ (a,\ b,\ ...)=在重复的键值后添加字母 a (a, b, ...)
+Start\ on\ second\ duplicate\ key\ with\ letter\ B\ (b,\ c,\ ...)=在重复的键值后添加字母 b (b, c, ...)
 Always\ add\ letter\ (a,\ b,\ ...)\ to\ generated\ keys=在生成键值时总是添加字母 (a, b, ...)
-Default\ pattern=默认模式
+Default\ pattern=Default pattern
 Reset\ %s\ to\ default\ value=Reset %s to default value
 Library\ mode=Library mode
 Reset\ to\ recommended=Reset to recommended
 Remove\ all=Remove all
-Reset\ All=Reset All
+Reset\ All=全部重置
 Linked\ identifiers=Linked identifiers
 
 insert\ entries=insert entries
@@ -2047,13 +2103,14 @@ Explicit\ selection=手动选择
 Searching\ for\ a\ keyword=指定字段的关键词
 Free\ search\ expression=检索语句
 Specified\ keywords=字段内容
-Cited\ entries=Cited entries
+Cited\ entries=根据AUX文件
 Search\ term\ is\ empty.=Search term is empty.
 Invalid\ regular\ expression.=无效的正则表达式
 Please\ provide\ a\ valid\ aux\ file.=请提供一个有效的AUX文件
 Keyword\ delimiter=Keyword delimiter
 Hierarchical\ keyword\ delimiter=Hierarchical keyword delimiter
 Escape\ ampersands=转义逻辑"与"符号
+Escape\ dollar\ sign=Escape dollar sign
 
 Hint\:\n\nTo\ search\ all\ fields\ for\ <b>Smith</b>,\ enter\:\n<tt>smith</tt>\n\nTo\ search\ the\ field\ <b>author</b>\ for\ <b>Smith</b>\ and\ the\ field\ <b>title</b>\ for\ <b>electrical</b>,\ enter\:\n<tt>author\=Smith\ and\ title\=electrical</tt>=Hint\:\n\nTo search all fields for <b>Smith</b>, enter\:\n<tt>smith</tt>\n\nTo search the field <b>author</b> for <b>Smith</b> and the field <b>title</b> for <b>electrical</b>, enter\:\n<tt>author\=Smith and title\=electrical</tt>
 
@@ -2263,7 +2320,7 @@ Reveal\ in\ file\ explorer=Reveal in file explorer
 
 Autolink\ files=自动链接文件
 
-Custom\ editor\ tabs=条目编辑器的标签
+Custom\ editor\ tabs=条目编辑器
 Custom\ export\ formats=自定义导出格式
 Custom\ import\ formats=自定义导入格式
 
@@ -2274,7 +2331,7 @@ Customized\ preview\ style=自定义预览样式
 Next\ preview\ style=下一个预览样式
 Previous\ preview\ style=上一个预览样式
 
-(\ Note\:\ Press\ return\ to\ commit\ changes\ in\ the\ table\!\ )=( Note\: Press return to commit changes in the table\! )
+(\ Note\:\ Press\ return\ to\ commit\ changes\ in\ the\ table\!\ )=（注意：按回车键以确认更改）
 Reset=Reset
 New\ inproceedings=新的inproceedings
 Reset\ entry\ types\ and\ fields\ to\ defaults=Reset entry types and fields to defaults
@@ -2288,10 +2345,6 @@ Removes\ digits.=Removes digits.
 
 Presets=默认
 
-Check\ Proxy\ Setting=检查代理设置
-Check\ connection=检查连接
-Connection\ failed\!=连接失败！
-Connection\ successful\!=连接成功！
 Generate\ groups\ from\ keywords\ in\ the\ following\ field=根据以下字段的关键字生成组
 Generate\ groups\ for\ author\ last\ names=根据作者的姓氏生成组
 Regular\ expression=正则表达式
@@ -2311,15 +2364,43 @@ Separate\ merged\ citations=拆分合并的引文
 Separate\ citations=分离引文
 
 Unprotect\ terms=未保护专有名词
-Error\ connecting\ to\ Writer\ document=连接到Writer文档时错误
-You\ need\ to\ open\ Writer\ with\ a\ document\ before\ connecting=连接前需要打开一个Writer文档
 
 Generate\ a\ new\ key\ for\ imported\ entries\ (overwriting\ their\ default)=为导入的条目生成一个新 citationkey (覆盖默认值)
+Warn\ about\ duplicates\ on\ import=导入重复条目时告警
 Import\ and\ Export=导入导出
 Custom\ DOI\ URI=自定义 DOI URI
 Use\ custom\ DOI\ base\ URI\ for\ article\ access=使用基于DOI的URI访问文章
 
 Cited\ on\ pages=Cited on pages
+Please\ move\ the\ cursor\ into\ the\ document\ text.=Please move the cursor into the document text.
+To\ get\ the\ visual\ positions\ of\ your\ citations\ I\ need\ to\ move\ the\ cursor\ around,\ but\ could\ not\ get\ it.=To get the visual positions of your citations I need to move the cursor around, but could not get it.
+
+I\ cannot\ insert\ to\ the\ cursors\ current\ location.=I cannot insert to the cursors current location.
+
+Please\ move\ the\ cursor\ to\ the\ location\ for\ the\ new\ citation.=Please move the cursor to the location for the new citation.
+
+Please\ create\ it\ in\ the\ document\ or\ change\ in\ the\ file\:=Please create it in the document or change in the file\:
+
+Please\ use\ the\ latter\ in\ the\ style\ file\ below\ to\ avoid\ localization\ problems.=Please use the latter in the style file below to avoid localization problems.
+
+The\ %0\ character\ style\ '%1'\ is\ a\ display\ name\ for\ '%2'.=The %0 character style '%1' is a display name for '%2'.
+
+The\ %0\ character\ style\ '%1'\ is\ missing\ from\ the\ document=The %0 character style '%1' is missing from the document
+
+The\ %0\ paragraph\ style\ '%1'\ is\ a\ display\ name\ for\ '%2'.=The %0 paragraph style '%1' is a display name for '%2'.
+
+The\ %0\ paragraph\ style\ '%1'\ is\ missing\ from\ the\ document=The %0 paragraph style '%1' is missing from the document
+
+Error\ while\ checking\ if\ Writer\ is\ recording\ changes\ or\ has\ recorded\ changes.=Error while checking if Writer is recording changes or has recorded changes.
+
+Cannot\ work\ with\ [Edit]/[Track\ Changes]/[Record]\ turned\ on.=Cannot work with [Edit]/[Track Changes]/[Record] turned on.
+
+Changes\ by\ JabRef\ could\ result\ in\ unexpected\ interactions\ with\ recorded\ changes.=Changes by JabRef could result in unexpected interactions with recorded changes.
+
+Recording\ and/or\ Recorded\ changes=Recording and/or Recorded changes
+
+Use\ [Edit]/[Track\ Changes]/[Manage]\ to\ resolve\ them\ first.=Use [Edit]/[Track Changes]/[Manage] to resolve them first.
+
 Unable\ to\ find\ valid\ certification\ path\ to\ requested\ target(%0),\ download\ anyway?=无法找到请求目标(%0)的有效证书路径，仍然下载？
 Download\ operation\ canceled.=下载操作已取消。
 
@@ -2336,7 +2417,6 @@ Entry\ Type=条目类型
 Entry\ types=条目类型
 Field\ names=字段名
 Others=其他
-Overwrite\ existing\ field\ values=覆盖现有字段内容
 Recommended=推荐
 
 Authors\ and\ Title=作者和标题
@@ -2367,6 +2447,8 @@ Query=查询
 Question=问题
 Select\ directory=选择目录
 
+Fulltext\ Index=Fulltext 索引
+Automatically\ index\ all\ linked\ files\ for\ fulltext\ search=自动索引所有链接的文件以进行全文搜索
 Rebuild\ fulltext\ search\ index=重建全文索引
 Rebuild\ fulltext\ search\ index\ for\ current\ library?=是否为当前文献库重建全文索引？
 Rebuilding\ fulltext\ search\ index...=正在重建全文索引...
@@ -2377,7 +2459,10 @@ Found\ matches\ in\ Annotations\:=在注释中找到匹配项：
 
 Grobid\ URL=Grobid URL
 Remote\ services=远程服务
-Allow\ sending\ PDF\ files\ and\ raw\ citation\ strings\ to\ a\ JabRef\ online\ service\ (Grobid)\ to\ determine\ Metadata.\ This\ produces\ better\ results.=Allow sending PDF files and raw citation strings to a JabRef online service (Grobid) to determine Metadata. This produces better results.
+Allow\ sending\ PDF\ files\ and\ raw\ citation\ strings\ to\ a\ JabRef\ online\ service\ (Grobid)\ to\ determine\ Metadata.\ This\ produces\ better\ results.=允许将 PDF 文件和原始引用发送到JabRef在线服务（Grobid）以获取元数据
+
+Fetcher\ cannot\ be\ tested\!=Fetcher cannot be tested\!
+Fetcher\ unknown\!=Fetcher unknown\!
 
 Character\ by\ character=Character by character
 Embedded=内嵌
@@ -2393,3 +2478,30 @@ Search\ across\ libraries\ in\ a\ new\ window=在新窗口中搜索库
 Keep\ search\ string\ across\ libraries=在所有库中保留搜索语句
 Keep\ dialog\ always\ on\ top=保持窗口位于最前面
 Search\ results\ from\ open\ libraries=Search results from open libraries
+
+Add\ certificate=添加证书
+Serial\ number=序号
+Issuer=签发者
+Valid\ from=起始有效期
+Valid\ to=截至有效期
+Signature\ algorithm=签名算法
+Version=版本
+
+Error\ downloading=下载出错
+
+Error\ while\ writing\ metadata.\ See\ the\ error\ log\ for\ details.=写入元数据时出错。详细信息请参阅错误日志。
+Failed\ to\ write\ metadata,\ file\ %1\ not\ found.=Failed to write metadata, file %1 not found.
+Success\!\ Finished\ writing\ metadata.=Success\! Finished writing metadata.
+
+Custom\ API\ key=自定义API
+Check\ %0\ API\ Key\ Setting=Check %0 API Key Setting
+
+Set=设定
+Append=附加
+Rename=重命名
+New\ field\ name=新的字段名
+Automatic\ field\ editor=自动化条目编辑
+
+(Note\:\ If\ original\ entries\ lack\ keywords\ to\ qualify\ for\ the\ new\ group\ configuration,\ confirming\ here\ will\ add\ them)=(Note\: If original entries lack keywords to qualify for the new group configuration, confirming here will add them)
+Assign=Assign
+Do\ not\ assign=Do not assign
diff --git a/src/main/resources/l10n/JabRef_zh_TW.properties b/src/main/resources/l10n/JabRef_zh_TW.properties
index b1b41eccd0b..6e74ac8da11 100644
--- a/src/main/resources/l10n/JabRef_zh_TW.properties
+++ b/src/main/resources/l10n/JabRef_zh_TW.properties
@@ -14,7 +14,7 @@ Unable\ to\ monitor\ file\ changes.\ Please\ close\ files\ and\ processes\ and\
 
 %0/%1\ entries=%0/%1 條目
 
-%0\ export\ successful=%0 匯出成功
+
 
 %0\ matches\ the\ regular\ expression\ <b>%1</b>=%0 符合正規表達式 <b>%1</b>
 
@@ -143,8 +143,6 @@ Cite\ command=引用指令
 
 Clear=清除
 
-Clear\ fields=清除欄位
-
 
 Close\ dialog=關閉對話視窗
 
@@ -163,7 +161,11 @@ Copied=已複製
 
 Copy=複製
 
+Copy\ title=複製標題
+Copy\ \\cite{citation\ key}=複製 \\cite{citation key}
 Copy\ citation\ key=複製引用鍵值（citation key）
+Copy\ citation\ key\ and\ link=複製引用鍵與連結
+Copy\ citation\ key\ and\ title=複製引用鍵與標題
 
 Copy\ to\ clipboard=複製到剪貼簿
 
@@ -215,7 +217,6 @@ Library\ properties=文獻倉庫屬性
 
 Default=預設
 
-Default\ encoding=預設編碼
 
 Downloading=正在下載
 
@@ -417,6 +418,7 @@ JabRef\ Version\ (Required\ to\ ensure\ backwards\ compatibility\ with\ Mr.\ DLi
 
 Journal\ abbreviations=期刊縮寫
 
+Keep\ both=保留全部
 
 
 Key\ bindings=按鍵
@@ -461,6 +463,8 @@ Moved\ group\ "%0".=已移動群組「%0」。
 
 
 
+
+
 Name=名稱
 
 Name\ formatter=姓名格式化工具
@@ -527,8 +531,6 @@ Paste=貼上
 
 
 
-PDF\ does\ not\ exist=PDF 不存在
-
 
 
 
@@ -576,6 +578,13 @@ Remove\ group=移除群組
 
 
 
+
+
+
+
+
+
+
 Remove\ link=移除連結
 
 Remove\ old\ entry=移除舊有條目
@@ -585,7 +594,6 @@ Remove\ string\ %0=移除字串 %0
 
 
 
-
 Replace=取代
 Replace\ With\:=取代為：
 Find\:=尋找：
@@ -624,7 +632,6 @@ Select\ all=全選
 
 
 
-
 Settings=設定
 
 Shortcut=快速鍵
@@ -657,7 +664,6 @@ Status=狀態
 
 
 
-
 the\ field\ <b>%0</b>=欄位 <b>%0</b>
 The\ group\ "%0"\ already\ contains\ the\ selection.=群組「%0」中已經包含選取的內容。
 
@@ -726,8 +732,6 @@ Unable\ to\ save\ library=無法儲存文獻倉庫
 
 
 Rename\ field=重新命名欄位
-Append\ field=添加欄位
-Append\ to\ fields=添加到欄位
 
 
 Autosave\ local\ libraries=自動儲存本機文獻倉庫
@@ -757,6 +761,17 @@ Connecting...=正在連接...
 Select\ style=選擇引用樣式
 Journals=期刊
 Cite=引用
+
+
+
+
+
+
+
+
+
+
+
 Web\ search=網頁搜尋
 
 
@@ -777,6 +792,7 @@ Rank=評分
 
 
 
+
 Merge\ entries=合併條目
 Merged\ entries=已合併選中條目
 You\ have\ to\ choose\ exactly\ two\ entries\ to\ merge.=你必須選擇恰好兩個條目進行合併。
@@ -792,6 +808,11 @@ Proxy\ configuration=代理伺服器設定
 Use\ custom\ proxy\ configuration=使用自訂代理伺服器
 Proxy\ requires\ authentication=代理伺服器需要認證
 Attention\:\ Password\ is\ stored\ in\ plain\ text\!=注意：密碼將以明文形式存放！
+Check\ Proxy\ Setting=檢查代理設定
+Check\ connection=檢查連接
+Connection\ failed\!=連線失敗！
+Connection\ successful\!=連線成功！
+
 
 Export\ sort\ order=匯出順序
 
@@ -816,9 +837,7 @@ Opens\ JabRef's\ website=開啟 JabRef 的網站
 
 Select\ at\ least\ one\ entry\ to\ manage\ keywords.=選中至少一則條目來管理關鍵詞
 Select\ export\ format=選擇匯出格式
-Copy\ title=複製標題
-Copy\ \\cite{citation\ key}=複製 \\cite{citation key}
-Copy\ citation\ key\ and\ title=複製引用鍵與標題
+
 
 
 Push\ to\ application=推送到應用程式
@@ -860,6 +879,11 @@ Online\ help\ forum=線上論壇
 
 
 
+
+
+
+
+
 Add\ new\ list=新增項目
 Open\ existing\ list=開啟現有項目
 Full\ journal\ name=期刊全名
@@ -892,7 +916,6 @@ Used\ libraries=使用的函式庫
 
 
 
-Copy\ citation\ key\ and\ link=複製引用鍵與連結
 
 
 
@@ -920,13 +943,11 @@ Next\ page=下一頁
 
 
 
-
 Hide\ panel=隱藏面板
 Move\ panel\ up=上移面板
 Move\ panel\ down=下移面板
 Linked\ files=聯動檔案
 Blog=部落格
-Copy\ citation=複製引用
 Development\ version=開發版本
 Export\ selected\ entries=匯出選取條目
 Export\ selected\ entries\ to\ clipboard=匯出選取條目到剪貼簿
@@ -970,7 +991,7 @@ Set\ rank\ to\ five=設定評分為 5 級
 Order=順序
 
 
-Affected\ fields\:=影響欄位\: 
+Affected\ fields\:=影響欄位\:
 Show\ preview\ as\ a\ tab\ in\ entry\ editor=在條目編輯器中以分頁形式顯示預覽
 Font=字型
 Visual\ theme=界面主題
@@ -1042,10 +1063,6 @@ Remove\ digits=移除數字
 Removes\ digits.=移除數字
 
 
-Check\ Proxy\ Setting=檢查代理設定
-Check\ connection=檢查連接
-Connection\ failed\!=連線失敗！
-Connection\ successful\!=連線成功！
 Generate\ groups\ for\ author\ last\ names=依據作者姓氏生成群組
 Regular\ expression=正規表達式
 
@@ -1062,6 +1079,20 @@ Use\ custom\ DOI\ base\ URI\ for\ article\ access=使用自訂的 DOI 基礎網
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 Question=問題
 Select\ directory=選擇資料夾
@@ -1069,3 +1100,10 @@ Select\ directory=選擇資料夾
 
 
 
+
+
+
+
+
+
+
diff --git a/src/main/resources/ssl/truststore.jks b/src/main/resources/ssl/truststore.jks
new file mode 100644
index 00000000000..8ddf160c674
Binary files /dev/null and b/src/main/resources/ssl/truststore.jks differ
diff --git a/src/main/resources/tinylog.properties b/src/main/resources/tinylog.properties
index ae34725dfec..26696d06933 100644
--- a/src/main/resources/tinylog.properties
+++ b/src/main/resources/tinylog.properties
@@ -1,4 +1,7 @@
 level = info
 writer = gui
-writer1 = console
-writer2 = application insights
+writerConsole = console
+writerAzure = application insights
+
+# More shrunk exception logs. See https://tinylog.org/v2/configuration/#strip-stack-trace-elements for details
+exception = strip: jdk.internal
diff --git a/src/main/resources/xjc/citavi/citavi.xsd b/src/main/resources/xjc/citavi/citavi.xsd
new file mode 100644
index 00000000000..7088082053a
--- /dev/null
+++ b/src/main/resources/xjc/citavi/citavi.xsd
@@ -0,0 +1,388 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Created with Liquid Technologies Online Tools 1.0 (https://www.liquid-technologies.com) -->
+<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <xs:element name="CitaviExchangeData">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element name="ProjectSettings">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="AttachmentsFolderPath" />
+              <xs:element name="ColorScheme" type="xs:string" />
+              <xs:element name="CustomFields">
+                <xs:complexType>
+                  <xs:sequence>
+                    <xs:element maxOccurs="unbounded" name="CustomFieldSettings">
+                      <xs:complexType>
+                        <xs:sequence>
+                          <xs:element name="CompareType" type="xs:string" />
+                          <xs:element name="DefaultValue" />
+                          <xs:element name="DropDownStyle" type="xs:string" />
+                          <xs:element name="PropertyName" type="xs:string" />
+                        </xs:sequence>
+                      </xs:complexType>
+                    </xs:element>
+                  </xs:sequence>
+                </xs:complexType>
+              </xs:element>
+              <xs:element name="Description" type="xs:string" />
+              <xs:element name="IsUtc" type="xs:boolean" />
+              <xs:element name="LastChangeTime" type="xs:string" />
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="ProjectUserSettings">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="LastReferenceId" type="xs:string" />
+              <xs:element name="ShowCategoryClassification" type="xs:boolean" />
+              <xs:element name="SortOrder">
+                <xs:complexType>
+                  <xs:sequence>
+                    <xs:element maxOccurs="unbounded" name="SortProperty">
+                      <xs:complexType>
+                        <xs:sequence>
+                          <xs:element name="ReferencePropertyId" type="xs:string" />
+                          <xs:element name="SortDirection" type="xs:string" />
+                        </xs:sequence>
+                      </xs:complexType>
+                    </xs:element>
+                  </xs:sequence>
+                </xs:complexType>
+              </xs:element>
+              <xs:element name="SortOrderImport">
+                <xs:complexType>
+                  <xs:sequence>
+                    <xs:element maxOccurs="unbounded" name="SortProperty">
+                      <xs:complexType>
+                        <xs:sequence>
+                          <xs:element name="ReferencePropertyId" type="xs:string" />
+                          <xs:element name="SortDirection" type="xs:string" />
+                        </xs:sequence>
+                      </xs:complexType>
+                    </xs:element>
+                  </xs:sequence>
+                </xs:complexType>
+              </xs:element>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="Categories">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="Category" maxOccurs="unbounded" minOccurs="0">
+                <xs:complexType>
+                  <xs:sequence>
+                    <xs:element type="xs:string" name="CreatedBy" minOccurs="0" />
+                    <xs:element type="xs:dateTime" name="CreatedOn" minOccurs="0" />
+                    <xs:element type="xs:string" name="ModifiedBy" minOccurs="0" />
+                    <xs:element type="xs:dateTime" name="ModifiedOn" minOccurs="0" />
+                    <xs:element type="xs:string" name="Name" />
+                  </xs:sequence>
+                  <xs:attribute type="xs:string" name="id" use="optional" />
+                </xs:complexType>
+              </xs:element>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="CategoryCatgories">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element type="xs:string" name="OnetoN" maxOccurs="unbounded" minOccurs="0" />
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="ImportGroups">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="ImportGroup" maxOccurs="unbounded" minOccurs="0">
+                <xs:complexType>
+                  <xs:sequence>
+                    <xs:element type="xs:string" name="CreatedBy" />
+                    <xs:element type="xs:dateTime" name="CreatedOn" />
+                    <xs:element type="xs:string" name="ModifiedBy" />
+                    <xs:element type="xs:dateTime" name="ModifiedOn" />
+                    <xs:element type="xs:byte" name="ImportGroupType" />
+                    <xs:element type="xs:string" name="Source" minOccurs="0" />
+                  </xs:sequence>
+                  <xs:attribute type="xs:string" name="id" use="optional" />
+                </xs:complexType>
+              </xs:element>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="ImportGroupReferences">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element type="xs:string" name="OnetoN" maxOccurs="unbounded" minOccurs="0" />
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="Keywords">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element maxOccurs="unbounded" name="Keyword">
+                <xs:complexType>
+                  <xs:sequence>
+                    <xs:element name="CreatedBy" type="xs:string" />
+                    <xs:element name="CreatedOn" type="xs:dateTime" />
+                    <xs:element name="ModifiedBy" type="xs:string" />
+                    <xs:element name="ModifiedOn" type="xs:dateTime" />
+                    <xs:element name="Name" type="xs:string" />
+                    <xs:element name="Protected" type="xs:boolean" />
+                    <xs:element name="SortFullName" type="xs:string" />
+                    <xs:element name="UniqueFullName" type="xs:string" />
+                  </xs:sequence>
+                  <xs:attribute name="id" type="xs:string" use="required" />
+                </xs:complexType>
+              </xs:element>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="Publishers">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element maxOccurs="unbounded" name="Publisher">
+                <xs:complexType>
+                  <xs:sequence>
+                    <xs:element name="CreatedBy" type="xs:string" />
+                    <xs:element name="CreatedOn" type="xs:dateTime" />
+                    <xs:element name="ModifiedBy" type="xs:string" />
+                    <xs:element name="ModifiedOn" type="xs:dateTime" />
+                    <xs:element name="Name" type="xs:string" />
+                    <xs:element name="Notes" type="xs:string" />
+                    <xs:element name="Protected" type="xs:boolean" />
+                    <xs:element name="SortFullName" type="xs:string" />
+                    <xs:element name="UniqueFullName" type="xs:string" />
+                  </xs:sequence>
+                  <xs:attribute name="id" type="xs:string" use="required" />
+                </xs:complexType>
+              </xs:element>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="Persons">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element maxOccurs="unbounded" name="Person">
+                <xs:complexType>
+                  <xs:sequence>
+                    <xs:element name="CreatedBy" type="xs:string" />
+                    <xs:element name="CreatedOn" type="xs:dateTime" />
+                    <xs:element name="ModifiedBy" type="xs:string" />
+                    <xs:element name="ModifiedOn" type="xs:dateTime" />
+                    <xs:element name="FirstName" type="xs:string" />
+                    <xs:element name="LastName" type="xs:string" />
+                    <xs:element name="MiddleName" type="xs:string" />
+                    <xs:element name="Protected" type="xs:boolean" />
+                    <xs:element name="Sex" type="xs:unsignedByte" />
+                    <xs:element name="SortFullName" type="xs:string" />
+                    <xs:element name="UniqueFullName" type="xs:string" />
+                  </xs:sequence>
+                  <xs:attribute name="id" type="xs:string" use="required" />
+                </xs:complexType>
+              </xs:element>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="References">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element maxOccurs="unbounded" name="Reference">
+                <xs:complexType>
+                  <xs:sequence>
+                    <xs:element name="CreatedBy" type="xs:string" />
+                    <xs:element name="CreatedOn" type="xs:dateTime" />
+                    <xs:element name="ModifiedBy" type="xs:string" />
+                    <xs:element name="ModifiedOn" type="xs:dateTime" />
+                    <xs:element name="Abstract" type="xs:string" />
+                    <xs:element name="AbstractComplexity" type="xs:unsignedByte" />
+                    <xs:element name="AbstractSourceTextFormat" type="xs:unsignedByte" />
+                    <xs:element name="CitationKeyUpdateType" type="xs:unsignedByte" />
+                    <xs:element name="CoverPath" type="xs:string" />
+                    <xs:element name="EvaluationComplexity" type="xs:unsignedByte" />
+                    <xs:element name="EvaluationSourceTextFormat" type="xs:unsignedByte" />
+                    <xs:element name="HasLabel1" type="xs:boolean" />
+                    <xs:element name="HasLabel2" type="xs:boolean" />
+                    <xs:element name="PageCount" type="xs:string" />
+                    <xs:element name="PageRange" type="xs:string" />
+                    <xs:element name="PageRangeNumber" type="xs:byte" />
+                    <xs:element name="Rating" type="xs:unsignedByte" />
+                    <xs:element name="ReferenceType" type="xs:string" />
+                    <xs:element name="ShortTitle" type="xs:string" />
+                    <xs:element name="ShortTitleUpdateType" type="xs:unsignedByte" />
+                    <xs:element name="StaticIDs" type="xs:string" />
+                    <xs:element name="TableOfContentsComplexity" type="xs:unsignedByte" />
+                    <xs:element name="TableOfContentsSourceTextFormat" type="xs:unsignedByte" />
+                    <xs:element name="Title" type="xs:string" />
+                    <xs:element name="Year" type="xs:string" />
+                    <xs:element name="Doi" type="xs:string" />
+                    <xs:element name="Isbn" type="xs:string" />
+                    <xs:element name="Volume" type="xs:string" />
+                  </xs:sequence>
+                  <xs:attribute name="id" type="xs:string" use="required" />
+                </xs:complexType>
+              </xs:element>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="ReferenceAuthors">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element maxOccurs="unbounded" name="OnetoN" type="xs:string" />
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="ReferenceEditors">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element maxOccurs="unbounded" name="OnetoN" type="xs:string" />
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="ReferenceGroups">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element maxOccurs="unbounded" name="OnetoN" type="xs:string" />
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="ReferenceKeywords">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element maxOccurs="unbounded" name="OnetoN" type="xs:string" />
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="ReferenceOrganizations">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element maxOccurs="unbounded" name="OnetoN" type="xs:string" />
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="ReferencePublishers">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element maxOccurs="unbounded" name="OnetoN" type="xs:string" />
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="Locations">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="Location">
+                <xs:complexType>
+                  <xs:sequence>
+                    <xs:element name="CreatedBy" type="xs:string" />
+                    <xs:element name="CreatedOn" type="xs:dateTime" />
+                    <xs:element name="ModifiedBy" type="xs:string" />
+                    <xs:element name="ModifiedOn" type="xs:dateTime" />
+                    <xs:element name="Address" type="xs:string" />
+                    <xs:element name="LocationType" type="xs:unsignedByte" />
+                    <xs:element name="PreviewBehaviour" type="xs:unsignedByte" />
+                    <xs:element name="ReferenceID" type="xs:string" />
+                  </xs:sequence>
+                  <xs:attribute name="id" type="xs:string" use="required" />
+                </xs:complexType>
+              </xs:element>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="Annotations">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element maxOccurs="unbounded" name="Annotation">
+                <xs:complexType>
+                  <xs:sequence>
+                    <xs:element name="CreatedBy" type="xs:string" />
+                    <xs:element name="CreatedOn" type="xs:dateTime" />
+                    <xs:element name="ModifiedBy" type="xs:string" />
+                    <xs:element name="ModifiedOn" type="xs:dateTime" />
+                    <xs:element name="LocationID" type="xs:string" />
+                    <xs:element name="Quads" type="xs:string" />
+                    <xs:element name="Visible" type="xs:boolean" />
+                  </xs:sequence>
+                  <xs:attribute name="id" type="xs:string" use="required" />
+                </xs:complexType>
+              </xs:element>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="KnowledgeItems">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element maxOccurs="unbounded" name="KnowledgeItem">
+                <xs:complexType>
+                  <xs:sequence>
+                    <xs:element name="CreatedBy" type="xs:string" />
+                    <xs:element name="CreatedOn" type="xs:dateTime" />
+                    <xs:element name="ModifiedBy" type="xs:string" />
+                    <xs:element name="ModifiedOn" type="xs:dateTime" />
+                    <xs:element minOccurs="0" name="CoreStatement" type="xs:string" />
+                    <xs:element name="CoreStatementUpdateType" type="xs:unsignedByte" />
+                    <xs:element name="KnowledgeItemType" type="xs:unsignedByte" />
+                    <xs:element minOccurs="0" name="PageRange" type="xs:string" />
+                    <xs:element name="PageRangeNumber" type="xs:int" />
+                    <xs:element minOccurs="0" name="PageRangeNumeralSystem" type="xs:unsignedByte" />
+                    <xs:element name="QuotationIndex" type="xs:unsignedByte" />
+                    <xs:element name="QuotationType" type="xs:unsignedByte" />
+                    <xs:element name="ReferenceID" type="xs:string" />
+                    <xs:element name="Relevance" type="xs:unsignedByte" />
+                    <xs:element name="SortFullName" type="xs:string" />
+                    <xs:element name="StaticIDs" type="xs:string" />
+                    <xs:element name="TextSourceTextFormat" type="xs:unsignedByte" />
+                    <xs:element minOccurs="0" name="Text" type="xs:string" />
+                    <xs:element type="xs:string" name="TextIsComplex" />
+                    <xs:element type="xs:string" name="TextFormatted" minOccurs="0" />
+                  </xs:sequence>
+                  <xs:attribute name="id" type="xs:string" use="required" />
+                </xs:complexType>
+              </xs:element>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="KnowledgeItemCategories">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="OnetoN" maxOccurs="unbounded" type="xs:string" />
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="KnowledgeItemKeywords">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element maxOccurs="unbounded" name="OnetoN" type="xs:string" />
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="EntityLinks">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element maxOccurs="unbounded" name="EntityLink">
+                <xs:complexType>
+                  <xs:sequence>
+                    <xs:element name="CreatedBy" type="xs:string" />
+                    <xs:element name="CreatedOn" type="xs:dateTime" />
+                    <xs:element name="ModifiedBy" type="xs:string" />
+                    <xs:element name="ModifiedOn" type="xs:dateTime" />
+                    <xs:element name="Indication" type="xs:string" />
+                    <xs:element name="RelationType" type="xs:unsignedByte" />
+                    <xs:element name="SourceID" type="xs:string" />
+                    <xs:element name="SourceType" type="xs:string" />
+                    <xs:element name="TargetID" type="xs:string" />
+                    <xs:element name="TargetType" type="xs:string" />
+                  </xs:sequence>
+                  <xs:attribute name="id" type="xs:string" use="required" />
+                </xs:complexType>
+              </xs:element>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+      </xs:sequence>
+      <xs:attribute name="Version" type="xs:string" use="required" />
+      <xs:attribute name="ConnectionIdentifier" type="xs:string" use="required" />
+      <xs:attribute name="Changeset" type="xs:unsignedByte" use="required" />
+    </xs:complexType>
+  </xs:element>
+</xs:schema>
diff --git a/src/main/resources/xjc/mods/mods-binding.xjb b/src/main/resources/xjc/mods/mods-binding.xjb
index b90a1d45bb0..6d30b7c7cf4 100644
--- a/src/main/resources/xjc/mods/mods-binding.xjb
+++ b/src/main/resources/xjc/mods/mods-binding.xjb
@@ -1,4 +1,4 @@
-<jxb:bindings version="2.0" xmlns:jxb="http://java.sun.com/xml/ns/jaxb" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+<jxb:bindings version="3.0" xmlns:jxb="https://jakarta.ee/xml/ns/jaxb" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
 
     <jxb:bindings schemaLocation="mods-3-7.xsd" node="/xsd:schema">
 
diff --git a/src/test/java/org/jabref/JabRefPreferencesTest.java b/src/test/java/org/jabref/JabRefPreferencesTest.java
deleted file mode 100644
index 27f00b68298..00000000000
--- a/src/test/java/org/jabref/JabRefPreferencesTest.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.jabref;
-
-import java.nio.charset.StandardCharsets;
-
-import org.jabref.preferences.GeneralPreferences;
-import org.jabref.preferences.JabRefPreferences;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.mockito.Answers;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-class JabRefPreferencesTest {
-
-    private JabRefPreferences prefs;
-
-    @BeforeEach
-    void setUp() {
-        prefs = mock(JabRefPreferences.class);
-        GeneralPreferences generalPreferences = mock(GeneralPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        when(generalPreferences.getDefaultEncoding()).thenReturn(StandardCharsets.UTF_8);
-        when(prefs.getGeneralPreferences()).thenReturn(generalPreferences);
-    }
-
-    // FIXME: This test is not testing anything. prefs.getDefaultEncoding() will always return StandardCharsets.UTF_8
-    //  because of setUp(): when(prefs.getDefaultEnconding()).thenReturn(StandardCharsets.UTF_8);
-    @Test
-    void getDefaultEncodingReturnsPreviouslyStoredEncoding() {
-        // prefs.setDefaultEncoding(StandardCharsets.UTF_8);
-        // assertEquals(StandardCharsets.UTF_8, prefs.getDefaultEncoding());
-    }
-}
diff --git a/src/test/java/org/jabref/architecture/MainArchitectureTests.java b/src/test/java/org/jabref/architecture/MainArchitectureTests.java
index 40e3d945f2b..6aafd6acc1a 100644
--- a/src/test/java/org/jabref/architecture/MainArchitectureTests.java
+++ b/src/test/java/org/jabref/architecture/MainArchitectureTests.java
@@ -6,6 +6,7 @@
 import com.tngtech.archunit.junit.AnalyzeClasses;
 import com.tngtech.archunit.junit.ArchIgnore;
 import com.tngtech.archunit.junit.ArchTest;
+import com.tngtech.archunit.library.GeneralCodingRules;
 
 import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.noClasses;
 import static com.tngtech.archunit.library.Architectures.layeredArchitecture;
@@ -20,6 +21,7 @@ class MainArchitectureTests {
     private static final String PACKAGE_ORG_JABREF_GUI = "org.jabref.gui..";
     private static final String PACKAGE_ORG_JABREF_LOGIC = "org.jabref.logic..";
     private static final String PACKAGE_ORG_JABREF_MODEL = "org.jabref.model..";
+    private static final String PACKAGE_ORG_JABREF_CLI = "org.jabref.cli..";
 
     @ArchTest
     public static void doNotUseApacheCommonsLang3(JavaClasses classes) {
@@ -92,7 +94,7 @@ public static void respectLayeredArchitecture(JavaClasses classes) {
                 .layer("Gui").definedBy(PACKAGE_ORG_JABREF_GUI)
                 .layer("Logic").definedBy(PACKAGE_ORG_JABREF_LOGIC)
                 .layer("Model").definedBy(PACKAGE_ORG_JABREF_MODEL)
-                .layer("Cli").definedBy("org.jabref.cli..")
+                .layer("Cli").definedBy(PACKAGE_ORG_JABREF_CLI)
                 .layer("Migrations").definedBy("org.jabref.migrations..") // TODO: Move to logic
                 .layer("Preferences").definedBy("org.jabref.preferences..")
                 .layer("Styletester").definedBy("org.jabref.styletester..")
@@ -135,4 +137,14 @@ public static void restrictUsagesInLogic(JavaClasses classes) {
                    .orShould().dependOnClassesThat().haveFullyQualifiedName(CLASS_ORG_JABREF_GLOBALS)
                    .check(classes);
     }
+
+    @ArchTest
+    public static void restrictStandardStreams(JavaClasses classes) {
+        noClasses().that().resideOutsideOfPackages(PACKAGE_ORG_JABREF_CLI)
+                   .and().resideOutsideOfPackages("org.jabref.gui.openoffice..") // Uses LibreOffice SDK
+                   .and().areNotAnnotatedWith(AllowedToUseStandardStreams.class)
+                   .should(GeneralCodingRules.ACCESS_STANDARD_STREAMS)
+                   .because("logging framework should be used instead or the class be marked explicitly as @AllowedToUseStandardStreams")
+                   .check(classes);
+    }
 }
diff --git a/src/test/java/org/jabref/architecture/TestArchitectureTests.java b/src/test/java/org/jabref/architecture/TestArchitectureTests.java
index 809143b0d03..76bc2f1540b 100644
--- a/src/test/java/org/jabref/architecture/TestArchitectureTests.java
+++ b/src/test/java/org/jabref/architecture/TestArchitectureTests.java
@@ -30,7 +30,6 @@ public class TestArchitectureTests {
     private final List<String> exceptions;
 
     public TestArchitectureTests() {
-
         // Add exceptions for the architectural test here
         // Note that bending the architectural constraints should not be done inconsiderately
         exceptions = new ArrayList<>();
diff --git a/src/test/java/org/jabref/cli/ArgumentProcessorTest.java b/src/test/java/org/jabref/cli/ArgumentProcessorTest.java
new file mode 100644
index 00000000000..1ab5a0b8fb0
--- /dev/null
+++ b/src/test/java/org/jabref/cli/ArgumentProcessorTest.java
@@ -0,0 +1,48 @@
+package org.jabref.cli;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+
+import org.jabref.cli.ArgumentProcessor.Mode;
+import org.jabref.logic.exporter.SavePreferences;
+import org.jabref.model.metadata.SaveOrderConfig;
+import org.jabref.preferences.PreferencesService;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+import org.mockito.Answers;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+class ArgumentProcessorTest {
+
+    private ArgumentProcessor processor;
+    private final PreferencesService preferencesService = mock(PreferencesService.class, Answers.RETURNS_DEEP_STUBS);
+    private final SavePreferences savePreferences = mock(SavePreferences.class, Answers.RETURNS_DEEP_STUBS);
+
+    @BeforeEach()
+    void setup() {
+        when(savePreferences.getSaveOrder()).thenReturn(SaveOrderConfig.getDefaultSaveOrder());
+        when(preferencesService.getSavePreferences()).thenReturn(savePreferences);
+    }
+
+    @Test
+    void testAuxImport(@TempDir Path tempDir) throws Exception {
+
+        String auxFile = Path.of(AuxCommandLineTest.class.getResource("paper.aux").toURI()).toAbsolutePath().toString();
+        String originBib = Path.of(AuxCommandLineTest.class.getResource("origin.bib").toURI()).toAbsolutePath().toString();
+
+        Path outputBib = tempDir.resolve("output.bisb").toAbsolutePath();
+        String outputBibFile = outputBib.toAbsolutePath().toString();
+
+        List<String> args = List.of("--nogui", "--debug", "--aux", auxFile + "," + outputBibFile, originBib);
+
+        processor = new ArgumentProcessor(args.toArray(String[]::new), Mode.INITIAL_START, preferencesService);
+
+        assertTrue(Files.exists(outputBib));
+    }
+}
diff --git a/src/test/java/org/jabref/gui/edit/CopyOrMoveFieldContentTabViewModelTest.java b/src/test/java/org/jabref/gui/edit/CopyOrMoveFieldContentTabViewModelTest.java
new file mode 100644
index 00000000000..75a1a176597
--- /dev/null
+++ b/src/test/java/org/jabref/gui/edit/CopyOrMoveFieldContentTabViewModelTest.java
@@ -0,0 +1,105 @@
+package org.jabref.gui.edit;
+
+import java.util.List;
+import java.util.Optional;
+
+import org.jabref.gui.StateManager;
+import org.jabref.gui.edit.automaticfiededitor.copyormovecontent.CopyOrMoveFieldContentTabViewModel;
+import org.jabref.model.database.BibDatabase;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.field.StandardField;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+
+public class CopyOrMoveFieldContentTabViewModelTest {
+    CopyOrMoveFieldContentTabViewModel copyOrMoveFieldContentTabViewModel;
+    BibEntry entryA;
+    BibEntry entryB;
+
+    BibDatabase bibDatabase;
+
+    StateManager stateManager = mock(StateManager.class);
+
+    @BeforeEach
+    void setup() {
+        entryA = new BibEntry(BibEntry.DEFAULT_TYPE)
+                .withField(StandardField.YEAR, "2015")
+                .withField(StandardField.DATE, "2014");
+
+        entryB = new BibEntry(BibEntry.DEFAULT_TYPE)
+                .withField(StandardField.DATE, "1998");
+        bibDatabase = new BibDatabase();
+        copyOrMoveFieldContentTabViewModel = newTwoFieldsViewModel(entryA, entryB);
+    }
+
+    @Test
+    void copyValueDoesNotCopyBlankValues() {
+        CopyOrMoveFieldContentTabViewModel copyOrMoveFieldContentTabViewModel = newTwoFieldsViewModel(entryA, entryB);
+
+        copyOrMoveFieldContentTabViewModel.fromFieldProperty().set(StandardField.YEAR);
+        copyOrMoveFieldContentTabViewModel.toFieldProperty().set(StandardField.DATE);
+        copyOrMoveFieldContentTabViewModel.overwriteFieldContentProperty().set(true);
+        copyOrMoveFieldContentTabViewModel.copyValue();
+
+        assertEquals(Optional.of("2015"), entryA.getField(StandardField.DATE), "YEAR field is not copied correctly to the DATE field");
+        assertEquals(Optional.of("2015"), entryA.getField(StandardField.YEAR), "YEAR field should not have changed");
+        assertEquals(Optional.of("1998"), entryB.getField(StandardField.DATE), "DATE field should not have changed because the YEAR field is blank e.g it doesn't exist");
+    }
+
+    @Test
+    void swapValuesShouldNotSwapFieldValuesIfOneOfTheValuesIsBlank() {
+        copyOrMoveFieldContentTabViewModel.fromFieldProperty().set(StandardField.YEAR);
+        copyOrMoveFieldContentTabViewModel.toFieldProperty().set(StandardField.DATE);
+        copyOrMoveFieldContentTabViewModel.overwriteFieldContentProperty().set(true);
+
+        copyOrMoveFieldContentTabViewModel.swapValues();
+
+        assertEquals(Optional.of("1998"), entryB.getField(StandardField.DATE));
+        assertEquals(Optional.empty(), entryB.getField(StandardField.YEAR));
+    }
+
+    @Test
+    void swapValuesShouldSwapFieldValuesIfBothValuesAreNotBlank() {
+        copyOrMoveFieldContentTabViewModel.fromFieldProperty().set(StandardField.YEAR);
+        copyOrMoveFieldContentTabViewModel.toFieldProperty().set(StandardField.DATE);
+        copyOrMoveFieldContentTabViewModel.overwriteFieldContentProperty().set(true);
+
+        copyOrMoveFieldContentTabViewModel.swapValues();
+
+        assertEquals(List.of(Optional.of("2014"), Optional.of("2015")),
+                     List.of(entryA.getField(StandardField.YEAR), entryA.getField(StandardField.DATE)),
+                     "YEAR and DATE values didn't swap");
+    }
+
+    @Test
+    void moveValueShouldNotMoveValueIfToFieldIsNotBlankAndOverwriteIsNotEnabled() {
+        copyOrMoveFieldContentTabViewModel.fromFieldProperty().set(StandardField.YEAR);
+        copyOrMoveFieldContentTabViewModel.toFieldProperty().set(StandardField.DATE);
+        copyOrMoveFieldContentTabViewModel.overwriteFieldContentProperty().set(false);
+
+        copyOrMoveFieldContentTabViewModel.moveValue();
+
+        assertEquals(Optional.of("2015"), entryA.getField(StandardField.YEAR));
+        assertEquals(Optional.of("2014"), entryA.getField(StandardField.DATE));
+    }
+
+    @Test
+    void moveValueShouldMoveValueIfOverwriteIsEnabled() {
+        copyOrMoveFieldContentTabViewModel.fromFieldProperty().set(StandardField.DATE);
+        copyOrMoveFieldContentTabViewModel.toFieldProperty().set(StandardField.YEAR);
+        copyOrMoveFieldContentTabViewModel.overwriteFieldContentProperty().set(true);
+
+        copyOrMoveFieldContentTabViewModel.moveValue();
+
+        assertEquals(Optional.of("1998"), entryB.getField(StandardField.YEAR));
+        assertEquals(Optional.empty(), entryB.getField(StandardField.DATE));
+    }
+
+    private CopyOrMoveFieldContentTabViewModel newTwoFieldsViewModel(BibEntry... selectedEntries) {
+        return new CopyOrMoveFieldContentTabViewModel(List.of(selectedEntries), bibDatabase, stateManager);
+    }
+}
diff --git a/src/test/java/org/jabref/gui/edit/EditFieldContentTabViewModelTest.java b/src/test/java/org/jabref/gui/edit/EditFieldContentTabViewModelTest.java
new file mode 100644
index 00000000000..1221580762a
--- /dev/null
+++ b/src/test/java/org/jabref/gui/edit/EditFieldContentTabViewModelTest.java
@@ -0,0 +1,118 @@
+package org.jabref.gui.edit;
+
+import java.util.List;
+import java.util.Optional;
+
+import org.jabref.gui.StateManager;
+import org.jabref.gui.edit.automaticfiededitor.editfieldcontent.EditFieldContentViewModel;
+import org.jabref.model.database.BibDatabase;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.field.StandardField;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.mockito.Mockito.mock;
+
+public class EditFieldContentTabViewModelTest {
+    EditFieldContentViewModel editFieldContentViewModel;
+    BibEntry entryA;
+    BibEntry entryB;
+
+    BibDatabase bibDatabase;
+
+    StateManager stateManager = mock(StateManager.class);
+
+    @BeforeEach
+    void setup() {
+        entryA = new BibEntry(BibEntry.DEFAULT_TYPE)
+                .withField(StandardField.YEAR, "2015")
+                .withField(StandardField.DATE, "2014");
+
+        entryB = new BibEntry(BibEntry.DEFAULT_TYPE)
+                .withField(StandardField.DATE, "1998")
+                .withField(StandardField.YEAR, "");
+
+        bibDatabase = new BibDatabase();
+        editFieldContentViewModel = new EditFieldContentViewModel(bibDatabase, List.of(entryA, entryB), stateManager);
+    }
+
+    @Test
+    void clearSelectedFieldShouldClearFieldContentEvenWhenOverwriteFieldContentIsNotEnabled() {
+        editFieldContentViewModel.selectedFieldProperty().set(StandardField.YEAR);
+        editFieldContentViewModel.overwriteFieldContentProperty().set(false);
+        editFieldContentViewModel.clearSelectedField();
+
+        assertEquals(Optional.empty(), entryA.getField(StandardField.YEAR));
+    }
+
+    @Test
+    void clearSelectedFieldShouldDoNothingWhenFieldDoesntExistOrIsEmpty() {
+        editFieldContentViewModel.selectedFieldProperty().set(StandardField.FILE);
+        editFieldContentViewModel.clearSelectedField();
+
+        assertEquals(Optional.empty(), entryA.getField(StandardField.FILE));
+    }
+
+    @Test
+    void setFieldValueShouldNotDoAnythingIfOverwriteFieldContentIsNotEnabled() {
+        editFieldContentViewModel.overwriteFieldContentProperty().set(false);
+        editFieldContentViewModel.selectedFieldProperty().set(StandardField.YEAR);
+        editFieldContentViewModel.fieldValueProperty().set("2001");
+        editFieldContentViewModel.setFieldValue();
+
+        assertEquals(Optional.of("2015"), entryA.getField(StandardField.YEAR));
+    }
+
+    @Test
+    void setFieldValueShouldSetFieldValueIfOverwriteFieldContentIsEnabled() {
+        editFieldContentViewModel.overwriteFieldContentProperty().set(true);
+        editFieldContentViewModel.selectedFieldProperty().set(StandardField.YEAR);
+        editFieldContentViewModel.fieldValueProperty().set("2001");
+        editFieldContentViewModel.setFieldValue();
+
+        assertEquals(Optional.of("2001"), entryA.getField(StandardField.YEAR));
+    }
+
+    @Test
+    void setFieldValueShouldSetFieldValueIfFieldContentIsEmpty() {
+        editFieldContentViewModel.overwriteFieldContentProperty().set(false);
+        editFieldContentViewModel.selectedFieldProperty().set(StandardField.YEAR);
+        editFieldContentViewModel.fieldValueProperty().set("2001");
+        editFieldContentViewModel.setFieldValue();
+
+        assertEquals(Optional.of("2001"), entryB.getField(StandardField.YEAR));
+    }
+
+    @Test
+    void appendToFieldValueShouldDoNothingIfOverwriteFieldContentIsNotEnabled() {
+        editFieldContentViewModel.overwriteFieldContentProperty().set(false);
+        editFieldContentViewModel.selectedFieldProperty().set(StandardField.YEAR);
+        editFieldContentViewModel.fieldValueProperty().set("0");
+        editFieldContentViewModel.appendToFieldValue();
+
+        assertEquals(Optional.of("2015"), entryA.getField(StandardField.YEAR));
+    }
+
+    @Test
+    void appendToFieldValueShouldAppendFieldValueIfOverwriteFieldContentIsEnabled() {
+        editFieldContentViewModel.overwriteFieldContentProperty().set(true);
+        editFieldContentViewModel.selectedFieldProperty().set(StandardField.YEAR);
+        editFieldContentViewModel.fieldValueProperty().set("0");
+        editFieldContentViewModel.appendToFieldValue();
+
+        assertEquals(Optional.of("20150"), entryA.getField(StandardField.YEAR));
+    }
+
+    @Test
+    void getAllFieldsShouldNeverBeEmpty() {
+        assertNotEquals(0, editFieldContentViewModel.getAllFields().size());
+    }
+
+    @Test
+    void getSelectedFieldShouldHaveADefaultValue() {
+        assertNotEquals(null, editFieldContentViewModel.getSelectedField());
+    }
+}
diff --git a/src/test/java/org/jabref/gui/edit/RenameFieldViewModelTest.java b/src/test/java/org/jabref/gui/edit/RenameFieldViewModelTest.java
new file mode 100644
index 00000000000..bf5a246e97f
--- /dev/null
+++ b/src/test/java/org/jabref/gui/edit/RenameFieldViewModelTest.java
@@ -0,0 +1,111 @@
+package org.jabref.gui.edit;
+
+import java.util.List;
+import java.util.Optional;
+
+import org.jabref.gui.StateManager;
+import org.jabref.gui.edit.automaticfiededitor.renamefield.RenameFieldViewModel;
+import org.jabref.model.database.BibDatabase;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.field.Field;
+import org.jabref.model.entry.field.FieldFactory;
+import org.jabref.model.entry.field.StandardField;
+import org.jabref.model.entry.field.UnknownField;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+
+public class RenameFieldViewModelTest {
+    RenameFieldViewModel renameFieldViewModel;
+    BibEntry entryA;
+    BibEntry entryB;
+
+    BibDatabase bibDatabase;
+
+    StateManager stateManager = mock(StateManager.class);
+
+    @BeforeEach
+    void setup() {
+        entryA = new BibEntry(BibEntry.DEFAULT_TYPE)
+                .withField(StandardField.YEAR, "2015")
+                .withField(StandardField.DATE, "2014")
+                .withField(StandardField.AUTHOR, "Doe");
+
+        entryB = new BibEntry(BibEntry.DEFAULT_TYPE)
+                .withField(StandardField.DATE, "1998")
+                .withField(StandardField.YEAR, "")
+                .withField(StandardField.AUTHOR, "Eddie");
+
+        bibDatabase = new BibDatabase();
+        renameFieldViewModel = new RenameFieldViewModel(List.of(entryA, entryB), bibDatabase, stateManager);
+    }
+
+    @Test
+    void renameFieldShouldRenameFieldIfItExist() {
+        renameFieldViewModel.selectField(StandardField.DATE);
+        renameFieldViewModel.setNewFieldName("ETAD");
+        renameFieldViewModel.renameField();
+
+        assertEquals(Optional.of("2014"), entryA.getField(FieldFactory.parseField("ETAD")));
+        assertEquals(Optional.empty(), entryA.getField(StandardField.DATE));
+
+        assertEquals(Optional.of("1998"), entryB.getField(FieldFactory.parseField("ETAD")));
+        assertEquals(Optional.empty(), entryB.getField(StandardField.DATE));
+    }
+
+    @Test
+    void renameFieldShouldDoNothingIfFieldDoNotExist() {
+        Field toRenameField = new UnknownField("Some_field_that_doesnt_exist");
+        renameFieldViewModel.selectField(toRenameField);
+        renameFieldViewModel.setNewFieldName("new_field_name");
+        renameFieldViewModel.renameField();
+
+        assertEquals(Optional.empty(), entryA.getField(toRenameField));
+        assertEquals(Optional.empty(), entryA.getField(new UnknownField("new_field_name")));
+
+        assertEquals(Optional.empty(), entryB.getField(toRenameField));
+        assertEquals(Optional.empty(), entryB.getField(new UnknownField("new_field_name")));
+    }
+
+    @Test
+    void renameFieldShouldNotDoAnythingIfTheNewFieldNameIsEmpty() {
+        renameFieldViewModel.selectField(StandardField.AUTHOR);
+        renameFieldViewModel.setNewFieldName("");
+        renameFieldViewModel.renameField();
+
+        assertEquals(Optional.of("Doe"), entryA.getField(StandardField.AUTHOR));
+        assertEquals(Optional.empty(), entryA.getField(FieldFactory.parseField("")));
+
+        assertEquals(Optional.of("Eddie"), entryB.getField(StandardField.AUTHOR));
+        assertEquals(Optional.empty(), entryB.getField(FieldFactory.parseField("")));
+    }
+
+    @Test
+    void renameFieldShouldNotDoAnythingIfTheNewFieldNameHasWhitespaceCharacters() {
+        renameFieldViewModel.selectField(StandardField.AUTHOR);
+        renameFieldViewModel.setNewFieldName("Hello, World");
+        renameFieldViewModel.renameField();
+
+        assertEquals(Optional.of("Doe"), entryA.getField(StandardField.AUTHOR));
+        assertEquals(Optional.empty(), entryA.getField(FieldFactory.parseField("Hello, World")));
+
+        assertEquals(Optional.of("Eddie"), entryB.getField(StandardField.AUTHOR));
+        assertEquals(Optional.empty(), entryB.getField(FieldFactory.parseField("Hello, World")));
+    }
+
+    @Test
+    void renameFieldShouldDoNothingWhenThereIsAlreadyAFieldWithTheSameNameAsNewFieldName() {
+        renameFieldViewModel.selectField(StandardField.DATE);
+        renameFieldViewModel.setNewFieldName(StandardField.YEAR.getName());
+        renameFieldViewModel.renameField();
+
+        assertEquals(Optional.of("2014"), entryA.getField(StandardField.DATE));
+        assertEquals(Optional.of("2015"), entryA.getField(StandardField.YEAR));
+
+        assertEquals(Optional.empty(), entryB.getField(StandardField.DATE));
+        assertEquals(Optional.of("1998"), entryB.getField(StandardField.YEAR));
+    }
+}
diff --git a/src/test/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationViewModelTest.java b/src/test/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationViewModelTest.java
index 7b758fa8bf1..91a3e8eead4 100644
--- a/src/test/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationViewModelTest.java
+++ b/src/test/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationViewModelTest.java
@@ -14,6 +14,7 @@
 public class FileAnnotationViewModelTest {
 
     private FileAnnotationViewModel annotationViewModel;
+    private FileAnnotationViewModel annotationViewModelWithoutFileAnnotation;
 
     @BeforeEach
     void setup() {
@@ -24,8 +25,9 @@ void setup() {
 
         FileAnnotation linkedFileAnnotation = new FileAnnotation("John", LocalDateTime.now(), 3, content, FileAnnotationType.FREETEXT, Optional.empty());
         FileAnnotation annotation = new FileAnnotation("Jaroslav Kucha ˇr", LocalDateTime.parse("2017-07-20T10:11:30"), 1, marking, FileAnnotationType.HIGHLIGHT, Optional.of(linkedFileAnnotation));
-
+        FileAnnotation annotationWithoutFileAnnotation = new FileAnnotation("Jaroslav Kucha ˇr", LocalDateTime.parse("2017-07-20T10:11:30"), 1, marking, FileAnnotationType.HIGHLIGHT, Optional.empty());
         annotationViewModel = new FileAnnotationViewModel(annotation);
+        annotationViewModelWithoutFileAnnotation = new FileAnnotationViewModel(annotationWithoutFileAnnotation);
     }
 
     @Test
@@ -48,6 +50,15 @@ public void retrieveCorrectContent() {
         assertEquals("This is content", annotationViewModel.getContent());
     }
 
+    @Test
+    public void retrieveCorrectContentWithoutLinkedFileAnnotation() {
+        String expectedMarking = String.format("This is paragraph 1.%n" +
+                "This is paragraph 2, and it crosses several lines, now you can see next paragraph:%n"
+                + "This is paragraph 3.");
+
+        assertEquals(expectedMarking, annotationViewModelWithoutFileAnnotation.getContent());
+    }
+
     @Test
     public void removeOnlyLineBreaksNotPrecededByPeriodOrColon() {
         String expectedMarking = String.format("This is paragraph 1.%n" +
@@ -56,4 +67,9 @@ public void removeOnlyLineBreaksNotPrecededByPeriodOrColon() {
 
         assertEquals(expectedMarking, annotationViewModel.getMarking());
     }
+
+    @Test
+    public void retrieveCorrectMarkingWithoutLinkedFileAnnotation() {
+        assertEquals("", annotationViewModelWithoutFileAnnotation.getMarking());
+    }
 }
diff --git a/src/test/java/org/jabref/gui/exporter/ExportToClipboardActionTest.java b/src/test/java/org/jabref/gui/exporter/ExportToClipboardActionTest.java
index f0d1be6933d..e1f400630b9 100644
--- a/src/test/java/org/jabref/gui/exporter/ExportToClipboardActionTest.java
+++ b/src/test/java/org/jabref/gui/exporter/ExportToClipboardActionTest.java
@@ -1,7 +1,5 @@
 package org.jabref.gui.exporter;
 
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
@@ -94,10 +92,9 @@ public void testExecuteIfNoSelectedEntries() {
 
     @Test
     public void testExecuteOnSuccess() {
-
         Exporter selectedExporter = new Exporter("html", "HTML", StandardFileType.HTML) {
             @Override
-            public void export(BibDatabaseContext databaseContext, Path file, Charset encoding, List<BibEntry> entries) {
+            public void export(BibDatabaseContext databaseContext, Path file, List<BibEntry> entries) {
             }
         };
 
@@ -105,7 +102,6 @@ public void export(BibDatabaseContext databaseContext, Path file, Charset encodi
         when(preferences.getImportExportPreferences()).thenReturn(importExportPrefs);
         GeneralPreferences generalPreferences = mock(GeneralPreferences.class, Answers.RETURNS_DEEP_STUBS);
         FilePreferences filePreferences = mock(FilePreferences.class, Answers.RETURNS_DEEP_STUBS);
-        when(generalPreferences.getDefaultEncoding()).thenReturn(StandardCharsets.UTF_8);
         when(preferences.getFilePreferences()).thenReturn(filePreferences);
         when(preferences.getGeneralPreferences()).thenReturn(generalPreferences);
         when(stateManager.getSelectedEntries()).thenReturn(selectedEntries);
diff --git a/src/test/java/org/jabref/gui/exporter/SaveDatabaseActionTest.java b/src/test/java/org/jabref/gui/exporter/SaveDatabaseActionTest.java
index 978867dfd28..e53ec0be4df 100644
--- a/src/test/java/org/jabref/gui/exporter/SaveDatabaseActionTest.java
+++ b/src/test/java/org/jabref/gui/exporter/SaveDatabaseActionTest.java
@@ -1,7 +1,6 @@
 package org.jabref.gui.exporter;
 
 import java.io.IOException;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Collections;
@@ -112,7 +111,6 @@ private SaveDatabaseAction createSaveDatabaseActionForBibDatabase(BibDatabase da
         libraryTab = mock(LibraryTab.class);
         MetaData metaData = mock(MetaData.class);
         when(savePreferences.withSaveType(any(SavePreferences.DatabaseSaveType.class))).thenReturn(savePreferences);
-        when(generalPreferences.getDefaultEncoding()).thenReturn(StandardCharsets.UTF_8);
         when(savePreferences.getFieldWriterPreferences()).thenReturn(fieldWriterPreferences);
         GlobalCitationKeyPattern emptyGlobalCitationKeyPattern = GlobalCitationKeyPattern.fromPattern("");
         when(metaData.getCiteKeyPattern(any(GlobalCitationKeyPattern.class))).thenReturn(emptyGlobalCitationKeyPattern);
diff --git a/src/test/java/org/jabref/gui/externalfiles/AutoSetFileLinksUtilTest.java b/src/test/java/org/jabref/gui/externalfiles/AutoSetFileLinksUtilTest.java
index 22c73109876..b429b879454 100644
--- a/src/test/java/org/jabref/gui/externalfiles/AutoSetFileLinksUtilTest.java
+++ b/src/test/java/org/jabref/gui/externalfiles/AutoSetFileLinksUtilTest.java
@@ -6,6 +6,8 @@
 import java.util.List;
 import java.util.TreeSet;
 
+import javafx.collections.FXCollections;
+
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.logic.util.io.AutoLinkPreferences;
 import org.jabref.model.database.BibDatabaseContext;
@@ -25,14 +27,13 @@
 
 public class AutoSetFileLinksUtilTest {
 
-    private final FilePreferences fileDirPrefs = mock(FilePreferences.class);
+    private final FilePreferences filePreferences = mock(FilePreferences.class);
     private final AutoLinkPreferences autoLinkPrefs = new AutoLinkPreferences(
             AutoLinkPreferences.CitationKeyDependency.START,
             "",
             false,
             ';');
     private final BibDatabaseContext databaseContext = mock(BibDatabaseContext.class);
-    private final ExternalFileTypes externalFileTypes = mock(ExternalFileTypes.class);
     private final BibEntry entry = new BibEntry(StandardEntryType.Article);
     private Path path = null;
 
@@ -41,23 +42,23 @@ public void setUp(@TempDir Path folder) throws Exception {
         path = folder.resolve("CiteKey.pdf");
         Files.createFile(path);
         entry.setCitationKey("CiteKey");
-        when(externalFileTypes.getExternalFileTypeSelection()).thenReturn(new TreeSet<>(ExternalFileTypes.getDefaultExternalFileTypes()));
+        when(filePreferences.getExternalFileTypes())
+                .thenReturn(FXCollections.observableSet(new TreeSet<>(ExternalFileTypes.getDefaultExternalFileTypes())));
     }
 
     @Test
     public void testFindAssociatedNotLinkedFilesSuccess() throws Exception {
-        // Due to mocking the externalFileType class, the file extension will not be found
         when(databaseContext.getFileDirectories(any())).thenReturn(Collections.singletonList(path.getParent()));
-        List<LinkedFile> expected = Collections.singletonList(new LinkedFile("", Path.of("CiteKey.pdf"), ""));
-        AutoSetFileLinksUtil util = new AutoSetFileLinksUtil(databaseContext, fileDirPrefs, autoLinkPrefs, externalFileTypes);
+        List<LinkedFile> expected = Collections.singletonList(new LinkedFile("", Path.of("CiteKey.pdf"), "PDF"));
+        AutoSetFileLinksUtil util = new AutoSetFileLinksUtil(databaseContext, filePreferences, autoLinkPrefs);
         List<LinkedFile> actual = util.findAssociatedNotLinkedFiles(entry);
         assertEquals(expected, actual);
     }
 
     @Test
     public void testFindAssociatedNotLinkedFilesForEmptySearchDir() throws Exception {
-        when(fileDirPrefs.shouldStoreFilesRelativeToBibFile()).thenReturn(false);
-        AutoSetFileLinksUtil util = new AutoSetFileLinksUtil(databaseContext, fileDirPrefs, autoLinkPrefs, externalFileTypes);
+        when(filePreferences.shouldStoreFilesRelativeToBibFile()).thenReturn(false);
+        AutoSetFileLinksUtil util = new AutoSetFileLinksUtil(databaseContext, filePreferences, autoLinkPrefs);
         List<LinkedFile> actual = util.findAssociatedNotLinkedFiles(entry);
         assertEquals(Collections.emptyList(), actual);
     }
diff --git a/src/test/java/org/jabref/gui/externalfiles/FileFilterUtilsTest.java b/src/test/java/org/jabref/gui/externalfiles/FileFilterUtilsTest.java
index a6888ab8d3a..9af4b1364bb 100755
--- a/src/test/java/org/jabref/gui/externalfiles/FileFilterUtilsTest.java
+++ b/src/test/java/org/jabref/gui/externalfiles/FileFilterUtilsTest.java
@@ -5,7 +5,9 @@
 import java.nio.file.attribute.FileTime;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 import org.junit.jupiter.api.BeforeEach;
@@ -64,20 +66,20 @@ public void isDuringLastYearPositiveTest() {
     @Nested
     class SortingTests {
 
-        private List<Path> files = new ArrayList<Path>();
-        private List<String> expectedSortByDateAscending = new ArrayList<String>();
-        private List<String> expectedSortByDateDescending = new ArrayList<String>();
-        private List<String> wrongOrder = new ArrayList<String>();
+        private final List<Path> files = new ArrayList<>();
+        private final List<String> expectedSortByDateAscending = new ArrayList<>();
+        private final List<String> expectedSortByDateDescending = new ArrayList<>();
+        private final List<String> wrongOrder = new ArrayList<>();
 
         /* Initialize the directory and files used in the sorting tests, and change their last edited dates. */
         @BeforeEach
         public void setUp(@TempDir Path tempDir) throws Exception {
-            
+
             Path firstPath = tempDir.resolve("firstFile.pdf");
             Path secondPath = tempDir.resolve("secondFile.pdf");
             Path thirdPath = tempDir.resolve("thirdFile.pdf");
             Path fourthPath = tempDir.resolve("fourthFile.pdf");
-    
+
             Files.createFile(firstPath);
             Files.createFile(secondPath);
             Files.createFile(thirdPath);
@@ -88,19 +90,19 @@ public void setUp(@TempDir Path tempDir) throws Exception {
             Files.setLastModifiedTime(secondPath, FileTime.fromMillis(5));
             Files.setLastModifiedTime(thirdPath, FileTime.fromMillis(1));
             Files.setLastModifiedTime(fourthPath, FileTime.fromMillis(2));
-            
+
             // fill the list to be sorted by the tests.
             files.add(firstPath);
             files.add(secondPath);
             files.add(thirdPath);
             files.add(fourthPath);
-    
+
             // fill the expected values lists.
             expectedSortByDateAscending.add(thirdPath.toString());
             expectedSortByDateAscending.add(fourthPath.toString());
             expectedSortByDateAscending.add(secondPath.toString());
             expectedSortByDateAscending.add(firstPath.toString());
-    
+
             expectedSortByDateDescending.add(firstPath.toString());
             expectedSortByDateDescending.add(secondPath.toString());
             expectedSortByDateDescending.add(fourthPath.toString());
@@ -111,7 +113,7 @@ public void setUp(@TempDir Path tempDir) throws Exception {
             wrongOrder.add(thirdPath.toString());
             wrongOrder.add(fourthPath.toString());
         }
-    
+
         @Test
         public void sortByDateAscendingPositiveTest() {
             List<String> sortedPaths = fileFilterUtils
@@ -131,7 +133,7 @@ public void sortByDateAscendingNegativeTest() {
                 .collect(Collectors.toList());
             assertNotEquals(sortedPaths, wrongOrder);
         }
-    
+
         @Test
         public void sortByDateDescendingPositiveTest() {
             List<String> sortedPaths = fileFilterUtils
@@ -152,4 +154,43 @@ public void testSortByDateDescendingNegativeTest() {
             assertNotEquals(sortedPaths, wrongOrder);
         }
     }
+
+    @Nested
+    class filteringTests {
+        private final List<Path> files = new ArrayList<>();
+        private final List<Path> targetFiles = new ArrayList<>();
+        private final Set<String> ignoreFileSet = new HashSet<>();
+
+        @BeforeEach
+        public void setUp(@TempDir Path tempDir) throws Exception {
+            ignoreFileSet.add(".DS_Store");
+            ignoreFileSet.add("Thumbs.db");
+
+            Path firstPath = tempDir.resolve("firstFile.pdf");
+            Path secondPath = tempDir.resolve("secondFile.pdf");
+            Path thirdPath = tempDir.resolve("thirdFile.pdf");
+            Path fourthPath = tempDir.resolve("fourthFile.pdf");
+            Path fifthPath = tempDir.resolve(".DS_Store");
+            Path sixthPath = tempDir.resolve("Thumbs.db");
+
+            Files.createFile(firstPath);
+            Files.createFile(secondPath);
+            Files.createFile(thirdPath);
+            Files.createFile(fourthPath);
+            Files.createFile(fifthPath);
+            Files.createFile(sixthPath);
+
+            files.add(firstPath);
+            files.add(secondPath);
+            files.add(thirdPath);
+            files.add(fourthPath);
+            files.add(fifthPath);
+            files.add(sixthPath);
+
+            targetFiles.add(firstPath);
+            targetFiles.add(secondPath);
+            targetFiles.add(thirdPath);
+            targetFiles.add(fourthPath);
+        }
+    }
 }
diff --git a/src/test/java/org/jabref/gui/externalfiles/GitIgnoreFileFilterTest.java b/src/test/java/org/jabref/gui/externalfiles/GitIgnoreFileFilterTest.java
new file mode 100644
index 00000000000..2504ffb55b7
--- /dev/null
+++ b/src/test/java/org/jabref/gui/externalfiles/GitIgnoreFileFilterTest.java
@@ -0,0 +1,50 @@
+package org.jabref.gui.externalfiles;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+class GitIgnoreFileFilterTest {
+
+    @Test
+    public void checkSimpleGitIgnore(@TempDir Path dir) throws Exception {
+        Files.writeString(dir.resolve(".gitignore"), """
+                *.png
+                """);
+        GitIgnoreFileFilter gitIgnoreFileFilter = new GitIgnoreFileFilter(dir);
+        assertFalse(gitIgnoreFileFilter.accept(dir.resolve("test.png")));
+    }
+
+    @Test
+    public void checkSimpleGitIgnoreWithAllowing(@TempDir Path dir) throws Exception {
+        Files.writeString(dir.resolve(".gitignore"), """
+                !*.png
+                """);
+        GitIgnoreFileFilter gitIgnoreFileFilter = new GitIgnoreFileFilter(dir);
+        assertTrue(gitIgnoreFileFilter.accept(dir.resolve("test.png")));
+    }
+
+    @Test
+    public void checkSimpleGitIgnoreWithOverwritingDefs(@TempDir Path dir) throws Exception {
+        Files.writeString(dir.resolve(".gitignore"), """
+                !*.png
+                *.png
+                """);
+        GitIgnoreFileFilter gitIgnoreFileFilter = new GitIgnoreFileFilter(dir);
+        assertFalse(gitIgnoreFileFilter.accept(dir.resolve("test.png")));
+    }
+
+    @Test
+    public void checkDirectoryGitIgnore(@TempDir Path dir) throws Exception {
+        Files.writeString(dir.resolve(".gitignore"), """
+                **/*.png
+                """);
+        GitIgnoreFileFilter gitIgnoreFileFilter = new GitIgnoreFileFilter(dir);
+        assertFalse(gitIgnoreFileFilter.accept(dir.resolve("test.png")));
+    }
+}
diff --git a/src/test/java/org/jabref/gui/externalfiles/UnlinkedFilesCrawlerTest.java b/src/test/java/org/jabref/gui/externalfiles/UnlinkedFilesCrawlerTest.java
new file mode 100644
index 00000000000..3d53ae3ef59
--- /dev/null
+++ b/src/test/java/org/jabref/gui/externalfiles/UnlinkedFilesCrawlerTest.java
@@ -0,0 +1,38 @@
+package org.jabref.gui.externalfiles;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+import org.jabref.gui.util.FileNodeViewModel;
+import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.preferences.FilePreferences;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+class UnlinkedFilesCrawlerTest {
+
+    @Test
+    public void minimalGitIgnore(@TempDir Path testRoot) throws Exception {
+        Files.writeString(testRoot.resolve(".gitignore"), """
+                *.png
+                """);
+        Path subDir = testRoot.resolve("subdir");
+        Files.createDirectories(subDir);
+        Files.createFile(subDir.resolve("test.png"));
+
+        UnlinkedPDFFileFilter unlinkedPDFFileFilter = mock(UnlinkedPDFFileFilter.class);
+        when(unlinkedPDFFileFilter.accept(any(Path.class))).thenReturn(true);
+
+        UnlinkedFilesCrawler unlinkedFilesCrawler = new UnlinkedFilesCrawler(testRoot, unlinkedPDFFileFilter, DateRange.ALL_TIME, ExternalFileSorter.DEFAULT, mock(BibDatabaseContext.class), mock(FilePreferences.class));
+
+        FileNodeViewModel fileNodeViewModel = unlinkedFilesCrawler.searchDirectory(testRoot, unlinkedPDFFileFilter);
+
+        assertEquals(new FileNodeViewModel(testRoot), fileNodeViewModel);
+    }
+}
diff --git a/src/test/java/org/jabref/gui/externalfiletype/ExternalFileTypesTest.java b/src/test/java/org/jabref/gui/externalfiletype/ExternalFileTypesTest.java
new file mode 100644
index 00000000000..dadcba319fc
--- /dev/null
+++ b/src/test/java/org/jabref/gui/externalfiletype/ExternalFileTypesTest.java
@@ -0,0 +1,121 @@
+package org.jabref.gui.externalfiletype;
+
+import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.Optional;
+import java.util.Set;
+
+import javafx.collections.FXCollections;
+
+import org.jabref.gui.icon.IconTheme;
+import org.jabref.model.entry.LinkedFile;
+import org.jabref.preferences.FilePreferences;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+class ExternalFileTypesTest {
+    private static final Set<ExternalFileType> TEST_LIST = Set.of(
+            StandardExternalFileType.PDF,
+            StandardExternalFileType.URL,
+            StandardExternalFileType.JPG,
+            StandardExternalFileType.TXT);
+
+    private static final String TEST_STRINGLIST = "PostScript:REMOVED;" +
+            "Word:REMOVED;" +
+            "Word 2007+:REMOVED;" +
+            "OpenDocument text:REMOVED;" +
+            "Excel:REMOVED;" +
+            "Excel 2007+:REMOVED;" +
+            "OpenDocument spreadsheet:REMOVED;" +
+            "PowerPoint:REMOVED;" +
+            "PowerPoint 2007+:REMOVED;" +
+            "OpenDocument presentation:REMOVED;" +
+            "Rich Text Format:REMOVED;" +
+            "PNG image:REMOVED;" +
+            "GIF image:REMOVED;" +
+            "Djvu:REMOVED;" +
+            "LaTeX:REMOVED;" +
+            "CHM:REMOVED;" +
+            "TIFF image:REMOVED;" +
+            "MHT:REMOVED;" +
+            "ePUB:REMOVED";
+
+    private final FilePreferences filePreferences = mock(FilePreferences.class);
+
+    @BeforeEach
+    void setUp() {
+        when(filePreferences.getExternalFileTypes()).thenReturn(FXCollections.observableSet(TEST_LIST));
+    }
+
+    @Test
+    void getExternalFileTypeByName() {
+        assertEquals(Optional.of(StandardExternalFileType.PDF), ExternalFileTypes.getExternalFileTypeByName("PDF", filePreferences));
+    }
+
+    @Test
+    void getExternalFileTypeByExt() {
+        assertEquals(Optional.of(StandardExternalFileType.URL), ExternalFileTypes.getExternalFileTypeByExt("html", filePreferences));
+    }
+
+    @Test
+    void isExternalFileTypeByExt() {
+        assertTrue(ExternalFileTypes.isExternalFileTypeByExt("html", filePreferences));
+        assertFalse(ExternalFileTypes.isExternalFileTypeByExt("tst", filePreferences));
+    }
+
+    @Test
+    void getExternalFileTypeForName() {
+        assertEquals(Optional.of(StandardExternalFileType.JPG), ExternalFileTypes.getExternalFileTypeForName("testfile.jpg", filePreferences));
+    }
+
+    @Test
+    void getExternalFileTypeByMimeType() {
+        assertEquals(Optional.of(StandardExternalFileType.TXT), ExternalFileTypes.getExternalFileTypeByMimeType("text/plain", filePreferences));
+    }
+
+    @Test
+    void getExternalFileTypeByFile() {
+        Path testfile = Path.of("testfile.txt");
+        assertEquals(Optional.of(StandardExternalFileType.TXT), ExternalFileTypes.getExternalFileTypeByFile(testfile, filePreferences));
+    }
+
+    @Test
+    void getExternalFileTypeByLinkedFile() {
+        LinkedFile testfile = new LinkedFile("A testfile", "https://testserver.com/testfile.pdf", "PDF");
+        assertEquals(Optional.of(StandardExternalFileType.PDF), ExternalFileTypes.getExternalFileTypeByLinkedFile(testfile, false, filePreferences));
+    }
+
+    @Test
+    void toStringList() {
+        String testString = ExternalFileTypes.toStringList(TEST_LIST);
+
+        assertEquals(TEST_STRINGLIST, testString);
+    }
+
+    @Test
+    void fromString() {
+        Set<ExternalFileType> testList = ExternalFileTypes.fromString(TEST_STRINGLIST);
+
+        assertEquals(TEST_LIST, testList);
+    }
+
+    @Test
+    void externalFileTypetoStringArray() {
+        ExternalFileType type = new CustomExternalFileType(
+                "testEntry",
+                "tst",
+                "text/plain",
+                "emacs",
+                "close",
+                IconTheme.JabRefIcons.CLOSE);
+
+        assertEquals("[testEntry, tst, text/plain, emacs, CLOSE]", Arrays.toString(type.toStringArray()));
+    }
+}
diff --git a/src/test/java/org/jabref/gui/fieldeditors/LinkedFileViewModelTest.java b/src/test/java/org/jabref/gui/fieldeditors/LinkedFileViewModelTest.java
index 6c4ddf69385..e11100032c4 100644
--- a/src/test/java/org/jabref/gui/fieldeditors/LinkedFileViewModelTest.java
+++ b/src/test/java/org/jabref/gui/fieldeditors/LinkedFileViewModelTest.java
@@ -13,6 +13,7 @@
 import java.util.Optional;
 import java.util.TreeSet;
 
+import javafx.collections.FXCollections;
 import javafx.scene.control.Alert.AlertType;
 import javafx.scene.control.ButtonType;
 
@@ -45,7 +46,6 @@
 import static org.junit.jupiter.api.Assertions.fail;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.ArgumentMatchers.contains;
 import static org.mockito.Mockito.atLeastOnce;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
@@ -62,7 +62,6 @@ class LinkedFileViewModelTest {
     private BibDatabaseContext databaseContext;
     private TaskExecutor taskExecutor;
     private DialogService dialogService;
-    private final ExternalFileTypes externalFileType = mock(ExternalFileTypes.class);
     private final FilePreferences filePreferences = mock(FilePreferences.class);
     private final PreferencesService preferences = mock(PreferencesService.class);
     private CookieManager cookieManager;
@@ -75,11 +74,7 @@ void setUp(@TempDir Path tempFolder) throws Exception {
         taskExecutor = mock(TaskExecutor.class);
         dialogService = mock(DialogService.class);
 
-        when(externalFileType.getExternalFileTypeSelection()).thenReturn(new TreeSet<>(ExternalFileTypes.getDefaultExternalFileTypes()));
-        when(externalFileType.getExternalFileTypeByMimeType("application/pdf")).thenReturn(Optional.of(StandardExternalFileType.PDF));
-        when(externalFileType.getExternalFileTypeByMimeType(contains("text/html"))).thenReturn(Optional.of(StandardExternalFileType.URL));
-        when(externalFileType.getExternalFileTypeByExt("pdf")).thenReturn(Optional.of(StandardExternalFileType.PDF));
-        when(externalFileType.getExternalFileTypeByExt("html")).thenReturn(Optional.of(StandardExternalFileType.URL));
+        when(filePreferences.getExternalFileTypes()).thenReturn(FXCollections.observableSet(new TreeSet<>(ExternalFileTypes.getDefaultExternalFileTypes())));
         when(preferences.getFilePreferences()).thenReturn(filePreferences);
         when(preferences.getXmpPreferences()).thenReturn(mock(XmpPreferences.class));
         tempFile = tempFolder.resolve("temporaryFile");
@@ -106,7 +101,7 @@ void deleteWhenFilePathNotPresentReturnsTrue() {
         linkedFile = spy(new LinkedFile("", Path.of("nonexistent file"), ""));
         doReturn(Optional.empty()).when(linkedFile).findIn(any(BibDatabaseContext.class), any(FilePreferences.class));
 
-        LinkedFileViewModel viewModel = new LinkedFileViewModel(linkedFile, entry, databaseContext, taskExecutor, dialogService, preferences, externalFileType);
+        LinkedFileViewModel viewModel = new LinkedFileViewModel(linkedFile, entry, databaseContext, taskExecutor, dialogService, preferences);
         boolean removed = viewModel.delete();
 
         assertTrue(removed);
@@ -124,7 +119,7 @@ void deleteWhenRemoveChosenReturnsTrueButDoesNotDeletesFile() {
                 any(ButtonType.class),
                 any(ButtonType.class))).thenAnswer(invocation -> Optional.of(invocation.getArgument(3))); // first vararg - remove button
 
-        LinkedFileViewModel viewModel = new LinkedFileViewModel(linkedFile, entry, databaseContext, taskExecutor, dialogService, preferences, externalFileType);
+        LinkedFileViewModel viewModel = new LinkedFileViewModel(linkedFile, entry, databaseContext, taskExecutor, dialogService, preferences);
         boolean removed = viewModel.delete();
 
         assertTrue(removed);
@@ -142,7 +137,7 @@ void deleteWhenDeleteChosenReturnsTrueAndDeletesFile() {
                 any(ButtonType.class),
                 any(ButtonType.class))).thenAnswer(invocation -> Optional.of(invocation.getArgument(4))); // second vararg - delete button
 
-        LinkedFileViewModel viewModel = new LinkedFileViewModel(linkedFile, entry, databaseContext, taskExecutor, dialogService, preferences, externalFileType);
+        LinkedFileViewModel viewModel = new LinkedFileViewModel(linkedFile, entry, databaseContext, taskExecutor, dialogService, preferences);
         boolean removed = viewModel.delete();
 
         assertTrue(removed);
@@ -160,7 +155,7 @@ void deleteMissingFileReturnsTrue() {
                 any(ButtonType.class),
                 any(ButtonType.class))).thenAnswer(invocation -> Optional.of(invocation.getArgument(4))); // second vararg - delete button
 
-        LinkedFileViewModel viewModel = new LinkedFileViewModel(linkedFile, entry, databaseContext, taskExecutor, dialogService, preferences, externalFileType);
+        LinkedFileViewModel viewModel = new LinkedFileViewModel(linkedFile, entry, databaseContext, taskExecutor, dialogService, preferences);
         boolean removed = viewModel.delete();
 
         assertTrue(removed);
@@ -177,7 +172,7 @@ void deleteWhenDialogCancelledReturnsFalseAndDoesNotRemoveFile() {
                 any(ButtonType.class),
                 any(ButtonType.class))).thenAnswer(invocation -> Optional.of(invocation.getArgument(5))); // third vararg - cancel button
 
-        LinkedFileViewModel viewModel = new LinkedFileViewModel(linkedFile, entry, databaseContext, taskExecutor, dialogService, preferences, externalFileType);
+        LinkedFileViewModel viewModel = new LinkedFileViewModel(linkedFile, entry, databaseContext, taskExecutor, dialogService, preferences);
         boolean removed = viewModel.delete();
 
         assertFalse(removed);
@@ -195,7 +190,7 @@ void downloadHtmlFileCausesWarningDisplay() throws MalformedURLException {
         String fileType = StandardExternalFileType.URL.getName();
         linkedFile = new LinkedFile(url, fileType);
 
-        LinkedFileViewModel viewModel = new LinkedFileViewModel(linkedFile, entry, databaseContext, new CurrentThreadTaskExecutor(), dialogService, preferences, externalFileType);
+        LinkedFileViewModel viewModel = new LinkedFileViewModel(linkedFile, entry, databaseContext, new CurrentThreadTaskExecutor(), dialogService, preferences);
 
         viewModel.download();
 
@@ -210,11 +205,11 @@ void downloadDoesNotOverwriteFileTypeExtension() throws MalformedURLException {
         when(filePreferences.getFileNamePattern()).thenReturn("[citationkey]");
         when(filePreferences.getFileDirectoryPattern()).thenReturn("");
 
-        LinkedFileViewModel viewModel = new LinkedFileViewModel(linkedFile, entry, databaseContext, new CurrentThreadTaskExecutor(), dialogService, preferences, externalFileType);
+        LinkedFileViewModel viewModel = new LinkedFileViewModel(linkedFile, entry, databaseContext, new CurrentThreadTaskExecutor(), dialogService, preferences);
 
         BackgroundTask<Path> task = viewModel.prepareDownloadTask(tempFile.getParent(), new URLDownload("http://arxiv.org/pdf/1207.0408v1"));
         task.onSuccess(destination -> {
-            LinkedFile newLinkedFile = LinkedFilesEditorViewModel.fromFile(destination, Collections.singletonList(tempFile.getParent()), externalFileType);
+            LinkedFile newLinkedFile = LinkedFilesEditorViewModel.fromFile(destination, Collections.singletonList(tempFile.getParent()), filePreferences);
             assertEquals("asdf.pdf", newLinkedFile.getLink());
             assertEquals("PDF", newLinkedFile.getFileType());
         });
@@ -225,8 +220,8 @@ void downloadDoesNotOverwriteFileTypeExtension() throws MalformedURLException {
     @FetcherTest
     @Test
     void downloadHtmlWhenLinkedFilePointsToHtml() throws MalformedURLException {
-        // the link mentioned in issue #7452
-        String url = "https://onlinelibrary.wiley.com/doi/abs/10.1002/0470862106.ia615";
+        // use google as test url, wiley is protected by clooudfare
+        String url = "https://google.com";
         String fileType = StandardExternalFileType.URL.getName();
         linkedFile = new LinkedFile(new URL(url), fileType);
 
@@ -236,7 +231,7 @@ void downloadHtmlWhenLinkedFilePointsToHtml() throws MalformedURLException {
 
         databaseContext.setDatabasePath(tempFile);
 
-        LinkedFileViewModel viewModel = new LinkedFileViewModel(linkedFile, entry, databaseContext, new CurrentThreadTaskExecutor(), dialogService, preferences, externalFileType);
+        LinkedFileViewModel viewModel = new LinkedFileViewModel(linkedFile, entry, databaseContext, new CurrentThreadTaskExecutor(), dialogService, preferences);
 
         viewModel.download();
 
@@ -260,7 +255,7 @@ void isNotSamePath() {
         when(filePreferences.getFileDirectoryPattern()).thenReturn("");
         when(databaseContext.getFirstExistingFileDir(filePreferences)).thenReturn(Optional.of(Path.of("/home")));
 
-        LinkedFileViewModel viewModel = new LinkedFileViewModel(linkedFile, entry, databaseContext, taskExecutor, dialogService, preferences, externalFileType);
+        LinkedFileViewModel viewModel = new LinkedFileViewModel(linkedFile, entry, databaseContext, taskExecutor, dialogService, preferences);
         assertFalse(viewModel.isGeneratedPathSameAsOriginal());
     }
 
@@ -272,7 +267,7 @@ void isSamePath() {
         when(filePreferences.getFileDirectoryPattern()).thenReturn("");
         when(databaseContext.getFirstExistingFileDir(filePreferences)).thenReturn(Optional.of(tempFile.getParent()));
 
-        LinkedFileViewModel viewModel = new LinkedFileViewModel(linkedFile, entry, databaseContext, taskExecutor, dialogService, preferences, externalFileType);
+        LinkedFileViewModel viewModel = new LinkedFileViewModel(linkedFile, entry, databaseContext, taskExecutor, dialogService, preferences);
         assertTrue(viewModel.isGeneratedPathSameAsOriginal());
     }
 
@@ -285,7 +280,7 @@ void isNotSamePathWithPattern() {
         when(filePreferences.getFileDirectoryPattern()).thenReturn("[entrytype]");
         when(databaseContext.getFirstExistingFileDir(filePreferences)).thenReturn(Optional.of(tempFile.getParent()));
 
-        LinkedFileViewModel viewModel = new LinkedFileViewModel(linkedFile, entry, databaseContext, taskExecutor, dialogService, preferences, externalFileType);
+        LinkedFileViewModel viewModel = new LinkedFileViewModel(linkedFile, entry, databaseContext, taskExecutor, dialogService, preferences);
         assertFalse(viewModel.isGeneratedPathSameAsOriginal());
     }
 
@@ -301,14 +296,14 @@ void isSamePathWithPattern() throws IOException {
         LinkedFileHandler fileHandler = new LinkedFileHandler(linkedFile, entry, databaseContext, filePreferences);
         fileHandler.moveToDefaultDirectory();
 
-        LinkedFileViewModel viewModel = new LinkedFileViewModel(linkedFile, entry, databaseContext, taskExecutor, dialogService, preferences, externalFileType);
+        LinkedFileViewModel viewModel = new LinkedFileViewModel(linkedFile, entry, databaseContext, taskExecutor, dialogService, preferences);
         assertTrue(viewModel.isGeneratedPathSameAsOriginal());
     }
 
     // Tests if added parameters to mimeType gets parsed to correct format.
     @Test
     void mimeTypeStringWithParameterIsReturnedAsWithoutParameter() {
-        Optional<ExternalFileType> test = externalFileType.getExternalFileTypeByMimeType("text/html; charset=UTF-8");
+        Optional<ExternalFileType> test = ExternalFileTypes.getExternalFileTypeByMimeType("text/html; charset=UTF-8", filePreferences);
         String actual = test.get().toString();
         assertEquals("URL", actual);
     }
@@ -323,7 +318,7 @@ void downloadPdfFileWhenLinkedFilePointsToPdfUrl() throws MalformedURLException
 
         databaseContext.setDatabasePath(tempFile);
 
-        LinkedFileViewModel viewModel = new LinkedFileViewModel(linkedFile, entry, databaseContext, new CurrentThreadTaskExecutor(), dialogService, preferences, externalFileType);
+        LinkedFileViewModel viewModel = new LinkedFileViewModel(linkedFile, entry, databaseContext, new CurrentThreadTaskExecutor(), dialogService, preferences);
         viewModel.download();
 
         // Loop through downloaded files to check for filetype='pdf'
@@ -337,5 +332,4 @@ void downloadPdfFileWhenLinkedFilePointsToPdfUrl() throws MalformedURLException
         // Assert fail if no PDF type was found
         fail();
     }
-
 }
diff --git a/src/test/java/org/jabref/gui/util/ControlHelperTest.java b/src/test/java/org/jabref/gui/util/ControlHelperTest.java
new file mode 100644
index 00000000000..1707604d04c
--- /dev/null
+++ b/src/test/java/org/jabref/gui/util/ControlHelperTest.java
@@ -0,0 +1,59 @@
+package org.jabref.gui.util;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.NullAndEmptySource;
+import org.junit.jupiter.params.provider.NullSource;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+public class ControlHelperTest {
+
+    private final String TEXT = "abcdef";
+    private final int MAX_CHARACTERS = 5;
+    private final int DEFAULT_MAX_CHARACTERS = -1;
+    private final String ELLIPSIS_STRING = "***";
+    private final ControlHelper.EllipsisPosition ELLIPSIS_POSITION = ControlHelper.EllipsisPosition.ENDING;
+
+    @ParameterizedTest
+    @NullAndEmptySource
+    void truncateWithTextNullAndEmptyReturnsSource(String text) {
+        String truncatedText = ControlHelper.truncateString(text, MAX_CHARACTERS, ELLIPSIS_STRING, ELLIPSIS_POSITION);
+        assertEquals(text, truncatedText);
+    }
+
+    @Test
+    void truncateWithDefaultMaxCharactersReturnsText() {
+        String truncatedText = ControlHelper.truncateString(TEXT, DEFAULT_MAX_CHARACTERS, ELLIPSIS_STRING, ELLIPSIS_POSITION);
+        assertEquals(TEXT, truncatedText);
+    }
+
+    @Test
+    void truncateWithEllipsisPositionBeginningReturnsTruncatedText() {
+        String truncatedText = ControlHelper.truncateString(TEXT, MAX_CHARACTERS, ELLIPSIS_STRING, ControlHelper.EllipsisPosition.BEGINNING);
+        assertEquals("***ef", truncatedText);
+    }
+
+    @Test
+    void truncateWithEllipsisPositionCenterReturnsTruncatedText() {
+        String truncatedText = ControlHelper.truncateString(TEXT, MAX_CHARACTERS, ELLIPSIS_STRING, ControlHelper.EllipsisPosition.CENTER);
+        assertEquals("a***f", truncatedText);
+    }
+
+    @Test
+    void truncateWithDefaultMaxCharactersAndNullEllipsisAndPositionEndingReturnsTruncatedText() {
+        String text = "a".repeat(75) + "b".repeat(25);
+        String truncatedText = ControlHelper.truncateString(text, DEFAULT_MAX_CHARACTERS, null, ControlHelper.EllipsisPosition.ENDING);
+        assertEquals("a".repeat(75), truncatedText);
+    }
+
+    @ParameterizedTest
+    @NullSource
+    void truncateWithNullEllipsisPositionThrowsNullPointerException(ControlHelper.EllipsisPosition ellipsisPosition) {
+        assertThrows(
+            NullPointerException.class,
+            () -> ControlHelper.truncateString(TEXT, MAX_CHARACTERS, ELLIPSIS_STRING, ellipsisPosition)
+        );
+    }
+}
diff --git a/src/test/java/org/jabref/gui/util/OpenConsoleActionTest.java b/src/test/java/org/jabref/gui/util/OpenConsoleActionTest.java
index 75154c693d8..5ec37c2ee0e 100644
--- a/src/test/java/org/jabref/gui/util/OpenConsoleActionTest.java
+++ b/src/test/java/org/jabref/gui/util/OpenConsoleActionTest.java
@@ -31,7 +31,7 @@ public void setup() {
 
     @Test
     public void newActionGetsCurrentDatabase() {
-        OpenConsoleAction action = new OpenConsoleAction(stateManager, preferences);
+        OpenConsoleAction action = new OpenConsoleAction(stateManager, preferences, null);
         action.execute();
         verify(stateManager, times(1)).getActiveDatabase();
         verify(current, times(1)).getDatabasePath();
@@ -39,7 +39,7 @@ public void newActionGetsCurrentDatabase() {
 
     @Test
     public void newActionGetsSuppliedDatabase() {
-        OpenConsoleAction action = new OpenConsoleAction(() -> other, stateManager, preferences);
+        OpenConsoleAction action = new OpenConsoleAction(() -> other, stateManager, preferences, null);
         action.execute();
         verify(stateManager, never()).getActiveDatabase();
         verify(other, times(1)).getDatabasePath();
@@ -47,10 +47,9 @@ public void newActionGetsSuppliedDatabase() {
 
     @Test
     public void actionDefaultsToCurrentDatabase() {
-        OpenConsoleAction action = new OpenConsoleAction(() -> null, stateManager, preferences);
+        OpenConsoleAction action = new OpenConsoleAction(() -> null, stateManager, preferences, null);
         action.execute();
         verify(stateManager, times(1)).getActiveDatabase();
         verify(current, times(1)).getDatabasePath();
     }
-
 }
diff --git a/src/test/java/org/jabref/gui/util/comparator/NumericFieldComparatorTest.java b/src/test/java/org/jabref/gui/util/comparator/NumericFieldComparatorTest.java
index be11abf0abe..4f377051201 100644
--- a/src/test/java/org/jabref/gui/util/comparator/NumericFieldComparatorTest.java
+++ b/src/test/java/org/jabref/gui/util/comparator/NumericFieldComparatorTest.java
@@ -62,4 +62,14 @@ public void compareWithPlusString() {
     public void compareWordWithMinus() {
         assertEquals(-1, comparator.compare("-abc", "-5"));
     }
+
+    @Test
+    void compareNumericSignalWithoutNumberWithLenghtBiggerThanOne() {
+        assertEquals(2, comparator.compare("- ", "+ "));
+    }
+
+    @Test
+    void compareNumericSignalAfterNumber() {
+        assertEquals(-2, comparator.compare("5- ", "7+ "));
+    }
 }
diff --git a/src/test/java/org/jabref/logic/autosaveandbackup/BackupManagerTest.java b/src/test/java/org/jabref/logic/autosaveandbackup/BackupManagerTest.java
index 6195936ad35..e99e3a3d8e8 100644
--- a/src/test/java/org/jabref/logic/autosaveandbackup/BackupManagerTest.java
+++ b/src/test/java/org/jabref/logic/autosaveandbackup/BackupManagerTest.java
@@ -1,37 +1,104 @@
 package org.jabref.logic.autosaveandbackup;
 
+import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
+import java.nio.file.attribute.FileTime;
+
+import org.jabref.logic.util.BackupFileType;
+import org.jabref.logic.util.io.BackupFileUtil;
 
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class BackupManagerTest {
 
     @Test
-    public void autosaveFileNameIsCorrectlyGeneratedWithinTmpDirectory() {
+    public void backupFileNameIsCorrectlyGeneratedInAppDataDirectory() {
         Path bibPath = Path.of("tmp", "test.bib");
-        Path savPath = BackupManager.getBackupPath(bibPath);
-        assertEquals(Path.of("tmp", "test.bib.sav"), savPath);
+        Path bakPath = BackupManager.getBackupPathForNewBackup(bibPath);
+
+        // Pattern is "27182d3c--test.bib--", but the hashing is implemented differently on Linux than on Windows
+        assertNotEquals("", bakPath);
     }
 
     @Test
-    public void autosaveFileIsEqualForNonExistingBackup() throws Exception {
+    public void backupFileIsEqualForNonExistingBackup() throws Exception {
         Path originalFile = Path.of(BackupManagerTest.class.getResource("no-autosave.bib").toURI());
         assertFalse(BackupManager.backupFileDiffers(originalFile));
     }
 
     @Test
     public void backupFileIsEqual() throws Exception {
+        // Prepare test: Create backup file on "right" path
+        Path source = Path.of(BackupManagerTest.class.getResource("no-changes.bib.bak").toURI());
+        Path target = BackupFileUtil.getPathForNewBackupFileAndCreateDirectory(Path.of(BackupManagerTest.class.getResource("no-changes.bib").toURI()), BackupFileType.BACKUP);
+        Files.copy(source, target, StandardCopyOption.REPLACE_EXISTING);
+
         Path originalFile = Path.of(BackupManagerTest.class.getResource("no-changes.bib").toURI());
         assertFalse(BackupManager.backupFileDiffers(originalFile));
     }
 
     @Test
     public void backupFileDiffers() throws Exception {
+        // Prepare test: Create backup file on "right" path
+        Path source = Path.of(BackupManagerTest.class.getResource("changes.bib.bak").toURI());
+        Path target = BackupFileUtil.getPathForNewBackupFileAndCreateDirectory(Path.of(BackupManagerTest.class.getResource("changes.bib").toURI()), BackupFileType.BACKUP);
+        Files.copy(source, target, StandardCopyOption.REPLACE_EXISTING);
+
         Path originalFile = Path.of(BackupManagerTest.class.getResource("changes.bib").toURI());
         assertTrue(BackupManager.backupFileDiffers(originalFile));
     }
+
+    @Test
+    public void correctBackupFileDeterminedForMultipleBakFiles() throws Exception {
+        Path noChangesBib = Path.of(BackupManagerTest.class.getResource("no-changes.bib").toURI());
+        Path noChangesBibBak = Path.of(BackupManagerTest.class.getResource("no-changes.bib.bak").toURI());
+
+        // Prepare test: Create backup files on "right" path
+        // most recent file does not have any changes
+        Path target = BackupFileUtil.getPathForNewBackupFileAndCreateDirectory(noChangesBib, BackupFileType.BACKUP);
+        Files.copy(noChangesBibBak, target, StandardCopyOption.REPLACE_EXISTING);
+
+        // create "older" .bak files containing changes
+        for (int i = 0; i < 10; i++) {
+            Path changesBibBak = Path.of(BackupManagerTest.class.getResource("changes.bib").toURI());
+            Path directory = BackupFileUtil.getAppDataBackupDir();
+            String timeSuffix = "2020-02-03--00.00.0" + Integer.toString(i);
+            String fileName = BackupFileUtil.getUniqueFilePrefix(noChangesBib) + "--no-changes.bib--" + timeSuffix + ".bak";
+            target = directory.resolve(fileName);
+            Files.copy(changesBibBak, target, StandardCopyOption.REPLACE_EXISTING);
+        }
+
+        Path originalFile = noChangesBib;
+        assertFalse(BackupManager.backupFileDiffers(originalFile));
+    }
+
+    @Test
+    public void bakFileWithNewerTimeStampLeadsToDiff() throws Exception {
+        Path changesBib = Path.of(BackupManagerTest.class.getResource("changes.bib").toURI());
+        Path changesBibBak = Path.of(BackupManagerTest.class.getResource("changes.bib.bak").toURI());
+
+        Path target = BackupFileUtil.getPathForNewBackupFileAndCreateDirectory(changesBib, BackupFileType.BACKUP);
+        Files.copy(changesBibBak, target, StandardCopyOption.REPLACE_EXISTING);
+
+        assertTrue(BackupManager.backupFileDiffers(changesBib));
+    }
+
+    @Test
+    public void bakFileWithOlderTimeStampDoesNotLeadToDiff() throws Exception {
+        Path changesBib = Path.of(BackupManagerTest.class.getResource("changes.bib").toURI());
+        Path changesBibBak = Path.of(BackupManagerTest.class.getResource("changes.bib.bak").toURI());
+
+        Path target = BackupFileUtil.getPathForNewBackupFileAndCreateDirectory(changesBib, BackupFileType.BACKUP);
+        Files.copy(changesBibBak, target, StandardCopyOption.REPLACE_EXISTING);
+
+        // Make .bak file very old
+        Files.setLastModifiedTime(target, FileTime.fromMillis(0));
+
+        assertFalse(BackupManager.backupFileDiffers(changesBib));
+    }
 }
diff --git a/src/test/java/org/jabref/logic/auxparser/AuxParserTest.java b/src/test/java/org/jabref/logic/auxparser/AuxParserTest.java
index e171fb56ccd..7b1ecb29e4f 100644
--- a/src/test/java/org/jabref/logic/auxparser/AuxParserTest.java
+++ b/src/test/java/org/jabref/logic/auxparser/AuxParserTest.java
@@ -64,6 +64,33 @@ void testNormal() throws URISyntaxException, IOException {
         }
     }
 
+    @Test
+    void testTwoArgMacro() throws URISyntaxException, IOException {
+        // Result should be identical to that of testNormal
+
+        InputStream originalStream = AuxParserTest.class.getResourceAsStream("origin.bib");
+        Path auxFile = Path.of(AuxParserTest.class.getResource("papertwoargmacro.aux").toURI());
+        try (InputStreamReader originalReader = new InputStreamReader(originalStream, StandardCharsets.UTF_8)) {
+            ParserResult result = new BibtexParser(importFormatPreferences, new DummyFileUpdateMonitor()).parse(originalReader);
+
+            AuxParser auxParser = new DefaultAuxParser(result.getDatabase());
+            AuxParserResult auxResult = auxParser.parse(auxFile);
+
+            assertTrue(auxResult.getGeneratedBibDatabase().hasEntries());
+            assertEquals(0, auxResult.getUnresolvedKeysCount());
+            BibDatabase newDB = auxResult.getGeneratedBibDatabase();
+            List<BibEntry> newEntries = newDB.getEntries();
+            assertEquals(2, newEntries.size());
+            assertTrue(newEntries.get(0).hasChanged());
+            assertTrue(newEntries.get(1).hasChanged());
+            assertEquals(2, auxResult.getResolvedKeysCount());
+            assertEquals(2, auxResult.getFoundKeysInAux());
+            assertEquals(auxResult.getFoundKeysInAux() + auxResult.getCrossRefEntriesCount(),
+                    auxResult.getResolvedKeysCount() + auxResult.getUnresolvedKeysCount());
+            assertEquals(0, auxResult.getCrossRefEntriesCount());
+        }
+    }
+
     @Test
     void testNotAllFound() throws URISyntaxException, IOException {
         InputStream originalStream = AuxParserTest.class.getResourceAsStream("origin.bib");
diff --git a/src/test/java/org/jabref/logic/auxparser/DefaultAuxParserTest.java b/src/test/java/org/jabref/logic/auxparser/DefaultAuxParserTest.java
index 4db977f5506..735262acf78 100644
--- a/src/test/java/org/jabref/logic/auxparser/DefaultAuxParserTest.java
+++ b/src/test/java/org/jabref/logic/auxparser/DefaultAuxParserTest.java
@@ -4,5 +4,4 @@
  * Please see {@link AuxParserTest} for the test cases
  */
 class DefaultAuxParserTest {
-
 }
diff --git a/src/test/java/org/jabref/logic/bibtex/BibEntryAssert.java b/src/test/java/org/jabref/logic/bibtex/BibEntryAssert.java
index 4de24b84d50..19c276cad2d 100644
--- a/src/test/java/org/jabref/logic/bibtex/BibEntryAssert.java
+++ b/src/test/java/org/jabref/logic/bibtex/BibEntryAssert.java
@@ -85,7 +85,8 @@ public static void assertEquals(InputStream expectedInputStream, List<BibEntry>
         assertNotNull(expectedInputStream);
         assertNotNull(actualEntries);
         // explicit reference of Assertions is needed here to disambiguate from the methods defined by this class
-        Assertions.assertEquals(getListFromInputStream(expectedInputStream), actualEntries);
+        List<BibEntry> expectedEntries = getListFromInputStream(expectedInputStream);
+        Assertions.assertEquals(expectedEntries, actualEntries);
     }
 
     public static void assertEquals(List<BibEntry> expectedEntries, InputStream actualInputStream)
@@ -138,7 +139,7 @@ public static void assertEquals(InputStream expectedIs, URL fileToImport, Import
      */
     public static void assertEquals(List<BibEntry> expected, Path fileToImport, Importer importer)
             throws IOException {
-        List<BibEntry> actualEntries = importer.importDatabase(fileToImport, StandardCharsets.UTF_8)
+        List<BibEntry> actualEntries = importer.importDatabase(fileToImport)
                                                .getDatabase().getEntries();
         // explicit reference of Assertions is needed here to disambiguate from the methods defined by this class
         Assertions.assertEquals(expected, actualEntries);
diff --git a/src/test/java/org/jabref/logic/bibtex/BibEntryWriterTest.java b/src/test/java/org/jabref/logic/bibtex/BibEntryWriterTest.java
index e3c47275f8f..ad5f8f70ecb 100644
--- a/src/test/java/org/jabref/logic/bibtex/BibEntryWriterTest.java
+++ b/src/test/java/org/jabref/logic/bibtex/BibEntryWriterTest.java
@@ -67,12 +67,14 @@ void testSerialization() throws IOException {
         bibEntryWriter.write(entry, bibWriter, BibDatabaseMode.BIBTEX);
 
         // @formatter:off
-        String expected = "@Article{," + OS.NEWLINE +
-                "  author  = {Foo Bar}," + OS.NEWLINE +
-                "  journal = {International Journal of Something}," + OS.NEWLINE +
-                "  note    = {some note}," + OS.NEWLINE +
-                "  number  = {1}," + OS.NEWLINE +
-                "}" + OS.NEWLINE;
+        String expected = """
+                @Article{,
+                  author  = {Foo Bar},
+                  journal = {International Journal of Something},
+                  note    = {some note},
+                  number  = {1},
+                }
+                """.replaceAll("\n", OS.NEWLINE);
         // @formatter:on
 
         assertEquals(expected, stringWriter.toString());
@@ -80,9 +82,11 @@ void testSerialization() throws IOException {
 
     @Test
     void writeOtherTypeTest() throws Exception {
-        String expected = "@Other{test," + OS.NEWLINE +
-                "  comment = {testentry}," + OS.NEWLINE +
-                "}" + OS.NEWLINE;
+        String expected = """
+                @Other{test,
+                  comment = {testentry},
+                }
+                """.replaceAll("\n", OS.NEWLINE);
 
         BibEntry entry = new BibEntry(new UnknownEntryType("other"));
         entry.setField(StandardField.COMMENT, "testentry");
@@ -100,11 +104,11 @@ void writeEntryWithFile() throws Exception {
 
         bibEntryWriter.write(entry, bibWriter, BibDatabaseMode.BIBTEX);
 
-        assertEquals("@Article{,"
-                + OS.NEWLINE
-                + "  file = {test:/home/uers/test.pdf:PDF},"
-                + OS.NEWLINE
-                + "}" + OS.NEWLINE, stringWriter.toString());
+        assertEquals("""
+                @Article{,
+                  file = {test:/home/uers/test.pdf:PDF},
+                }
+                """.replaceAll("\n", OS.NEWLINE), stringWriter.toString());
     }
 
     @Test
@@ -120,12 +124,14 @@ void writeEntryWithOrField() throws Exception {
         bibEntryWriter.write(entry, bibWriter, BibDatabaseMode.BIBTEX);
 
         // @formatter:off
-        String expected = "@InBook{," + OS.NEWLINE +
-                "  editor  = {Foo Bar}," + OS.NEWLINE +
-                "  note    = {some note}," + OS.NEWLINE +
-                "  number  = {1}," + OS.NEWLINE +
-                "  journal = {International Journal of Something}," + OS.NEWLINE +
-                "}" + OS.NEWLINE;
+        String expected = """
+                @InBook{,
+                  editor  = {Foo Bar},
+                  note    = {some note},
+                  number  = {1},
+                  journal = {International Journal of Something},
+                }
+                """.replaceAll("\n", OS.NEWLINE);
         // @formatter:on
 
         assertEquals(expected, stringWriter.toString());
@@ -145,13 +151,15 @@ void writeEntryWithOrFieldBothFieldsPresent() throws Exception {
         bibEntryWriter.write(entry, bibWriter, BibDatabaseMode.BIBTEX);
 
         // @formatter:off
-        String expected = "@InBook{," + OS.NEWLINE +
-                "  author  = {Foo Thor}," + OS.NEWLINE +
-                "  editor  = {Edi Bar}," + OS.NEWLINE +
-                "  note    = {some note}," + OS.NEWLINE +
-                "  number  = {1}," + OS.NEWLINE +
-                "  journal = {International Journal of Something}," + OS.NEWLINE +
-                "}" + OS.NEWLINE;
+        String expected = """
+                @InBook{,
+                  author  = {Foo Thor},
+                  editor  = {Edi Bar},
+                  note    = {some note},
+                  number  = {1},
+                  journal = {International Journal of Something},
+                }
+                """.replaceAll("\n", OS.NEWLINE);
         // @formatter:on
 
         assertEquals(expected, stringWriter.toString());
@@ -159,9 +167,11 @@ void writeEntryWithOrFieldBothFieldsPresent() throws Exception {
 
     @Test
     void writeReallyUnknownTypeTest() throws Exception {
-        String expected = "@Reallyunknowntype{test," + OS.NEWLINE +
-                "  comment = {testentry}," + OS.NEWLINE +
-                "}" + OS.NEWLINE;
+        String expected = """
+                @Reallyunknowntype{test,
+                  comment = {testentry},
+                }
+                """.replaceAll("\n", OS.NEWLINE);
 
         BibEntry entry = new BibEntry();
         entry.setType(new UnknownEntryType("ReallyUnknownType"));
@@ -175,12 +185,14 @@ void writeReallyUnknownTypeTest() throws Exception {
     @Test
     void roundTripTest() throws IOException {
         // @formatter:off
-        String bibtexEntry = "@Article{test," + OS.NEWLINE +
-                "  Author                   = {Foo Bar}," + OS.NEWLINE +
-                "  Journal                  = {International Journal of Something}," + OS.NEWLINE +
-                "  Note                     = {some note}," + OS.NEWLINE +
-                "  Number                   = {1}" + OS.NEWLINE +
-                "}" + OS.NEWLINE;
+        String bibtexEntry = """
+                @Article{test,
+                  Author                   = {Foo Bar},
+                  Journal                  = {International Journal of Something},
+                  Note                     = {some note},
+                  Number                   = {1}
+                }
+                """.replaceAll("\n", OS.NEWLINE);
         // @formatter:on
 
         // read in bibtex string
@@ -267,12 +279,14 @@ void roundTripWithKeepsLFLineBreakStyle() throws IOException {
     @Test
     void roundTripWithModification() throws IOException {
         // @formatter:off
-        String bibtexEntry = "@Article{test," + OS.NEWLINE +
-                "  Author                   = {Foo Bar}," + OS.NEWLINE +
-                "  Journal                  = {International Journal of Something}," + OS.NEWLINE +
-                "  Note                     = {some note}," + OS.NEWLINE +
-                "  Number                   = {1}," + OS.NEWLINE +
-                "}";
+        String bibtexEntry = """
+                @Article{test,
+                  Author                   = {Foo Bar},
+                  Journal                  = {International Journal of Something},
+                  Note                     = {some note},
+                  Number                   = {1},
+                }
+                """.replaceAll("\n", OS.NEWLINE);
         // @formatter:on
 
         // read in bibtex string
@@ -287,12 +301,14 @@ void roundTripWithModification() throws IOException {
         bibEntryWriter.write(entry, bibWriter, BibDatabaseMode.BIBTEX);
 
         // @formatter:off
-        String expected = "@Article{test," + OS.NEWLINE +
-                "  author  = {BlaBla}," + OS.NEWLINE +
-                "  journal = {International Journal of Something}," + OS.NEWLINE +
-                "  note    = {some note}," + OS.NEWLINE +
-                "  number  = {1}," + OS.NEWLINE +
-                "}" + OS.NEWLINE;
+        String expected = """
+                @Article{test,
+                  author  = {BlaBla},
+                  journal = {International Journal of Something},
+                  note    = {some note},
+                  number  = {1},
+                }
+                """.replaceAll("\n", OS.NEWLINE);
         // @formatter:on
         assertEquals(expected, stringWriter.toString());
     }
@@ -300,13 +316,15 @@ void roundTripWithModification() throws IOException {
     @Test
     void roundTripWithCamelCasingInTheOriginalEntryAndResultInLowerCase() throws IOException {
         // @formatter:off
-        String bibtexEntry = OS.NEWLINE + "@Article{test," + OS.NEWLINE +
-                "  Author                   = {Foo Bar}," + OS.NEWLINE +
-                "  Journal                  = {International Journal of Something}," + OS.NEWLINE +
-                "  Number                   = {1}," + OS.NEWLINE +
-                "  Note                     = {some note}," + OS.NEWLINE +
-                "  HowPublished             = {asdf}," + OS.NEWLINE +
-                "}";
+        String bibtexEntry = """
+                @Article{test,
+                  Author                   = {Foo Bar},
+                  Journal                  = {International Journal of Something},
+                  Number                   = {1},
+                  Note                     = {some note},
+                  HowPublished             = {asdf},
+                }
+                """.replaceAll("\n", OS.NEWLINE);
         // @formatter:on
 
         // read in bibtex string
@@ -321,13 +339,15 @@ void roundTripWithCamelCasingInTheOriginalEntryAndResultInLowerCase() throws IOE
         bibEntryWriter.write(entry, bibWriter, BibDatabaseMode.BIBTEX);
 
         // @formatter:off
-        String expected = "@Article{test," + OS.NEWLINE +
-                "  author       = {BlaBla}," + OS.NEWLINE +
-                "  journal      = {International Journal of Something}," + OS.NEWLINE +
-                "  note         = {some note}," + OS.NEWLINE +
-                "  number       = {1}," + OS.NEWLINE +
-                "  howpublished = {asdf}," + OS.NEWLINE +
-                "}" + OS.NEWLINE;
+        String expected = """
+                @Article{test,
+                  author       = {BlaBla},
+                  journal      = {International Journal of Something},
+                  note         = {some note},
+                  number       = {1},
+                  howpublished = {asdf},
+                }
+                """.replaceAll("\n", OS.NEWLINE);
         // @formatter:on
         assertEquals(expected, stringWriter.toString());
     }
@@ -335,13 +355,16 @@ void roundTripWithCamelCasingInTheOriginalEntryAndResultInLowerCase() throws IOE
     @Test
     void testEntryTypeChange() throws IOException {
         // @formatter:off
-        String expected = OS.NEWLINE + "@Article{test," + OS.NEWLINE +
-                "  author       = {BlaBla}," + OS.NEWLINE +
-                "  journal      = {International Journal of Something}," + OS.NEWLINE +
-                "  number       = {1}," + OS.NEWLINE +
-                "  note         = {some note}," + OS.NEWLINE +
-                "  howpublished = {asdf}," + OS.NEWLINE +
-                "}" + OS.NEWLINE;
+        String expected = """
+
+                @Article{test,
+                  author       = {BlaBla},
+                  journal      = {International Journal of Something},
+                  number       = {1},
+                  note         = {some note},
+                  howpublished = {asdf},
+                }
+                """.replaceAll("\n", OS.NEWLINE);
         // @formatter:on
 
         // read in bibtex string
@@ -356,13 +379,15 @@ void testEntryTypeChange() throws IOException {
         bibEntryWriter.write(entry, bibWriter, BibDatabaseMode.BIBTEX);
 
         // @formatter:off
-        String expectedNewEntry = "@InProceedings{test," + OS.NEWLINE +
-                "  author       = {BlaBla}," + OS.NEWLINE +
-                "  note         = {some note}," + OS.NEWLINE +
-                "  number       = {1}," + OS.NEWLINE +
-                "  howpublished = {asdf}," + OS.NEWLINE +
-                "  journal      = {International Journal of Something}," + OS.NEWLINE +
-                "}" + OS.NEWLINE;
+        String expectedNewEntry = """
+                @InProceedings{test,
+                  author       = {BlaBla},
+                  note         = {some note},
+                  number       = {1},
+                  howpublished = {asdf},
+                  journal      = {International Journal of Something},
+                }
+                """.replaceAll("\n", OS.NEWLINE);
         // @formatter:on
         assertEquals(expectedNewEntry, stringWriter.toString());
     }
@@ -424,12 +449,14 @@ void roundTripNormalizesNewLines() throws IOException {
     @Test
     void multipleWritesWithoutModification() throws IOException {
         // @formatter:off
-        String bibtexEntry = "@Article{test," + OS.NEWLINE +
-                "  Author                   = {Foo Bar}," + OS.NEWLINE +
-                "  Journal                  = {International Journal of Something}," + OS.NEWLINE +
-                "  Note                     = {some note}," + OS.NEWLINE +
-                "  Number                   = {1}" + OS.NEWLINE +
-                "}" + OS.NEWLINE;
+        String bibtexEntry = """
+                @Article{test,
+                  Author                   = {Foo Bar},
+                  Journal                  = {International Journal of Something},
+                  Note                     = {some note},
+                  Number                   = {1}
+                }
+                """.replaceAll("\n", OS.NEWLINE);
         // @formatter:on
 
         String result = testSingleWrite(bibtexEntry);
@@ -458,11 +485,13 @@ private String testSingleWrite(String bibtexEntry) throws IOException {
     @Test
     void monthFieldSpecialSyntax() throws IOException {
         // @formatter:off
-        String bibtexEntry = "@Article{test," + OS.NEWLINE +
-                "  Author                   = {Foo Bar}," + OS.NEWLINE +
-                "  Month                    = mar," + OS.NEWLINE +
-                "  Number                   = {1}" + OS.NEWLINE +
-                "}" + OS.NEWLINE;
+        String bibtexEntry = """
+                @Article{test,
+                  Author                   = {Foo Bar},
+                  Month                    = mar,
+                  Number                   = {1}
+                }
+                """.replaceAll("\n", OS.NEWLINE);
         // @formatter:on
 
         // read in bibtex string
@@ -484,19 +513,21 @@ void monthFieldSpecialSyntax() throws IOException {
     @Test
     void customTypeCanBewritten() throws IOException {
         // @formatter:off
-        String bibtexEntry = "@reference{Broecker1984,\n" +
-                "title = {International Center of Photography},\n" +
-                "subtitle = {Encyclopedia of Photography},\n" +
-                "editor = {Broecker, William L.},\n" +
-                "date = {1984},\n" +
-                "eprint = {305515791},\n" +
-                "eprinttype = {scribd},\n" +
-                "isbn = {0-517-55271-X},\n" +
-                "keywords = {g:photography, p:positive, c:silver, m:albumen, c:pigment, m:carbon, g:reference, c:encyclopedia},\n" +
-                "location = {New York},\n" +
-                "pagetotal = {678},\n" +
-                "publisher = {Crown},\n" +
-                "}\n";
+        String bibtexEntry = """
+                @reference{Broecker1984,
+                  title = {International Center of Photography},
+                  subtitle = {Encyclopedia of Photography},
+                  editor = {Broecker, William L.},
+                  date = {1984},
+                  eprint = {305515791},
+                  eprinttype = {scribd},
+                  isbn = {0-517-55271-X},
+                  keywords = {g:photography, p:positive, c:silver, m:albumen, c:pigment, m:carbon, g:reference, c:encyclopedia},
+                  location = {New York},
+                  pagetotal = {678},
+                  publisher = {Crown},
+                }
+                """;
         // @formatter:on
 
         // read in bibtex string
@@ -509,19 +540,21 @@ void customTypeCanBewritten() throws IOException {
         // write out bibtex string
         bibEntryWriter.write(entry, bibWriter, BibDatabaseMode.BIBTEX);
 
-        String expected = "@Reference{Broecker1984," + OS.NEWLINE +
-                "  date       = {1984}," + OS.NEWLINE +
-                "  editor     = {Broecker, William L.}," + OS.NEWLINE +
-                "  eprint     = {305515791}," + OS.NEWLINE +
-                "  eprinttype = {scribd}," + OS.NEWLINE +
-                "  isbn       = {0-517-55271-X}," + OS.NEWLINE +
-                "  keywords   = {g:photography, p:positive, c:silver, m:albumen, c:pigment, m:carbon, g:reference, c:encyclopedia}," + OS.NEWLINE +
-                "  location   = {NY}," + OS.NEWLINE +
-                "  pagetotal  = {678}," + OS.NEWLINE +
-                "  publisher  = {Crown}," + OS.NEWLINE +
-                "  subtitle   = {Encyclopedia of Photography}," + OS.NEWLINE +
-                "  title      = {International Center of Photography}," + OS.NEWLINE +
-                "}" + OS.NEWLINE;
+        String expected = """
+                @Reference{Broecker1984,
+                  date       = {1984},
+                  editor     = {Broecker, William L.},
+                  eprint     = {305515791},
+                  eprinttype = {scribd},
+                  isbn       = {0-517-55271-X},
+                  keywords   = {g:photography, p:positive, c:silver, m:albumen, c:pigment, m:carbon, g:reference, c:encyclopedia},
+                  location   = {NY},
+                  pagetotal  = {678},
+                  publisher  = {Crown},
+                  subtitle   = {Encyclopedia of Photography},
+                  title      = {International Center of Photography},
+                }
+                """.replaceAll("\n", OS.NEWLINE);
 
         assertEquals(expected, stringWriter.toString());
     }
@@ -535,9 +568,11 @@ void constantMonthApril() throws Exception {
 
         bibEntryWriter.write(entry, bibWriter, BibDatabaseMode.BIBTEX);
 
-        assertEquals("@Misc{," + OS.NEWLINE +
-                        "  month = apr," + OS.NEWLINE +
-                        "}" + OS.NEWLINE,
+        assertEquals("""
+                        @Misc{,
+                          month = apr,
+                        }
+                        """.replaceAll("\n", OS.NEWLINE),
                 stringWriter.toString());
     }
 
@@ -550,24 +585,28 @@ void monthApril() throws Exception {
 
         bibEntryWriter.write(entry, bibWriter, BibDatabaseMode.BIBTEX);
 
-        assertEquals("@Misc{," + OS.NEWLINE +
-                        "  month = {apr}," + OS.NEWLINE +
-                        "}" + OS.NEWLINE,
+        assertEquals("""
+                        @Misc{,
+                          month = {apr},
+                        }
+                        """.replaceAll("\n", OS.NEWLINE),
                 stringWriter.toString());
     }
 
     @Test
     void filenameIsUnmodifiedDuringWrite() throws Exception {
         // source: https://github.com/JabRef/jabref/issues/7012#issuecomment-707788107
-        String bibtexEntry = "@Book{Hue17," + OS.NEWLINE +
-                "  author    = {Rudolf Huebener}," + OS.NEWLINE +
-                "  date      = {2017}," + OS.NEWLINE +
-                "  title     = {Leiter, Halbleiter, Supraleiter}," + OS.NEWLINE +
-                "  doi       = {10.1007/978-3-662-53281-2}," + OS.NEWLINE +
-                "  publisher = {Springer Berlin Heidelberg}," + OS.NEWLINE +
-                "  file      = {:Hue17 - Leiter # Halbleiter # Supraleiter.pdf:PDF}," + OS.NEWLINE +
-                "  timestamp = {2020.10.13}," + OS.NEWLINE +
-                "}" + OS.NEWLINE;
+        String bibtexEntry = """
+                    @Book{Hue17,
+                      author    = {Rudolf Huebener},
+                      date      = {2017},
+                      title     = {Leiter, Halbleiter, Supraleiter},
+                      doi       = {10.1007/978-3-662-53281-2},
+                      publisher = {Springer Berlin Heidelberg},
+                      file      = {:Hue17 - Leiter # Halbleiter # Supraleiter.pdf:PDF},
+                      timestamp = {2020.10.13},
+                }
+                """.replaceAll("\n", OS.NEWLINE);
 
         // read in bibtex string
         ParserResult result = new BibtexParser(importFormatPreferences, fileMonitor).parse(new StringReader(bibtexEntry));
@@ -640,13 +679,15 @@ void writeThrowsErrorIfFieldContainsUnbalancedBraces() {
     @Test
     void roundTripWithPrecedingCommentTest() throws IOException {
         // @formatter:off
-        String bibtexEntry = "% Some random comment that should stay here" + OS.NEWLINE +
-                "@Article{test," + OS.NEWLINE +
-                "  Author                   = {Foo Bar}," + OS.NEWLINE +
-                "  Journal                  = {International Journal of Something}," + OS.NEWLINE +
-                "  Note                     = {some note}," + OS.NEWLINE +
-                "  Number                   = {1}" + OS.NEWLINE +
-                "}" + OS.NEWLINE;
+        String bibtexEntry = """
+                % Some random comment that should stay here
+                @Article{test,
+                  Author                   = {Foo Bar},
+                  Journal                  = {International Journal of Something},
+                  Note                     = {some note},
+                  Number                   = {1}
+                }
+                """.replaceAll("\n", OS.NEWLINE);
         // @formatter:on
 
         // read in bibtex string
@@ -663,13 +704,15 @@ void roundTripWithPrecedingCommentTest() throws IOException {
     @Test
     void roundTripWithPrecedingCommentAndModificationTest() throws IOException {
         // @formatter:off
-        String bibtexEntry = "% Some random comment that should stay here" + OS.NEWLINE +
-                "@Article{test," + OS.NEWLINE +
-                "  Author                   = {Foo Bar}," + OS.NEWLINE +
-                "  Journal                  = {International Journal of Something}," + OS.NEWLINE +
-                "  Number                   = {1}," + OS.NEWLINE +
-                "  Note                     = {some note}" + OS.NEWLINE +
-                "}";
+        String bibtexEntry = """
+                % Some random comment that should stay here
+                @Article{test,
+                  Author                   = {Foo Bar},
+                  Journal                  = {International Journal of Something},
+                  Number                   = {1},
+                  Note                     = {some note}
+                }
+                """.replaceAll("\n", OS.NEWLINE);
         // @formatter:on
 
         // read in bibtex string
@@ -684,13 +727,15 @@ void roundTripWithPrecedingCommentAndModificationTest() throws IOException {
         bibEntryWriter.write(entry, bibWriter, BibDatabaseMode.BIBTEX);
 
         // @formatter:off
-        String expected = "% Some random comment that should stay here" + OS.NEWLINE +
-                "@Article{test," + OS.NEWLINE +
-                "  author  = {John Doe}," + OS.NEWLINE +
-                "  journal = {International Journal of Something}," + OS.NEWLINE +
-                "  note    = {some note}," + OS.NEWLINE +
-                "  number  = {1}," + OS.NEWLINE +
-                "}" + OS.NEWLINE;
+        String expected = """
+                % Some random comment that should stay here
+                @Article{test,
+                  author  = {John Doe},
+                  journal = {International Journal of Something},
+                  note    = {some note},
+                  number  = {1},
+                }
+                """.replaceAll("\n", OS.NEWLINE);
         // @formatter:on
 
         assertEquals(expected, stringWriter.toString());
@@ -714,16 +759,18 @@ void alphabeticSerialization() throws IOException {
         bibEntryWriter.write(entry, bibWriter, BibDatabaseMode.BIBLATEX);
 
         // @formatter:off
-        String expected = "@Article{," + OS.NEWLINE +
-                "  author       = {Foo Bar}," + OS.NEWLINE +
-                "  date         = {2019-10-16}," + OS.NEWLINE +
-                "  journaltitle = {International Journal of Something}," + OS.NEWLINE +
-                "  title        = {Title}," + OS.NEWLINE +
-                "  note         = {some note}," + OS.NEWLINE +
-                "  number       = {1}," + OS.NEWLINE +
-                "  chapter      = {chapter}," + OS.NEWLINE +
-                "  year         = {2019}," + OS.NEWLINE +
-                "}" + OS.NEWLINE;
+        String expected = """
+                @Article{,
+                  author       = {Foo Bar},
+                  date         = {2019-10-16},
+                  journaltitle = {International Journal of Something},
+                  title        = {Title},
+                  note         = {some note},
+                  number       = {1},
+                  chapter      = {chapter},
+                  year         = {2019},
+                }
+                """.replaceAll("\n", OS.NEWLINE);
         // @formatter:on
 
         assertEquals(expected, stringWriter.toString());
@@ -762,29 +809,33 @@ void testSerializeAll() throws IOException {
         String output = bibEntryWriter.serializeAll(List.of(entry1, entry2), BibDatabaseMode.BIBLATEX);
 
         // @formatter:off
-        String expected1 = "@Article{," + OS.NEWLINE +
-                "  author       = {Journal Author}," + OS.NEWLINE +
-                "  date         = {2020-11-16}," + OS.NEWLINE +
-                "  journaltitle = {Journal of Words}," + OS.NEWLINE +
-                "  title        = {Entry Title}," + OS.NEWLINE +
-                "  note         = {some note}," + OS.NEWLINE +
-                "  number       = {1}," + OS.NEWLINE +
-                "  chapter      = {chapter}," + OS.NEWLINE +
-                "  year         = {2019}," + OS.NEWLINE +
-                "}" + OS.NEWLINE;
+        String expected1 = """
+                @Article{,
+                  author       = {Journal Author},
+                  date         = {2020-11-16},
+                  journaltitle = {Journal of Words},
+                  title        = {Entry Title},
+                  note         = {some note},
+                  number       = {1},
+                  chapter      = {chapter},
+                  year         = {2019},
+                }
+                """.replaceAll("\n", OS.NEWLINE);
         // @formatter:on
 
         // @formatter:off
-        String expected2 = "@Book{," + OS.NEWLINE +
-                "  author    = {John Book}," + OS.NEWLINE +
-                "  date      = {2017-12-20}," + OS.NEWLINE +
-                "  title     = {Entry Title}," + OS.NEWLINE +
-                "  chapter   = {chapter}," + OS.NEWLINE +
-                "  note      = {some note}," + OS.NEWLINE +
-                "  number    = {1}," + OS.NEWLINE +
-                "  booktitle = {The Big Book of Books}," + OS.NEWLINE +
-                "  year      = {2020}," + OS.NEWLINE +
-                "}" + OS.NEWLINE;
+        String expected2 = """
+                @Book{,
+                  author    = {John Book},
+                  date      = {2017-12-20},
+                  title     = {Entry Title},
+                  chapter   = {chapter},
+                  note      = {some note},
+                  number    = {1},
+                  booktitle = {The Big Book of Books},
+                  year      = {2020},
+                }
+                """.replaceAll("\n", OS.NEWLINE);
         // @formatter:on
 
         assertEquals(expected1 + OS.NEWLINE + expected2, output);
diff --git a/src/test/java/org/jabref/logic/bibtex/FieldContentFormatterTest.java b/src/test/java/org/jabref/logic/bibtex/FieldContentFormatterTest.java
index cf0402421bd..08cd66fe0f6 100644
--- a/src/test/java/org/jabref/logic/bibtex/FieldContentFormatterTest.java
+++ b/src/test/java/org/jabref/logic/bibtex/FieldContentFormatterTest.java
@@ -2,7 +2,6 @@
 
 import java.util.Collections;
 
-import org.jabref.logic.util.OS;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.field.UnknownField;
 
@@ -22,24 +21,23 @@ void setUp() throws Exception {
     }
 
     @Test
-    void unifiesLineBreaks() {
+    void doesNotUnifyLineBreaks() {
         String original = "I\r\nunify\nline\rbreaks.";
-        String expected = "I\nunify\nline\nbreaks.".replace("\n", OS.NEWLINE);
         String processed = parser.format(new StringBuilder(original), StandardField.ABSTRACT);
 
-        assertEquals(expected, processed);
+        // Normalization is done at org.jabref.logic.exporter.BibWriter, so no need to normalize here
+        assertEquals(original, processed);
     }
 
     @Test
     void retainsWhitespaceForMultiLineFields() {
         String original = "I\nkeep\nline\nbreaks\nand\n\ttabs.";
-        String formatted = original.replace("\n", OS.NEWLINE);
 
         String abstrakt = parser.format(new StringBuilder(original), StandardField.ABSTRACT);
         String review = parser.format(new StringBuilder(original), StandardField.REVIEW);
 
-        assertEquals(formatted, abstrakt);
-        assertEquals(formatted, review);
+        assertEquals(original, abstrakt);
+        assertEquals(original, review);
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/bibtex/FieldWriterTests.java b/src/test/java/org/jabref/logic/bibtex/FieldWriterTests.java
index 6449aff37b3..e3e6d2e133a 100644
--- a/src/test/java/org/jabref/logic/bibtex/FieldWriterTests.java
+++ b/src/test/java/org/jabref/logic/bibtex/FieldWriterTests.java
@@ -56,16 +56,11 @@ void setUp() {
     }
 
     @Test
-    void normalizeNewlineInAbstractField() throws Exception {
+    void noNormalizationOfNewlinesInAbstractField() throws Exception {
         String text = "lorem" + OS.NEWLINE + " ipsum lorem ipsum\nlorem ipsum \rlorem ipsum\r\ntest";
-
-        String expected = "{" + "lorem" + OS.NEWLINE + " ipsum lorem ipsum" + OS.NEWLINE
-                + "lorem ipsum "
-                + OS.NEWLINE + "lorem ipsum"
-                + OS.NEWLINE + "test" + "}";
-
         String result = writer.write(StandardField.ABSTRACT, text);
-
+        // The normalization is done at org.jabref.logic.exporter.BibWriter, so no need to normalize here
+        String expected = "{" + text + "}";
         assertEquals(expected, result);
     }
 
@@ -142,7 +137,7 @@ void tolerateEscapeCharacters() throws Exception {
     @Test
     void hashEnclosedWordsGetRealStringsInMonthField() throws Exception {
         String text = "#jan# - #feb#";
-        assertEquals("jan #{ - } # feb", writer.write(StandardField.MONTH, text));
+        assertEquals("jan # { - } # feb", writer.write(StandardField.MONTH, text));
     }
 
     @ParameterizedTest
diff --git a/src/test/java/org/jabref/logic/bibtex/comparator/BibDatabaseDiffTest.java b/src/test/java/org/jabref/logic/bibtex/comparator/BibDatabaseDiffTest.java
index 58a75f5470f..cf47e6bb055 100644
--- a/src/test/java/org/jabref/logic/bibtex/comparator/BibDatabaseDiffTest.java
+++ b/src/test/java/org/jabref/logic/bibtex/comparator/BibDatabaseDiffTest.java
@@ -104,7 +104,6 @@ void compareOfTwoDifferentEntriesWithDifferentDataReportsDifferences() throws Ex
         assertNull(diff.getEntryDifferences().get(0).getNewEntry(), "newEntry is not null");
         assertEquals(entryTwo, diff.getEntryDifferences().get(1).getNewEntry(), "there is another value as newEntry");
         assertNull(diff.getEntryDifferences().get(1).getOriginalEntry(), "originalEntry is not null");
-
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/bibtex/comparator/EntryComparatorTest.java b/src/test/java/org/jabref/logic/bibtex/comparator/EntryComparatorTest.java
index 4dd225aa275..cfaa38b42da 100644
--- a/src/test/java/org/jabref/logic/bibtex/comparator/EntryComparatorTest.java
+++ b/src/test/java/org/jabref/logic/bibtex/comparator/EntryComparatorTest.java
@@ -10,50 +10,52 @@
 
 class EntryComparatorTest {
 
-    private BibEntry entry1 = new BibEntry();
-    private BibEntry entry2 = new BibEntry();
-
+    @SuppressWarnings("EqualsWithItself")
     @Test
-    void recognizeIdenticObjectsAsEqual() {
-        BibEntry e2 = entry1;
-        assertEquals(0, new EntryComparator(false, false, StandardField.TITLE).compare(entry1, e2));
+    void recognizeIdenticalObjectsAsEqual() {
+        BibEntry entry = new BibEntry();
+        assertEquals(0, new EntryComparator(false, false, StandardField.TITLE).compare(entry, entry));
     }
 
     @Test
-    void compareAuthorFieldBiggerAscending() throws Exception {
-        entry1.setField(StandardField.AUTHOR, "Stephen King");
-        entry2.setField(StandardField.AUTHOR, "Henning Mankell");
-
+    void compareAuthorFieldBiggerAscending() {
+        BibEntry entry1 = new BibEntry()
+                .withField(StandardField.AUTHOR, "Stephen King");
+        BibEntry entry2 = new BibEntry()
+                .withField(StandardField.AUTHOR, "Henning Mankell");
         EntryComparator entryComparator = new EntryComparator(false, false, StandardField.AUTHOR);
 
         assertEquals(-2, entryComparator.compare(entry1, entry2));
     }
 
     @Test
-    void bothEntriesHaveNotSetTheFieldToCompareAscending() throws Exception {
-
-        entry1.setField(StandardField.BOOKTITLE, "Stark - The Dark Half (1989)");
-        entry2.setField(StandardField.COMMENTATOR, "Some Commentator");
+    void bothEntriesHaveNotSetTheFieldToCompareAscending() {
+        BibEntry entry1 = new BibEntry()
+                .withField(StandardField.BOOKTITLE, "Stark - The Dark Half (1989)");
+        BibEntry entry2 = new BibEntry()
+                .withField(StandardField.COMMENTATOR, "Some Commentator");
         EntryComparator entryComparator = new EntryComparator(false, false, StandardField.TITLE);
 
         assertEquals(-1, entryComparator.compare(entry1, entry2));
     }
 
     @Test
-    void secondEntryHasNotSetFieldToCompareAscending() throws Exception {
-
-        entry1.setField(StandardField.TITLE, "Stark - The Dark Half (1989)");
-        entry2.setField(StandardField.COMMENTATOR, "Some Commentator");
+    void secondEntryHasNotSetFieldToCompareAscending() {
+        BibEntry entry1 = new BibEntry()
+                .withField(StandardField.TITLE, "Stark - The Dark Half (1989)");
+        BibEntry entry2 = new BibEntry()
+                .withField(StandardField.COMMENTATOR, "Some Commentator");
         EntryComparator entryComparator = new EntryComparator(false, false, StandardField.TITLE);
 
         assertEquals(-1, entryComparator.compare(entry1, entry2));
     }
 
     @Test
-    void firstEntryHasNotSetFieldToCompareAscending() throws Exception {
-
-        entry1.setField(StandardField.COMMENTATOR, "Some Commentator");
-        entry2.setField(StandardField.TITLE, "Stark - The Dark Half (1989)");
+    void firstEntryHasNotSetFieldToCompareAscending() {
+        BibEntry entry1 = new BibEntry()
+                .withField(StandardField.COMMENTATOR, "Some Commentator");
+        BibEntry entry2 = new BibEntry()
+                .withField(StandardField.TITLE, "Stark - The Dark Half (1989)");
 
         EntryComparator entryComparator = new EntryComparator(false, false, StandardField.TITLE);
 
@@ -61,10 +63,11 @@ void firstEntryHasNotSetFieldToCompareAscending() throws Exception {
     }
 
     @Test
-    void bothEntriesNumericAscending() throws Exception {
-
-        entry1.setField(StandardField.EDITION, "1");
-        entry2.setField(StandardField.EDITION, "3");
+    void bothEntriesNumericAscending() {
+        BibEntry entry1 = new BibEntry()
+                .withField(StandardField.EDITION, "1");
+        BibEntry entry2 = new BibEntry()
+                .withField(StandardField.EDITION, "3");
 
         EntryComparator entryComparator = new EntryComparator(false, false, StandardField.EDITION);
 
@@ -73,29 +76,29 @@ void bothEntriesNumericAscending() throws Exception {
 
     @Test
     void compareObjectsByKeyAscending() {
-        BibEntry e1 = new BibEntry();
-        BibEntry e2 = new BibEntry();
-        e1.setCitationKey("Mayer2019b");
-        e2.setCitationKey("Mayer2019a");
+        BibEntry e1 = new BibEntry()
+                .withCitationKey("Mayer2019b");
+        BibEntry e2 = new BibEntry()
+                .withCitationKey("Mayer2019a");
         assertEquals(1, new EntryComparator(false, false, InternalField.KEY_FIELD).compare(e1, e2));
         assertEquals(-1, new EntryComparator(false, false, InternalField.KEY_FIELD).compare(e2, e1));
     }
 
     @Test
     void compareObjectsByKeyWithNull() {
-        BibEntry e1 = new BibEntry();
+        BibEntry e1 = new BibEntry()
+                .withCitationKey("Mayer2019b");
         BibEntry e2 = new BibEntry();
-        e1.setCitationKey("Mayer2019b");
         assertEquals(-1, new EntryComparator(false, false, InternalField.KEY_FIELD).compare(e1, e2));
         assertEquals(1, new EntryComparator(false, false, InternalField.KEY_FIELD).compare(e2, e1));
     }
 
     @Test
     void compareObjectsByKeyWithBlank() {
-        BibEntry e1 = new BibEntry();
-        BibEntry e2 = new BibEntry();
-        e1.setCitationKey("Mayer2019b");
-        e2.setCitationKey(" ");
+        BibEntry e1 = new BibEntry()
+                .withCitationKey("Mayer2019b");
+        BibEntry e2 = new BibEntry()
+                .withCitationKey(" ");
         assertEquals(-1, new EntryComparator(false, false, InternalField.KEY_FIELD).compare(e1, e2));
         assertEquals(1, new EntryComparator(false, false, InternalField.KEY_FIELD).compare(e2, e1));
     }
diff --git a/src/test/java/org/jabref/logic/bibtex/comparator/GroupDiffTest.java b/src/test/java/org/jabref/logic/bibtex/comparator/GroupDiffTest.java
index 002a71dec46..9fded7c7802 100644
--- a/src/test/java/org/jabref/logic/bibtex/comparator/GroupDiffTest.java
+++ b/src/test/java/org/jabref/logic/bibtex/comparator/GroupDiffTest.java
@@ -56,10 +56,9 @@ void compareWithChangedGroup() {
 
         Optional<GroupDiff> groupDiff = GroupDiff.compare(originalMetaData, newMetaData);
 
-        Optional<GroupDiff> expectedGroupDiff = Optional.of(new GroupDiff(newMetaData.getGroups().get(), originalMetaData.getGroups().get()));
+        Optional<GroupDiff> expectedGroupDiff = Optional.of(new GroupDiff(originalMetaData.getGroups().get(), newMetaData.getGroups().get()));
 
         assertEquals(expectedGroupDiff.get().getNewGroupRoot(), groupDiff.get().getNewGroupRoot());
         assertEquals(expectedGroupDiff.get().getOriginalGroupRoot(), groupDiff.get().getOriginalGroupRoot());
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/bst/BstFunctionsTest.java b/src/test/java/org/jabref/logic/bst/BstFunctionsTest.java
new file mode 100644
index 00000000000..1b63e26cbb3
--- /dev/null
+++ b/src/test/java/org/jabref/logic/bst/BstFunctionsTest.java
@@ -0,0 +1,666 @@
+package org.jabref.logic.bst;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import org.jabref.logic.bst.util.BstCaseChangersTest;
+import org.jabref.logic.bst.util.BstNameFormatterTest;
+import org.jabref.logic.bst.util.BstPurifierTest;
+import org.jabref.logic.bst.util.BstTextPrefixerTest;
+import org.jabref.logic.bst.util.BstWidthCalculatorTest;
+import org.jabref.model.database.BibDatabase;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.field.StandardField;
+import org.jabref.model.entry.types.StandardEntryType;
+
+import org.antlr.v4.runtime.RecognitionException;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * For additional tests see for
+ * <ul>
+ * <li> purify: {@link BstPurifierTest}</li>
+ * <li> width: {@link BstWidthCalculatorTest}</li>
+ * <li> format.name: {@link BstNameFormatterTest}</li>
+ * <li> change.case: {@link BstCaseChangersTest}</li>
+ * <li> prefix: {@link BstTextPrefixerTest}</li>
+ * </ul>
+ */
+class BstFunctionsTest {
+    @Test
+    public void testCompareFunctions() throws RecognitionException {
+        BstVM vm = new BstVM("""
+                FUNCTION { test.compare } {
+                    #5  #5      =   % TRUE
+                    #1  #2      =   % FALSE
+                    #3  #4      <   % TRUE
+                    #4  #3      <   % FALSE
+                    #4  #4      <   % FALSE
+                    #3  #4      >   % FALSE
+                    #4  #3      >   % TRUE
+                    #4  #4      >   % FALSE
+                    "H" "H"     =   % TRUE
+                    "H" "Ha"    =   % FALSE
+                }
+                EXECUTE { test.compare }
+                """);
+
+        vm.render(Collections.emptyList());
+
+        assertEquals(BstVM.FALSE, vm.getStack().pop());
+        assertEquals(BstVM.TRUE, vm.getStack().pop());
+        assertEquals(BstVM.FALSE, vm.getStack().pop());
+        assertEquals(BstVM.TRUE, vm.getStack().pop());
+        assertEquals(BstVM.FALSE, vm.getStack().pop());
+        assertEquals(BstVM.FALSE, vm.getStack().pop());
+        assertEquals(BstVM.FALSE, vm.getStack().pop());
+        assertEquals(BstVM.TRUE, vm.getStack().pop());
+        assertEquals(BstVM.FALSE, vm.getStack().pop());
+        assertEquals(BstVM.TRUE, vm.getStack().pop());
+        assertEquals(0, vm.getStack().size());
+    }
+
+    @Test
+    public void testArithmeticFunctions() throws RecognitionException {
+        BstVM vm = new BstVM("""
+                FUNCTION { test } {
+                    #1  #1  +   % 2
+                    #5  #2  -   % 3
+                }
+                EXECUTE { test }
+                """);
+
+        vm.render(Collections.emptyList());
+
+        assertEquals(3, vm.getStack().pop());
+        assertEquals(2, vm.getStack().pop());
+        assertEquals(0, vm.getStack().size());
+    }
+
+    @Test
+    public void testArithmeticFunctionTypeMismatch() throws RecognitionException {
+        BstVM vm = new BstVM("""
+                FUNCTION { test } {
+                    #1  "HELLO" +   % Should throw exception
+                }
+                EXECUTE { test }
+                """);
+
+        assertThrows(BstVMException.class, () -> vm.render(Collections.emptyList()));
+    }
+
+    @Test
+    public void testStringOperations() throws RecognitionException {
+        // Test for concat (*) and add.period
+        BstVM vm = new BstVM("""
+                FUNCTION { test } {
+                    "H" "ello"      *           % Hello
+                    "Johnny"        add.period$ % Johnny.
+                    "Johnny."       add.period$ % Johnny.
+                    "Johnny!"       add.period$ % Johnny!
+                    "Johnny?"       add.period$ % Johnny?
+                    "Johnny} }}}"   add.period$ % Johnny.}
+                    "Johnny!}"      add.period$ % Johnny!}
+                    "Johnny?}"      add.period$ % Johnny?}
+                    "Johnny.}"      add.period$ % Johnny.}
+                }
+                EXECUTE { test }
+                """);
+
+        vm.render(Collections.emptyList());
+
+        assertEquals("Johnny.}", vm.getStack().pop());
+        assertEquals("Johnny?}", vm.getStack().pop());
+        assertEquals("Johnny!}", vm.getStack().pop());
+        assertEquals("Johnny.}", vm.getStack().pop());
+        assertEquals("Johnny?", vm.getStack().pop());
+        assertEquals("Johnny!", vm.getStack().pop());
+        assertEquals("Johnny.", vm.getStack().pop());
+        assertEquals("Johnny.", vm.getStack().pop());
+        assertEquals("Hello", vm.getStack().pop());
+        assertEquals(0, vm.getStack().size());
+    }
+
+    @Test
+    public void testMissing() throws RecognitionException {
+        BstVM vm = new BstVM("""
+                ENTRY { title } { } { }
+                FUNCTION { presort } { cite$ 'sort.key$ := }
+                ITERATE { presort }
+                READ
+                SORT
+                FUNCTION { test } { title missing$ cite$ }
+                ITERATE { test }
+                """);
+        List<BibEntry> testEntries = List.of(
+                BstVMTest.defaultTestEntry(),
+                new BibEntry(StandardEntryType.Article)
+                        .withCitationKey("test")
+                        .withField(StandardField.AUTHOR, "No title"));
+
+        vm.render(testEntries);
+
+        assertEquals("test", vm.getStack().pop());      // cite
+        assertEquals(BstVM.TRUE, vm.getStack().pop());          // missing title
+        assertEquals("canh05", vm.getStack().pop());    // cite
+        assertEquals(BstVM.FALSE, vm.getStack().pop());         // missing title
+        assertEquals(0, vm.getStack().size());
+    }
+
+    @Test
+    public void testNumNames() throws RecognitionException {
+        BstVM vm = new BstVM("""
+                FUNCTION { test } {
+                    "Johnny Foo { and } Mary Bar" num.names$
+                    "Johnny Foo and Mary Bar" num.names$
+                }
+                EXECUTE { test }
+                """);
+
+        vm.render(Collections.emptyList());
+
+        assertEquals(2, vm.getStack().pop());
+        assertEquals(1, vm.getStack().pop());
+        assertEquals(0, vm.getStack().size());
+    }
+
+    @Test
+    public void testSubstring() throws RecognitionException {
+        BstVM vm = new BstVM("""
+                FUNCTION { test } {
+                    "123456789" #2  #1          substring$  % 2
+                    "123456789" #4  global.max$ substring$  % 456789
+                    "123456789" #1  #9          substring$  % 123456789
+                    "123456789" #1  #10         substring$  % 123456789
+                    "123456789" #1  #99         substring$  % 123456789
+                    "123456789" #-7 #3          substring$  % 123
+                    "123456789" #-1 #1          substring$  % 9
+                    "123456789" #-1 #3          substring$  % 789
+                    "123456789" #-2 #2          substring$  % 78
+                } EXECUTE { test }
+                """);
+
+        vm.render(Collections.emptyList());
+
+        assertEquals("78", vm.getStack().pop());
+        assertEquals("789", vm.getStack().pop());
+        assertEquals("9", vm.getStack().pop());
+        assertEquals("123", vm.getStack().pop());
+        assertEquals("123456789", vm.getStack().pop());
+        assertEquals("123456789", vm.getStack().pop());
+        assertEquals("123456789", vm.getStack().pop());
+        assertEquals("456789", vm.getStack().pop());
+        assertEquals("2", vm.getStack().pop());
+        assertEquals(0, vm.getStack().size());
+    }
+
+    @Test
+    public void testEmpty() throws RecognitionException {
+        BstVM vm = new BstVM("""
+                ENTRY { title } { } { }
+                READ
+                STRINGS { s }
+                FUNCTION { test } {
+                    s empty$          % TRUE
+                    "" empty$         % TRUE
+                    "   " empty$      % TRUE
+                    title empty$      % TRUE
+                    " HALLO " empty$  % FALSE
+                }
+                ITERATE { test }
+                """);
+        List<BibEntry> testEntry = List.of(new BibEntry(StandardEntryType.Article));
+
+        vm.render(testEntry);
+
+        assertEquals(BstVM.FALSE, vm.getStack().pop());
+        assertEquals(BstVM.TRUE, vm.getStack().pop());
+        assertEquals(BstVM.TRUE, vm.getStack().pop());
+        assertEquals(BstVM.TRUE, vm.getStack().pop());
+        assertEquals(BstVM.TRUE, vm.getStack().pop());
+        assertEquals(0, vm.getStack().size());
+    }
+
+    @Test
+    public void testFormatNameStatic() throws RecognitionException {
+        BstVM vm = new BstVM("""
+                FUNCTION { format }{ "Charles Louis Xavier Joseph de la Vall{\\'e}e Poussin" #1 "{vv~}{ll}{, jj}{, f}?" format.name$ }
+                EXECUTE { format }
+                """);
+        List<BibEntry> v = Collections.emptyList();
+
+        vm.render(v);
+
+        assertEquals("de~la Vall{\\'e}e~Poussin, C.~L. X.~J?", vm.getStack().pop());
+        assertEquals(0, vm.getStack().size());
+    }
+
+    @Test
+    public void testFormatNameInEntries() throws RecognitionException {
+        BstVM vm = new BstVM("""
+                ENTRY { author } { } { }
+                FUNCTION { presort } { cite$ 'sort.key$ := }
+                ITERATE { presort }
+                READ
+                SORT
+                FUNCTION { format }{ author #2 "{vv~}{ll}{, jj}{, f}?" format.name$ }
+                ITERATE { format }
+                """);
+        List<BibEntry> testEntries = List.of(
+                BstVMTest.defaultTestEntry(),
+                new BibEntry(StandardEntryType.Book)
+                        .withCitationKey("test")
+                        .withField(StandardField.AUTHOR, "Jonathan Meyer and Charles Louis Xavier Joseph de la Vall{\\'e}e Poussin"));
+
+        vm.render(testEntries);
+
+        assertEquals("de~la Vall{\\'e}e~Poussin, C.~L. X.~J?", vm.getStack().pop());
+        assertEquals("Annabi, H?", vm.getStack().pop());
+        assertEquals(0, vm.getStack().size());
+    }
+
+    @Test
+    public void testChangeCase() throws RecognitionException {
+        BstVM vm = new BstVM("""
+                STRINGS { title }
+                READ
+                FUNCTION { format.title } {
+                    duplicate$ empty$
+                        { pop$ "" }
+                        { "t" change.case$ }
+                    if$
+                }
+                FUNCTION { test } {
+                    "hello world" "u" change.case$ format.title
+                    "Hello World" format.title
+                    "" format.title
+                    "{A}{D}/{C}ycle: {I}{B}{M}'s {F}ramework for {A}pplication {D}evelopment and {C}ase" "u" change.case$ format.title
+                }
+                EXECUTE { test }
+                """);
+
+        vm.render(Collections.emptyList());
+
+        assertEquals("{A}{D}/{C}ycle: {I}{B}{M}'s {F}ramework for {A}pplication {D}evelopment and {C}ase",
+                vm.getStack().pop());
+        assertEquals("", vm.getStack().pop());
+        assertEquals("Hello world", vm.getStack().pop());
+        assertEquals("Hello world", vm.getStack().pop());
+        assertEquals(0, vm.getStack().size());
+    }
+
+    @Test
+    public void testTextLength() throws RecognitionException {
+        BstVM vm = new BstVM("""
+                FUNCTION { test } {
+                    "hello world" text.length$                                  % 11
+                    "Hello {W}orld" text.length$                                % 11
+                    "" text.length$                                             % 0
+                    "{A}{D}/{Cycle}" text.length$                               % 8
+                    "{\\This is one character}" text.length$                    % 1
+                    "{\\This {is} {one} {c{h}}aracter as well}" text.length$    % 1
+                    "{\\And this too" text.length$                              % 1
+                    "These are {\\11}" text.length$                             % 11
+                }
+                EXECUTE { test }
+                """);
+
+        vm.render(Collections.emptyList());
+
+        assertEquals(11, vm.getStack().pop());
+        assertEquals(1, vm.getStack().pop());
+        assertEquals(1, vm.getStack().pop());
+        assertEquals(1, vm.getStack().pop());
+        assertEquals(8, vm.getStack().pop());
+        assertEquals(0, vm.getStack().pop());
+        assertEquals(11, vm.getStack().pop());
+        assertEquals(11, vm.getStack().pop());
+        assertEquals(0, vm.getStack().size());
+    }
+
+    @Test
+    public void testIntToStr() throws RecognitionException {
+        BstVM vm = new BstVM("""
+                FUNCTION { test } { #3 int.to.str$ #9999 int.to.str$ }
+                EXECUTE { test }
+                """);
+
+        vm.render(Collections.emptyList());
+
+        assertEquals("9999", vm.getStack().pop());
+        assertEquals("3", vm.getStack().pop());
+        assertEquals(0, vm.getStack().size());
+    }
+
+    @Test
+    public void testChrToInt() throws RecognitionException {
+        BstVM vm = new BstVM("""
+                FUNCTION { test } { "H" chr.to.int$ }
+                EXECUTE { test }
+                """);
+
+        vm.render(Collections.emptyList());
+
+        assertEquals(72, vm.getStack().pop());
+        assertEquals(0, vm.getStack().size());
+    }
+
+    @Test
+    public void testChrToIntIntToChr() throws RecognitionException {
+        BstVM vm = new BstVM("""
+                FUNCTION { test } { "H" chr.to.int$ int.to.chr$ }
+                EXECUTE {test}
+                """);
+
+        vm.render(Collections.emptyList());
+
+        assertEquals("H", vm.getStack().pop());
+        assertEquals(0, vm.getStack().size());
+    }
+
+    @Test
+    public void testType() throws RecognitionException {
+        BstVM vm = new BstVM("""
+                ENTRY  { } { } { }
+                FUNCTION { presort } { cite$ 'sort.key$ := }
+                ITERATE { presort }
+                SORT
+                FUNCTION { test } { type$ }
+                ITERATE { test }
+                """);
+        List<BibEntry> testEntries = List.of(
+                new BibEntry(StandardEntryType.Article).withCitationKey("a"),
+                new BibEntry(StandardEntryType.Book).withCitationKey("b"),
+                new BibEntry(StandardEntryType.Misc).withCitationKey("c"),
+                new BibEntry(StandardEntryType.InProceedings).withCitationKey("d"));
+
+        vm.render(testEntries);
+
+        assertEquals("inproceedings", vm.getStack().pop());
+        assertEquals("misc", vm.getStack().pop());
+        assertEquals("book", vm.getStack().pop());
+        assertEquals("article", vm.getStack().pop());
+        assertEquals(0, vm.getStack().size());
+    }
+
+    @Test
+    public void testCallType() throws RecognitionException {
+        BstVM vm = new BstVM("""
+                ENTRY { title } { } { }
+                FUNCTION { presort } { cite$ 'sort.key$ := }
+                ITERATE { presort }
+                READ
+                SORT
+                FUNCTION { inproceedings }{ "InProceedings called on " title * }
+                FUNCTION { book }{ "Book called on " title * }
+                ITERATE { call.type$ }
+                """);
+        List<BibEntry> testEntries = List.of(
+                BstVMTest.defaultTestEntry(),
+                new BibEntry(StandardEntryType.Book)
+                        .withCitationKey("test")
+                        .withField(StandardField.TITLE, "Test"));
+
+        vm.render(testEntries);
+
+        assertEquals("Book called on Test", vm.getStack().pop());
+        assertEquals(
+                "InProceedings called on Effective work practices for floss development: A model and propositions",
+                vm.getStack().pop());
+        assertEquals(0, vm.getStack().size());
+    }
+
+    @Test
+    public void testSwap() throws RecognitionException {
+        BstVM vm = new BstVM("""
+                FUNCTION { a } { #3 "Hallo" swap$ }
+                EXECUTE { a }
+                """);
+
+        List<BibEntry> v = Collections.emptyList();
+        vm.render(v);
+
+        assertEquals(3, vm.getStack().pop());
+        assertEquals("Hallo", vm.getStack().pop());
+        assertEquals(0, vm.getStack().size());
+    }
+
+    @Test
+    void testAssignFunction() {
+        BstVM vm = new BstVM("""
+                INTEGERS { test.var }
+                FUNCTION { test.func } { #1 'test.var := }
+                EXECUTE { test.func }
+                """);
+
+        vm.render(Collections.emptyList());
+
+        Map<String, BstFunctions.BstFunction> functions = vm.latestContext.functions();
+        assertTrue(functions.containsKey("test.func"));
+        assertNotNull(functions.get("test.func"));
+        assertEquals(1, vm.latestContext.integers().get("test.var"));
+    }
+
+    @Test
+    void testSimpleIf() {
+        BstVM vm = new BstVM("""
+                FUNCTION { path1 } { #1 }
+                FUNCTION { path0 } { #0 }
+                FUNCTION { test } {
+                    #1 path1 path0 if$
+                    #0 path1 path0 if$
+                }
+                EXECUTE { test }
+                """);
+
+        vm.render(Collections.emptyList());
+
+        assertEquals(0, vm.getStack().pop());
+        assertEquals(1, vm.getStack().pop());
+        assertEquals(0, vm.getStack().size());
+    }
+
+    @Test
+    void testSimpleWhile() {
+        BstVM vm = new BstVM("""
+                INTEGERS { i }
+                FUNCTION { test } {
+                    #3 'i :=
+                    { i }
+                    {
+                        i
+                        i #1 -
+                        'i :=
+                    }
+                    while$
+                }
+                EXECUTE { test }
+                """);
+
+        vm.render(Collections.emptyList());
+
+        assertEquals(1, vm.getStack().pop());
+        assertEquals(2, vm.getStack().pop());
+        assertEquals(3, vm.getStack().pop());
+        assertEquals(0, vm.getStack().size());
+    }
+
+    @Test
+    public void testNestedControlFunctions() throws RecognitionException {
+        BstVM vm = new BstVM("""
+                STRINGS { t }
+                FUNCTION { not } { { #0 } { #1 } if$ }
+                FUNCTION { n.dashify } {
+                    "HELLO-WORLD" 't :=
+                    ""
+                    { t empty$ not }                                    % while
+                    {
+                        t #1 #1 substring$ "-" =                        % if
+                        {
+                            t #1 #2 substring$ "--" = not               % if
+                            {
+                                "--" *
+                                t #2 global.max$ substring$ 't :=
+                            }
+                            {
+                                { t #1 #1 substring$ "-" = }            % while
+                                {
+                                    "-" *
+                                    t #2 global.max$ substring$ 't :=
+                                }
+                                while$
+                            }
+                           if$
+                        }
+                        {
+                            t #1 #1 substring$ *
+                            t #2 global.max$ substring$ 't :=
+                        }
+                        if$
+                    }
+                    while$
+                }
+                EXECUTE { n.dashify }
+                """);
+        List<BibEntry> v = Collections.emptyList();
+
+        vm.render(v);
+
+        assertEquals(1, vm.getStack().size());
+        assertEquals("HELLO--WORLD", vm.getStack().pop());
+    }
+
+    @Test
+    public void testLogic() throws RecognitionException {
+        BstVM vm = new BstVM("""
+                FUNCTION { not } { { #0 } { #1 } if$ }
+                FUNCTION { and } { 'skip$ { pop$ #0 } if$ }
+                FUNCTION { or } { { pop$ #1 } 'skip$ if$ }
+                FUNCTION { test } {
+                    #1 #1 and
+                    #0 #1 and
+                    #1 #0 and
+                    #0 #0 and
+                    #0 not
+                    #1 not
+                    #1 #1 or
+                    #0 #1 or
+                    #1 #0 or
+                    #0 #0 or
+                }
+                EXECUTE { test }
+                """);
+
+        vm.render(Collections.emptyList());
+
+        assertEquals(BstVM.FALSE, vm.getStack().pop());
+        assertEquals(BstVM.TRUE, vm.getStack().pop());
+        assertEquals(BstVM.TRUE, vm.getStack().pop());
+        assertEquals(BstVM.TRUE, vm.getStack().pop());
+        assertEquals(BstVM.FALSE, vm.getStack().pop());
+        assertEquals(BstVM.TRUE, vm.getStack().pop());
+        assertEquals(BstVM.FALSE, vm.getStack().pop());
+        assertEquals(BstVM.FALSE, vm.getStack().pop());
+        assertEquals(BstVM.FALSE, vm.getStack().pop());
+        assertEquals(BstVM.TRUE, vm.getStack().pop());
+        assertEquals(0, vm.getStack().size());
+    }
+
+    /**
+     * See also {@link BstWidthCalculatorTest}
+     */
+
+    @Test
+    public void testWidth() throws RecognitionException {
+        BstVM vm = new BstVM("""
+                ENTRY { address author title type } { } { label }
+                STRINGS { longest.label }
+                INTEGERS { number.label longest.label.width }
+                FUNCTION { initialize.longest.label } {
+                    "" 'longest.label :=
+                    #1 'number.label :=
+                    #0 'longest.label.width :=
+                }
+                FUNCTION {longest.label.pass} {
+                    number.label int.to.str$ 'label :=
+                    number.label #1 + 'number.label :=
+                    label width$ longest.label.width >
+                        {
+                            label 'longest.label :=
+                            label width$ 'longest.label.width :=
+                        }
+                        'skip$
+                    if$
+                }
+                EXECUTE { initialize.longest.label }
+                ITERATE { longest.label.pass }
+                FUNCTION { begin.bib } {
+                    preamble$ empty$
+                        'skip$
+                        { preamble$ write$ newline$ }
+                    if$
+                    "\\begin{thebibliography}{"  longest.label  * "}" *
+                }
+                EXECUTE {begin.bib}
+                """);
+
+        List<BibEntry> testEntries = List.of(BstVMTest.defaultTestEntry());
+
+        vm.render(testEntries);
+
+        assertTrue(vm.latestContext.integers().containsKey("longest.label.width"));
+        assertEquals("\\begin{thebibliography}{1}", vm.getStack().pop());
+    }
+
+    @Test
+    public void testDuplicateEmptyPopSwapIf() throws RecognitionException {
+        BstVM vm = new BstVM("""
+                FUNCTION { emphasize } {
+                    duplicate$ empty$
+                        { pop$ "" }
+                        { "{\\em " swap$ * "}" * }
+                    if$
+                }
+                FUNCTION { test } {
+                    "" emphasize
+                    "Hello" emphasize
+                }
+                EXECUTE { test }
+                """);
+
+        vm.render(Collections.emptyList());
+
+        assertEquals("{\\em Hello}", vm.getStack().pop());
+        assertEquals("", vm.getStack().pop());
+        assertEquals(0, vm.getStack().size());
+    }
+
+    @Test
+    public void testPreambleWriteNewlineQuote() {
+        BstVM vm = new BstVM("""
+                FUNCTION { test } {
+                    preamble$
+                    write$
+                    newline$
+                    "hello"
+                    write$
+                    quote$ "quoted" * quote$ *
+                    write$
+                }
+                EXECUTE { test }
+                """);
+
+        BibDatabase testDatabase = new BibDatabase();
+        testDatabase.setPreamble("A Preamble");
+
+        String result = vm.render(Collections.emptyList(), testDatabase);
+
+        assertEquals("A Preamble\nhello\"quoted\"", result);
+    }
+}
diff --git a/src/test/java/org/jabref/logic/bst/BstVMTest.java b/src/test/java/org/jabref/logic/bst/BstVMTest.java
new file mode 100644
index 00000000000..4a66a8d5836
--- /dev/null
+++ b/src/test/java/org/jabref/logic/bst/BstVMTest.java
@@ -0,0 +1,220 @@
+package org.jabref.logic.bst;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.List;
+
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.field.StandardField;
+import org.jabref.model.entry.types.StandardEntryType;
+
+import org.antlr.v4.runtime.RecognitionException;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class BstVMTest {
+
+    public static BibEntry defaultTestEntry() {
+        return new BibEntry(StandardEntryType.InProceedings)
+                .withCitationKey("canh05")
+                .withField(StandardField.AUTHOR, "Crowston, K. and Annabi, H. and Howison, J. and Masango, C.")
+                .withField(StandardField.TITLE, "Effective work practices for floss development: A model and propositions")
+                .withField(StandardField.BOOKTITLE, "Hawaii International Conference On System Sciences (HICSS)")
+                .withField(StandardField.YEAR, "2005")
+                .withField(StandardField.OWNER, "oezbek")
+                .withField(StandardField.TIMESTAMP, "2006.05.29")
+                .withField(StandardField.URL, "http://james.howison.name/publications.html");
+    }
+
+    @Test
+    public void testAbbrv() throws RecognitionException, IOException {
+        BstVM vm = new BstVM(Path.of("src/test/resources/org/jabref/logic/bst/abbrv.bst"));
+        List<BibEntry> testEntries = List.of(defaultTestEntry());
+
+        String expected = "\\begin{thebibliography}{1}\\bibitem{canh05}K.~Crowston, H.~Annabi, J.~Howison, and C.~Masango.\\newblock Effective work practices for floss development: A model and  propositions.\\newblock In {\\em Hawaii International Conference On System Sciences (HICSS)}, 2005.\\end{thebibliography}";
+        String result = vm.render(testEntries);
+
+        assertEquals(
+                expected.replaceAll("\\s", ""),
+                result.replaceAll("\\s", ""));
+    }
+
+    @Test
+    public void testSimple() throws RecognitionException {
+        BstVM vm = new BstVM("""
+                ENTRY { address author title type } { } { label }
+                INTEGERS { output.state before.all mid.sentence after.sentence after.block }
+                FUNCTION { init.state.consts }{
+                   #0 'before.all :=
+                   #1 'mid.sentence :=
+                   #2 'after.sentence :=
+                   #3 'after.block :=
+                }
+                STRINGS { s t }
+                READ
+                """);
+        List<BibEntry> testEntries = List.of(defaultTestEntry());
+
+        vm.render(testEntries);
+
+        assertEquals(2, vm.latestContext.strings().size());
+        assertEquals(7, vm.latestContext.integers().size());
+        assertEquals(1, vm.latestContext.entries().size());
+        assertEquals(5, vm.latestContext.entries().get(0).fields.size());
+        assertEquals(38, vm.latestContext.functions().size());
+    }
+
+    @Test
+    public void testLabel() throws RecognitionException {
+        BstVM vm = new BstVM("""
+                ENTRY { title } {} { label }
+                FUNCTION { test } {
+                    label #0 =
+                    title 'label :=
+                    #5 label #6 pop$ }
+                READ
+                ITERATE { test }
+                """);
+        List<BibEntry> testEntries = List.of(defaultTestEntry());
+
+        vm.render(testEntries);
+
+        assertEquals(
+                "Effective work practices for floss development: A model and propositions",
+                vm.latestContext.stack().pop());
+    }
+
+    @Test
+    public void testQuote() throws RecognitionException {
+        BstVM vm = new BstVM("FUNCTION { a }{ quote$ quote$ * } EXECUTE { a }");
+
+        vm.render(Collections.emptyList());
+        assertEquals("\"\"", vm.latestContext.stack().pop());
+    }
+
+    @Test
+    public void testBuildIn() throws RecognitionException {
+        BstVM vm = new BstVM("EXECUTE { global.max$ }");
+
+        vm.render(Collections.emptyList());
+
+        assertEquals(Integer.MAX_VALUE, vm.latestContext.stack().pop());
+        assertTrue(vm.latestContext.stack().empty());
+    }
+
+    @Test
+    public void testVariables() throws RecognitionException {
+        BstVM vm = new BstVM("""
+                STRINGS { t }
+                FUNCTION { not } {
+                    { #0 } { #1 } if$
+                }
+                FUNCTION { n.dashify } {
+                    "HELLO-WORLD" 't :=
+                    t empty$ not
+                }
+                EXECUTE { n.dashify }
+                """);
+
+        vm.render(Collections.emptyList());
+
+        assertEquals(BstVM.TRUE, vm.latestContext.stack().pop());
+    }
+
+    @Test
+    public void testHypthenatedName() throws RecognitionException, IOException {
+        BstVM vm = new BstVM(Path.of("src/test/resources/org/jabref/logic/bst/abbrv.bst"));
+        List<BibEntry> testEntries = List.of(
+                new BibEntry(StandardEntryType.Article)
+                        .withCitationKey("canh05")
+                        .withField(StandardField.AUTHOR, "Jean-Paul Sartre")
+        );
+
+        String result = vm.render(testEntries);
+
+        assertTrue(result.contains("J.-P. Sartre"));
+    }
+
+    @Test
+    void testAbbrevStyleChopWord() {
+        BstVM vm = new BstVM("""
+                STRINGS { s }
+                INTEGERS { len }
+
+                FUNCTION { chop.word }
+                {
+                    's :=
+                        'len :=
+                        s #1 len substring$ =
+                            { s len #1 + global.max$ substring$ }
+                        's
+                        if$
+                }
+
+                FUNCTION { test } {
+                    "A " #2
+                    "A Colorful Morning"
+                    chop.word
+
+                    "An " #3
+                    "A Colorful Morning"
+                    chop.word
+                }
+
+                EXECUTE { test }
+                """);
+
+        vm.render(Collections.emptyList());
+
+        assertEquals("A Colorful Morning", vm.latestContext.stack().pop());
+        assertEquals("Colorful Morning", vm.latestContext.stack().pop());
+        assertEquals(0, vm.latestContext.stack().size());
+    }
+
+    @Test
+    void testAbbrevStyleSortFormatTitle() {
+        BstVM vm = new BstVM("""
+                STRINGS { s t }
+                INTEGERS { len }
+                FUNCTION { sortify } {
+                    purify$
+                    "l" change.case$
+                }
+
+                FUNCTION { chop.word }
+                {
+                    's :=
+                        'len :=
+                        s #1 len substring$ =
+                            { s len #1 + global.max$ substring$ }
+                        's
+                        if$
+                }
+
+                FUNCTION { sort.format.title }
+                { 't :=
+                   "A " #2
+                    "An " #3
+                      "The " #4 t chop.word
+                    chop.word
+                   chop.word
+                  sortify
+                  #1 global.max$ substring$
+                }
+
+                FUNCTION { test } {
+                    "A Colorful Morning"
+                    sort.format.title
+                }
+
+                EXECUTE {test}
+                """);
+
+        vm.render(Collections.emptyList());
+
+        assertEquals("colorful morning", vm.latestContext.stack().pop());
+    }
+}
diff --git a/src/test/java/org/jabref/logic/bst/BstVMVisitorTest.java b/src/test/java/org/jabref/logic/bst/BstVMVisitorTest.java
new file mode 100644
index 00000000000..366ba0a9d55
--- /dev/null
+++ b/src/test/java/org/jabref/logic/bst/BstVMVisitorTest.java
@@ -0,0 +1,249 @@
+package org.jabref.logic.bst;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.types.StandardEntryType;
+
+import org.antlr.v4.runtime.RecognitionException;
+import org.antlr.v4.runtime.tree.ParseTree;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+class BstVMVisitorTest {
+
+    @Test
+    public void testVisitStringsCommand() {
+        BstVM vm = new BstVM("STRINGS { test.string1 test.string2 test.string3 }");
+
+        vm.render(Collections.emptyList());
+
+        Map<String, String> strList = vm.latestContext.strings();
+        assertTrue(strList.containsKey("test.string1"));
+        assertNull(strList.get("test.string1"));
+        assertTrue(strList.containsKey("test.string2"));
+        assertNull(strList.get("test.string2"));
+        assertTrue(strList.containsKey("test.string3"));
+        assertNull(strList.get("test.string3"));
+    }
+
+    @Test
+    public void testVisitIntegersCommand() {
+        BstVM vm = new BstVM("INTEGERS { variable.a variable.b variable.c }");
+
+        vm.render(Collections.emptyList());
+
+        Map<String, Integer> integersList = vm.latestContext.integers();
+        assertTrue(integersList.containsKey("variable.a"));
+        assertEquals(0, integersList.get("variable.a"));
+        assertTrue(integersList.containsKey("variable.b"));
+        assertEquals(0, integersList.get("variable.b"));
+        assertTrue(integersList.containsKey("variable.c"));
+        assertEquals(0, integersList.get("variable.c"));
+    }
+
+    @Test
+    void testVisitFunctionCommand() {
+        BstVM vm = new BstVM("""
+                FUNCTION { test.func } { #1 'test.var := }
+                EXECUTE { test.func }
+                """);
+
+        vm.render(Collections.emptyList());
+
+        Map<String, BstFunctions.BstFunction> functions = vm.latestContext.functions();
+        assertTrue(functions.containsKey("test.func"));
+        assertNotNull(functions.get("test.func"));
+    }
+
+    @Test
+    void testVisitMacroCommand() {
+        BstVM vm = new BstVM("""
+                MACRO { jan } { "January" }
+                EXECUTE { jan }
+                """);
+
+        vm.render(Collections.emptyList());
+
+        Map<String, BstFunctions.BstFunction> functions = vm.latestContext.functions();
+        assertTrue(functions.containsKey("jan"));
+        assertNotNull(functions.get("jan"));
+        assertEquals("January", vm.latestContext.stack().pop());
+        assertTrue(vm.latestContext.stack().isEmpty());
+    }
+
+    @Test
+    void testVisitEntryCommand() {
+        BstVM vm = new BstVM("ENTRY { address author title type } { variable } { label }");
+        List<BibEntry> testEntries = List.of(BstVMTest.defaultTestEntry());
+
+        vm.render(testEntries);
+
+        BstEntry bstEntry = vm.latestContext.entries().get(0);
+        assertTrue(bstEntry.fields.containsKey("address"));
+        assertTrue(bstEntry.fields.containsKey("author"));
+        assertTrue(bstEntry.fields.containsKey("title"));
+        assertTrue(bstEntry.fields.containsKey("type"));
+        assertTrue(bstEntry.localIntegers.containsKey("variable"));
+        assertTrue(bstEntry.localStrings.containsKey("label"));
+        assertTrue(bstEntry.localStrings.containsKey("sort.key$"));
+    }
+
+    @Test
+    void testVisitReadCommand() {
+        BstVM vm = new BstVM("""
+                ENTRY { author title booktitle year owner timestamp url } { } { }
+                READ
+                """);
+        List<BibEntry> testEntries = List.of(BstVMTest.defaultTestEntry());
+
+        vm.render(testEntries);
+
+        Map<String, String> fields = vm.latestContext.entries().get(0).fields;
+        assertEquals("Crowston, K. and Annabi, H. and Howison, J. and Masango, C.", fields.get("author"));
+        assertEquals("Effective work practices for floss development: A model and propositions", fields.get("title"));
+        assertEquals("Hawaii International Conference On System Sciences (HICSS)", fields.get("booktitle"));
+        assertEquals("2005", fields.get("year"));
+        assertEquals("oezbek", fields.get("owner"));
+        assertEquals("2006.05.29", fields.get("timestamp"));
+        assertEquals("http://james.howison.name/publications.html", fields.get("url"));
+    }
+
+    @Test
+    public void testVisitExecuteCommand() throws RecognitionException {
+        BstVM vm = new BstVM("""
+                INTEGERS { variable.a }
+                FUNCTION { init.state.consts } { #5 'variable.a := }
+                EXECUTE { init.state.consts }
+                """);
+
+        vm.render(Collections.emptyList());
+
+        assertEquals(5, vm.latestContext.integers().get("variable.a"));
+    }
+
+    @Test
+    public void testVisitIterateCommand() throws RecognitionException {
+        BstVM vm = new BstVM("""
+                ENTRY { } { } { }
+                FUNCTION { test } { cite$ }
+                READ
+                ITERATE { test }
+                """);
+        List<BibEntry> testEntries = List.of(
+                BstVMTest.defaultTestEntry(),
+                new BibEntry(StandardEntryType.Article)
+                        .withCitationKey("test"));
+
+        vm.render(testEntries);
+
+        assertEquals(2, vm.getStack().size());
+        assertEquals("test", vm.getStack().pop());
+        assertEquals("canh05", vm.getStack().pop());
+    }
+
+    @Test
+    public void testVisitReverseCommand() throws RecognitionException {
+        BstVM vm = new BstVM("""
+                ENTRY { } { } { }
+                FUNCTION { test } { cite$ }
+                READ
+                REVERSE { test }
+                """);
+        List<BibEntry> testEntries = List.of(
+                BstVMTest.defaultTestEntry(),
+                new BibEntry(StandardEntryType.Article)
+                        .withCitationKey("test"));
+
+        vm.render(testEntries);
+
+        assertEquals(2, vm.getStack().size());
+        assertEquals("canh05", vm.getStack().pop());
+        assertEquals("test", vm.getStack().pop());
+    }
+
+    @Test
+    public void testVisitSortCommand() throws RecognitionException {
+        BstVM vm = new BstVM("""
+                ENTRY { } { } { }
+                FUNCTION { presort } { cite$ 'sort.key$ := }
+                ITERATE { presort }
+                SORT
+                """);
+        List<BibEntry> testEntries = List.of(
+                new BibEntry(StandardEntryType.Article).withCitationKey("c"),
+                new BibEntry(StandardEntryType.Article).withCitationKey("b"),
+                new BibEntry(StandardEntryType.Article).withCitationKey("d"),
+                new BibEntry(StandardEntryType.Article).withCitationKey("a"));
+
+        vm.render(testEntries);
+
+        List<BstEntry> sortedEntries = vm.latestContext.entries();
+        assertEquals(Optional.of("a"), sortedEntries.get(0).entry.getCitationKey());
+        assertEquals(Optional.of("b"), sortedEntries.get(1).entry.getCitationKey());
+        assertEquals(Optional.of("c"), sortedEntries.get(2).entry.getCitationKey());
+        assertEquals(Optional.of("d"), sortedEntries.get(3).entry.getCitationKey());
+    }
+
+    @Test
+    void testVisitIdentifier() {
+        BstVM vm = new BstVM("""
+                ENTRY { } { local.variable } { local.label }
+                READ
+                STRINGS { label }
+                INTEGERS { variable }
+                FUNCTION { test } {
+                    #1 'local.variable :=
+                    #2 'variable :=
+                    "TEST" 'local.label :=
+                    "TEST-GLOBAL" 'label :=
+                    local.label local.variable
+                    label variable
+                }
+                ITERATE { test }
+                """);
+        List<BibEntry> testEntries = List.of(BstVMTest.defaultTestEntry());
+
+        vm.render(testEntries);
+
+        assertEquals(2, vm.getStack().pop());
+        assertEquals("TEST-GLOBAL", vm.getStack().pop());
+        assertEquals(1, vm.getStack().pop());
+        assertEquals("TEST", vm.getStack().pop());
+        assertEquals(0, vm.getStack().size());
+    }
+
+    @Test
+    void testVisitStackitem() {
+        BstVM vm = new BstVM("""
+                STRINGS { t }
+                FUNCTION { test2 } { #3 }
+                FUNCTION { test } {
+                    "HELLO"
+                    #1
+                    't
+                    { #2 }
+                    test2
+                }
+                EXECUTE { test }
+                """);
+
+        vm.render(Collections.emptyList());
+
+        assertEquals(3, vm.getStack().pop());
+        assertTrue(vm.getStack().pop() instanceof ParseTree);
+        assertEquals(new BstVMVisitor.Identifier("t"), vm.getStack().pop());
+        assertEquals(1, vm.getStack().pop());
+        assertEquals("HELLO", vm.getStack().pop());
+        assertEquals(0, vm.getStack().size());
+    }
+
+    // stackitem
+}
diff --git a/src/test/java/org/jabref/logic/bst/TestVM.java b/src/test/java/org/jabref/logic/bst/TestVM.java
deleted file mode 100644
index bb9fc8ad193..00000000000
--- a/src/test/java/org/jabref/logic/bst/TestVM.java
+++ /dev/null
@@ -1,634 +0,0 @@
-package org.jabref.logic.bst;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.StringReader;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-
-import org.jabref.logic.bst.VM.BstEntry;
-import org.jabref.logic.bst.VM.StackFunction;
-import org.jabref.logic.importer.ImportFormatPreferences;
-import org.jabref.logic.importer.ParserResult;
-import org.jabref.logic.importer.fileformat.BibtexParser;
-import org.jabref.model.entry.BibEntry;
-import org.jabref.model.util.DummyFileUpdateMonitor;
-
-import org.antlr.runtime.RecognitionException;
-import org.junit.jupiter.api.Test;
-import org.mockito.Answers;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.mock;
-
-public class TestVM {
-
-    @Test
-    public void testAbbrv() throws RecognitionException, IOException {
-        VM vm = new VM(new File("src/test/resources/org/jabref/logic/bst/abbrv.bst"));
-        List<BibEntry> v = List.of(t1BibtexEntry());
-
-        String expected = "\\begin{thebibliography}{1}\\bibitem{canh05}K.~Crowston, H.~Annabi, J.~Howison, and C.~Masango.\\newblock Effective work practices for floss development: A model and  propositions.\\newblock In {\\em Hawaii International Conference On System Sciences (HICSS)}, 2005.\\end{thebibliography}";
-
-        assertEquals(expected.replaceAll("\\s", ""), vm.run(v).replaceAll("\\s", ""));
-    }
-
-    @Test
-    public void testVMSimple() throws RecognitionException, IOException {
-
-        VM vm = new VM("ENTRY  { " + "  address " + "  author " + "  title " + "  type "
-                + "}  {}  { label }" + "INTEGERS { output.state before.all"
-                + " mid.sentence after.sentence after.block }"
-                + "FUNCTION {init.state.consts}{ #0 'before.all := "
-                + " #1 'mid.sentence :=  #2 'after.sentence :=  #3 'after.block := } "
-                + "STRINGS { s t } " + "READ");
-
-        List<BibEntry> v = List.of(t1BibtexEntry());
-
-        vm.run(v);
-
-        assertEquals(2, vm.getStrings().size());
-        assertEquals(7, vm.getIntegers().size());
-        assertEquals(1, vm.getEntries().size());
-        assertEquals(5, vm.getEntries().get(0).fields.size());
-        assertEquals(38, vm.getFunctions().size());
-    }
-
-    @Test
-    public void testLabel() throws RecognitionException, IOException {
-        VM vm = new VM("ENTRY  { title }  {}  { label } "
-                + "FUNCTION { test } { label #0 = title 'label := #5 label #6 pop$ } " + "READ "
-                + "ITERATE { test }");
-
-        List<BibEntry> v = List.of(t1BibtexEntry());
-
-        vm.run(v);
-
-        assertEquals("Effective work practices for floss development: A model and propositions", vm
-                .getStack()
-                .pop());
-    }
-
-    @Test
-    public void testQuote() throws RecognitionException {
-        VM vm = new VM("FUNCTION {a}{ quote$ quote$ * } EXECUTE {a}");
-
-        vm.run(Collections.emptyList());
-        assertEquals("\"\"", vm.getStack().pop());
-    }
-
-    @Test
-    public void testVMFunction1() throws RecognitionException {
-        VM vm = new VM("FUNCTION {init.state.consts}{ #0 'before.all := } ");
-
-        vm.run(Collections.emptyList());
-
-        assertEquals(38, vm.getFunctions().size());
-
-        assertTrue(vm.getFunctions().get("init.state.consts") instanceof StackFunction);
-
-        StackFunction fun = (StackFunction) vm.getFunctions().get("init.state.consts");
-        assertEquals(3, fun.getTree().getChildCount());
-    }
-
-    @Test
-    public void testVMExecuteSimple() throws RecognitionException {
-        VM vm = new VM("INTEGERS { variable.a } " + "FUNCTION {init.state.consts}{ #5 'variable.a := } "
-                + "EXECUTE {init.state.consts}");
-
-        vm.run(Collections.emptyList());
-
-        assertEquals(Integer.valueOf(5), vm.getIntegers().get("variable.a"));
-    }
-
-    @Test
-    public void testVMExecuteSimple2() throws RecognitionException {
-        VM vm = new VM("FUNCTION {a}{ #5 #5 = " + "#1 #2 = " + "#3 #4 < " + "#4 #3 < "
-                + "#4 #4 < " + "#3 #4 > " + "#4 #3 > " + "#4 #4 > " + "\"H\" \"H\" = "
-                + "\"H\" \"Ha\" = } " + "EXECUTE {a}");
-
-        vm.run(Collections.emptyList());
-
-        assertEquals(VM.FALSE, vm.getStack().pop());
-        assertEquals(VM.TRUE, vm.getStack().pop());
-        assertEquals(VM.FALSE, vm.getStack().pop());
-        assertEquals(VM.TRUE, vm.getStack().pop());
-        assertEquals(VM.FALSE, vm.getStack().pop());
-        assertEquals(VM.FALSE, vm.getStack().pop());
-        assertEquals(VM.FALSE, vm.getStack().pop());
-        assertEquals(VM.TRUE, vm.getStack().pop());
-        assertEquals(VM.FALSE, vm.getStack().pop());
-        assertEquals(VM.TRUE, vm.getStack().pop());
-        assertEquals(0, vm.getStack().size());
-    }
-
-    @Test
-    public void testVMIfSkipPop() throws RecognitionException {
-        VM vm = new VM("FUNCTION {not}    {   { #0 }        { #1 }  if$    }"
-                + "FUNCTION {and}    {   'skip$        { pop$ #0 }      if$    }"
-                + "FUNCTION {or}    {   { pop$ #1 }        'skip$      if$    }" + "FUNCTION {test} { "
-                + "#1 #1 and #0 #1 and #1 #0 and #0 #0 and " + "#0 not #1 not "
-                + "#1 #1 or #0 #1 or #1 #0 or #0 #0 or }" + "EXECUTE {test}");
-
-        vm.run(Collections.emptyList());
-
-        assertEquals(VM.FALSE, vm.getStack().pop());
-        assertEquals(VM.TRUE, vm.getStack().pop());
-        assertEquals(VM.TRUE, vm.getStack().pop());
-        assertEquals(VM.TRUE, vm.getStack().pop());
-        assertEquals(VM.FALSE, vm.getStack().pop());
-        assertEquals(VM.TRUE, vm.getStack().pop());
-        assertEquals(VM.FALSE, vm.getStack().pop());
-        assertEquals(VM.FALSE, vm.getStack().pop());
-        assertEquals(VM.FALSE, vm.getStack().pop());
-        assertEquals(VM.TRUE, vm.getStack().pop());
-        assertEquals(0, vm.getStack().size());
-    }
-
-    @Test
-    public void testVMArithmetic() throws RecognitionException {
-        VM vm = new VM("FUNCTION {test} { " + "#1 #1 + #5 #2 - }" + "EXECUTE {test}");
-
-        vm.run(Collections.emptyList());
-
-        assertEquals(3, vm.getStack().pop());
-        assertEquals(2, vm.getStack().pop());
-        assertEquals(0, vm.getStack().size());
-    }
-
-    @Test
-    public void testVMArithmetic2() throws RecognitionException {
-        VM vm = new VM("FUNCTION {test} { " + "#1 \"HELLO\" + #5 #2 - }" + "EXECUTE {test}");
-        assertThrows(VMException.class, () -> vm.run(Collections.emptyList()));
-    }
-
-    @Test
-    public void testNumNames() throws RecognitionException {
-        VM vm = new VM("FUNCTION {test} { \"Johnny Foo and Mary Bar\" num.names$ }" + "EXECUTE {test}");
-
-        vm.run(Collections.emptyList());
-
-        assertEquals(2, vm.getStack().pop());
-        assertEquals(0, vm.getStack().size());
-    }
-
-    @Test
-    public void testNumNames2() throws RecognitionException {
-        VM vm = new VM("FUNCTION {test} { \"Johnny Foo { and } Mary Bar\" num.names$ }"
-                + "EXECUTE {test}");
-
-        vm.run(Collections.emptyList());
-
-        assertEquals(1, vm.getStack().pop());
-        assertEquals(0, vm.getStack().size());
-    }
-
-    @Test
-    public void testVMStringOps1() throws RecognitionException {
-        VM vm = new VM(
-                "FUNCTION {test} { \"H\" \"allo\" * \"Johnny\" add.period$ \"Johnny.\" add.period$"
-                        + "\"Johnny!\" add.period$ \"Johnny?\" add.period$ \"Johnny} }}}\" add.period$"
-                        + "\"Johnny!}\" add.period$ \"Johnny?}\" add.period$ \"Johnny.}\" add.period$ }"
-                        + "EXECUTE {test}");
-
-        vm.run(Collections.emptyList());
-
-        assertEquals("Johnny.}", vm.getStack().pop());
-        assertEquals("Johnny?}", vm.getStack().pop());
-        assertEquals("Johnny!}", vm.getStack().pop());
-        assertEquals("Johnny.}", vm.getStack().pop());
-        assertEquals("Johnny?", vm.getStack().pop());
-        assertEquals("Johnny!", vm.getStack().pop());
-        assertEquals("Johnny.", vm.getStack().pop());
-        assertEquals("Johnny.", vm.getStack().pop());
-        assertEquals("Hallo", vm.getStack().pop());
-        assertEquals(0, vm.getStack().size());
-    }
-
-    @Test
-    public void testSubstring() throws RecognitionException {
-        VM vm = new VM("FUNCTION {test} " + "{ \"123456789\" #2  #1  substring$ " + // 2
-                "  \"123456789\" #4 global.max$ substring$ " + // 456789
-                "  \"123456789\" #1  #9  substring$ " + // 123456789
-                "  \"123456789\" #1  #10 substring$ " + // 123456789
-                "  \"123456789\" #1  #99 substring$ " + // 123456789
-
-                "  \"123456789\" #-7 #3  substring$ " + // 123
-                "  \"123456789\" #-1 #1  substring$ " + // 9
-                "  \"123456789\" #-1 #3  substring$ " + // 789
-                "  \"123456789\" #-2 #2  substring$ " + // 78
-
-                "} EXECUTE {test} ");
-
-        vm.run(Collections.emptyList());
-
-        assertEquals("78", vm.getStack().pop());
-        assertEquals("789", vm.getStack().pop());
-        assertEquals("9", vm.getStack().pop());
-        assertEquals("123", vm.getStack().pop());
-
-        assertEquals("123456789", vm.getStack().pop());
-        assertEquals("123456789", vm.getStack().pop());
-        assertEquals("123456789", vm.getStack().pop());
-        assertEquals("456789", vm.getStack().pop());
-        assertEquals("2", vm.getStack().pop());
-        assertEquals(0, vm.getStack().size());
-    }
-
-    @Test
-    public void testEmpty() throws RecognitionException, IOException {
-        VM vm = new VM("ENTRY {title}{}{} READ STRINGS { s } FUNCTION {test} " + "{ s empty$ " + // FALSE
-                "\"\" empty$ " + // FALSE
-                "\"   \" empty$ " + // FALSE
-                " title empty$ " + // FALSE
-                " \" HALLO \" empty$ } ITERATE {test} ");
-
-        List<BibEntry> v = List.of(TestVM.bibtexString2BibtexEntry("@article{a, author=\"AAA\"}"));
-        vm.run(v);
-        assertEquals(VM.FALSE, vm.getStack().pop());
-        assertEquals(VM.TRUE, vm.getStack().pop());
-        assertEquals(VM.TRUE, vm.getStack().pop());
-        assertEquals(VM.TRUE, vm.getStack().pop());
-        assertEquals(VM.TRUE, vm.getStack().pop());
-        assertEquals(0, vm.getStack().size());
-    }
-
-    @Test
-    public void testDuplicateEmptyPopSwapIf() throws RecognitionException {
-        VM vm = new VM("FUNCTION {emphasize} " + "{ duplicate$ empty$ " + "  { pop$ \"\" } "
-                + "  { \"{\\em \" swap$ * \"}\" * } " + "  if$ " + "} " + "FUNCTION {test} {"
-                + "  \"\" emphasize " + "  \"Hello\" emphasize " + "}" + "EXECUTE {test} ");
-
-        vm.run(Collections.emptyList());
-
-        assertEquals("{\\em Hello}", vm.getStack().pop());
-        assertEquals("", vm.getStack().pop());
-        assertEquals(0, vm.getStack().size());
-    }
-
-    @Test
-    public void testChangeCase() throws RecognitionException {
-        VM vm = new VM(
-                "STRINGS { title } "
-                        + "READ "
-                        + "FUNCTION {format.title}"
-                        + " { duplicate$ empty$ "
-                        + "    { pop$ \"\" } "
-                        + "    { \"t\" change.case$ } "
-                        + "  if$ "
-                        + "} "
-                        + "FUNCTION {test} {"
-                        + "  \"hello world\" \"u\" change.case$ format.title "
-                        + "  \"Hello World\" format.title "
-                        + "  \"\" format.title "
-                        + "  \"{A}{D}/{C}ycle: {I}{B}{M}'s {F}ramework for {A}pplication {D}evelopment and {C}ase\" \"u\" change.case$ format.title "
-                        + "}" + "EXECUTE {test} ");
-
-        vm.run(Collections.emptyList());
-
-        assertEquals(
-                "{A}{D}/{C}ycle: {I}{B}{M}'s {F}ramework for {A}pplication {D}evelopment and {C}ase",
-                vm.getStack().pop());
-        assertEquals("", vm.getStack().pop());
-        assertEquals("Hello world", vm.getStack().pop());
-        assertEquals("Hello world", vm.getStack().pop());
-        assertEquals(0, vm.getStack().size());
-    }
-
-    @Test
-    public void testTextLength() throws RecognitionException {
-        VM vm = new VM("FUNCTION {test} {" + "  \"hello world\" text.length$ "
-                + "  \"Hello {W}orld\" text.length$ " + "  \"\" text.length$ "
-                + "  \"{A}{D}/{Cycle}\" text.length$ "
-                + "  \"{\\This is one character}\" text.length$ "
-                + "  \"{\\This {is} {one} {c{h}}aracter as well}\" text.length$ "
-                + "  \"{\\And this too\" text.length$ " + "  \"These are {\\11}\" text.length$ " + "} "
-                + "EXECUTE {test} ");
-
-        vm.run(Collections.emptyList());
-
-        assertEquals(11, vm.getStack().pop());
-        assertEquals(1, vm.getStack().pop());
-        assertEquals(1, vm.getStack().pop());
-        assertEquals(1, vm.getStack().pop());
-        assertEquals(8, vm.getStack().pop());
-        assertEquals(0, vm.getStack().pop());
-        assertEquals(11, vm.getStack().pop());
-        assertEquals(11, vm.getStack().pop());
-        assertEquals(0, vm.getStack().size());
-    }
-
-    @Test
-    public void testVMIntToStr() throws RecognitionException {
-        VM vm = new VM("FUNCTION {test} { #3 int.to.str$ #9999 int.to.str$}" + "EXECUTE {test}");
-
-        vm.run(Collections.emptyList());
-
-        assertEquals("9999", vm.getStack().pop());
-        assertEquals("3", vm.getStack().pop());
-        assertEquals(0, vm.getStack().size());
-    }
-
-    @Test
-    public void testVMChrToInt() throws RecognitionException {
-        VM vm = new VM("FUNCTION {test} { \"H\" chr.to.int$ }" + "EXECUTE {test}");
-
-        vm.run(Collections.emptyList());
-
-        assertEquals(72, vm.getStack().pop());
-        assertEquals(0, vm.getStack().size());
-    }
-
-    @Test
-    public void testVMChrToIntIntToChr() throws RecognitionException {
-        VM vm = new VM("FUNCTION {test} { \"H\" chr.to.int$ int.to.chr$ }" + "EXECUTE {test}");
-
-        vm.run(Collections.emptyList());
-
-        assertEquals("H", vm.getStack().pop());
-        assertEquals(0, vm.getStack().size());
-    }
-
-    @Test
-    public void testSort() throws RecognitionException, IOException {
-        VM vm = new VM("ENTRY  { title }  { }  { label }"
-                + "FUNCTION {presort} { cite$ 'sort.key$ := } ITERATE { presort } SORT");
-
-        List<BibEntry> v = List.of(
-                TestVM.bibtexString2BibtexEntry("@article{a, author=\"AAA\"}"),
-                TestVM.bibtexString2BibtexEntry("@article{b, author=\"BBB\"}"),
-                TestVM.bibtexString2BibtexEntry("@article{d, author=\"DDD\"}"),
-                TestVM.bibtexString2BibtexEntry("@article{c, author=\"CCC\"}"));
-        vm.run(v);
-
-        List<BstEntry> v2 = vm.getEntries();
-        assertEquals(Optional.of("a"), v2.get(0).entry.getCitationKey());
-        assertEquals(Optional.of("b"), v2.get(1).entry.getCitationKey());
-        assertEquals(Optional.of("c"), v2.get(2).entry.getCitationKey());
-        assertEquals(Optional.of("d"), v2.get(3).entry.getCitationKey());
-    }
-
-    @Test
-    public void testBuildIn() throws RecognitionException {
-        VM vm = new VM("EXECUTE {global.max$}");
-
-        vm.run(Collections.emptyList());
-
-        assertEquals(Integer.MAX_VALUE, vm.getStack().pop());
-        assertTrue(vm.getStack().empty());
-    }
-
-    @Test
-    public void testVariables() throws RecognitionException {
-        VM vm = new VM(" STRINGS { t }                          "
-                + " FUNCTION {not}    { { #0 } { #1 }  if$ } "
-                + " FUNCTION {n.dashify} { \"HELLO-WORLD\" 't := t empty$ not } "
-                + " EXECUTE {n.dashify}                    ");
-
-        vm.run(Collections.emptyList());
-
-        assertEquals(VM.TRUE, vm.getStack().pop());
-    }
-
-    @Test
-    public void testWhile() throws RecognitionException {
-        VM vm = new VM(
-                "STRINGS { t }            "
-                        + "FUNCTION {not}    {   "
-                        + " { #0 } { #1 }  if$ } "
-                        + "FUNCTION {n.dashify}              "
-                        + "{ \"HELLO-WORLD\"                 "
-                        + "  't :=                           "
-                        + " \"\"                                                 "
-                        + "       { t empty$ not }                 "
-                        + "       { t #1 #1 substring$ \"-\" =                      "
-                        + "         { t #1 #2 substring$ \"--\" = not "
-                        + "              { \"--\" *                                       "
-                        + "                t #2 global.max$ substring$ 't :=                 "
-                        + "              }                                                    "
-                        + "              {   { t #1 #1 substring$ \"-\" = }                "
-                        + "                  { \"-\" *                                         "
-                        + "                    t #2 global.max$ substring$ 't :=               "
-                        + "                  }                                                  "
-                        + "                while$                                                                  "
-                        + "              }                                                                  "
-                        + "            if$                                                                  "
-                        + "          }                                                                  "
-                        + "          { t #1 #1 substring$ *                                       "
-                        + "            t #2 global.max$ substring$ 't :=                          "
-                        + "          }                                                                  "
-                        + "          if$                                                                  "
-                        + "        }                                                                  "
-                        + "      while$                                                                  "
-                        + "    }                                                                  "
-                        + " EXECUTE {n.dashify} ");
-
-        List<BibEntry> v = Collections.emptyList();
-        vm.run(v);
-
-        assertEquals(1, vm.getStack().size());
-        assertEquals("HELLO--WORLD", vm.getStack().pop());
-    }
-
-    @Test
-    public void testType() throws RecognitionException, IOException {
-        VM vm = new VM("ENTRY  { title }  { }  { label }"
-                + "FUNCTION {presort} { cite$ 'sort.key$ := } ITERATE { presort } SORT FUNCTION {test} { type$ } ITERATE { test }");
-
-        List<BibEntry> v = List.of(
-                TestVM.bibtexString2BibtexEntry("@article{a, author=\"AAA\"}"),
-                TestVM.bibtexString2BibtexEntry("@book{b, author=\"BBB\"}"),
-                TestVM.bibtexString2BibtexEntry("@misc{c, author=\"CCC\"}"),
-                TestVM.bibtexString2BibtexEntry("@inproceedings{d, author=\"DDD\"}"));
-        vm.run(v);
-
-        assertEquals(4, vm.getStack().size());
-        assertEquals("inproceedings", vm.getStack().pop());
-        assertEquals("misc", vm.getStack().pop());
-        assertEquals("book", vm.getStack().pop());
-        assertEquals("article", vm.getStack().pop());
-    }
-
-    @Test
-    public void testMissing() throws RecognitionException, IOException {
-        VM vm = new VM(
-                "ENTRY    { title }  { }  { label } " +
-                        "FUNCTION {presort} { cite$ 'sort.key$ := } " +
-                        "ITERATE  {presort} " +
-                        "READ SORT " +
-                        "FUNCTION {test}{ title missing$ cite$ } " +
-                        "ITERATE  { test }");
-
-        List<BibEntry> v = List.of(
-                t1BibtexEntry(),
-                TestVM.bibtexString2BibtexEntry("@article{test, author=\"No title\"}"));
-        vm.run(v);
-
-        assertEquals(4, vm.getStack().size());
-
-        assertEquals("test", vm.getStack().pop());
-        assertEquals(1, vm.getStack().pop());
-        assertEquals("canh05", vm.getStack().pop());
-        assertEquals(0, vm.getStack().pop());
-    }
-
-    @Test
-    public void testFormatName() throws RecognitionException {
-        VM vm = new VM(
-                "FUNCTION {format}{ \"Charles Louis Xavier Joseph de la Vall{\\'e}e Poussin\" #1 \"{vv~}{ll}{, jj}{, f}?\" format.name$ }"
-                        + "EXECUTE {format}");
-
-        List<BibEntry> v = Collections.emptyList();
-        vm.run(v);
-        assertEquals("de~la Vall{\\'e}e~Poussin, C.~L. X.~J?", vm.getStack().pop());
-        assertEquals(0, vm.getStack().size());
-    }
-
-    @Test
-    public void testFormatName2() throws RecognitionException, IOException {
-        VM vm = new VM("ENTRY  { author }  { }  { label } " + "FUNCTION {presort} { cite$ 'sort.key$ := } "
-                + "ITERATE { presort } " + "READ " + "SORT "
-                + "FUNCTION {format}{ author #2 \"{vv~}{ll}{, jj}{, f}?\" format.name$ }" + "ITERATE {format}");
-
-        List<BibEntry> v = List.of(
-                t1BibtexEntry(),
-                TestVM.bibtexString2BibtexEntry(
-                        "@book{test, author=\"Jonathan Meyer and Charles Louis Xavier Joseph de la Vall{\\'e}e Poussin\"}"));
-        vm.run(v);
-        assertEquals("de~la Vall{\\'e}e~Poussin, C.~L. X.~J?", vm.getStack().pop());
-        assertEquals("Annabi, H?", vm.getStack().pop());
-        assertEquals(0, vm.getStack().size());
-    }
-
-    @Test
-    public void testCallType() throws RecognitionException, IOException {
-        VM vm = new VM(
-                "ENTRY  { title }  { }  { label } FUNCTION {presort} { cite$ 'sort.key$ := } ITERATE { presort } READ SORT "
-                        + "FUNCTION {inproceedings}{ \"InProceedings called on \" title * } "
-                        + "FUNCTION {book}{ \"Book called on \" title * } " + " ITERATE { call.type$ }");
-
-        List<BibEntry> v = List.of(
-                t1BibtexEntry(),
-                TestVM.bibtexString2BibtexEntry("@book{test, title=\"Test\"}"));
-
-        vm.run(v);
-
-        assertEquals(2, vm.getStack().size());
-
-        assertEquals("Book called on Test", vm.getStack().pop());
-        assertEquals(
-                "InProceedings called on Effective work practices for floss development: A model and propositions",
-                vm.getStack().pop());
-        assertEquals(0, vm.getStack().size());
-    }
-
-    @Test
-    public void testIterate() throws RecognitionException, IOException {
-        VM vm = new VM("ENTRY  { " + "  address " + "  author " + "  title " + "  type "
-                + "}  {}  { label } " + "FUNCTION {test}{ cite$ } " + "READ " + "ITERATE { test }");
-
-        List<BibEntry> v = List.of(
-                t1BibtexEntry(),
-                TestVM.bibtexString2BibtexEntry("@article{test, title=\"BLA\"}"));
-
-        vm.run(v);
-
-        assertEquals(2, vm.getStack().size());
-
-        String s1 = (String) vm.getStack().pop();
-        String s2 = (String) vm.getStack().pop();
-
-        if ("canh05".equals(s1)) {
-            assertEquals("test", s2);
-        } else {
-            assertEquals("canh05", s2);
-            assertEquals("test", s1);
-        }
-    }
-
-    @Test
-    public void testWidth() throws RecognitionException, IOException {
-        VM vm = new VM("ENTRY  { " + "  address " + "  author " + "  title " + "  type "
-                + "}  {}  { label } " +
-                "STRINGS { longest.label } " +
-                "INTEGERS { number.label longest.label.width } " +
-                "FUNCTION {initialize.longest.label} " +
-                "{ \"\" 'longest.label := " +
-                "  #1 'number.label := " +
-                "  #0 'longest.label.width := " +
-                "} " +
-                " " +
-                "        FUNCTION {longest.label.pass} " +
-                "        { number.label int.to.str$ 'label := " +
-                "          number.label #1 + 'number.label := " +
-                "          label width$ longest.label.width > " +
-                "            { label 'longest.label := " +
-                "              label width$ 'longest.label.width := " +
-                "            } " +
-                "            'skip$ " +
-                "          if$ " +
-                "        } " +
-                " " +
-                "        EXECUTE {initialize.longest.label} " +
-                " " +
-                "        ITERATE {longest.label.pass} " +
-                "FUNCTION {begin.bib} " +
-                "{ preamble$ empty$" +
-                "    'skip$" +
-                "    { preamble$ write$ newline$ }" +
-                "  if$" +
-                "  \"\\begin{thebibliography}{\"  longest.label  * \"}\" *" +
-                "}" +
-                "EXECUTE {begin.bib}");
-
-        List<BibEntry> v = List.of(t1BibtexEntry());
-
-        vm.run(v);
-
-        assertTrue(vm.getIntegers().containsKey("longest.label.width"));
-        assertEquals("\\begin{thebibliography}{1}", vm.getStack().pop());
-    }
-
-    @Test
-    public void testVMSwap() throws RecognitionException {
-        VM vm = new VM("FUNCTION {a}{ #3 \"Hallo\" swap$ } EXECUTE { a }");
-
-        List<BibEntry> v = Collections.emptyList();
-        vm.run(v);
-
-        assertEquals(2, vm.getStack().size());
-        assertEquals(3, vm.getStack().pop());
-        assertEquals("Hallo", vm.getStack().pop());
-    }
-
-    @Test
-    public void testHypthenatedName() throws RecognitionException, IOException {
-        VM vm = new VM(new File("src/test/resources/org/jabref/logic/bst/abbrv.bst"));
-        List<BibEntry> v = List.of(TestVM.bibtexString2BibtexEntry("@article{canh05, author = \"Jean-Paul Sartre\" }"));
-        assertTrue(vm.run(v).contains("J.-P. Sartre"));
-    }
-
-    private static BibEntry bibtexString2BibtexEntry(String s) throws IOException {
-        ParserResult result = new BibtexParser(mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS), new DummyFileUpdateMonitor()).parse(new StringReader(s));
-        Collection<BibEntry> c = result.getDatabase().getEntries();
-        assertEquals(1, c.size());
-        return c.iterator().next();
-    }
-
-    private static String t1BibtexString() {
-        return "@inproceedings{canh05,\n"
-                + "  author = {Crowston, K. and Annabi, H. and Howison, J. and Masango, C.},\n"
-                + "  title = {Effective work practices for floss development: A model and propositions},\n"
-                + "  booktitle = {Hawaii International Conference On System Sciences (HICSS)},\n"
-                + "  year = {2005},\n" + "  owner = {oezbek},\n" + "  timestamp = {2006.05.29},\n"
-                + "  url = {http://james.howison.name/publications.html}}\n";
-    }
-
-    private static BibEntry t1BibtexEntry() throws IOException {
-        return TestVM.bibtexString2BibtexEntry(t1BibtexString());
-    }
-}
diff --git a/src/test/java/org/jabref/logic/bst/BibtexCaseChangersTest.java b/src/test/java/org/jabref/logic/bst/util/BstCaseChangersTest.java
similarity index 93%
rename from src/test/java/org/jabref/logic/bst/BibtexCaseChangersTest.java
rename to src/test/java/org/jabref/logic/bst/util/BstCaseChangersTest.java
index 5349be3ef3f..3bf615093e4 100644
--- a/src/test/java/org/jabref/logic/bst/BibtexCaseChangersTest.java
+++ b/src/test/java/org/jabref/logic/bst/util/BstCaseChangersTest.java
@@ -1,8 +1,8 @@
-package org.jabref.logic.bst;
+package org.jabref.logic.bst.util;
 
 import java.util.stream.Stream;
 
-import org.jabref.logic.bst.BibtexCaseChanger.FORMAT_MODE;
+import org.jabref.logic.bst.util.BstCaseChanger.FormatMode;
 
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
@@ -12,12 +12,12 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class BibtexCaseChangersTest {
+public class BstCaseChangersTest {
 
     @ParameterizedTest
     @MethodSource("provideStringsForTitleLowers")
     public void testChangeCaseTitleLowers(String expected, String toBeFormatted) {
-        assertEquals(expected, BibtexCaseChanger.changeCase(toBeFormatted, FORMAT_MODE.TITLE_LOWERS));
+        assertEquals(expected, BstCaseChanger.changeCase(toBeFormatted, FormatMode.TITLE_LOWERS));
     }
 
     private static Stream<Arguments> provideStringsForTitleLowers() {
@@ -59,7 +59,7 @@ private static Stream<Arguments> provideStringsForTitleLowers() {
     @ParameterizedTest
     @MethodSource("provideStringsForAllLowers")
     public void testChangeCaseAllLowers(String expected, String toBeFormatted) {
-        assertEquals(expected, BibtexCaseChanger.changeCase(toBeFormatted, FORMAT_MODE.ALL_LOWERS));
+        assertEquals(expected, BstCaseChanger.changeCase(toBeFormatted, FormatMode.ALL_LOWERS));
     }
 
     private static Stream<Arguments> provideStringsForAllLowers() {
@@ -90,7 +90,7 @@ private static Stream<Arguments> provideStringsForAllLowers() {
     @ParameterizedTest
     @MethodSource("provideStringsForAllUppers")
     public void testChangeCaseAllUppers(String expected, String toBeFormatted) {
-        assertEquals(expected, BibtexCaseChanger.changeCase(toBeFormatted, FORMAT_MODE.ALL_UPPERS));
+        assertEquals(expected, BstCaseChanger.changeCase(toBeFormatted, FormatMode.ALL_UPPERS));
     }
 
     private static Stream<Arguments> provideStringsForAllUppers() {
@@ -121,7 +121,7 @@ private static Stream<Arguments> provideStringsForAllUppers() {
     @ParameterizedTest
     @MethodSource("provideTitleCaseAllLowers")
     public void testTitleCaseAllLowers(String expected, String toBeFormatted) {
-        assertEquals(expected, BibtexCaseChanger.changeCase(toBeFormatted, FORMAT_MODE.ALL_LOWERS));
+        assertEquals(expected, BstCaseChanger.changeCase(toBeFormatted, FormatMode.ALL_LOWERS));
     }
 
     private static Stream<Arguments> provideTitleCaseAllLowers() {
diff --git a/src/test/java/org/jabref/logic/bst/BibtexNameFormatterTest.java b/src/test/java/org/jabref/logic/bst/util/BstNameFormatterTest.java
similarity index 52%
rename from src/test/java/org/jabref/logic/bst/BibtexNameFormatterTest.java
rename to src/test/java/org/jabref/logic/bst/util/BstNameFormatterTest.java
index a8000752edb..4912af099bf 100644
--- a/src/test/java/org/jabref/logic/bst/BibtexNameFormatterTest.java
+++ b/src/test/java/org/jabref/logic/bst/util/BstNameFormatterTest.java
@@ -1,48 +1,42 @@
-package org.jabref.logic.bst;
+package org.jabref.logic.bst.util;
 
 import org.jabref.model.entry.AuthorList;
 
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class BibtexNameFormatterTest {
+public class BstNameFormatterTest {
 
     @Test
     public void testUmlautsFullNames() {
-        AuthorList al = AuthorList
-                .parse("Charles Louis Xavier Joseph de la Vall{\\'e}e Poussin");
+        AuthorList list = AuthorList.parse("Charles Louis Xavier Joseph de la Vall{\\'e}e Poussin");
 
-        assertEquals("de~laVall{\\'e}e~PoussinCharles Louis Xavier~Joseph", BibtexNameFormatter.formatName(al
-                .getAuthor(0), "{vv}{ll}{jj}{ff}", Assertions::fail));
+        assertEquals("de~laVall{\\'e}e~PoussinCharles Louis Xavier~Joseph",
+                BstNameFormatter.formatName(list.getAuthor(0), "{vv}{ll}{jj}{ff}"));
     }
 
     @Test
     public void testUmlautsAbbreviations() {
-        AuthorList al = AuthorList
-                .parse("Charles Louis Xavier Joseph de la Vall{\\'e}e Poussin");
+        AuthorList list = AuthorList.parse("Charles Louis Xavier Joseph de la Vall{\\'e}e Poussin");
 
-        assertEquals("de~la Vall{\\'e}e~Poussin, C.~L. X.~J.", BibtexNameFormatter.formatName(al
-                .getAuthor(0), "{vv~}{ll}{, jj}{, f.}", Assertions::fail));
+        assertEquals("de~la Vall{\\'e}e~Poussin, C.~L. X.~J.",
+                BstNameFormatter.formatName(list.getAuthor(0), "{vv~}{ll}{, jj}{, f.}"));
     }
 
     @Test
     public void testUmlautsAbbreviationsWithQuestionMark() {
-        AuthorList al = AuthorList
-                .parse("Charles Louis Xavier Joseph de la Vall{\\'e}e Poussin");
+        AuthorList list = AuthorList.parse("Charles Louis Xavier Joseph de la Vall{\\'e}e Poussin");
 
-        assertEquals("de~la Vall{\\'e}e~Poussin, C.~L. X.~J?", BibtexNameFormatter.formatName(al
-                .getAuthor(0), "{vv~}{ll}{, jj}{, f}?", Assertions::fail));
+        assertEquals("de~la Vall{\\'e}e~Poussin, C.~L. X.~J?",
+                BstNameFormatter.formatName(list.getAuthor(0), "{vv~}{ll}{, jj}{, f}?"));
     }
 
     @Test
     public void testFormatName() {
-        AuthorList al = AuthorList
-                .parse("Charles Louis Xavier Joseph de la Vall{\\'e}e Poussin");
+        AuthorList list = AuthorList.parse("Charles Louis Xavier Joseph de la Vall{\\'e}e Poussin");
 
-        assertEquals("dlVP", BibtexNameFormatter.formatName(al.getAuthor(0), "{v{}}{l{}}",
-                Assertions::fail));
+        assertEquals("dlVP", BstNameFormatter.formatName(list.getAuthor(0), "{v{}}{l{}}"));
 
         assertNameFormatA("Meyer, J?", "Jonathan Meyer and Charles Louis Xavier Joseph de la Vall{\\'e}e Poussin");
         assertNameFormatB("J.~Meyer", "Jonathan Meyer and Charles Louis Xavier Joseph de la Vall{\\'e}e Poussin");
@@ -60,8 +54,7 @@ public void testFormatName() {
     }
 
     private void assertNameFormat(String string, String string2, int which, String format) {
-        assertEquals(string, BibtexNameFormatter.formatName(string2, which, format,
-                Assertions::fail));
+        assertEquals(string, BstNameFormatter.formatName(string2, which, format));
     }
 
     private void assertNameFormatC(String string, String string2) {
@@ -79,44 +72,41 @@ private void assertNameFormatA(String string, String string2) {
     @Test
     public void matchingBraceConsumedForCompleteWords() {
         StringBuilder sb = new StringBuilder();
-        assertEquals(6, BibtexNameFormatter.consumeToMatchingBrace(sb, "{HELLO} {WORLD}"
-                .toCharArray(), 0));
+        assertEquals(6, BstNameFormatter.consumeToMatchingBrace(sb, "{HELLO} {WORLD}".toCharArray(), 0));
         assertEquals("{HELLO}", sb.toString());
     }
 
     @Test
     public void matchingBraceConsumedForBracesInWords() {
         StringBuilder sb = new StringBuilder();
-        assertEquals(18, BibtexNameFormatter.consumeToMatchingBrace(sb, "{HE{L{}L}O} {WORLD}"
-                .toCharArray(), 12));
+        assertEquals(18, BstNameFormatter.consumeToMatchingBrace(sb, "{HE{L{}L}O} {WORLD}".toCharArray(), 12));
         assertEquals("{WORLD}", sb.toString());
     }
 
     @Test
     public void testConsumeToMatchingBrace() {
         StringBuilder sb = new StringBuilder();
-        assertEquals(10, BibtexNameFormatter.consumeToMatchingBrace(sb, "{HE{L{}L}O} {WORLD}"
-                .toCharArray(), 0));
+        assertEquals(10, BstNameFormatter.consumeToMatchingBrace(sb, "{HE{L{}L}O} {WORLD}".toCharArray(), 0));
         assertEquals("{HE{L{}L}O}", sb.toString());
     }
 
     @Test
     public void testGetFirstCharOfString() {
-        assertEquals("C", BibtexNameFormatter.getFirstCharOfString("Charles"));
-        assertEquals("V", BibtexNameFormatter.getFirstCharOfString("Vall{\\'e}e"));
-        assertEquals("{\\'e}", BibtexNameFormatter.getFirstCharOfString("{\\'e}"));
-        assertEquals("{\\'e", BibtexNameFormatter.getFirstCharOfString("{\\'e"));
-        assertEquals("E", BibtexNameFormatter.getFirstCharOfString("{E"));
+        assertEquals("C", BstNameFormatter.getFirstCharOfString("Charles"));
+        assertEquals("V", BstNameFormatter.getFirstCharOfString("Vall{\\'e}e"));
+        assertEquals("{\\'e}", BstNameFormatter.getFirstCharOfString("{\\'e}"));
+        assertEquals("{\\'e", BstNameFormatter.getFirstCharOfString("{\\'e"));
+        assertEquals("E", BstNameFormatter.getFirstCharOfString("{E"));
     }
 
     @Test
     public void testNumberOfChars() {
-        assertEquals(6, BibtexNameFormatter.numberOfChars("Vall{\\'e}e", -1));
-        assertEquals(2, BibtexNameFormatter.numberOfChars("Vall{\\'e}e", 2));
-        assertEquals(1, BibtexNameFormatter.numberOfChars("Vall{\\'e}e", 1));
-        assertEquals(6, BibtexNameFormatter.numberOfChars("Vall{\\'e}e", 6));
-        assertEquals(6, BibtexNameFormatter.numberOfChars("Vall{\\'e}e", 7));
-        assertEquals(8, BibtexNameFormatter.numberOfChars("Vall{e}e", -1));
-        assertEquals(6, BibtexNameFormatter.numberOfChars("Vall{\\'e this will be skipped}e", -1));
+        assertEquals(6, BstNameFormatter.numberOfChars("Vall{\\'e}e", -1));
+        assertEquals(2, BstNameFormatter.numberOfChars("Vall{\\'e}e", 2));
+        assertEquals(1, BstNameFormatter.numberOfChars("Vall{\\'e}e", 1));
+        assertEquals(6, BstNameFormatter.numberOfChars("Vall{\\'e}e", 6));
+        assertEquals(6, BstNameFormatter.numberOfChars("Vall{\\'e}e", 7));
+        assertEquals(8, BstNameFormatter.numberOfChars("Vall{e}e", -1));
+        assertEquals(6, BstNameFormatter.numberOfChars("Vall{\\'e this will be skipped}e", -1));
     }
 }
diff --git a/src/test/java/org/jabref/logic/bst/BibtexPurifyTest.java b/src/test/java/org/jabref/logic/bst/util/BstPurifierTest.java
similarity index 80%
rename from src/test/java/org/jabref/logic/bst/BibtexPurifyTest.java
rename to src/test/java/org/jabref/logic/bst/util/BstPurifierTest.java
index 684e4366225..295b735fd37 100644
--- a/src/test/java/org/jabref/logic/bst/BibtexPurifyTest.java
+++ b/src/test/java/org/jabref/logic/bst/util/BstPurifierTest.java
@@ -1,4 +1,4 @@
-package org.jabref.logic.bst;
+package org.jabref.logic.bst.util;
 
 import java.util.stream.Stream;
 
@@ -7,14 +7,13 @@
 import org.junit.jupiter.params.provider.MethodSource;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.fail;
 
-public class BibtexPurifyTest {
+public class BstPurifierTest {
 
     @ParameterizedTest
     @MethodSource("provideTestStrings")
     public void testPurify(String expected, String toBePurified) {
-        assertEquals(expected, BibtexPurify.purify(toBePurified, s -> fail("Should not Warn (" + s + ")! purify should be " + expected + " for " + toBePurified)));
+        assertEquals(expected, BstPurifier.purify(toBePurified));
     }
 
     private static Stream<Arguments> provideTestStrings() {
diff --git a/src/test/java/org/jabref/logic/bst/TextPrefixFunctionTest.java b/src/test/java/org/jabref/logic/bst/util/BstTextPrefixerTest.java
similarity index 73%
rename from src/test/java/org/jabref/logic/bst/TextPrefixFunctionTest.java
rename to src/test/java/org/jabref/logic/bst/util/BstTextPrefixerTest.java
index d91eadd8920..cc857101822 100644
--- a/src/test/java/org/jabref/logic/bst/TextPrefixFunctionTest.java
+++ b/src/test/java/org/jabref/logic/bst/util/BstTextPrefixerTest.java
@@ -1,11 +1,10 @@
-package org.jabref.logic.bst;
+package org.jabref.logic.bst.util;
 
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.fail;
 
-public class TextPrefixFunctionTest {
+public class BstTextPrefixerTest {
 
     @Test
     public void testPrefix() {
@@ -21,6 +20,6 @@ public void testPrefix() {
     }
 
     private static void assertPrefix(final String string, final String string2) {
-        assertEquals(string, BibtexTextPrefix.textPrefix(5, string2, s -> fail("Should not Warn! text.prefix$ should be " + string + " for (5) " + string2)));
+        assertEquals(string, BstTextPrefixer.textPrefix(5, string2));
     }
 }
diff --git a/src/test/java/org/jabref/logic/bst/BibtexWidthTest.java b/src/test/java/org/jabref/logic/bst/util/BstWidthCalculatorTest.java
similarity index 91%
rename from src/test/java/org/jabref/logic/bst/BibtexWidthTest.java
rename to src/test/java/org/jabref/logic/bst/util/BstWidthCalculatorTest.java
index 79cb00b3eb8..30f2f6770e5 100644
--- a/src/test/java/org/jabref/logic/bst/BibtexWidthTest.java
+++ b/src/test/java/org/jabref/logic/bst/util/BstWidthCalculatorTest.java
@@ -1,4 +1,4 @@
-package org.jabref.logic.bst;
+package org.jabref.logic.bst.util;
 
 import java.util.stream.Stream;
 
@@ -35,12 +35,12 @@
  * \bibcite{canh05}{CMM{$^{+}$}05}
  * </code>
  */
-public class BibtexWidthTest {
+public class BstWidthCalculatorTest {
 
     @ParameterizedTest
     @MethodSource("provideTestWidth")
     public void testWidth(int i, String str) {
-        assertEquals(i, BibtexWidth.width(str));
+        assertEquals(i, BstWidthCalculator.width(str));
     }
 
     private static Stream<Arguments> provideTestWidth() {
@@ -60,7 +60,7 @@ private static Stream<Arguments> provideTestWidth() {
     @ParameterizedTest
     @MethodSource("provideTestGetCharWidth")
     public void testGetCharWidth(int i, Character c) {
-        assertEquals(i, BibtexWidth.getCharWidth(c));
+        assertEquals(i, BstWidthCalculator.getCharWidth(c));
     }
 
     private static Stream<Arguments> provideTestGetCharWidth() {
diff --git a/src/test/java/org/jabref/logic/citationkeypattern/CitationKeyGeneratorTest.java b/src/test/java/org/jabref/logic/citationkeypattern/CitationKeyGeneratorTest.java
index d33045c890d..626563158c2 100644
--- a/src/test/java/org/jabref/logic/citationkeypattern/CitationKeyGeneratorTest.java
+++ b/src/test/java/org/jabref/logic/citationkeypattern/CitationKeyGeneratorTest.java
@@ -1134,4 +1134,18 @@ void generateKeyWithFallbackField() {
 
         assertEquals("2021", generateKey(bibEntry, "[title:([EPRINT:([YEAR])])]"));
     }
+
+    @Test
+    void generateKeyWithLowercaseAuthorLastnameUseVonPart() {
+        BibEntry entry = createABibEntryAuthor("Stéphane d'Ascoli");
+        entry.setField(StandardField.YEAR, "2021");
+        assertEquals("dAscoli2021", generateKey(entry, "[auth][year]"));
+    }
+
+    @Test
+    void generateKeyWithLowercaseAuthorWithVonAndLastname() {
+        BibEntry entry = createABibEntryAuthor("Michiel van den Brekel");
+        entry.setField(StandardField.YEAR, "2021");
+        assertEquals("Brekel2021", generateKey(entry, "[auth][year]"));
+    }
 }
diff --git a/src/test/java/org/jabref/logic/citationstyle/CitationStyleGeneratorTest.java b/src/test/java/org/jabref/logic/citationstyle/CitationStyleGeneratorTest.java
index e0489efd4bc..03b98f814b8 100644
--- a/src/test/java/org/jabref/logic/citationstyle/CitationStyleGeneratorTest.java
+++ b/src/test/java/org/jabref/logic/citationstyle/CitationStyleGeneratorTest.java
@@ -1,6 +1,7 @@
 package org.jabref.logic.citationstyle;
 
 import java.util.List;
+import java.util.stream.Stream;
 
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.TestEntry;
@@ -12,8 +13,10 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
 
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -21,6 +24,40 @@ class CitationStyleGeneratorTest {
 
     private final BibEntryTypesManager bibEntryTypesManager = new BibEntryTypesManager();
 
+    @Test
+    void testACMCitation() {
+        BibDatabaseContext context = new BibDatabaseContext(new BibDatabase(List.of(TestEntry.getTestEntry())));
+        context.setMode(BibDatabaseMode.BIBLATEX);
+        List<CitationStyle> styleList = CitationStyle.discoverCitationStyles();
+        CitationStyle style = styleList.stream().filter(e -> "ACM SIGGRAPH".equals(e.getTitle())).findAny().orElse(null);
+        String citation = CitationStyleGenerator.generateCitation(TestEntry.getTestEntry(), style.getSource(), CitationStyleOutputFormat.HTML, context, new BibEntryTypesManager());
+
+        // if the acm-siggraph.csl citation style changes this has to be modified
+        String expected = "  <div class=\"csl-entry\">"
+                + "<span style=\"font-variant: small-caps\">Smith, B., Jones, B., and Williams, J.</span> 2016-07. Title of the test entry. <span style=\"font-style: italic\">BibTeX Journal</span> <span style=\"font-style: italic\">34</span>, 3, 45&ndash;67."
+                + "</div>\n"
+                + "";
+
+        assertEquals(expected, citation);
+    }
+
+    @Test
+    void testAPACitation() {
+        BibDatabaseContext context = new BibDatabaseContext(new BibDatabase(List.of(TestEntry.getTestEntry())));
+        context.setMode(BibDatabaseMode.BIBLATEX);
+        List<CitationStyle> styleList = CitationStyle.discoverCitationStyles();
+        CitationStyle style = styleList.stream().filter(e -> "American Psychological Association 6th edition".equals(e.getTitle())).findAny().orElse(null);
+        String citation = CitationStyleGenerator.generateCitation(TestEntry.getTestEntry(), style.getSource(), CitationStyleOutputFormat.HTML, context, new BibEntryTypesManager());
+
+        // if the apa-6th-citation.csl citation style changes this has to be modified
+        String expected = "  <div class=\"csl-entry\">"
+                + "Smith, B., Jones, B., &amp; Williams, J. (2016-07). Title of the test entry. <span style=\"font-style: italic\">BibTeX Journal</span>, <span style=\"font-style: italic\">34</span>(3), 45&ndash;67. https://doi.org/10.1001/bla.blubb"
+                + "</div>\n"
+                + "";
+
+        assertEquals(expected, citation);
+    }
+
     @Test
     void testIgnoreNewLine() {
         BibEntry entry = new BibEntry();
@@ -57,8 +94,8 @@ void testMissingCitationStyle() {
     @Test
     void testHtmlFormat() {
         String expectedCitation = "  <div class=\"csl-entry\">\n" +
-            "    <div class=\"csl-left-margin\">[1]</div><div class=\"csl-right-inline\">B. Smith, B. Jones, and J. Williams, &ldquo;Title of the test entry,&rdquo; <span style=\"font-style: italic\">BibTeX Journal</span>, vol. 34, no. 7, Art. no. 3, 2016-07, doi: 10.1001/bla.blubb.</div>\n" +
-            "  </div>\n";
+                "    <div class=\"csl-left-margin\">[1]</div><div class=\"csl-right-inline\">B. Smith, B. Jones, and J. Williams, &ldquo;Title of the test entry,&rdquo; <span style=\"font-style: italic\">BibTeX Journal</span>, vol. 34, no. 3, pp. 45&ndash;67, 2016-07, doi: 10.1001/bla.blubb.</div>\n" +
+                "  </div>\n";
 
         BibEntry entry = TestEntry.getTestEntry();
         String style = CitationStyle.getDefault().getSource();
@@ -70,7 +107,7 @@ void testHtmlFormat() {
 
     @Test
     void testTextFormat() {
-        String expectedCitation = "[1]B. Smith, B. Jones, and J. Williams, “Title of the test entry,” BibTeX Journal, vol. 34, no. 7, Art. no. 3, 2016-07, doi: 10.1001/bla.blubb.\n";
+        String expectedCitation = "[1]B. Smith, B. Jones, and J. Williams, “Title of the test entry,” BibTeX Journal, vol. 34, no. 3, pp. 45–67, 2016-07, doi: 10.1001/bla.blubb.\n";
 
         BibEntry entry = TestEntry.getTestEntry();
         String style = CitationStyle.getDefault().getSource();
@@ -95,11 +132,10 @@ void testHandleDiacritics() {
     }
 
     @Test
-    @Disabled("Currently citeproc does not handler number field correctly")
     void testHandleAmpersand() {
-        String expectedCitation = "[1]B. Smith, B. Jones, and J. Williams, “&TitleTest&” BibTeX Journal, vol. 34, no. 3, pp. 45–67, Jul. 2016.\n";
+        String expectedCitation = "[1]B. Smith, B. Jones, and J. Williams, “Famous quote: “&TitleTest&” - that is it,” BibTeX Journal, vol. 34, no. 3, pp. 45–67, 2016-07, doi: 10.1001/bla.blubb.\n";
         BibEntry entry = TestEntry.getTestEntry();
-        entry.setField(StandardField.TITLE, "“&TitleTest&”");
+        entry.setField(StandardField.TITLE, "Famous quote: “&TitleTest&” - that is it");
         String style = CitationStyle.getDefault().getSource();
         CitationStyleOutputFormat format = CitationStyleOutputFormat.TEXT;
 
@@ -110,19 +146,19 @@ void testHandleAmpersand() {
     @Test
     void testHandleCrossRefFields() {
         BibEntry firstEntry = new BibEntry(StandardEntryType.InCollection)
-            .withCitationKey("smit2021")
-            .withField(StandardField.AUTHOR, "Smith, Bob")
-            .withField(StandardField.TITLE, "An article")
-            .withField(StandardField.PAGES, "1-10")
-            .withField(StandardField.CROSSREF, "jone2021");
+                .withCitationKey("smit2021")
+                .withField(StandardField.AUTHOR, "Smith, Bob")
+                .withField(StandardField.TITLE, "An article")
+                .withField(StandardField.PAGES, "1-10")
+                .withField(StandardField.CROSSREF, "jone2021");
 
         BibEntry secondEntry = new BibEntry(StandardEntryType.Book)
-            .withCitationKey("jone2021")
-            .withField(StandardField.EDITOR, "Jones, John")
-            .withField(StandardField.PUBLISHER, "Great Publisher")
-            .withField(StandardField.TITLE, "A book")
-            .withField(StandardField.YEAR, "2021")
-            .withField(StandardField.ADDRESS, "Somewhere");
+                .withCitationKey("jone2021")
+                .withField(StandardField.EDITOR, "Jones, John")
+                .withField(StandardField.PUBLISHER, "Great Publisher")
+                .withField(StandardField.TITLE, "A book")
+                .withField(StandardField.YEAR, "2021")
+                .withField(StandardField.ADDRESS, "Somewhere");
 
         String expectedCitation = "[1]B. Smith, “An article,” J. Jones, Ed. Somewhere: Great Publisher, 2021, pp. 1–10.\n";
         BibDatabaseContext bibDatabaseContext = new BibDatabaseContext(new BibDatabase(List.of(firstEntry, secondEntry)));
@@ -132,85 +168,465 @@ void testHandleCrossRefFields() {
         assertEquals(expectedCitation, actualCitation);
     }
 
-    @Test
-    void testBibtexWithNumber() {
-        BibEntry entry = new BibEntry(StandardEntryType.Article);
-        entry.setField(StandardField.AUTHOR, "Last, First and\nDoe, Jane");
-        entry.setField(StandardField.NUMBER, "7");
-
+    static Stream<Arguments> testCslMapping() {
         // if the default citation style changes this has to be modified
-        String expected = "[1]F. Last and J. Doe, Art. no. 7.\n";
-
-        BibDatabaseContext bibDatabaseContext = new BibDatabaseContext(new BibDatabase(List.of(entry)));
-        bibDatabaseContext.setMode(BibDatabaseMode.BIBTEX);
-
-        String citation = CitationStyleGenerator.generateCitation(entry, CitationStyle.getDefault().getSource(), CitationStyleOutputFormat.TEXT, bibDatabaseContext, bibEntryTypesManager);
-        assertEquals(expected, citation);
+        return Stream.of(
+                Arguments.of(
+                        "[1]F. Last and J. Doe, no. 28.\n",
+                        BibDatabaseMode.BIBTEX,
+                        new BibEntry(StandardEntryType.Article)
+                                .withField(StandardField.AUTHOR, "Last, First and\nDoe, Jane")
+                                .withField(StandardField.NUMBER, "28"),
+                        "ieee.csl"),
+                Arguments.of(
+                        "[1]F. Last and J. Doe, no. 7.\n",
+                        BibDatabaseMode.BIBLATEX,
+                        new BibEntry(StandardEntryType.Article)
+                                .withField(StandardField.AUTHOR, "Last, First and\nDoe, Jane")
+                                .withField(StandardField.ISSUE, "7"),
+                        "ieee.csl"),
+                Arguments.of(
+                        "[1]F. Last and J. Doe, no. 28.\n",
+                        BibDatabaseMode.BIBLATEX,
+                        new BibEntry(StandardEntryType.Article)
+                                .withField(StandardField.AUTHOR, "Last, First and Doe, Jane")
+                                .withField(StandardField.NUMBER, "28"),
+                        "ieee.csl"),
+                Arguments.of(
+                        "[1]F. Last and J. Doe, no. 28.\n",
+                        BibDatabaseMode.BIBLATEX,
+                        new BibEntry(StandardEntryType.Article)
+                                .withField(StandardField.AUTHOR, "Last, First and\nDoe, Jane")
+                                .withField(StandardField.ISSUE, "7")
+                                .withField(StandardField.NUMBER, "28"),
+                        "ieee.csl"),
+                Arguments.of(
+                        "[1]F. Last and J. Doe, no. 7, Art. no. e0270533.\n",
+                        BibDatabaseMode.BIBLATEX,
+                        new BibEntry(StandardEntryType.Article)
+                                .withField(StandardField.AUTHOR, "Last, First and\nDoe, Jane")
+                                .withField(StandardField.ISSUE, "7")
+                                .withField(StandardField.EID, "e0270533"),
+                        "ieee.csl"),
+                         Arguments.of(
+                        "[1]F. Last and J. Doe, no. 33, pp. 7–8.\n",
+                        BibDatabaseMode.BIBLATEX,
+                        new BibEntry(StandardEntryType.Article)
+                                .withField(StandardField.AUTHOR, "Last, First and\nDoe, Jane")
+                                .withField(StandardField.PAGES, "7--8")
+                                .withField(StandardField.ISSUE, "33"),
+                        "ieee.csl"),
+
+                Arguments.of(
+                        "Foo, B. (n.d.). volume + issue + number + pages. Bib(La)TeX Journal, 1(3number), 45–67.\n",
+                        BibDatabaseMode.BIBTEX,
+                        new BibEntry(StandardEntryType.Article)
+                                .withField(StandardField.AUTHOR, "Foo, Bar")
+                                .withField(StandardField.JOURNAL, "Bib(La)TeX Journal")
+                                .withField(StandardField.NUMBER, "3number")
+                                .withField(StandardField.PAGES, "45--67")
+                                .withField(StandardField.TITLE, "volume + issue + number + pages")
+                                .withField(StandardField.VOLUME, "1")
+                                .withField(StandardField.COMMENT, "The issue field does not exist in Bibtex standard, therefore there is no need to render it (The issue field exists in biblatex standard though)")
+                                .withField(StandardField.ISSUE, "9issue"),
+                        "apa-6th-edition.csl"),
+
+                Arguments.of(
+                        "Foo, B. (n.d.). volume + issue + pages. Bib(La)TeX Journal, 1(9), 45–67.\n",
+                        BibDatabaseMode.BIBTEX,
+                        new BibEntry(StandardEntryType.Article)
+                                .withField(StandardField.AUTHOR, "Foo, Bar")
+                                .withField(StandardField.JOURNAL, "Bib(La)TeX Journal")
+                                .withField(StandardField.PAGES, "45--67")
+                                .withField(StandardField.TITLE, "volume + issue + pages")
+                                .withField(StandardField.VOLUME, "1")
+                                .withField(StandardField.COMMENT, "The issue field does not exist in Bibtex standard, therefore there is no need to render it (The issue field exists in biblatex standard though.). Since, for this entry, there is no number field present and therefore no data will be overwriten, enabling the user to be able to move the data within the issue field to the number field via cleanup action is something worth pursuing.")
+                                .withField(StandardField.ISSUE, "9"),
+                        "apa-6th-edition.csl"),
+
+                Arguments.of(
+                        "Foo, B. (n.d.). volume + pages. Bib(La)TeX Journal, 1, 45–67.\n",
+                        BibDatabaseMode.BIBTEX,
+                        new BibEntry(StandardEntryType.Article)
+                                .withField(StandardField.AUTHOR, "Foo, Bar")
+                                .withField(StandardField.JOURNAL, "Bib(La)TeX Journal")
+                                .withField(StandardField.PAGES, "45--67")
+                                .withField(StandardField.TITLE, "volume + pages")
+                                .withField(StandardField.VOLUME, "1"),
+                        "apa-6th-edition.csl"),
+
+                Arguments.of(
+                        "Foo, B. (n.d.). number. Bib(La)TeX Journal, (3number).\n",
+                        BibDatabaseMode.BIBTEX,
+                        new BibEntry(StandardEntryType.Article)
+                                .withField(StandardField.AUTHOR, "Foo, Bar")
+                                .withField(StandardField.JOURNAL, "Bib(La)TeX Journal")
+                                .withField(StandardField.NUMBER, "3number")
+                                .withField(StandardField.TITLE, "number"),
+                        "apa-6th-edition.csl"),
+
+                // The issue field does not exist in bibtex standard, therefore there is no need to render it (it exists in biblatex standard though). Since, for this entry, there is no number field present and therefore no data will be overwriten, enabling the user to be able to move the data within the issue field to the number field via cleanup action is something worth pursuing.
+                Arguments.of(
+                        "Foo, B. (n.d.). issue + pages. Bib(La)TeX Journal, (9), 45–67.\n",
+                        BibDatabaseMode.BIBTEX,
+                        new BibEntry(StandardEntryType.Article)
+                                .withField(StandardField.AUTHOR, "Foo, Bar")
+                                .withField(StandardField.JOURNAL, "Bib(La)TeX Journal")
+                                .withField(StandardField.PAGES, "45--67")
+                                .withField(StandardField.TITLE, "issue + pages")
+                                .withField(StandardField.ISSUE, "9"),
+                        "apa-6th-edition.csl"),
+
+                // The issue field does not exist in bibtex standard, therefore there is no need to render it (it exists in biblatex standard though)
+                Arguments.of(
+                        "Foo, B. (n.d.). issue + number. Bib(La)TeX Journal, (3number).\n",
+                        BibDatabaseMode.BIBTEX,
+                        new BibEntry(StandardEntryType.Article)
+                                .withField(StandardField.AUTHOR, "Foo, Bar")
+                                .withField(StandardField.JOURNAL, "Bib(La)TeX Journal")
+                                .withField(StandardField.NUMBER, "3number")
+                                .withField(StandardField.TITLE, "issue + number")
+                                .withField(StandardField.ISSUE, "9issue"),
+                        "apa-6th-edition.csl"),
+
+                // The issue field does not exist in bibtex standard, therefore there is no need to render it (it exists in biblatex standard though)
+                Arguments.of(
+                        "Foo, B. (n.d.). issue + number + pages. Bib(La)TeX Journal, (3number), 45–67.\n",
+                        BibDatabaseMode.BIBTEX,
+                        new BibEntry(StandardEntryType.Article)
+                                .withField(StandardField.AUTHOR, "Foo, Bar")
+                                .withField(StandardField.JOURNAL, "Bib(La)TeX Journal")
+                                .withField(StandardField.NUMBER, "3number")
+                                .withField(StandardField.PAGES, "45--67")
+                                .withField(StandardField.TITLE, "issue + number + pages")
+                                .withField(StandardField.ISSUE, "9issue"),
+                        "apa-6th-edition.csl"),
+
+                // "Article number" is not a field that exists in Bibtex standard. Printing the article number in the pages field is a workaround. Some Journals have opted to put the article number into the pages field. APA 7th Style recommends following procedure: If the journal article has an article number instead of a page range, include the word "Article" and then the article number instead of the page range. Question: Should it be rendered WITH Article or WITHOUT the Word Article in Front? I guess without?
+                Arguments.of(
+                        "Foo, B. (n.d.). number + pages. Bib(La)TeX Journal, (3number), Article 777.\n",
+                        BibDatabaseMode.BIBTEX,
+                        new BibEntry(StandardEntryType.Article)
+                                .withField(StandardField.AUTHOR, "Foo, Bar")
+                                .withField(StandardField.JOURNAL, "Bib(La)TeX Journal")
+                                .withField(StandardField.NUMBER, "3number")
+                                .withField(StandardField.PAGES, "Article 777")
+                                .withField(StandardField.TITLE, "number + pages")
+                                .withField(StandardField.COMMENT, "number + article-number WITH the word article instead of pagerange"),
+                        "apa-6th-edition.csl"),
+
+                // "The issue field does not exist in bibtex standard, therefore there is no need to render it (it exists in biblatex standard though). Since, for this entry, there is no number field present and therefore no data will be overwriten, enabling the user to be able to move the data within the issue field to the number field via cleanup action is something worth pursuing."
+                Arguments.of(
+                        "Foo, B. (n.d.). issue. Bib(La)TeX Journal, (9issue).\n",
+                        BibDatabaseMode.BIBTEX,
+                        new BibEntry(StandardEntryType.Article)
+                                .withField(StandardField.AUTHOR, "Foo, Bar")
+                                .withField(StandardField.JOURNAL, "Bib(La)TeX Journal")
+                                .withField(StandardField.TITLE, "issue")
+                                .withField(StandardField.ISSUE, "9issue"),
+                        "apa-6th-edition.csl"),
+
+                Arguments.of(
+                        "Foo, B. (n.d.). number + pages. Bib(La)TeX Journal, (3number), 45–67.\n",
+                        BibDatabaseMode.BIBTEX,
+                        new BibEntry(StandardEntryType.Article)
+                                .withField(StandardField.AUTHOR, "Foo, Bar")
+                                .withField(StandardField.JOURNAL, "Bib(La)TeX Journal")
+                                .withField(StandardField.NUMBER, "3number")
+                                .withField(StandardField.PAGES, "45--67")
+                                .withField(StandardField.TITLE, "number + pages"),
+                        "apa-6th-edition.csl"),
+
+                // "Article number" is not a field that exists in Bibtex standard. Printing the article number in the pages field is a workaround. Some Journals have opted to put the article number into the pages field. APA 7th Style recommends following procedure: If the journal article has an article number instead of a page range, include the word "Article" and then the article number instead of the page range. Question: Should it be rendered WITH Article or WITHOUT the Word Article in Front? I guess without?
+                Arguments.of(
+                        "Foo, B. (n.d.). number + pages. BibTeX Journal, (3number), 777e23.\n",
+                        BibDatabaseMode.BIBTEX,
+                        new BibEntry(StandardEntryType.Article)
+                                .withField(StandardField.AUTHOR, "Foo, Bar")
+                                .withField(StandardField.JOURNAL, "BibTeX Journal")
+                                .withField(StandardField.NUMBER, "3number")
+                                .withField(StandardField.PAGES, "777e23")
+                                .withField(StandardField.TITLE, "number + pages")
+                                .withField(StandardField.COMMENT, "number + article-number WITHOUT the word article instead of pagerange"),
+                        "apa-6th-edition.csl"),
+
+                // Not rendering the "eid" field here, is correct. The "eid" field(short for: electronic identifier) does not exist in Bibtex standard. It exists in Biblatex standard though and is the field, in which the "article number" should be entered into. "Article number" is a field that does not exist in Bibtex and also not in Biblatex standard. As a workaround, some Journals have opted to put the article number into the pages field. APA 7th Style recommends following procedure: "If the journal article has an article number instead of a page range, include the word "Article" and then the article number instead of the page range." - Source: https://apastyle.apa.org/style-grammar-guidelines/references/examples/journal-article-references#2. Additionally the APA style (7th edition) created by the CSL community "prints the issue (= the "number" field" in Biblatex)  whenever it is in the data and the number (= the "eid" field in Biblatex) when no page range is present, entirely independent of the issue number" - Source: https://github.com/citation-style-language/styles/issues/5827#issuecomment-1006011280). I personally think the "eid" field SHOULD be rendered here SOMEWHERE, maybe even IN ADDITION to the page range, because we have the data, right? Why not show it? - But this is just my humble opinion and may not be coherent with the current APA Style 7th edition. Not rendering the "issue" field here is sufficient for APA 7th edition. Under current circumstances the "number" field takes priority over the "issue" field (see https://github.com/JabRef/jabref/issues/8372#issuecomment-1023768144). [Keyword: IS RENDERING BOTH VIABLE?]. Ideally, they would coexist: "Roughly speaking number subdivides volume and issue is much closer to subdividing year. I don't think I would want to say that issue is subordinate to number or vice versa. They sort of operate on a similar level." (Source: https://github.com/plk/biblatex/issues/726#issuecomment-1010264258)
+                Arguments.of(
+                        "Foo, B. (n.d.). eid + issue + number + pages. BibTeX Journal, (3number), 45–67.\n",
+                        BibDatabaseMode.BIBTEX,
+                        new BibEntry(StandardEntryType.Article)
+                                .withField(StandardField.AUTHOR, "Foo, Bar")
+                                .withField(StandardField.JOURNAL, "BibTeX Journal")
+                                .withField(StandardField.NUMBER, "3number")
+                                .withField(StandardField.PAGES, "45--67")
+                                .withField(StandardField.TITLE, "eid + issue + number + pages")
+                                .withField(StandardField.EID, "6eid")
+                                .withField(StandardField.ISSUE, "9issue"),
+                        "apa-6th-edition.csl"),
+
+                /*
+                Not rendering the "eid" field here, is correct. The "eid" field(= electronic identifier) does not exist in Bibtex standard.
+                                 Since, for this entry, there is no pages field present and therefore no data will be overwritten, enabling the user to be able to move the data within the eid scala.annotation.meta.field to the pages scala.annotation.meta.field via cleanup action is something worth pursuing.
+
+                Not rendering the "issue" field here is correct. The "issue" field does not exist in Bibtex standard.
+                        Since, for this entry, there is no number field present and therefore no data will be overwritten, enabling the user to be able to move the data within the issue field to the number field via cleanup action is something worth pursuing.
+                 */
+                Arguments.of(
+                        "Foo, B. (n.d.). eid + issue. BibTeX Journal, (9issue), Article 6eid.\n",
+                        BibDatabaseMode.BIBTEX,
+                        new BibEntry(StandardEntryType.Article)
+                                .withField(StandardField.AUTHOR, "Foo, Bar")
+                                .withField(StandardField.JOURNAL, "BibTeX Journal")
+                                .withField(StandardField.TITLE, "eid + issue")
+                                .withField(StandardField.COMMENT, "")
+                                .withField(StandardField.EID, "Article 6eid")
+                                .withField(StandardField.ISSUE, "9issue"),
+                        "apa-6th-edition.csl"),
+
+        /*
+        Not rendering the "eid" field here, is sufficient, but contested practice. This statement is based on the following reasoning: "eid" (in long: electronic identifier) is the field, which should be used to enter the "article number", when using the Biblatex standard. Both "eid" and "article number" do not exist in the older Bibtex standard. As a workaround, some Journals and publishers have opted to put the article number into the pages field. APA 7th Style recommends following procedure: "If the journal article has an article number instead of a page range, include the word "Article" and then the article number instead of the page range." - Source: https://apastyle.apa.org/style-grammar-guidelines/references/examples/journal-article-references#2. Additionally the APA style (7th edition) created by the CSL community "prints the issue [= the "number" field" in both Biblatex and Bibtex]  whenever it is in the data and the number [= the "eid" field in Biblatex] when no page range is present, entirely independent of the issue number" - Source: https://github.com/citation-style-language/styles/issues/5827#issuecomment-1006011280. I personally think the "eid" field SHOULD be rendered here SOMEWHERE, maybe even IN ADDITION to the page range, because we have the data, right? Why not show it? - But this is just my humble opinion and may not be coherent with the current APA Style 7th edition.
+
+        Not rendering the "issue" field here is sufficient for APA 7th edition. Under current circumstances the "number" field takes priority over the "issue" field (see https://github.com/JabRef/jabref/issues/8372#issuecomment-1023768144). [Keyword: IS RENDERING BOTH VIABLE?]. Ideally, they would coexist: "Roughly speaking number subdivides volume and issue is much closer to subdividing year. I don't think I would want to say that issue is subordinate to number or vice versa. They sort of operate on a similar level." (Source: https://github.com/plk/biblatex/issues/726#issuecomment-1010264258)
+         */
+                Arguments.of(
+                        "Foo, B. (n.d.). volume + issue + number + pages + eid. Bib(La)TeX Journal, 1(3number), 45–67.\n",
+                        BibDatabaseMode.BIBLATEX,
+                        new BibEntry(StandardEntryType.Article)
+                                .withField(StandardField.AUTHOR, "Foo, Bar")
+                                .withField(StandardField.JOURNALTITLE, "Bib(La)TeX Journal")
+                                .withField(StandardField.TITLE, "volume + issue + number + pages + eid")
+                                .withField(StandardField.EID, "6eid")
+                                .withField(StandardField.ISSUE, "9issue")
+                                .withField(StandardField.NUMBER, "3number")
+                                .withField(StandardField.PAGES, "45--67")
+                                .withField(StandardField.VOLUME, "1"),
+                        "apa-6th-edition.csl"),
+
+                // Not rendering the "eid" field here, is sufficient, but contested practice. This statement is based on the following reasoning: "eid" (in long: electronic identifier) is the field, which should be used to enter the "article number", when using the Biblatex standard. Both "eid" and "article number" do not exist in the older Bibtex standard. As a workaround, some Journals and publishers have opted to put the article number into the pages field. APA 7th Style recommends following procedure: "If the journal article has an article number instead of a page range, include the word "Article" and then the article number instead of the page range." - Source: https://apastyle.apa.org/style-grammar-guidelines/references/examples/journal-article-references#2. Additionally the APA style (7th edition) created by the CSL community "prints the issue [= the "number" field" in both Biblatex and Bibtex]  whenever it is in the data and the number [= the "eid" field in Biblatex] when no page range is present, entirely independent of the issue number" - Source: https://github.com/citation-style-language/styles/issues/5827#issuecomment-1006011280. I personally think the "eid" field SHOULD be rendered here SOMEWHERE, maybe even IN ADDITION to the page range, because we have the data, right? Why not show it? - But this is just my humble opinion and may not be coherent with the current APA Style 7th edition.
+                Arguments.of(
+                        "Foo, B. (n.d.). volume + issue + pages + eid. Bib(La)TeX Journal, 1(9issue), 45–67.\n",
+                        BibDatabaseMode.BIBLATEX,
+                        new BibEntry(StandardEntryType.Article)
+                                .withField(StandardField.AUTHOR, "Foo, Bar")
+                                .withField(StandardField.JOURNALTITLE, "Bib(La)TeX Journal")
+                                .withField(StandardField.TITLE, "volume + issue + pages + eid")
+                                .withField(StandardField.EID, "Article 6eid")
+                                .withField(StandardField.ISSUE, "9issue")
+                                .withField(StandardField.PAGES, "45--67")
+                                .withField(StandardField.VOLUME, "1"),
+                        "apa-6th-edition.csl"),
+
+                // Not rendering the "eid" field here, is sufficient, but contested practice. This statement is based on the following reasoning: "eid" (in long: electronic identifier) is the field, which should be used to enter the "article number", when using the Biblatex standard. Both "eid" and "article number" do not exist in the older Bibtex standard. As a workaround, some Journals and publishers have opted to put the article number into the pages field. APA 7th Style recommends following procedure: "If the journal article has an article number instead of a page range, include the word "Article" and then the article number instead of the page range." - Source: https://apastyle.apa.org/style-grammar-guidelines/references/examples/journal-article-references#2. Additionally the APA style (7th edition) created by the CSL community "prints the issue [= the "number" field" in both Biblatex and Bibtex]  whenever it is in the data and the number [= the "eid" field in Biblatex] when no page range is present, entirely independent of the issue number" - Source: https://github.com/citation-style-language/styles/issues/5827#issuecomment-1006011280. I personally think the "eid" field SHOULD be rendered here SOMEWHERE, maybe even IN ADDITION to the page range, because we have the data, right? Why not show it? - But this is just my humble opinion and may not be coherent with the current APA Style 7th edition.
+                Arguments.of(
+                        "Foo, B. (n.d.). volume + number + pages + eid. Bib(La)TeX Journal, 1(3number), 45–67.\n",
+                        BibDatabaseMode.BIBLATEX,
+                        new BibEntry(StandardEntryType.Article)
+                                .withField(StandardField.AUTHOR, "Foo, Bar")
+                                .withField(StandardField.JOURNALTITLE, "Bib(La)TeX Journal")
+                                .withField(StandardField.TITLE, "volume + number + pages + eid")
+                                .withField(StandardField.EID, "6eid")
+                                .withField(StandardField.NUMBER, "3number")
+                                .withField(StandardField.PAGES, "45--67")
+                                .withField(StandardField.VOLUME, "1"),
+                        "apa-6th-edition.csl"),
+
+                Arguments.of(
+                        /*
+                         * Change test once apa-6th-edition.csl supports the CSL "number" field.
+                         * Tracked in https://github.com/citation-style-language/styles/issues/5827
+                         * Ideal test: "Foo, B. (n.d.). eid + issue. Bib(La)TeX Journal, (9issue), Article 6eid.\n",
+                         * Because of https://apastyle.apa.org/style-grammar-guidelines/references/examples/journal-article-references#2
+                         */
+                        "Foo, B. (n.d.). eid + issue. Bib(La)TeX Journal, (9issue).\n",
+                        BibDatabaseMode.BIBLATEX,
+                        new BibEntry(StandardEntryType.Article)
+                                .withField(StandardField.AUTHOR, "Foo, Bar")
+                                .withField(StandardField.JOURNALTITLE, "Bib(La)TeX Journal")
+                                .withField(StandardField.TITLE, "eid + issue")
+                                .withField(StandardField.EID, "Article 6eid")
+                                .withField(StandardField.ISSUE, "9issue"),
+                        "apa-6th-edition.csl"),
+
+                // Not rendering the "eid" field here, is sufficient, but contested practice. This statement is based on the following reasoning: "eid" (in long: electronic identifier) is the field, which should be used to enter the "article number", when using the Biblatex standard. Both "eid" and "article number" do not exist in the older Bibtex standard. As a workaround, some Journals and publishers have opted to put the article number into the pages field. APA 7th Style recommends following procedure: "If the journal article has an article number instead of a page range, include the word "Article" and then the article number instead of the page range." - Source: https://apastyle.apa.org/style-grammar-guidelines/references/examples/journal-article-references#2. Additionally the APA style (7th edition) created by the CSL community "prints the issue [= the "number" field" in both Biblatex and Bibtex]  whenever it is in the data and the number [= the "eid" field in Biblatex] when no page range is present, entirely independent of the issue number" - Source: https://github.com/citation-style-language/styles/issues/5827#issuecomment-1006011280. I personally think the "eid" field SHOULD be rendered here SOMEWHERE, maybe even IN ADDITION to the page range, because we have the data, right? Why not show it? - But this is just my humble opinion and may not be coherent with the current APA Style 7th edition.
+                Arguments.of(
+                        "Foo, B. (n.d.). eid + issue + pages. Bib(La)TeX Journal, (9issue), 45–67.\n",
+                        BibDatabaseMode.BIBLATEX,
+                        new BibEntry(StandardEntryType.Article)
+                                .withField(StandardField.AUTHOR, "Foo, Bar")
+                                .withField(StandardField.JOURNALTITLE, "Bib(La)TeX Journal")
+                                .withField(StandardField.TITLE, "eid + issue + pages")
+                                .withField(StandardField.EID, "6eid")
+                                .withField(StandardField.ISSUE, "9issue")
+                                .withField(StandardField.PAGES, "45--67"),
+                        "apa-6th-edition.csl"),
+
+                // Not rendering the "issue" field here is sufficient for APA 7th edition. Under current circumstances the "number" field takes priority over the "issue" field (see https://github.com/JabRef/jabref/issues/8372#issuecomment-1023768144). [Keyword: IS RENDERING BOTH VIABLE?]. Ideally, they would coexist: "Roughly speaking number subdivides volume and issue is much closer to subdividing year. I don't think I would want to say that issue is subordinate to number or vice versa. They sort of operate on a similar level." (Source: https://github.com/plk/biblatex/issues/726#issuecomment-1010264258)
+                /*
+                  Change test once apa-6th-edition.csl supports the CSL "number" field.
+                  Tracked in https://github.com/citation-style-language/styles/issues/5827
+                  Ideal test: "Foo, B. (n.d.). eid + issue + number. Bib(La)TeX Journal, (3number), Article 6eid.\n",
+                  Because of https://apastyle.apa.org/style-grammar-guidelines/references/examples/journal-article-references#2
+                 */
+                Arguments.of(
+                        "Foo, B. (n.d.). eid + issue + number. Bib(La)TeX Journal, (3number).\n",
+                        BibDatabaseMode.BIBLATEX,
+                        new BibEntry(StandardEntryType.Article)
+                                .withField(StandardField.AUTHOR, "Foo, Bar")
+                                .withField(StandardField.JOURNALTITLE, "Bib(La)TeX Journal")
+                                .withField(StandardField.TITLE, "eid + issue + number")
+                                .withField(StandardField.EID, "Article 6eid")
+                                .withField(StandardField.ISSUE, "9issue")
+                                .withField(StandardField.NUMBER, "3number"),
+                        "apa-6th-edition.csl"),
+
+                /*
+                    Not rendering the "eid" field here, is sufficient, but contested practice. This statement is based on the following reasoning: "eid" (in long: electronic identifier) is the field, which should be used to enter the "article number", when using the Biblatex standard. Both "eid" and "article number" do not exist in the older Bibtex standard. As a workaround, some Journals and publishers have opted to put the article number into the pages field. APA 7th Style recommends following procedure: "If the journal article has an article number instead of a page range, include the word "Article" and then the article number instead of the page range." - Source: https://apastyle.apa.org/style-grammar-guidelines/references/examples/journal-article-references#2. Additionally the APA style (7th edition) created by the CSL community "prints the issue [= the "number" field" in both Biblatex and Bibtex]  whenever it is in the data and the number [= the "eid" field in Biblatex] when no page range is present, entirely independent of the issue number" - Source: https://github.com/citation-style-language/styles/issues/5827#issuecomment-1006011280. I personally think the "eid" field SHOULD be rendered here SOMEWHERE, maybe even IN ADDITION to the page range, because we have the data, right? Why not show it? - But this is just my humble opinion and may not be coherent with the current APA Style 7th edition.
+
+                    Not rendering the "issue" field here is sufficient for APA 7th edition. Under current circumstances the "number" field takes priority over the "issue" field (see https://github.com/JabRef/jabref/issues/8372#issuecomment-1023768144). [Keyword: IS RENDERING BOTH VIABLE?]. Ideally, they would coexist: "Roughly speaking number subdivides volume and issue is much closer to subdividing year. I don't think I would want to say that issue is subordinate to number or vice versa. They sort of operate on a similar level." (Source: https://github.com/plk/biblatex/issues/726#issuecomment-1010264258)
+                */
+                Arguments.of(
+                        "Foo, B. (n.d.). eid + issue + number + pages. Bib(La)TeX Journal, (3number), 45–67.\n",
+                        BibDatabaseMode.BIBLATEX,
+                        new BibEntry(StandardEntryType.Article)
+                                .withField(StandardField.AUTHOR, "Foo, Bar")
+                                .withField(StandardField.JOURNALTITLE, "Bib(La)TeX Journal")
+                                .withField(StandardField.TITLE, "eid + issue + number + pages")
+                                .withField(StandardField.EID, "6eid")
+                                .withField(StandardField.ISSUE, "9issue")
+                                .withField(StandardField.NUMBER, "3number")
+                                .withField(StandardField.PAGES, "45--67"),
+                        "apa-6th-edition.csl"),
+
+                // Not rendering the "eid" field here, is sufficient, but contested practice. My personal opinion is that the "eid" (article number) will probably be more helpful to users for finding this article than the page range, if the "number" and "issue" and "volume" are unknown.
+                Arguments.of(
+                        "Foo, B. (n.d.). eid + pages. Bib(La)TeX Journal, 45–67.\n",
+                        BibDatabaseMode.BIBLATEX,
+                        new BibEntry(StandardEntryType.Article)
+                                .withField(StandardField.AUTHOR, "Foo, Bar")
+                                .withField(StandardField.JOURNALTITLE, "Bib(La)TeX Journal")
+                                .withField(StandardField.TITLE, "eid + pages")
+                                .withField(StandardField.EID, "6eid")
+                                .withField(StandardField.PAGES, "45--67"),
+                        "apa-6th-edition.csl"),
+
+                Arguments.of(
+                       /*
+                         Change test once apa-6th-edition.csl supports the CSL "number" field.
+                         Tracked in https://github.com/citation-style-language/styles/issues/5827
+                         Ideal test: "Foo, B. (n.d.). eid. Bib(La)TeX Journal, Article 6eid.\n",
+                         Because of https://apastyle.apa.org/style-grammar-guidelines/references/examples/journal-article-references#2
+                       */
+                        "Foo, B. (n.d.). eid. Bib(La)TeX Journal.\n",
+                        BibDatabaseMode.BIBLATEX,
+                        new BibEntry(StandardEntryType.Article)
+                                .withField(StandardField.AUTHOR, "Foo, Bar")
+                                .withField(StandardField.JOURNALTITLE, "Bib(La)TeX Journal")
+                                .withField(StandardField.TITLE, "eid")
+                                .withField(StandardField.EID, "Article 6eid"),
+                        "apa-6th-edition.csl"),
+
+                // All correct and not controversial, because APA Style (7th edition) recommends following procedure: "If the journal article has an article number instead of a page range, include the word "Article" and then the article number instead of the page range." (Source: https://apastyle.apa.org/style-grammar-guidelines/references/examples/journal-article-references#2)
+                /*
+                 Change test once apa-6th-edition.csl supports the CSL "number" field.
+                 Tracked in https://github.com/citation-style-language/styles/issues/5827
+                 Ideal test: "Foo, B. (n.d.). volume + number + eid. Bib(La)TeX Journal, 1(3number), Article 6eid.\n",
+                 Because of https://apastyle.apa.org/style-grammar-guidelines/references/examples/journal-article-references#2
+                */
+                Arguments.of(
+                        "Foo, B. (n.d.). volume + number + eid. Bib(La)TeX Journal, 1(3number).\n",
+                        BibDatabaseMode.BIBLATEX,
+                        new BibEntry(StandardEntryType.Article)
+                                .withField(StandardField.AUTHOR, "Foo, Bar")
+                                .withField(StandardField.JOURNALTITLE, "Bib(La)TeX Journal")
+                                .withField(StandardField.TITLE, "volume + number + eid")
+                                .withField(StandardField.EID, "Article 6eid")
+                                .withField(StandardField.NUMBER, "3number")
+                                .withField(StandardField.VOLUME, "1"),
+                        "apa-6th-edition.csl"),
+
+                // Not rendering the "eid" field here, is sufficient, but contested practice. This statement is based on the following reasoning: "eid" (in long: electronic identifier) is the field, which should be used to enter the "article number", when using the Biblatex standard. Both "eid" and "article number" do not exist in the older Bibtex standard. As a workaround, some Journals and publishers have opted to put the article number into the pages field. APA 7th Style recommends following procedure: "If the journal article has an article number instead of a page range, include the word "Article" and then the article number instead of the page range." - Source: https://apastyle.apa.org/style-grammar-guidelines/references/examples/journal-article-references#2. Additionally the APA style (7th edition) created by the CSL community "prints the issue [= the "number" field" in both Biblatex and Bibtex]  whenever it is in the data and the number [= the "eid" field in Biblatex] when no page range is present, entirely independent of the issue number" - Source: https://github.com/citation-style-language/styles/issues/5827#issuecomment-1006011280. I personally think the "eid" field SHOULD be rendered here SOMEWHERE, maybe even IN ADDITION to the page range, because we have the data, right? Why not show it? - But this is just my humble opinion and may not be coherent with the current APA Style 7th edition.
+                Arguments.of(
+                        "Foo, B. (n.d.). volume + pages + eid. Bib(La)TeX Journal, 1, 45–67.\n",
+                        BibDatabaseMode.BIBLATEX,
+                        new BibEntry(StandardEntryType.Article)
+                                .withField(StandardField.AUTHOR, "Foo, Bar")
+                                .withField(StandardField.JOURNALTITLE, "Bib(La)TeX Journal")
+                                .withField(StandardField.TITLE, "volume + pages + eid")
+                                .withField(StandardField.EID, "6eid")
+                                .withField(StandardField.PAGES, "45--67")
+                                .withField(StandardField.VOLUME, "1"),
+                        "apa-6th-edition.csl"),
+
+                // APA 7th Style recommends following procedure: "If the journal article has an article number instead of a page range, include the word "Article" and then the article number instead of the page range." (Source: https://apastyle.apa.org/style-grammar-guidelines/references/examples/journal-article-references#2)
+                /*
+                 Change test once apa-6th-edition.csl supports the CSL "number" field.
+                 Tracked in https://github.com/citation-style-language/styles/issues/5827
+                 Ideal test: "Foo, B. (n.d.). eid + number. Bib(La)TeX Journal, (3number), Article 6eid.\n",
+                 Because of https://apastyle.apa.org/style-grammar-guidelines/references/examples/journal-article-references#2
+                */
+                Arguments.of(
+                        "Foo, B. (n.d.). eid + number. Bib(La)TeX Journal, (3number).\n",
+                        BibDatabaseMode.BIBLATEX,
+                        new BibEntry(StandardEntryType.Article)
+                                .withField(StandardField.AUTHOR, "Foo, Bar")
+                                .withField(StandardField.JOURNALTITLE, "Bib(La)TeX Journal")
+                                .withField(StandardField.TITLE, "eid + number")
+                                .withField(StandardField.EID, "Article 6eid")
+                                .withField(StandardField.NUMBER, "3number"),
+                        "apa-6th-edition.csl"),
+
+                // Not rendering the "eid" field here, is sufficient, but contested practice. This statement is based on the following reasoning: "eid" (in long: electronic identifier) is the field, which should be used to enter the "article number", when using the Biblatex standard. Both "eid" and "article number" do not exist in the older Bibtex standard. As a workaround, some Journals and publishers have opted to put the article number into the pages field. APA 7th Style recommends following procedure: "If the journal article has an article number instead of a page range, include the word "Article" and then the article number instead of the page range." - Source: https://apastyle.apa.org/style-grammar-guidelines/references/examples/journal-article-references#2. Additionally the APA style (7th edition) created by the CSL community "prints the issue [= the "number" field" in both Biblatex and Bibtex]  whenever it is in the data and the number [= the "eid" field in Biblatex] when no page range is present, entirely independent of the issue number" - Source: https://github.com/citation-style-language/styles/issues/5827#issuecomment-1006011280. I personally think the "eid" field SHOULD be rendered here SOMEWHERE, maybe even IN ADDITION to the page range, because we have the data, right? Why not show it? - But this is just my humble opinion and may not be coherent with the current APA Style 7th edition.
+                Arguments.of(
+                        "Foo, B. (n.d.). eid + number + pages. Bib(La)TeX Journal, (3number), 45–67.\n",
+                        BibDatabaseMode.BIBLATEX,
+                        new BibEntry(StandardEntryType.Article)
+                                .withField(StandardField.AUTHOR, "Foo, Bar")
+                                .withField(StandardField.JOURNALTITLE, "Bib(La)TeX Journal")
+                                .withField(StandardField.TITLE, "eid + number + pages")
+                                .withField(StandardField.EID, "6eid")
+                                .withField(StandardField.NUMBER, "3number")
+                                .withField(StandardField.PAGES, "45--67"),
+                        "apa-6th-edition.csl"),
+
+                // Not rendering the "issue" field here is sufficient for APA Style (7th edition). Under current circumstances the "number" field takes priority over the "issue" field (see https://github.com/JabRef/jabref/issues/8372#issuecomment-1023768144). [Keyword: IS RENDERING BOTH VIABLE?]. Ideally, they would coexist: "Roughly speaking number subdivides volume and issue is much closer to subdividing year. I don't think I would want to say that issue is subordinate to number or vice versa. They sort of operate on a similar level." (Source: https://github.com/plk/biblatex/issues/726#issuecomment-1010264258)
+                Arguments.of(
+                        "Foo, B. (n.d.). issue + number. Bib(La)TeX Journal, (3number).\n",
+                        BibDatabaseMode.BIBLATEX,
+                        new BibEntry(StandardEntryType.Article)
+                                .withField(StandardField.AUTHOR, "Foo, Bar")
+                                .withField(StandardField.JOURNALTITLE, "Bib(La)TeX Journal")
+                                .withField(StandardField.TITLE, "issue + number")
+                                .withField(StandardField.ISSUE, "9issue")
+                                .withField(StandardField.NUMBER, "3number"),
+                        "apa-6th-edition.csl"),
+
+                // Not rendering the "issue" field here is sufficient for APA 7th edition. Under current circumstances the "number" field takes priority over the "issue" field (see https://github.com/JabRef/jabref/issues/8372#issuecomment-1023768144). [Keyword: IS RENDERING BOTH VIABLE?]. Ideally, they would coexist: "Roughly speaking number subdivides volume and issue is much closer to subdividing year. I don't think I would want to say that issue is subordinate to number or vice versa. They sort of operate on a similar level." (Source: https://github.com/plk/biblatex/issues/726#issuecomment-1010264258)
+                Arguments.of(
+                        "Foo, B. (n.d.). issue + number + pages. Bib(La)TeX Journal, (3number), 45–67.\n",
+                        BibDatabaseMode.BIBLATEX,
+                        new BibEntry(StandardEntryType.Article)
+                                .withField(StandardField.AUTHOR, "Foo, Bar")
+                                .withField(StandardField.JOURNALTITLE, "Bib(La)TeX Journal")
+                                .withField(StandardField.TITLE, "issue + number + pages")
+                                .withField(StandardField.ISSUE, "9issue")
+                                .withField(StandardField.NUMBER, "3number")
+                                .withField(StandardField.PAGES, "45--67"),
+                        "apa-6th-edition.csl")
+        );
     }
 
-    @Test
-    void testBiblatexWithIssue() {
-        BibEntry entry = new BibEntry(StandardEntryType.Article);
-        entry.setField(StandardField.AUTHOR, "Last, First and\nDoe, Jane");
-        entry.setField(StandardField.ISSUE, "7");
-
-        // if the default citation style changes this has to be modified
-        String expected = "[1]F. Last and J. Doe, no. 7.\n";
-
+    @ParameterizedTest
+    @MethodSource
+    void testCslMapping(String expected, BibDatabaseMode mode, BibEntry entry, String cslFileName) throws Exception {
         BibDatabaseContext bibDatabaseContext = new BibDatabaseContext(new BibDatabase(List.of(entry)));
-        bibDatabaseContext.setMode(BibDatabaseMode.BIBLATEX);
-
-        String citation = CitationStyleGenerator.generateCitation(entry, CitationStyle.getDefault().getSource(), CitationStyleOutputFormat.TEXT, bibDatabaseContext, bibEntryTypesManager);
-        assertEquals(expected, citation);
-    }
-
-    @Test
-    void testBiblatexWitNumber() {
-        BibEntry entry = new BibEntry(StandardEntryType.Article);
-        entry.setField(StandardField.AUTHOR, "Last, First and Doe, Jane");
-        entry.setField(StandardField.NUMBER, "7");
-
-        // if the default citation style changes this has to be modified
-        String expected = "[1]F. Last and J. Doe, Art. no. 7.\n";
-
-        BibDatabaseContext bibDatabaseContext = new BibDatabaseContext(new BibDatabase(List.of(entry)));
-        bibDatabaseContext.setMode(BibDatabaseMode.BIBLATEX);
-
-        String citation = CitationStyleGenerator.generateCitation(entry, CitationStyle.getDefault().getSource(), CitationStyleOutputFormat.TEXT, bibDatabaseContext, bibEntryTypesManager);
-        assertEquals(expected, citation);
-    }
-
-    @Test
-    void testBiblatexWithIssueAndNumber() {
-        BibEntry entry = new BibEntry(StandardEntryType.Article);
-        entry.setField(StandardField.AUTHOR, "Last, First and\nDoe, Jane");
-        entry.setField(StandardField.ISSUE, "7");
-        entry.setField(StandardField.NUMBER, "28");
-
-        // if the default citation style changes this has to be modified
-        String expected = "[1]F. Last and J. Doe, no. 7, Art. no. 28.\n";
-
-        BibDatabaseContext bibDatabaseContext = new BibDatabaseContext(new BibDatabase(List.of(entry)));
-        bibDatabaseContext.setMode(BibDatabaseMode.BIBLATEX);
-
-        String citation = CitationStyleGenerator.generateCitation(entry, CitationStyle.getDefault().getSource(), CitationStyleOutputFormat.TEXT, bibDatabaseContext, bibEntryTypesManager);
-        assertEquals(expected, citation);
-    }
-
-    @Test
-    void testBiblatexWithPages() {
-        BibEntry entry = new BibEntry(StandardEntryType.Article);
-        entry.setField(StandardField.AUTHOR, "Last, First and\nDoe, Jane");
-        entry.setField(StandardField.PAGES, "7--8");
-        entry.setField(StandardField.ISSUE, "28");
-
-        // if the default citation style changes this has to be modified
-        String expected = "[1]F. Last and J. Doe, no. 28, pp. 7–8.\n";
-
-        BibDatabaseContext bibDatabaseContext = new BibDatabaseContext(new BibDatabase(List.of(entry)));
-        bibDatabaseContext.setMode(BibDatabaseMode.BIBLATEX);
-
-        String citation = CitationStyleGenerator.generateCitation(entry, CitationStyle.getDefault().getSource(), CitationStyleOutputFormat.TEXT, bibDatabaseContext, bibEntryTypesManager);
+        bibDatabaseContext.setMode(mode);
+
+        String citation = CitationStyleGenerator.generateCitation(
+                entry,
+                CitationStyle.createCitationStyleFromFile(cslFileName).orElseThrow().getSource(),
+                CitationStyleOutputFormat.TEXT,
+                bibDatabaseContext,
+                bibEntryTypesManager);
         assertEquals(expected, citation);
     }
 }
diff --git a/src/test/java/org/jabref/logic/citationstyle/CitationStyleTest.java b/src/test/java/org/jabref/logic/citationstyle/CitationStyleTest.java
index 6d97c192ca2..b05aed909a5 100644
--- a/src/test/java/org/jabref/logic/citationstyle/CitationStyleTest.java
+++ b/src/test/java/org/jabref/logic/citationstyle/CitationStyleTest.java
@@ -22,17 +22,22 @@ void getDefault() throws Exception {
 
     @Test
     void testDefaultCitation() {
-
         BibDatabaseContext context = new BibDatabaseContext(new BibDatabase(List.of(TestEntry.getTestEntry())));
         context.setMode(BibDatabaseMode.BIBLATEX);
         String citation = CitationStyleGenerator.generateCitation(TestEntry.getTestEntry(), CitationStyle.getDefault().getSource(), CitationStyleOutputFormat.HTML, context, new BibEntryTypesManager());
 
         // if the default citation style changes this has to be modified
         String expected = "  <div class=\"csl-entry\">\n"
-                          + "    <div class=\"csl-left-margin\">[1]</div><div class=\"csl-right-inline\">B. Smith, B. Jones, and J. Williams, &ldquo;Title of the test entry,&rdquo; <span style=\"font-style: italic\">BibTeX Journal</span>, vol. 34, no. 7, Art. no. 3, 2016-07, doi: 10.1001/bla.blubb.</div>\n"
+                          + "    <div class=\"csl-left-margin\">[1]</div><div class=\"csl-right-inline\">B. Smith, B. Jones, and J. Williams, &ldquo;Title of the test entry,&rdquo; <span style=\"font-style: italic\">BibTeX Journal</span>, vol. 34, no. 3, pp. 45&ndash;67, 2016-07, doi: 10.1001/bla.blubb.</div>\n"
                           + "  </div>\n"
                           + "";
 
         assertEquals(expected, citation);
     }
+
+    @Test
+    void testDiscoverCitationStylesNotNull() throws Exception {
+        List<CitationStyle> styleList = CitationStyle.discoverCitationStyles();
+        assertNotNull(styleList);
+    }
 }
diff --git a/src/test/java/org/jabref/logic/cleanup/ConvertToBiblatexCleanupTest.java b/src/test/java/org/jabref/logic/cleanup/ConvertToBiblatexCleanupTest.java
index 8c215028ba9..2208a000130 100644
--- a/src/test/java/org/jabref/logic/cleanup/ConvertToBiblatexCleanupTest.java
+++ b/src/test/java/org/jabref/logic/cleanup/ConvertToBiblatexCleanupTest.java
@@ -97,5 +97,4 @@ public void cleanupMovesJournalToJournaltitle() {
         assertEquals(Optional.empty(), entry.getField(StandardField.JOURNAL));
         assertEquals(Optional.of("Best of JabRef"), entry.getField(StandardField.JOURNALTITLE));
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/cleanup/DoiCleanupTest.java b/src/test/java/org/jabref/logic/cleanup/DoiCleanupTest.java
index 66d9d4219ee..10373808718 100644
--- a/src/test/java/org/jabref/logic/cleanup/DoiCleanupTest.java
+++ b/src/test/java/org/jabref/logic/cleanup/DoiCleanupTest.java
@@ -60,8 +60,12 @@ private static Stream<Arguments> provideDoiForAllLowers() {
 
                 // cleanup just ee field with URL
                 Arguments.of(doiResult, new BibEntry()
-                        .withField(unknownField, "https://doi.org/10.1145/2594455"))
-        );
-    }
+                        .withField(unknownField, "https://doi.org/10.1145/2594455")),
 
+                // cleanup of url encoded chars
+                Arguments.of(new BibEntry()
+                         .withField(StandardField.DOI, "10.18726/2018_3"),
+                          new BibEntry()
+                         .withField(unknownField, "https://doi.org/10.18726/2018%7B%5Ctextunderscore%7D3")));
+            }
 }
diff --git a/src/test/java/org/jabref/logic/cleanup/DoiDecodeCleanupTest.java b/src/test/java/org/jabref/logic/cleanup/DoiDecodeCleanupTest.java
new file mode 100644
index 00000000000..b07904b2719
--- /dev/null
+++ b/src/test/java/org/jabref/logic/cleanup/DoiDecodeCleanupTest.java
@@ -0,0 +1,66 @@
+package org.jabref.logic.cleanup;
+
+import java.util.stream.Stream;
+
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.field.StandardField;
+import org.jabref.model.entry.field.UnknownField;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class DoiDecodeCleanupTest {
+
+    @ParameterizedTest
+    @MethodSource("provideDoiForAllLowers")
+    public void testChangeDoi(BibEntry expected, BibEntry doiInfoField) {
+        DoiCleanup cleanUp = new DoiCleanup();
+        cleanUp.cleanup(doiInfoField);
+
+        assertEquals(expected, doiInfoField);
+    }
+
+    private static Stream<Arguments> provideDoiForAllLowers() {
+        UnknownField unknownField = new UnknownField("ee");
+        BibEntry doiResult = new BibEntry().withField(StandardField.DOI, "10.18726/2018_3");
+
+        return Stream.of(
+                // cleanup for Doi field only
+                Arguments.of(doiResult, new BibEntry().withField(
+                        StandardField.URL, "https://doi.org/10.18726/2018%7B%5Ctextunderscore%7D3")),
+
+                // cleanup with Doi and URL to all entries
+                Arguments.of(doiResult, new BibEntry()
+                        .withField(StandardField.DOI, "10.18726/2018%7B%5Ctextunderscore%7D3")
+                        .withField(StandardField.URL, "https://doi.org/10.18726/2018%7B%5Ctextunderscore%7D3")
+                        .withField(StandardField.NOTE, "https://doi.org/10.18726/2018%7B%5Ctextunderscore%7D3")
+                        .withField(unknownField, "https://doi.org/10.18726/2018%7B%5Ctextunderscore%7D3")),
+
+                // cleanup with Doi and no URL to entries
+                Arguments.of(
+                        new BibEntry()
+                        .withField(StandardField.DOI, "10.18726/2018_3")
+                        .withField(StandardField.NOTE, "This is a random note to this Doi")
+                        .withField(unknownField, "This is a random ee field for this Doi"),
+                        new BibEntry()
+                        .withField(StandardField.DOI, "10.18726/2018_3")
+                        .withField(StandardField.NOTE, "This is a random note to this Doi")
+                        .withField(unknownField, "This is a random ee field for this Doi")),
+
+                // cleanup with spaced Doi
+                Arguments.of(doiResult, new BibEntry()
+                        .withField(StandardField.DOI, "10.18726/2018%7B%5Ctextunderscore%7D3")),
+
+                // cleanup just Note field with URL
+                Arguments.of(doiResult, new BibEntry()
+                        .withField(StandardField.NOTE, "https://doi.org/10.18726/2018%7B%5Ctextunderscore%7D3")),
+
+                // cleanup just ee field with URL
+                Arguments.of(doiResult, new BibEntry()
+                        .withField(unknownField, "https://doi.org/10.18726/2018%7B%5Ctextunderscore%7D3"))
+        );
+    }
+}
diff --git a/src/test/java/org/jabref/logic/cleanup/TimeStampToCreationDateTest.java b/src/test/java/org/jabref/logic/cleanup/TimeStampToCreationDateTest.java
index 6cfbb82029f..67027811cf1 100644
--- a/src/test/java/org/jabref/logic/cleanup/TimeStampToCreationDateTest.java
+++ b/src/test/java/org/jabref/logic/cleanup/TimeStampToCreationDateTest.java
@@ -176,5 +176,4 @@ public void withDifferentFormats(BibEntry expected, BibEntry input) {
         migrator.cleanup(input);
         assertEquals(expected, input);
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/crawler/CrawlerTest.java b/src/test/java/org/jabref/logic/crawler/CrawlerTest.java
index f41c82be17e..7f2c60405cc 100644
--- a/src/test/java/org/jabref/logic/crawler/CrawlerTest.java
+++ b/src/test/java/org/jabref/logic/crawler/CrawlerTest.java
@@ -1,9 +1,11 @@
 package org.jabref.logic.crawler;
 
 import java.net.URL;
-import java.nio.charset.Charset;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.List;
+
+import javafx.collections.FXCollections;
 
 import org.jabref.logic.bibtex.FieldContentFormatterPreferences;
 import org.jabref.logic.citationkeypattern.CitationKeyPatternPreferences;
@@ -11,6 +13,7 @@
 import org.jabref.logic.exporter.SavePreferences;
 import org.jabref.logic.git.SlrGitHandler;
 import org.jabref.logic.importer.ImportFormatPreferences;
+import org.jabref.logic.importer.ImporterPreferences;
 import org.jabref.logic.util.io.FileUtil;
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.metadata.SaveOrderConfig;
@@ -34,6 +37,7 @@ class CrawlerTest {
     @TempDir
     Path tempRepositoryDirectory;
     ImportFormatPreferences importFormatPreferences;
+    ImporterPreferences importerPreferences;
     SavePreferences savePreferences;
     BibEntryTypesManager entryTypesManager;
     SlrGitHandler gitHandler = mock(SlrGitHandler.class, Answers.RETURNS_DEFAULTS);
@@ -45,21 +49,26 @@ class CrawlerTest {
     @Test
     public void testWhetherAllFilesAreCreated() throws Exception {
         setUp();
-        Crawler testCrawler = new Crawler(getPathToStudyDefinitionFile(), gitHandler, generalPreferences, importFormatPreferences, savePreferences, entryTypesManager, new DummyFileUpdateMonitor());
+        Crawler testCrawler = new Crawler(getPathToStudyDefinitionFile(),
+                gitHandler,
+                generalPreferences,
+                importFormatPreferences,
+                importerPreferences,
+                savePreferences,
+                entryTypesManager,
+                new DummyFileUpdateMonitor());
 
         testCrawler.performCrawl();
 
         assertTrue(Files.exists(Path.of(tempRepositoryDirectory.toString(), hashCodeQuantum + " - Quantum")));
         assertTrue(Files.exists(Path.of(tempRepositoryDirectory.toString(), hashCodeCloudComputing + " - Cloud Computing")));
 
-        assertTrue(Files.exists(Path.of(tempRepositoryDirectory.toString(), hashCodeQuantum + " - Quantum", "ArXiv.bib")));
-        assertTrue(Files.exists(Path.of(tempRepositoryDirectory.toString(), hashCodeCloudComputing + " - Cloud Computing", "ArXiv.bib")));
-
-        assertTrue(Files.exists(Path.of(tempRepositoryDirectory.toString(), hashCodeQuantum + " - Quantum", "Springer.bib")));
-        assertTrue(Files.exists(Path.of(tempRepositoryDirectory.toString(), hashCodeCloudComputing + " - Cloud Computing", "Springer.bib")));
-
-        assertTrue(Files.exists(Path.of(tempRepositoryDirectory.toString(), hashCodeQuantum + " - Quantum", "result.bib")));
-        assertTrue(Files.exists(Path.of(tempRepositoryDirectory.toString(), hashCodeCloudComputing + " - Cloud Computing", "result.bib")));
+        List<String> filesToAssert = List.of("ArXiv.bib", "Springer.bib", "result.bib", "Medline_PubMed.bib");
+        filesToAssert.forEach(
+                fileName -> {
+                    assertTrue(Files.exists(Path.of(tempRepositoryDirectory.toString(), hashCodeQuantum + " - Quantum", fileName)));
+                    assertTrue(Files.exists(Path.of(tempRepositoryDirectory.toString(), hashCodeCloudComputing + " - Cloud Computing", fileName)));
+                });
         assertTrue(Files.exists(Path.of(tempRepositoryDirectory.toString(), "studyResult.bib")));
     }
 
@@ -85,11 +94,12 @@ private void setUp() throws Exception {
                 ',');
 
         importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        importerPreferences = mock(ImporterPreferences.class);
         savePreferences = mock(SavePreferences.class, Answers.RETURNS_DEEP_STUBS);
         when(savePreferences.getSaveOrder()).thenReturn(new SaveOrderConfig());
         when(savePreferences.takeMetadataSaveOrderInAccount()).thenReturn(true);
         when(savePreferences.getCitationKeyPatternPreferences()).thenReturn(citationKeyPatternPreferences);
-        when(generalPreferences.getDefaultEncoding()).thenReturn(Charset.defaultCharset());
+        when(importerPreferences.getApiKeys()).thenReturn(FXCollections.emptyObservableSet());
         when(importFormatPreferences.getKeywordSeparator()).thenReturn(',');
         when(importFormatPreferences.getFieldContentFormatterPreferences()).thenReturn(new FieldContentFormatterPreferences());
         entryTypesManager = new BibEntryTypesManager();
diff --git a/src/test/java/org/jabref/logic/crawler/StudyDatabaseToFetcherConverterTest.java b/src/test/java/org/jabref/logic/crawler/StudyDatabaseToFetcherConverterTest.java
index 55ef69a9c62..37829f6fb5d 100644
--- a/src/test/java/org/jabref/logic/crawler/StudyDatabaseToFetcherConverterTest.java
+++ b/src/test/java/org/jabref/logic/crawler/StudyDatabaseToFetcherConverterTest.java
@@ -1,14 +1,17 @@
 package org.jabref.logic.crawler;
 
 import java.net.URL;
-import java.nio.charset.Charset;
 import java.nio.file.Path;
 import java.util.List;
+import java.util.stream.Collectors;
+
+import javafx.collections.FXCollections;
 
 import org.jabref.logic.bibtex.FieldContentFormatterPreferences;
 import org.jabref.logic.exporter.SavePreferences;
 import org.jabref.logic.git.SlrGitHandler;
 import org.jabref.logic.importer.ImportFormatPreferences;
+import org.jabref.logic.importer.ImporterPreferences;
 import org.jabref.logic.importer.SearchBasedFetcher;
 import org.jabref.logic.preferences.TimestampPreferences;
 import org.jabref.logic.util.io.FileUtil;
@@ -29,6 +32,7 @@
 class StudyDatabaseToFetcherConverterTest {
     GeneralPreferences generalPreferences;
     ImportFormatPreferences importFormatPreferences;
+    ImporterPreferences importerPreferences;
     SavePreferences savePreferences;
     TimestampPreferences timestampPreferences;
     BibEntryTypesManager entryTypesManager;
@@ -40,13 +44,14 @@ class StudyDatabaseToFetcherConverterTest {
     void setUpMocks() {
         generalPreferences = mock(GeneralPreferences.class, Answers.RETURNS_DEEP_STUBS);
         importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        importerPreferences = mock(ImporterPreferences.class);
         savePreferences = mock(SavePreferences.class, Answers.RETURNS_DEEP_STUBS);
         timestampPreferences = mock(TimestampPreferences.class);
-        when(generalPreferences.getDefaultEncoding()).thenReturn(Charset.defaultCharset());
         when(savePreferences.getSaveOrder()).thenReturn(new SaveOrderConfig());
         when(savePreferences.takeMetadataSaveOrderInAccount()).thenReturn(true);
         when(importFormatPreferences.getKeywordSeparator()).thenReturn(',');
         when(importFormatPreferences.getFieldContentFormatterPreferences()).thenReturn(new FieldContentFormatterPreferences());
+        when(importerPreferences.getApiKeys()).thenReturn(FXCollections.emptyObservableSet());
         entryTypesManager = new BibEntryTypesManager();
         gitHandler = mock(SlrGitHandler.class, Answers.RETURNS_DEFAULTS);
     }
@@ -56,13 +61,25 @@ public void getActiveFetcherInstances() throws Exception {
         Path studyDefinition = tempRepositoryDirectory.resolve("study.yml");
         copyTestStudyDefinitionFileIntoDirectory(studyDefinition);
 
-        StudyRepository studyRepository = new StudyRepository(tempRepositoryDirectory, gitHandler, generalPreferences, importFormatPreferences, new DummyFileUpdateMonitor(), savePreferences, entryTypesManager);
-        StudyDatabaseToFetcherConverter converter = new StudyDatabaseToFetcherConverter(studyRepository.getActiveLibraryEntries(), importFormatPreferences);
+        StudyRepository studyRepository = new StudyRepository(
+                tempRepositoryDirectory,
+                gitHandler,
+                generalPreferences,
+                importFormatPreferences,
+                importerPreferences,
+                new DummyFileUpdateMonitor(),
+                savePreferences,
+                entryTypesManager);
+        StudyDatabaseToFetcherConverter converter = new StudyDatabaseToFetcherConverter(
+                studyRepository.getActiveLibraryEntries(),
+                importFormatPreferences,
+                importerPreferences);
         List<SearchBasedFetcher> result = converter.getActiveFetchers();
 
-        Assertions.assertEquals(2, result.size());
-        Assertions.assertEquals(result.get(0).getName(), "Springer");
-        Assertions.assertEquals(result.get(1).getName(), "ArXiv");
+        Assertions.assertEquals(
+                List.of("Springer", "ArXiv", "Medline/PubMed"),
+                result.stream().map(SearchBasedFetcher::getName).collect(Collectors.toList())
+        );
     }
 
     private void copyTestStudyDefinitionFileIntoDirectory(Path destination) throws Exception {
diff --git a/src/test/java/org/jabref/logic/crawler/StudyRepositoryTest.java b/src/test/java/org/jabref/logic/crawler/StudyRepositoryTest.java
index 587e68949ed..697b04958f6 100644
--- a/src/test/java/org/jabref/logic/crawler/StudyRepositoryTest.java
+++ b/src/test/java/org/jabref/logic/crawler/StudyRepositoryTest.java
@@ -2,14 +2,14 @@
 
 import java.io.IOException;
 import java.net.URL;
-import java.nio.charset.Charset;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 
+import javafx.collections.FXCollections;
+
 import org.jabref.logic.bibtex.FieldContentFormatterPreferences;
 import org.jabref.logic.citationkeypattern.CitationKeyGenerator;
 import org.jabref.logic.citationkeypattern.CitationKeyPatternPreferences;
@@ -18,6 +18,7 @@
 import org.jabref.logic.exporter.SavePreferences;
 import org.jabref.logic.git.SlrGitHandler;
 import org.jabref.logic.importer.ImportFormatPreferences;
+import org.jabref.logic.importer.ImporterPreferences;
 import org.jabref.logic.preferences.TimestampPreferences;
 import org.jabref.logic.util.io.FileUtil;
 import org.jabref.model.database.BibDatabase;
@@ -39,6 +40,7 @@
 
 import static org.jabref.logic.citationkeypattern.CitationKeyGenerator.DEFAULT_UNWANTED_CHARACTERS;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.Mockito.mock;
@@ -49,6 +51,7 @@ class StudyRepositoryTest {
     CitationKeyPatternPreferences citationKeyPatternPreferences;
     GeneralPreferences generalPreferences;
     ImportFormatPreferences importFormatPreferences;
+    ImporterPreferences importerPreferences;
     SavePreferences savePreferences;
     TimestampPreferences timestampPreferences;
     BibEntryTypesManager entryTypesManager;
@@ -68,6 +71,7 @@ public void setUpMocks() throws Exception {
         generalPreferences = mock(GeneralPreferences.class, Answers.RETURNS_DEEP_STUBS);
         savePreferences = mock(SavePreferences.class, Answers.RETURNS_DEEP_STUBS);
         importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        importerPreferences = mock(ImporterPreferences.class);
         timestampPreferences = mock(TimestampPreferences.class);
         citationKeyPatternPreferences = new CitationKeyPatternPreferences(
                 false,
@@ -79,10 +83,10 @@ public void setUpMocks() throws Exception {
                 DEFAULT_UNWANTED_CHARACTERS,
                 GlobalCitationKeyPattern.fromPattern("[auth][year]"),
                 ',');
-        when(generalPreferences.getDefaultEncoding()).thenReturn(Charset.defaultCharset());
         when(savePreferences.getSaveOrder()).thenReturn(new SaveOrderConfig());
         when(savePreferences.takeMetadataSaveOrderInAccount()).thenReturn(true);
         when(savePreferences.getCitationKeyPatternPreferences()).thenReturn(citationKeyPatternPreferences);
+        when(importerPreferences.getApiKeys()).thenReturn(FXCollections.emptyObservableSet());
         when(importFormatPreferences.getKeywordSeparator()).thenReturn(',');
         when(importFormatPreferences.getFieldContentFormatterPreferences()).thenReturn(new FieldContentFormatterPreferences());
         when(timestampPreferences.getTimestampField()).then(invocation -> StandardField.TIMESTAMP);
@@ -94,15 +98,22 @@ public void setUpMocks() throws Exception {
     void providePathToNonExistentRepositoryThrowsException() {
         Path nonExistingRepositoryDirectory = tempRepositoryDirectory.resolve(NON_EXISTING_DIRECTORY);
 
-        assertThrows(IOException.class, () -> new StudyRepository(nonExistingRepositoryDirectory, gitHandler, generalPreferences, importFormatPreferences, new DummyFileUpdateMonitor(), savePreferences, entryTypesManager));
+        assertThrows(IOException.class, () -> new StudyRepository(
+                nonExistingRepositoryDirectory,
+                gitHandler,
+                generalPreferences,
+                importFormatPreferences,
+                importerPreferences,
+                new DummyFileUpdateMonitor(),
+                savePreferences,
+                entryTypesManager));
     }
 
     /**
      * Tests whether the file structure of the repository is created correctly from the study definitions file.
      */
     @Test
-    void repositoryStructureCorrectlyCreated() throws Exception {
-
+    void repositoryStructureCorrectlyCreated() {
         // When repository is instantiated the directory structure is created
         assertTrue(Files.exists(Path.of(tempRepositoryDirectory.toString(), hashCodeQuantum + " - Quantum")));
         assertTrue(Files.exists(Path.of(tempRepositoryDirectory.toString(), hashCodeCloudComputing + " - Cloud Computing")));
@@ -113,9 +124,9 @@ void repositoryStructureCorrectlyCreated() throws Exception {
         assertTrue(Files.exists(Path.of(tempRepositoryDirectory.toString(), hashCodeQuantum + " - Quantum", "Springer.bib")));
         assertTrue(Files.exists(Path.of(tempRepositoryDirectory.toString(), hashCodeCloudComputing + " - Cloud Computing", "Springer.bib")));
         assertTrue(Files.exists(Path.of(tempRepositoryDirectory.toString(), hashCodeSoftwareEngineering + " - Software Engineering", "Springer.bib")));
-        assertTrue(Files.notExists(Path.of(tempRepositoryDirectory.toString(), hashCodeQuantum + " - Quantum", "IEEEXplore.bib")));
-        assertTrue(Files.notExists(Path.of(tempRepositoryDirectory.toString(), hashCodeCloudComputing + " - Cloud Computing", "IEEEXplore.bib")));
-        assertTrue(Files.notExists(Path.of(tempRepositoryDirectory.toString(), hashCodeSoftwareEngineering + " - Software Engineering", "IEEEXplore.bib")));
+        assertFalse(Files.exists(Path.of(tempRepositoryDirectory.toString(), hashCodeQuantum + " - Quantum", "IEEEXplore.bib")));
+        assertFalse(Files.exists(Path.of(tempRepositoryDirectory.toString(), hashCodeCloudComputing + " - Cloud Computing", "IEEEXplore.bib")));
+        assertFalse(Files.exists(Path.of(tempRepositoryDirectory.toString(), hashCodeSoftwareEngineering + " - Software Engineering", "IEEEXplore.bib")));
     }
 
     /**
@@ -154,27 +165,24 @@ void mergedResultsPersistedCorrectly() throws Exception {
         assertEquals(getSpringerCloudComputingMockResults(), getTestStudyRepository().getQueryResultEntries("Cloud Computing").getEntries());
     }
 
-    @Test
-    void setsLastSearchDatePersistedCorrectly() throws Exception {
-        List<QueryResult> mockResults = getMockResults();
-
-        studyRepository.persist(mockResults);
-
-        assertEquals(LocalDate.now(), getTestStudyRepository().getStudy().getLastSearchDate());
-    }
-
     @Test
     void studyResultsPersistedCorrectly() throws Exception {
         List<QueryResult> mockResults = getMockResults();
-
         studyRepository.persist(mockResults);
-
         assertEquals(new HashSet<>(getNonDuplicateBibEntryResult().getEntries()), new HashSet<>(getTestStudyRepository().getStudyResultEntries().getEntries()));
     }
 
     private StudyRepository getTestStudyRepository() throws Exception {
         setUpTestStudyDefinitionFile();
-        studyRepository = new StudyRepository(tempRepositoryDirectory, gitHandler, generalPreferences, importFormatPreferences, new DummyFileUpdateMonitor(), savePreferences, entryTypesManager);
+        studyRepository = new StudyRepository(
+                tempRepositoryDirectory,
+                gitHandler,
+                generalPreferences,
+                importFormatPreferences,
+                importerPreferences,
+                new DummyFileUpdateMonitor(),
+                savePreferences,
+                entryTypesManager);
         return studyRepository;
     }
 
diff --git a/src/test/java/org/jabref/logic/crawler/StudyYamlParserTest.java b/src/test/java/org/jabref/logic/crawler/StudyYamlParserTest.java
index 8fbd419f01f..1b169f7f00a 100644
--- a/src/test/java/org/jabref/logic/crawler/StudyYamlParserTest.java
+++ b/src/test/java/org/jabref/logic/crawler/StudyYamlParserTest.java
@@ -2,7 +2,6 @@
 
 import java.net.URL;
 import java.nio.file.Path;
-import java.time.LocalDate;
 import java.util.List;
 
 import org.jabref.logic.util.io.FileUtil;
@@ -31,25 +30,22 @@ void setupStudy() throws Exception {
         String studyName = "TestStudyName";
         List<String> researchQuestions = List.of("Question1", "Question2");
         List<StudyQuery> queryEntries = List.of(new StudyQuery("Quantum"), new StudyQuery("Cloud Computing"), new StudyQuery("\"Software Engineering\""));
-        List<StudyDatabase> libraryEntries = List.of(new StudyDatabase("Springer", true), new StudyDatabase("ArXiv", true), new StudyDatabase("IEEEXplore", false));
+        List<StudyDatabase> libraryEntries = List.of(new StudyDatabase("Springer", true), new StudyDatabase("ArXiv", true),
+                new StudyDatabase("Medline/PubMed", true), new StudyDatabase("IEEEXplore", false));
 
         expectedStudy = new Study(authors, studyName, researchQuestions, queryEntries, libraryEntries);
-        expectedStudy.setLastSearchDate(LocalDate.parse("2020-11-26"));
     }
 
     @Test
     public void parseStudyFileSuccessfully() throws Exception {
         Study study = new StudyYamlParser().parseStudyYamlFile(testDirectory.resolve("study.yml"));
-
         assertEquals(expectedStudy, study);
     }
 
     @Test
     public void writeStudyFileSuccessfully() throws Exception {
         new StudyYamlParser().writeStudyYamlFile(expectedStudy, testDirectory.resolve("study.yml"));
-
         Study study = new StudyYamlParser().parseStudyYamlFile(testDirectory.resolve("study.yml"));
-
         assertEquals(expectedStudy, study);
     }
 }
diff --git a/src/test/java/org/jabref/logic/database/DatabaseMergerTest.java b/src/test/java/org/jabref/logic/database/DatabaseMergerTest.java
index 7fc49bab232..f36cddb486c 100644
--- a/src/test/java/org/jabref/logic/database/DatabaseMergerTest.java
+++ b/src/test/java/org/jabref/logic/database/DatabaseMergerTest.java
@@ -3,6 +3,7 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
+import org.jabref.logic.bibtex.comparator.BibtexStringComparator;
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibEntry;
@@ -36,27 +37,53 @@ void setUp() {
     @Test
     void mergeAddsNonDuplicateEntries() {
         // Entries 1 and 2 are identical
-        BibEntry entry1 = new BibEntry()
+        BibEntry entry1 = new BibEntry(StandardEntryType.Article)
                 .withField(StandardField.AUTHOR, "Phillip Kaye and Michele Mosca")
                 .withField(StandardField.TITLE, "Quantum Networks for Generating Arbitrary Quantum States");
-        entry1.setType(StandardEntryType.Article);
-        BibEntry entry2 = new BibEntry()
+        BibEntry entry2 = new BibEntry(StandardEntryType.Article)
                 .withField(StandardField.AUTHOR, "Phillip Kaye and Michele Mosca")
                 .withField(StandardField.TITLE, "Quantum Networks for Generating Arbitrary Quantum States");
-        entry2.setType(StandardEntryType.Article);
-        BibEntry entry3 = new BibEntry()
+        BibEntry entry3 = new BibEntry(StandardEntryType.Article)
                 .withField(StandardField.AUTHOR, "Stephen Blaha")
                 .withField(StandardField.TITLE, "Quantum Computers and Quantum Computer Languages: Quantum Assembly Language and Quantum C Language");
-        entry3.setType(StandardEntryType.Article);
 
         BibDatabase database = new BibDatabase(List.of(entry1));
         BibDatabase other = new BibDatabase(List.of(entry2, entry3));
         new DatabaseMerger(importFormatPreferences.getKeywordSeparator()).merge(database, other);
 
-        assertEquals(2, database.getEntries().size());
         assertEquals(List.of(entry1, entry3), database.getEntries());
     }
 
+    @Test
+    void mergeAddsWithDuplicateEntries() {
+        // Entries 1 and 2 are identical,  Entries 3 and 4 are identical
+        BibEntry entry1 = new BibEntry(StandardEntryType.Book)
+                .withField(StandardField.AUTHOR, "Joshua Bloch")
+                .withField(StandardField.TITLE, "Effective Java")
+                .withField(StandardField.ISBN, "0-201-31005-8");
+        BibEntry entry2 = new BibEntry(StandardEntryType.Book)
+                .withField(StandardField.AUTHOR, "Joshua J. Bloch")
+                .withField(StandardField.TITLE, "Effective Java:Programming Language Guide")
+                .withField(StandardField.ISBN, "0-201-31005-8")
+                .withField(StandardField.YEAR, "2001")
+                .withField(StandardField.EDITION, "1");
+        BibEntry entry3 = new BibEntry(StandardEntryType.Book)
+                .withField(StandardField.AUTHOR, "Joshua J. Bloch")
+                .withField(StandardField.TITLE, "Effective Java")
+                .withField(StandardField.ISBN, "978-0-321-35668-0")
+                .withField(StandardField.YEAR, "2008")
+                .withField(StandardField.EDITION, "2");
+        BibEntry entry4 = new BibEntry(StandardEntryType.Book)
+                .withField(StandardField.AUTHOR, "Joshua Bloch")
+                .withField(StandardField.TITLE, "Effective Java:Programming Language Guide")
+                .withField(StandardField.ISBN, "978-0-321-35668-0");
+
+        BibDatabase database = new BibDatabase(List.of(entry1, entry4));
+        BibDatabase other = new BibDatabase(List.of(entry2, entry3));
+        new DatabaseMerger(importFormatPreferences.getKeywordSeparator()).merge(database, other);
+        assertEquals(List.of(entry1, entry4), database.getEntries());
+    }
+
     @Test
     void mergeBibTexStringsWithSameNameAreImportedWithModifiedName() {
         BibtexString targetString = new BibtexString("name", "content1");
@@ -80,10 +107,10 @@ void mergeBibTexStringsWithSameNameAreImportedWithModifiedName() {
         new DatabaseMerger(importFormatPreferences.getKeywordSeparator()).mergeStrings(target, source2);
         // Use string representation to compare since the id will not match
         List<String> resultStringsSorted = target.getStringValues()
-                                                 .stream()
-                                                 .map(BibtexString::toString)
-                                                 .sorted()
-                                                 .collect(Collectors.toList());
+                .stream()
+                .map(BibtexString::toString)
+                .sorted()
+                .collect(Collectors.toList());
 
         assertEquals(List.of(targetString.toString(), importedBibTeXString1.toString(),
                 importedBibTeXString2.toString()), resultStringsSorted);
@@ -106,14 +133,12 @@ void mergeBibTexStringsWithSameNameAndContentAreIgnored() {
         source.addString(sourceString2);
 
         new DatabaseMerger(importFormatPreferences.getKeywordSeparator()).mergeStrings(target, source);
-        // Use string representation to compare since the id will not match
-        List<String> resultStringsSorted = target.getStringValues()
-                                                 .stream()
-                                                 .map(BibtexString::toString)
-                                                 .sorted()
-                                                 .collect(Collectors.toList());
+        List<BibtexString> resultStringsSorted = target.getStringValues()
+                .stream()
+                .sorted((s1, s2) -> new BibtexStringComparator(false).compare(s1, s2))
+                .collect(Collectors.toList());
 
-        assertEquals(List.of(targetString1.toString(), targetString2.toString()), resultStringsSorted);
+        assertEquals(List.of(targetString1, targetString2), resultStringsSorted);
     }
 
     @Test
@@ -162,6 +187,7 @@ void mergeMetaDataWithAllEntriesGroup() {
         assertEquals(targetRootGroup, target.getGroups().get());
         assertEquals(target.getGroups().get().getChildren().size(), 1);
         assertEquals(expectedImportedGroupNode, target.getGroups().get().getChildren().get(0));
+        assertEquals(expectedContentSelectors, target.getContentSelectorList());
     }
 
     static class TestGroup extends AbstractGroup {
diff --git a/src/test/java/org/jabref/logic/exporter/AtomicFileOutputStreamTest.java b/src/test/java/org/jabref/logic/exporter/AtomicFileOutputStreamTest.java
new file mode 100644
index 00000000000..80086d77db9
--- /dev/null
+++ b/src/test/java/org/jabref/logic/exporter/AtomicFileOutputStreamTest.java
@@ -0,0 +1,68 @@
+package org.jabref.logic.exporter;
+
+import java.io.ByteArrayInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+import com.google.common.base.Strings;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+import org.mockito.Mockito;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.spy;
+
+class AtomicFileOutputStreamTest {
+
+    private static final String FIFTY_CHARS = Strings.repeat("1234567890", 5);
+    private static final String FIVE_THOUSAND_CHARS = Strings.repeat("A", 5_000);
+
+    @Test
+    public void normalSaveWorks(@TempDir Path tempDir) throws Exception {
+        Path out = tempDir.resolve("normal-save.txt");
+        Files.writeString(out, FIFTY_CHARS);
+
+        try (AtomicFileOutputStream atomicFileOutputStream = new AtomicFileOutputStream(out)) {
+            InputStream inputStream = new ByteArrayInputStream(FIVE_THOUSAND_CHARS.getBytes());
+            inputStream.transferTo(atomicFileOutputStream);
+        }
+
+        // Written file still has the contents as before the error
+        assertEquals(FIVE_THOUSAND_CHARS, Files.readString(out));
+    }
+
+    @Test
+    public void originalContentExistsAtWriteError(@TempDir Path tempDir) throws Exception {
+        Path pathToTestFile = tempDir.resolve("error-during-save.txt");
+        Files.writeString(pathToTestFile, FIFTY_CHARS);
+
+        Path pathToTmpFile = tempDir.resolve("error-during-save.txt.tmp");
+
+        try (FileOutputStream outputStream = new FileOutputStream(pathToTmpFile.toFile())) {
+            FileOutputStream spiedOutputStream = spy(outputStream);
+            doAnswer(invocation -> {
+                // by writing one byte, we ensure that the `.tmp` file is created
+                outputStream.write(((byte[]) invocation.getRawArguments()[0])[0]);
+                outputStream.flush();
+                throw new IOException();
+            }).when(spiedOutputStream)
+              .write(Mockito.any(byte[].class), anyInt(), anyInt());
+
+            assertThrows(IOException.class, () -> {
+                try (AtomicFileOutputStream atomicFileOutputStream = new AtomicFileOutputStream(pathToTestFile, pathToTmpFile, spiedOutputStream, false);
+                     InputStream inputStream = new ByteArrayInputStream(FIVE_THOUSAND_CHARS.getBytes())) {
+                    inputStream.transferTo(atomicFileOutputStream);
+                }
+            });
+        }
+
+        // Written file still has the contents as before the error
+        assertEquals(FIFTY_CHARS, Files.readString(pathToTestFile));
+    }
+}
diff --git a/src/test/java/org/jabref/logic/exporter/BibTeXMLExporterTestFiles.java b/src/test/java/org/jabref/logic/exporter/BibTeXMLExporterTestFiles.java
index 2e8bfa1d5a5..8dbbd117221 100644
--- a/src/test/java/org/jabref/logic/exporter/BibTeXMLExporterTestFiles.java
+++ b/src/test/java/org/jabref/logic/exporter/BibTeXMLExporterTestFiles.java
@@ -2,8 +2,6 @@
 
 import java.io.IOException;
 import java.net.URISyntaxException;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.List;
@@ -34,7 +32,6 @@ public class BibTeXMLExporterTestFiles {
 
     private static Path resourceDir;
     public BibDatabaseContext databaseContext;
-    public Charset charset;
     public Path tempFile;
     public BibTeXMLExporter bibtexmlExportFormat;
     public BibtexImporter testImporter;
@@ -51,7 +48,6 @@ public static Stream<String> fileNames() throws IOException, URISyntaxException
     @BeforeEach
     public void setUp(@TempDir Path testFolder) throws Exception {
         databaseContext = new BibDatabaseContext();
-        charset = StandardCharsets.UTF_8;
         bibtexmlExportFormat = new BibTeXMLExporter();
         Files.createFile(testFolder.resolve("ARandomlyNamedFile.tmp"));
         tempFile = testFolder.resolve("ARandomlyNamedFile.tmp");
@@ -65,10 +61,10 @@ public final void testPerformExport(String filename) throws IOException, SaveExc
         Path importFile = resourceDir.resolve(filename);
         String tempFilePath = tempFile.toAbsolutePath().toString();
 
-        List<BibEntry> entries = testImporter.importDatabase(importFile, StandardCharsets.UTF_8).getDatabase()
+        List<BibEntry> entries = testImporter.importDatabase(importFile).getDatabase()
                                              .getEntries();
 
-        bibtexmlExportFormat.export(databaseContext, tempFile, charset, entries);
+        bibtexmlExportFormat.export(databaseContext, tempFile, entries);
 
         Builder control = Input.from(Files.newInputStream(resourceDir.resolve(xmlFileName)));
         Builder test = Input.from(Files.newInputStream(Path.of(tempFilePath)));
diff --git a/src/test/java/org/jabref/logic/exporter/BibtexDatabaseWriterTest.java b/src/test/java/org/jabref/logic/exporter/BibtexDatabaseWriterTest.java
index 0a298d3d32c..915dcf1b315 100644
--- a/src/test/java/org/jabref/logic/exporter/BibtexDatabaseWriterTest.java
+++ b/src/test/java/org/jabref/logic/exporter/BibtexDatabaseWriterTest.java
@@ -82,7 +82,6 @@ public class BibtexDatabaseWriterTest {
     @BeforeEach
     void setUp() {
         generalPreferences = mock(GeneralPreferences.class);
-        when(generalPreferences.getDefaultEncoding()).thenReturn(null);
         savePreferences = mock(SavePreferences.class, Answers.RETURNS_DEEP_STUBS);
         when(savePreferences.getSaveOrder()).thenReturn(new SaveOrderConfig());
         when(savePreferences.takeMetadataSaveOrderInAccount()).thenReturn(true);
@@ -107,18 +106,8 @@ void writeWithNullEntriesThrowsException() throws Exception {
         assertThrows(NullPointerException.class, () -> databaseWriter.savePartOfDatabase(bibtexContext, null));
     }
 
-    @Test
-    void writeEncodingUsAsciiWhenSetInPreferences() throws Exception {
-        when(generalPreferences.getDefaultEncoding()).thenReturn(StandardCharsets.US_ASCII);
-
-        databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
-
-        assertEquals("% Encoding: US-ASCII" + OS.NEWLINE, stringWriter.toString());
-    }
-
     @Test
     void writeEncodingUsAsciiWhenSetInPreferencesAndHeader() throws Exception {
-        when(generalPreferences.getDefaultEncoding()).thenReturn(StandardCharsets.US_ASCII);
         metaData.setEncoding(StandardCharsets.US_ASCII);
 
         databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
@@ -126,21 +115,9 @@ void writeEncodingUsAsciiWhenSetInPreferencesAndHeader() throws Exception {
         assertEquals("% Encoding: US-ASCII" + OS.NEWLINE, stringWriter.toString());
     }
 
-    @Test
-    void writeEncodingWindows1252WhenSetInPreferences() throws Exception {
-        Charset charsetWindows1252 = Charset.forName("windows-1252");
-        when(generalPreferences.getDefaultEncoding()).thenReturn(charsetWindows1252);
-
-        databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
-
-        assertEquals("% Encoding: windows-1252" + OS.NEWLINE, stringWriter.toString());
-    }
-
     @Test
     void writeEncodingWindows1252WhenSetInPreferencesAndHeader() throws Exception {
-        Charset charsetWindows1252 = Charset.forName("windows-1252");
-        when(generalPreferences.getDefaultEncoding()).thenReturn(charsetWindows1252);
-        metaData.setEncoding(charsetWindows1252);
+        metaData.setEncoding(Charset.forName("windows-1252"));
 
         databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
 
@@ -158,7 +135,7 @@ void writePreamble() throws Exception {
 
     @Test
     void writePreambleAndEncoding() throws Exception {
-        when(generalPreferences.getDefaultEncoding()).thenReturn(StandardCharsets.US_ASCII);
+        metaData.setEncoding(StandardCharsets.US_ASCII);
         database.setPreamble("Test preamble");
 
         databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
@@ -182,10 +159,10 @@ void writeEntry() throws Exception {
 
     @Test
     void writeEncodingAndEntry() throws Exception {
-        when(generalPreferences.getDefaultEncoding()).thenReturn(StandardCharsets.US_ASCII);
         BibEntry entry = new BibEntry();
         entry.setType(StandardEntryType.Article);
         database.insertEntry(entry);
+        metaData.setEncoding(StandardCharsets.US_ASCII);
 
         databaseWriter.savePartOfDatabase(bibtexContext, Collections.singletonList(entry));
 
@@ -207,8 +184,8 @@ void writeEpilogue() throws Exception {
 
     @Test
     void writeEpilogueAndEncoding() throws Exception {
-        when(generalPreferences.getDefaultEncoding()).thenReturn(StandardCharsets.US_ASCII);
         database.setEpilog("Test epilog");
+        metaData.setEncoding(StandardCharsets.US_ASCII);
 
         databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
 
@@ -216,6 +193,27 @@ void writeEpilogueAndEncoding() throws Exception {
                 "Test epilog" + OS.NEWLINE, stringWriter.toString());
     }
 
+    @Test
+    void utf8EncodingWrittenIfExplicitlyDefined() throws Exception {
+        metaData.setEncoding(StandardCharsets.UTF_8);
+        metaData.setEncodingExplicitlySupplied(true);
+
+        databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
+
+        assertEquals("% Encoding: UTF-8" + OS.NEWLINE,
+                stringWriter.toString());
+    }
+
+    @Test
+    void utf8EncodingNotWrittenIfNotExplicitlyDefined() throws Exception {
+        metaData.setEncoding(StandardCharsets.UTF_8);
+        metaData.setEncodingExplicitlySupplied(false);
+
+        databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
+
+        assertEquals("", stringWriter.toString());
+    }
+
     @Test
     void writeMetadata() throws Exception {
         DatabaseCitationKeyPattern bibtexKeyPattern = new DatabaseCitationKeyPattern(mock(GlobalCitationKeyPattern.class));
@@ -230,10 +228,10 @@ void writeMetadata() throws Exception {
 
     @Test
     void writeMetadataAndEncoding() throws Exception {
-        when(generalPreferences.getDefaultEncoding()).thenReturn(StandardCharsets.US_ASCII);
         DatabaseCitationKeyPattern bibtexKeyPattern = new DatabaseCitationKeyPattern(mock(GlobalCitationKeyPattern.class));
         bibtexKeyPattern.setDefaultValue("test");
         metaData.setCiteKeyPattern(bibtexKeyPattern);
+        metaData.setEncoding(StandardCharsets.US_ASCII);
 
         databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
 
@@ -260,11 +258,10 @@ void writeGroups() throws Exception {
 
     @Test
     void writeGroupsAndEncoding() throws Exception {
-        when(generalPreferences.getDefaultEncoding()).thenReturn(StandardCharsets.US_ASCII);
-
         GroupTreeNode groupRoot = GroupTreeNode.fromGroup(new AllEntriesGroup(""));
         groupRoot.addChild(GroupTreeNode.fromGroup(new ExplicitGroup("test", GroupHierarchyType.INCLUDING, ',')));
         metaData.setGroups(groupRoot);
+        metaData.setEncoding(StandardCharsets.US_ASCII);
 
         databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
 
@@ -290,7 +287,7 @@ void writeString() throws Exception {
 
     @Test
     void writeStringAndEncoding() throws Exception {
-        when(generalPreferences.getDefaultEncoding()).thenReturn(StandardCharsets.US_ASCII);
+        metaData.setEncoding(StandardCharsets.US_ASCII);
         database.addString(new BibtexString("name", "content"));
 
         databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
@@ -301,7 +298,6 @@ void writeStringAndEncoding() throws Exception {
 
     @Test
     void doNotWriteUtf8StringAndEncoding() throws Exception {
-        when(generalPreferences.getDefaultEncoding()).thenReturn(StandardCharsets.UTF_8);
         database.addString(new BibtexString("name", "content"));
 
         databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
@@ -375,9 +371,8 @@ void writeCustomizedTypesInAlphabeticalOrder() throws Exception {
     void roundtripWithArticleMonths() throws Exception {
         Path testBibtexFile = Path.of("src/test/resources/testbib/articleWithMonths.bib");
         Charset encoding = StandardCharsets.UTF_8;
-        ParserResult result = new BibtexParser(importFormatPreferences, fileMonitor).parse(Importer.getReader(testBibtexFile, encoding));
+        ParserResult result = new BibtexParser(importFormatPreferences, fileMonitor).parse(Importer.getReader(testBibtexFile));
 
-        when(generalPreferences.getDefaultEncoding()).thenReturn(encoding);
         when(savePreferences.shouldSaveInOriginalOrder()).thenReturn(true);
         BibDatabaseContext context = new BibDatabaseContext(result.getDatabase(), result.getMetaData());
 
@@ -387,7 +382,6 @@ void roundtripWithArticleMonths() throws Exception {
 
     @Test
     void roundtripUtf8EncodingHeaderRemoved() throws Exception {
-        when(generalPreferences.getDefaultEncoding()).thenReturn(StandardCharsets.UTF_8);
         // @formatter:off
         String bibtexEntry = OS.NEWLINE + "% Encoding: UTF8" + OS.NEWLINE +
                 OS.NEWLINE +
@@ -414,9 +408,8 @@ void roundtripUtf8EncodingHeaderRemoved() throws Exception {
 
     @Test
     void roundtripWin1252HeaderKept(@TempDir Path bibFolder) throws Exception {
-        when(generalPreferences.getDefaultEncoding()).thenReturn(StandardCharsets.UTF_8);
         Path testFile = Path.of(BibtexImporterTest.class.getResource("encoding-windows-1252-with-header.bib").toURI());
-        ParserResult result = new BibtexImporter(importFormatPreferences, fileMonitor).importDatabase(testFile, StandardCharsets.UTF_8);
+        ParserResult result = new BibtexImporter(importFormatPreferences, fileMonitor).importDatabase(testFile);
         BibDatabaseContext context = new BibDatabaseContext(result.getDatabase(), result.getMetaData());
 
         Path pathToFile = bibFolder.resolve("JabRef.bib");
@@ -432,13 +425,50 @@ void roundtripWin1252HeaderKept(@TempDir Path bibFolder) throws Exception {
         assertEquals(Files.readString(testFile, charset), Files.readString(file, charset));
     }
 
+    @Test
+    void roundtripUtf8HeaderKept(@TempDir Path bibFolder) throws Exception {
+        Path testFile = Path.of(BibtexImporterTest.class.getResource("encoding-utf-8-with-header-with-databasetypecomment.bib").toURI());
+        ParserResult result = new BibtexImporter(importFormatPreferences, fileMonitor).importDatabase(testFile);
+        BibDatabaseContext context = new BibDatabaseContext(result.getDatabase(), result.getMetaData());
+
+        Path pathToFile = bibFolder.resolve("JabRef.bib");
+        Path file = Files.createFile(pathToFile);
+        Charset charset = StandardCharsets.UTF_8;
+
+        try (BufferedWriter fileWriter = Files.newBufferedWriter(file, charset)) {
+            BibWriter bibWriter = new BibWriter(fileWriter, context.getDatabase().getNewLineSeparator());
+            BibtexDatabaseWriter databaseWriter = new BibtexDatabaseWriter(bibWriter, generalPreferences, savePreferences, entryTypesManager);
+            databaseWriter.saveDatabase(context);
+        }
+
+        assertEquals(Files.readString(testFile, charset), Files.readString(file, charset));
+    }
+
+    @Test
+    void roundtripNotExplicitUtf8HeaderNotInsertedDuringWrite(@TempDir Path bibFolder) throws Exception {
+        Path testFile = Path.of(BibtexImporterTest.class.getResource("encoding-utf-8-without-header-with-databasetypecomment.bib").toURI());
+        ParserResult result = new BibtexImporter(importFormatPreferences, fileMonitor).importDatabase(testFile);
+        BibDatabaseContext context = new BibDatabaseContext(result.getDatabase(), result.getMetaData());
+
+        Path pathToFile = bibFolder.resolve("JabRef.bib");
+        Path file = Files.createFile(pathToFile);
+        Charset charset = StandardCharsets.UTF_8;
+
+        try (BufferedWriter fileWriter = Files.newBufferedWriter(file, charset)) {
+            BibWriter bibWriter = new BibWriter(fileWriter, context.getDatabase().getNewLineSeparator());
+            BibtexDatabaseWriter databaseWriter = new BibtexDatabaseWriter(bibWriter, generalPreferences, savePreferences, entryTypesManager);
+            databaseWriter.saveDatabase(context);
+        }
+
+        assertEquals(Files.readString(testFile, charset), Files.readString(file, charset));
+    }
+
     @Test
     void roundtripWithComplexBib() throws Exception {
         Path testBibtexFile = Path.of("src/test/resources/testbib/complex.bib");
         Charset encoding = StandardCharsets.UTF_8;
-        ParserResult result = new BibtexParser(importFormatPreferences, fileMonitor).parse(Importer.getReader(testBibtexFile, encoding));
+        ParserResult result = new BibtexParser(importFormatPreferences, fileMonitor).parse(Importer.getReader(testBibtexFile));
 
-        when(generalPreferences.getDefaultEncoding()).thenReturn(encoding);
         when(savePreferences.shouldSaveInOriginalOrder()).thenReturn(true);
         BibDatabaseContext context = new BibDatabaseContext(result.getDatabase(), result.getMetaData());
 
@@ -450,9 +480,8 @@ void roundtripWithComplexBib() throws Exception {
     void roundtripWithUserComment() throws Exception {
         Path testBibtexFile = Path.of("src/test/resources/testbib/bibWithUserComments.bib");
         Charset encoding = StandardCharsets.UTF_8;
-        ParserResult result = new BibtexParser(importFormatPreferences, fileMonitor).parse(Importer.getReader(testBibtexFile, encoding));
+        ParserResult result = new BibtexParser(importFormatPreferences, fileMonitor).parse(Importer.getReader(testBibtexFile));
 
-        when(generalPreferences.getDefaultEncoding()).thenReturn(encoding);
         when(savePreferences.shouldSaveInOriginalOrder()).thenReturn(true);
         BibDatabaseContext context = new BibDatabaseContext(result.getDatabase(), result.getMetaData());
 
@@ -477,7 +506,6 @@ void roundtripWithOneUserCommentAndEntryChange() throws Exception {
         BibEntry entry = result.getDatabase().getEntryByCitationKey("1137631").get();
         entry.setField(StandardField.AUTHOR, "Mr. Author");
 
-        when(generalPreferences.getDefaultEncoding()).thenReturn(StandardCharsets.UTF_8);
         when(savePreferences.shouldSaveInOriginalOrder()).thenReturn(true);
         BibDatabaseContext context = new BibDatabaseContext(result.getDatabase(), result.getMetaData());
 
@@ -507,7 +535,6 @@ void roundtripWithTwoEntriesAndOneUserCommentAndEntryChange() throws Exception {
         BibEntry entry = result.getDatabase().getEntryByCitationKey("1137631").get();
         entry.setField(StandardField.AUTHOR, "Mr. Author");
 
-        when(generalPreferences.getDefaultEncoding()).thenReturn(StandardCharsets.UTF_8);
         when(savePreferences.shouldSaveInOriginalOrder()).thenReturn(true);
         BibDatabaseContext context = new BibDatabaseContext(result.getDatabase(), result.getMetaData());
 
@@ -522,12 +549,11 @@ void roundtripWithTwoEntriesAndOneUserCommentAndEntryChange() throws Exception {
     void roundtripWithUserCommentAndEntryChange() throws Exception {
         Path testBibtexFile = Path.of("src/test/resources/testbib/bibWithUserComments.bib");
         Charset encoding = StandardCharsets.UTF_8;
-        ParserResult result = new BibtexParser(importFormatPreferences, fileMonitor).parse(Importer.getReader(testBibtexFile, encoding));
+        ParserResult result = new BibtexParser(importFormatPreferences, fileMonitor).parse(Importer.getReader(testBibtexFile));
 
         BibEntry entry = result.getDatabase().getEntryByCitationKey("1137631").get();
         entry.setField(StandardField.AUTHOR, "Mr. Author");
 
-        when(generalPreferences.getDefaultEncoding()).thenReturn(encoding);
         when(savePreferences.shouldSaveInOriginalOrder()).thenReturn(true);
         BibDatabaseContext context = new BibDatabaseContext(result.getDatabase(), result.getMetaData());
 
@@ -539,14 +565,13 @@ void roundtripWithUserCommentAndEntryChange() throws Exception {
     void roundtripWithUserCommentBeforeStringAndChange() throws Exception {
         Path testBibtexFile = Path.of("src/test/resources/testbib/complex.bib");
         Charset encoding = StandardCharsets.UTF_8;
-        ParserResult result = new BibtexParser(importFormatPreferences, fileMonitor).parse(Importer.getReader(testBibtexFile, encoding));
+        ParserResult result = new BibtexParser(importFormatPreferences, fileMonitor).parse(Importer.getReader(testBibtexFile));
 
         for (BibtexString string : result.getDatabase().getStringValues()) {
             // Mark them as changed
             string.setContent(string.getContent());
         }
 
-        when(generalPreferences.getDefaultEncoding()).thenReturn(encoding);
         when(savePreferences.shouldSaveInOriginalOrder()).thenReturn(true);
         BibDatabaseContext context = new BibDatabaseContext(result.getDatabase(), result.getMetaData());
 
@@ -559,9 +584,8 @@ void roundtripWithUserCommentBeforeStringAndChange() throws Exception {
     void roundtripWithUnknownMetaData() throws Exception {
         Path testBibtexFile = Path.of("src/test/resources/testbib/unknownMetaData.bib");
         Charset encoding = StandardCharsets.UTF_8;
-        ParserResult result = new BibtexParser(importFormatPreferences, fileMonitor).parse(Importer.getReader(testBibtexFile, encoding));
+        ParserResult result = new BibtexParser(importFormatPreferences, fileMonitor).parse(Importer.getReader(testBibtexFile));
 
-        when(generalPreferences.getDefaultEncoding()).thenReturn(encoding);
         when(savePreferences.shouldSaveInOriginalOrder()).thenReturn(true);
         BibDatabaseContext context = new BibDatabaseContext(result.getDatabase(), result.getMetaData());
 
@@ -829,7 +853,6 @@ void roundtripWithContentSelectorsAndUmlauts() throws Exception {
 
         ParserResult firstParse = new BibtexParser(importFormatPreferences, fileMonitor).parse(new StringReader(fileContent));
 
-        when(generalPreferences.getDefaultEncoding()).thenReturn(encoding);
         when(savePreferences.shouldSaveInOriginalOrder()).thenReturn(true);
         BibDatabaseContext context = new BibDatabaseContext(firstParse.getDatabase(), firstParse.getMetaData());
 
diff --git a/src/test/java/org/jabref/logic/exporter/CsvExportFormatTest.java b/src/test/java/org/jabref/logic/exporter/CsvExportFormatTest.java
index d641b1a7e59..584f73e109f 100644
--- a/src/test/java/org/jabref/logic/exporter/CsvExportFormatTest.java
+++ b/src/test/java/org/jabref/logic/exporter/CsvExportFormatTest.java
@@ -1,8 +1,6 @@
 package org.jabref.logic.exporter;
 
 import java.io.File;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
@@ -29,7 +27,6 @@
 public class CsvExportFormatTest {
 
     public BibDatabaseContext databaseContext;
-    public Charset charset;
     private Exporter exportFormat;
 
     @BeforeEach
@@ -44,7 +41,6 @@ public void setUp() {
         exportFormat = exporterFactory.getExporterByName("oocsv").get();
 
         databaseContext = new BibDatabaseContext();
-        charset = StandardCharsets.UTF_8;
     }
 
     @AfterEach
@@ -60,7 +56,7 @@ public void testPerformExportForSingleAuthor(@TempDir Path testFolder) throws Ex
         entry.setField(StandardField.AUTHOR, "Someone, Van Something");
         List<BibEntry> entries = Arrays.asList(entry);
 
-        exportFormat.export(databaseContext, path, charset, entries);
+        exportFormat.export(databaseContext, path, entries);
 
         List<String> lines = Files.readAllLines(path);
         assertEquals(2, lines.size());
@@ -77,7 +73,7 @@ public void testPerformExportForMultipleAuthors(@TempDir Path testFolder) throws
         entry.setField(StandardField.AUTHOR, "von Neumann, John and Smith, John and Black Brown, Peter");
         List<BibEntry> entries = Arrays.asList(entry);
 
-        exportFormat.export(databaseContext, path, charset, entries);
+        exportFormat.export(databaseContext, path, entries);
 
         List<String> lines = Files.readAllLines(path);
         assertEquals(2, lines.size());
@@ -94,7 +90,7 @@ public void testPerformExportForSingleEditor(@TempDir Path testFolder) throws Ex
         entry.setField(StandardField.EDITOR, "Someone, Van Something");
         List<BibEntry> entries = Arrays.asList(entry);
 
-        exportFormat.export(databaseContext, tmpFile.toPath(), charset, entries);
+        exportFormat.export(databaseContext, tmpFile.toPath(), entries);
 
         List<String> lines = Files.readAllLines(tmpFile.toPath());
         assertEquals(2, lines.size());
@@ -111,7 +107,7 @@ public void testPerformExportForMultipleEditors(@TempDir Path testFolder) throws
         entry.setField(StandardField.EDITOR, "von Neumann, John and Smith, John and Black Brown, Peter");
         List<BibEntry> entries = Arrays.asList(entry);
 
-        exportFormat.export(databaseContext, tmpFile.toPath(), charset, entries);
+        exportFormat.export(databaseContext, tmpFile.toPath(), entries);
 
         List<String> lines = Files.readAllLines(tmpFile.toPath());
         assertEquals(2, lines.size());
diff --git a/src/test/java/org/jabref/logic/exporter/DocBook5ExporterTest.java b/src/test/java/org/jabref/logic/exporter/DocBook5ExporterTest.java
index e6baf19f1cb..34e6838a8ab 100644
--- a/src/test/java/org/jabref/logic/exporter/DocBook5ExporterTest.java
+++ b/src/test/java/org/jabref/logic/exporter/DocBook5ExporterTest.java
@@ -71,7 +71,7 @@ void setUp() throws URISyntaxException {
     void testPerformExportForSingleEntry(@TempDir Path testFolder) throws Exception {
         Path path = testFolder.resolve("ThisIsARandomlyNamedFile");
 
-        exporter.export(databaseContext, path, charset, entries);
+        exporter.export(databaseContext, path, entries);
 
         Builder control = Input.from(Files.newInputStream(xmlFile));
         Builder test = Input.from(Files.newInputStream(path));
diff --git a/src/test/java/org/jabref/logic/exporter/DocbookExporterTest.java b/src/test/java/org/jabref/logic/exporter/DocbookExporterTest.java
index 39246058eeb..6a068df5b27 100644
--- a/src/test/java/org/jabref/logic/exporter/DocbookExporterTest.java
+++ b/src/test/java/org/jabref/logic/exporter/DocbookExporterTest.java
@@ -52,7 +52,7 @@ public void testCorruptedTitleBraces(@TempDir Path testFolder) throws Exception
 
         List<BibEntry> entries = Arrays.asList(entry);
 
-        exportFormat.export(databaseContext, tmpFile, charset, entries);
+        exportFormat.export(databaseContext, tmpFile, entries);
 
         List<String> lines = Files.readAllLines(tmpFile);
         assertEquals(20, lines.size());
@@ -68,11 +68,10 @@ public void testCorruptedTitleUnicode(@TempDir Path testFolder) throws Exception
 
         List<BibEntry> entries = Arrays.asList(entry);
 
-        exportFormat.export(databaseContext, tmpFile, charset, entries);
+        exportFormat.export(databaseContext, tmpFile, entries);
 
         List<String> lines = Files.readAllLines(tmpFile);
         assertEquals(20, lines.size());
         assertEquals("   <citetitle pubwork=\"article\">Insect neuropeptide bursicon homodimers induce innate immune and stress genes during molting by activating the NF&#45;&#954;B transcription factor Relish.</citetitle>", lines.get(9));
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/exporter/EmbeddedBibFilePdfExporterTest.java b/src/test/java/org/jabref/logic/exporter/EmbeddedBibFilePdfExporterTest.java
index 5ec6811977a..e2e4ee62323 100644
--- a/src/test/java/org/jabref/logic/exporter/EmbeddedBibFilePdfExporterTest.java
+++ b/src/test/java/org/jabref/logic/exporter/EmbeddedBibFilePdfExporterTest.java
@@ -132,13 +132,13 @@ void setUp() throws IOException {
     @ParameterizedTest
     @MethodSource("provideBibEntriesWithValidPdfFileLinks")
     void successfulExportToAllFilesOfEntry(BibEntry bibEntryWithValidPdfFileLink) throws Exception {
-        assertTrue(exporter.exportToAllFilesOfEntry(databaseContext, encoding, filePreferences, bibEntryWithValidPdfFileLink, Arrays.asList(olly2018)));
+        assertTrue(exporter.exportToAllFilesOfEntry(databaseContext, filePreferences, bibEntryWithValidPdfFileLink, Arrays.asList(olly2018)));
     }
 
     @ParameterizedTest
     @MethodSource("provideBibEntriesWithInvalidPdfFileLinks")
     void unsuccessfulExportToAllFilesOfEntry(BibEntry bibEntryWithValidPdfFileLink) throws Exception {
-        assertFalse(exporter.exportToAllFilesOfEntry(databaseContext, encoding, filePreferences, bibEntryWithValidPdfFileLink, Arrays.asList(olly2018)));
+        assertFalse(exporter.exportToAllFilesOfEntry(databaseContext, filePreferences, bibEntryWithValidPdfFileLink, Arrays.asList(olly2018)));
     }
 
     public static Stream<Arguments> provideBibEntriesWithValidPdfFileLinks() {
@@ -152,13 +152,13 @@ public static Stream<Arguments> provideBibEntriesWithInvalidPdfFileLinks() {
     @ParameterizedTest
     @MethodSource("providePathsToValidPDFs")
     void successfulExportToFileByPath(Path path) throws Exception {
-        assertTrue(exporter.exportToFileByPath(databaseContext, dataBase, encoding, filePreferences, path));
+        assertTrue(exporter.exportToFileByPath(databaseContext, dataBase, filePreferences, path));
     }
 
     @ParameterizedTest
     @MethodSource("providePathsToInvalidPDFs")
     void unsuccessfulExportToFileByPath(Path path) throws Exception {
-        assertFalse(exporter.exportToFileByPath(databaseContext, dataBase, encoding, filePreferences, path));
+        assertFalse(exporter.exportToFileByPath(databaseContext, dataBase, filePreferences, path));
     }
 
     public static Stream<Arguments> providePathsToValidPDFs() {
diff --git a/src/test/java/org/jabref/logic/exporter/ExporterTest.java b/src/test/java/org/jabref/logic/exporter/ExporterTest.java
index 34d1d5b1477..fddc690af10 100644
--- a/src/test/java/org/jabref/logic/exporter/ExporterTest.java
+++ b/src/test/java/org/jabref/logic/exporter/ExporterTest.java
@@ -66,7 +66,7 @@ private static Stream<Object[]> exportFormats() {
     public void testExportingEmptyDatabaseYieldsEmptyFile(Exporter exportFormat, String name, @TempDir Path testFolder) throws Exception {
         Path tmpFile = testFolder.resolve("ARandomlyNamedFile");
         Files.createFile(tmpFile);
-        exportFormat.export(databaseContext, tmpFile, charset, entries);
+        exportFormat.export(databaseContext, tmpFile, entries);
         assertEquals(Collections.emptyList(), Files.readAllLines(tmpFile));
     }
 
@@ -76,17 +76,7 @@ public void testExportingNullDatabaseThrowsNPE(Exporter exportFormat, String nam
         assertThrows(NullPointerException.class, () -> {
             Path tmpFile = testFolder.resolve("ARandomlyNamedFile");
             Files.createFile(tmpFile);
-            exportFormat.export(null, tmpFile, charset, entries);
-        });
-    }
-
-    @ParameterizedTest
-    @MethodSource("exportFormats")
-    public void testExportingNullEntriesThrowsNPE(Exporter exportFormat, String name, @TempDir Path testFolder) {
-        assertThrows(NullPointerException.class, () -> {
-            Path tmpFile = testFolder.resolve("ARandomlyNamedFile");
-            Files.createFile(tmpFile);
-            exportFormat.export(databaseContext, tmpFile, charset, null);
+            exportFormat.export(null, tmpFile, entries);
         });
     }
 }
diff --git a/src/test/java/org/jabref/logic/exporter/FieldFormatterCleanupsTest.java b/src/test/java/org/jabref/logic/exporter/FieldFormatterCleanupsTest.java
index abc2f4b6bbb..e3b51b341d5 100644
--- a/src/test/java/org/jabref/logic/exporter/FieldFormatterCleanupsTest.java
+++ b/src/test/java/org/jabref/logic/exporter/FieldFormatterCleanupsTest.java
@@ -42,7 +42,6 @@ public void setUp() {
 
     @Test
     public void checkSimpleUseCase() {
-
         FieldFormatterCleanups actions = new FieldFormatterCleanups(true, Cleanups.parse("title[identity]"));
 
         FieldFormatterCleanup identityInTitle = new FieldFormatterCleanup(StandardField.TITLE, new IdentityFormatter());
@@ -66,7 +65,6 @@ public void invalidSaveActionSting() {
 
     @Test
     public void checkLowerCaseSaveAction() {
-
         FieldFormatterCleanups actions = new FieldFormatterCleanups(true, Cleanups.parse("title[lower_case]"));
 
         FieldFormatterCleanup lowerCaseTitle = new FieldFormatterCleanup(StandardField.TITLE, new LowerCaseFormatter());
@@ -92,7 +90,6 @@ public void checkTwoSaveActionsForOneField() {
 
     @Test
     public void checkThreeSaveActionsForOneField() {
-
         FieldFormatterCleanups actions = new FieldFormatterCleanups(true, Cleanups.parse("title[lower_case,identity,normalize_date]"));
 
         FieldFormatterCleanup lowerCaseTitle = new FieldFormatterCleanup(StandardField.TITLE, new LowerCaseFormatter());
@@ -107,7 +104,6 @@ public void checkThreeSaveActionsForOneField() {
 
     @Test
     public void checkMultipleSaveActions() {
-
         FieldFormatterCleanups actions = new FieldFormatterCleanups(true, Cleanups.parse("pages[normalize_page_numbers]title[lower_case]"));
         List<FieldFormatterCleanup> formatterCleanups = actions.getConfiguredActions();
 
@@ -123,7 +119,6 @@ public void checkMultipleSaveActions() {
 
     @Test
     public void checkMultipleSaveActionsWithMultipleFormatters() {
-
         FieldFormatterCleanups actions = new FieldFormatterCleanups(true,
                 Cleanups.parse("pages[normalize_page_numbers,normalize_date]title[lower_case]"));
         List<FieldFormatterCleanup> formatterCleanups = actions.getConfiguredActions();
diff --git a/src/test/java/org/jabref/logic/exporter/HtmlExportFormatTest.java b/src/test/java/org/jabref/logic/exporter/HtmlExportFormatTest.java
index 821b9f4933b..b0157678ecd 100644
--- a/src/test/java/org/jabref/logic/exporter/HtmlExportFormatTest.java
+++ b/src/test/java/org/jabref/logic/exporter/HtmlExportFormatTest.java
@@ -59,7 +59,7 @@ public void tearDown() {
     @Test
     public void emitWellFormedHtml(@TempDir Path testFolder) throws Exception {
         Path path = testFolder.resolve("ThisIsARandomlyNamedFile");
-        exportFormat.export(databaseContext, path, charset, entries);
+        exportFormat.export(databaseContext, path, entries);
         List<String> lines = Files.readAllLines(path);
         assertEquals("</html>", lines.get(lines.size() - 1));
     }
diff --git a/src/test/java/org/jabref/logic/exporter/MSBibExportFormatTestFiles.java b/src/test/java/org/jabref/logic/exporter/MSBibExportFormatTestFiles.java
index b5791ce3076..11de4f34588 100644
--- a/src/test/java/org/jabref/logic/exporter/MSBibExportFormatTestFiles.java
+++ b/src/test/java/org/jabref/logic/exporter/MSBibExportFormatTestFiles.java
@@ -66,11 +66,11 @@ void testPerformExport(String filename) throws IOException, SaveException {
         Path expectedFile = resourceDir.resolve(xmlFileName);
         Path importFile = resourceDir.resolve(filename);
 
-        List<BibEntry> entries = testImporter.importDatabase(importFile, StandardCharsets.UTF_8)
+        List<BibEntry> entries = testImporter.importDatabase(importFile)
                                              .getDatabase()
                                              .getEntries();
 
-        exporter.export(databaseContext, exportedFile, charset, entries);
+        exporter.export(databaseContext, exportedFile, entries);
 
         String expected = String.join("\n", Files.readAllLines(expectedFile));
         String actual = String.join("\n", Files.readAllLines(exportedFile));
diff --git a/src/test/java/org/jabref/logic/exporter/ModsExportFormatTestFiles.java b/src/test/java/org/jabref/logic/exporter/ModsExportFormatFilesTest.java
similarity index 78%
rename from src/test/java/org/jabref/logic/exporter/ModsExportFormatTestFiles.java
rename to src/test/java/org/jabref/logic/exporter/ModsExportFormatFilesTest.java
index 5820f344daa..567459318c6 100644
--- a/src/test/java/org/jabref/logic/exporter/ModsExportFormatTestFiles.java
+++ b/src/test/java/org/jabref/logic/exporter/ModsExportFormatFilesTest.java
@@ -5,7 +5,6 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.List;
-import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import org.jabref.logic.bibtex.BibEntryAssert;
@@ -22,14 +21,18 @@
 import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Answers;
 import org.mockito.Mockito;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.Mockito.mock;
 
-public class ModsExportFormatTestFiles {
-
+public class ModsExportFormatFilesTest {
+    private static final Logger LOGGER = LoggerFactory.getLogger(ModsExportFormatFilesTest.class);
     private static Path resourceDir;
+
     public Charset charset;
+
     private BibDatabaseContext databaseContext;
     private Path exportedFile;
     private ModsExporter exporter;
@@ -39,12 +42,11 @@ public class ModsExportFormatTestFiles {
 
     public static Stream<String> fileNames() throws Exception {
         resourceDir = Path.of(MSBibExportFormatTestFiles.class.getResource("ModsExportFormatTestAllFields.bib").toURI()).getParent();
-        System.out.println(resourceDir);
+        LOGGER.debug("Mods export resouce dir {}", resourceDir);
 
         try (Stream<Path> stream = Files.list(resourceDir)) {
-            //            stream.forEach(n -> System.out.println(n));
             return stream.map(n -> n.getFileName().toString()).filter(n -> n.endsWith(".bib"))
-                         .filter(n -> n.startsWith("Mods")).collect(Collectors.toList()).stream();
+                         .filter(n -> n.startsWith("Mods")).toList().stream();
         }
     }
 
@@ -65,12 +67,12 @@ public void setUp(@TempDir Path testFolder) throws Exception {
     @ParameterizedTest
     @MethodSource("fileNames")
     public final void testPerformExport(String filename) throws Exception {
-        importFile = Path.of(ModsExportFormatTestFiles.class.getResource(filename).toURI());
+        importFile = Path.of(ModsExportFormatFilesTest.class.getResource(filename).toURI());
         String xmlFileName = filename.replace(".bib", ".xml");
-        List<BibEntry> entries = bibtexImporter.importDatabase(importFile, charset).getDatabase().getEntries();
-        Path expectedFile = Path.of(ModsExportFormatTestFiles.class.getResource(xmlFileName).toURI());
+        List<BibEntry> entries = bibtexImporter.importDatabase(importFile).getDatabase().getEntries();
+        Path expectedFile = Path.of(ModsExportFormatFilesTest.class.getResource(xmlFileName).toURI());
 
-        exporter.export(databaseContext, exportedFile, charset, entries);
+        exporter.export(databaseContext, exportedFile, entries);
 
         assertEquals(
                 String.join("\n", Files.readAllLines(expectedFile)),
@@ -80,23 +82,23 @@ public final void testPerformExport(String filename) throws Exception {
     @ParameterizedTest
     @MethodSource("fileNames")
     public final void testExportAsModsAndThenImportAsMods(String filename) throws Exception {
-        importFile = Path.of(ModsExportFormatTestFiles.class.getResource(filename).toURI());
-        List<BibEntry> entries = bibtexImporter.importDatabase(importFile, charset).getDatabase().getEntries();
+        importFile = Path.of(ModsExportFormatFilesTest.class.getResource(filename).toURI());
+        List<BibEntry> entries = bibtexImporter.importDatabase(importFile).getDatabase().getEntries();
 
-        exporter.export(databaseContext, exportedFile, charset, entries);
+        exporter.export(databaseContext, exportedFile, entries);
         BibEntryAssert.assertEquals(entries, exportedFile, modsImporter);
     }
 
     @ParameterizedTest
     @MethodSource("fileNames")
     public final void testImportAsModsAndExportAsMods(String filename) throws Exception {
-        importFile = Path.of(ModsExportFormatTestFiles.class.getResource(filename).toURI());
+        importFile = Path.of(ModsExportFormatFilesTest.class.getResource(filename).toURI());
         String xmlFileName = filename.replace(".bib", ".xml");
-        Path xmlFile = Path.of(ModsExportFormatTestFiles.class.getResource(xmlFileName).toURI());
+        Path xmlFile = Path.of(ModsExportFormatFilesTest.class.getResource(xmlFileName).toURI());
 
-        List<BibEntry> entries = modsImporter.importDatabase(xmlFile, charset).getDatabase().getEntries();
+        List<BibEntry> entries = modsImporter.importDatabase(xmlFile).getDatabase().getEntries();
 
-        exporter.export(databaseContext, exportedFile, charset, entries);
+        exporter.export(databaseContext, exportedFile, entries);
 
         assertEquals(
                 String.join("\n", Files.readAllLines(xmlFile)),
diff --git a/src/test/java/org/jabref/logic/exporter/ModsExportFormatTest.java b/src/test/java/org/jabref/logic/exporter/ModsExportFormatTest.java
index d205b4ce235..cf98c1764af 100644
--- a/src/test/java/org/jabref/logic/exporter/ModsExportFormatTest.java
+++ b/src/test/java/org/jabref/logic/exporter/ModsExportFormatTest.java
@@ -1,7 +1,5 @@
 package org.jabref.logic.exporter;
 
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Collections;
@@ -21,14 +19,12 @@
 
 public class ModsExportFormatTest {
 
-    public Charset charset;
     private ModsExporter modsExportFormat;
     private BibDatabaseContext databaseContext;
 
     @BeforeEach
     public void setUp() throws Exception {
         databaseContext = new BibDatabaseContext();
-        charset = StandardCharsets.UTF_8;
         modsExportFormat = new ModsExporter();
         new BibtexImporter(mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS), new DummyFileUpdateMonitor());
         Path.of(ModsExportFormatTest.class.getResource("ModsExportFormatTestAllFields.bib").toURI());
@@ -38,7 +34,7 @@ public void setUp() throws Exception {
     public final void exportForNoEntriesWritesNothing(@TempDir Path tempFile) throws Exception {
         Path file = tempFile.resolve("ThisIsARandomlyNamedFile");
         Files.createFile(file);
-        modsExportFormat.export(databaseContext, tempFile, charset, Collections.emptyList());
+        modsExportFormat.export(databaseContext, tempFile, Collections.emptyList());
         assertEquals(Collections.emptyList(), Files.readAllLines(file));
     }
 }
diff --git a/src/test/java/org/jabref/logic/exporter/MsBibExportFormatTest.java b/src/test/java/org/jabref/logic/exporter/MsBibExportFormatTest.java
index 9ddbe119d73..7be464fc9a6 100644
--- a/src/test/java/org/jabref/logic/exporter/MsBibExportFormatTest.java
+++ b/src/test/java/org/jabref/logic/exporter/MsBibExportFormatTest.java
@@ -1,8 +1,6 @@
 package org.jabref.logic.exporter;
 
 import java.io.IOException;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Collections;
@@ -20,13 +18,11 @@
 public class MsBibExportFormatTest {
 
     public BibDatabaseContext databaseContext;
-    public Charset charset;
     public MSBibExporter msBibExportFormat;
 
     @BeforeEach
     public void setUp() throws Exception {
         databaseContext = new BibDatabaseContext();
-        charset = StandardCharsets.UTF_8;
         msBibExportFormat = new MSBibExporter();
     }
 
@@ -35,7 +31,7 @@ public final void testPerformExportWithNoEntry(@TempDir Path tempFile) throws IO
         Path path = tempFile.resolve("ThisIsARandomlyNamedFile");
         Files.createFile(path);
         List<BibEntry> entries = Collections.emptyList();
-        msBibExportFormat.export(databaseContext, path, charset, entries);
+        msBibExportFormat.export(databaseContext, path, entries);
         assertEquals(Collections.emptyList(), Files.readAllLines(path));
     }
 }
diff --git a/src/test/java/org/jabref/logic/exporter/OpenOfficeDocumentCreatorTest.java b/src/test/java/org/jabref/logic/exporter/OpenOfficeDocumentCreatorTest.java
index 95d1994e607..886398c7725 100644
--- a/src/test/java/org/jabref/logic/exporter/OpenOfficeDocumentCreatorTest.java
+++ b/src/test/java/org/jabref/logic/exporter/OpenOfficeDocumentCreatorTest.java
@@ -81,7 +81,7 @@ void setUp() throws URISyntaxException {
     void testPerformExportForSingleEntry(@TempDir Path testFolder) throws Exception {
         Path zipPath = testFolder.resolve("OpenOfficeRandomNamedFile");
 
-        exporter.export(databaseContext, zipPath, charset, entries);
+        exporter.export(databaseContext, zipPath, entries);
 
         Path unzipFolder = testFolder.resolve("unzipFolder");
         unzipContentXml(zipPath, testFolder.resolve(unzipFolder));
@@ -90,6 +90,10 @@ void testPerformExportForSingleEntry(@TempDir Path testFolder) throws Exception
         Input.Builder control = Input.from(Files.newInputStream(xmlFile));
         Input.Builder test = Input.from(Files.newInputStream(contentXmlPath));
 
+        // for debugging purposes
+       // Path testPath = xmlFile.resolveSibling("test.xml");
+       // Files.copy(Files.newInputStream(contentXmlPath), testPath, StandardCopyOption.REPLACE_EXISTING);
+
         assertThat(test, CompareMatcher.isSimilarTo(control)
                                        .normalizeWhitespace()
                                        .withNodeMatcher(new DefaultNodeMatcher(ElementSelectors.byNameAndText)).throwComparisonFailure());
diff --git a/src/test/java/org/jabref/logic/exporter/XmpExporterTest.java b/src/test/java/org/jabref/logic/exporter/XmpExporterTest.java
index fa316547047..05266a60aac 100644
--- a/src/test/java/org/jabref/logic/exporter/XmpExporterTest.java
+++ b/src/test/java/org/jabref/logic/exporter/XmpExporterTest.java
@@ -1,7 +1,5 @@
 package org.jabref.logic.exporter;
 
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Arrays;
@@ -26,16 +24,12 @@
 public class XmpExporterTest {
 
     private Exporter exporter;
-    private BibDatabaseContext databaseContext;
-    private Charset encoding;
+    private final BibDatabaseContext databaseContext = new BibDatabaseContext();
     private final XmpPreferences xmpPreferences = mock(XmpPreferences.class);
 
     @BeforeEach
     public void setUp() {
         exporter = new XmpExporter(xmpPreferences);
-
-        databaseContext = new BibDatabaseContext();
-        encoding = StandardCharsets.UTF_8;
     }
 
     @Test
@@ -46,23 +40,25 @@ public void exportSingleEntry(@TempDir Path testFolder) throws Exception {
         BibEntry entry = new BibEntry();
         entry.setField(StandardField.AUTHOR, "Alan Turing");
 
-        exporter.export(databaseContext, file, encoding, Collections.singletonList(entry));
+        exporter.export(databaseContext, file, Collections.singletonList(entry));
         String actual = String.join("\n", Files.readAllLines(file)); // we are using \n to join, so we need it in the expected string as well, \r\n would fail
-        String expected = "  <rdf:RDF xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\">\n" +
-                "    <rdf:Description xmlns:dc=\"http://purl.org/dc/elements/1.1/\" rdf:about=\"\">\n" +
-                "      <dc:creator>\n" +
-                "        <rdf:Seq>\n" +
-                "          <rdf:li>Alan Turing</rdf:li>\n" +
-                "        </rdf:Seq>\n" +
-                "      </dc:creator>\n" +
-                "      <dc:format>application/pdf</dc:format>\n" +
-                "      <dc:type>\n" +
-                "        <rdf:Bag>\n" +
-                "          <rdf:li>Misc</rdf:li>\n" +
-                "        </rdf:Bag>\n" +
-                "      </dc:type>\n" +
-                "    </rdf:Description>\n" +
-                "  </rdf:RDF>";
+        String expected = """
+                  <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+                    <rdf:Description xmlns:dc="http://purl.org/dc/elements/1.1/" rdf:about="">
+                      <dc:creator>
+                        <rdf:Seq>
+                          <rdf:li>Alan Turing</rdf:li>
+                        </rdf:Seq>
+                      </dc:creator>
+                      <dc:format>application/pdf</dc:format>
+                      <dc:type>
+                        <rdf:Bag>
+                          <rdf:li>Misc</rdf:li>
+                        </rdf:Bag>
+                      </dc:type>
+                    </rdf:Description>
+                  </rdf:RDF>
+                """.stripTrailing();
         assertEquals(expected, actual);
     }
 
@@ -78,43 +74,45 @@ public void writeMultipleEntriesInASingleFile(@TempDir Path testFolder) throws E
         entryArmbrust.setField(StandardField.AUTHOR, "Michael Armbrust");
         entryArmbrust.setCitationKey("Armbrust2010");
 
-        exporter.export(databaseContext, file, encoding, Arrays.asList(entryTuring, entryArmbrust));
+        exporter.export(databaseContext, file, Arrays.asList(entryTuring, entryArmbrust));
 
         String actual = String.join("\n", Files.readAllLines(file)); // we are using \n to join, so we need it in the expected string as well, \r\n would fail
 
-        String expected = "  <rdf:RDF xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\">\n" +
-                "    <rdf:Description xmlns:dc=\"http://purl.org/dc/elements/1.1/\" rdf:about=\"\">\n" +
-                "      <dc:creator>\n" +
-                "        <rdf:Seq>\n" +
-                "          <rdf:li>Alan Turing</rdf:li>\n" +
-                "        </rdf:Seq>\n" +
-                "      </dc:creator>\n" +
-                "      <dc:format>application/pdf</dc:format>\n" +
-                "      <dc:type>\n" +
-                "        <rdf:Bag>\n" +
-                "          <rdf:li>Misc</rdf:li>\n" +
-                "        </rdf:Bag>\n" +
-                "      </dc:type>\n" +
-                "    </rdf:Description>\n" +
-                "    <rdf:Description xmlns:dc=\"http://purl.org/dc/elements/1.1/\" rdf:about=\"\">\n" +
-                "      <dc:creator>\n" +
-                "        <rdf:Seq>\n" +
-                "          <rdf:li>Michael Armbrust</rdf:li>\n" +
-                "        </rdf:Seq>\n" +
-                "      </dc:creator>\n" +
-                "      <dc:relation>\n" +
-                "        <rdf:Bag>\n" +
-                "          <rdf:li>bibtex/citationkey/Armbrust2010</rdf:li>\n" +
-                "        </rdf:Bag>\n" +
-                "      </dc:relation>\n" +
-                "      <dc:format>application/pdf</dc:format>\n" +
-                "      <dc:type>\n" +
-                "        <rdf:Bag>\n" +
-                "          <rdf:li>Misc</rdf:li>\n" +
-                "        </rdf:Bag>\n" +
-                "      </dc:type>\n" +
-                "    </rdf:Description>\n" +
-                "  </rdf:RDF>";
+        String expected = """
+                    <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+                      <rdf:Description xmlns:dc="http://purl.org/dc/elements/1.1/" rdf:about="">
+                        <dc:creator>
+                          <rdf:Seq>
+                            <rdf:li>Alan Turing</rdf:li>
+                          </rdf:Seq>
+                        </dc:creator>
+                        <dc:format>application/pdf</dc:format>
+                        <dc:type>
+                          <rdf:Bag>
+                            <rdf:li>Misc</rdf:li>
+                          </rdf:Bag>
+                        </dc:type>
+                      </rdf:Description>
+                      <rdf:Description xmlns:dc="http://purl.org/dc/elements/1.1/" rdf:about="">
+                        <dc:creator>
+                          <rdf:Seq>
+                            <rdf:li>Michael Armbrust</rdf:li>
+                          </rdf:Seq>
+                        </dc:creator>
+                        <dc:relation>
+                          <rdf:Bag>
+                            <rdf:li>bibtex/citationkey/Armbrust2010</rdf:li>
+                          </rdf:Bag>
+                        </dc:relation>
+                        <dc:format>application/pdf</dc:format>
+                        <dc:type>
+                          <rdf:Bag>
+                            <rdf:li>Misc</rdf:li>
+                          </rdf:Bag>
+                        </dc:type>
+                      </rdf:Description>
+                    </rdf:RDF>
+                  """.stripTrailing();
         assertEquals(expected, actual);
     }
 
@@ -126,61 +124,65 @@ public void writeMultipleEntriesInDifferentFiles(@TempDir Path testFolder) throw
 
         BibEntry entryTuring = new BibEntry()
                 .withField(StandardField.AUTHOR, "Alan Turing");
-
         BibEntry entryArmbrust = new BibEntry()
                 .withField(StandardField.AUTHOR, "Michael Armbrust")
                 .withCitationKey("Armbrust2010");
 
-        exporter.export(databaseContext, file, encoding, List.of(entryTuring, entryArmbrust));
+        exporter.export(databaseContext, file, List.of(entryTuring, entryArmbrust));
 
+        // Nothing written in given file
         List<String> lines = Files.readAllLines(file);
         assertEquals(Collections.emptyList(), lines);
 
+        // turing contains the turing entry only
         Path fileTuring = Path.of(file.getParent().toString(), entryTuring.getId() + "_null.xmp");
-        String actualTuring = String.join("\n", Files.readAllLines(fileTuring)); // we are using \n to join, so we need it in the expected string as well, \r\n would fail
-
-        String expectedTuring = "  <rdf:RDF xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\">\n" +
-                "    <rdf:Description xmlns:dc=\"http://purl.org/dc/elements/1.1/\" rdf:about=\"\">\n" +
-                "      <dc:creator>\n" +
-                "        <rdf:Seq>\n" +
-                "          <rdf:li>Alan Turing</rdf:li>\n" +
-                "        </rdf:Seq>\n" +
-                "      </dc:creator>\n" +
-                "      <dc:format>application/pdf</dc:format>\n" +
-                "      <dc:type>\n" +
-                "        <rdf:Bag>\n" +
-                "          <rdf:li>Misc</rdf:li>\n" +
-                "        </rdf:Bag>\n" +
-                "      </dc:type>\n" +
-                "    </rdf:Description>\n" +
-                "  </rdf:RDF>";
-
+        // we are using \n to join, so we need it in the expected string as well, \r\n would fail
+        String actualTuring = String.join("\n", Files.readAllLines(fileTuring));
+        String expectedTuring = """
+                <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+                  <rdf:Description xmlns:dc="http://purl.org/dc/elements/1.1/" rdf:about="">
+                    <dc:creator>
+                      <rdf:Seq>
+                        <rdf:li>Alan Turing</rdf:li>
+                      </rdf:Seq>
+                    </dc:creator>
+                    <dc:format>application/pdf</dc:format>
+                    <dc:type>
+                      <rdf:Bag>
+                        <rdf:li>Misc</rdf:li>
+                      </rdf:Bag>
+                    </dc:type>
+                  </rdf:Description>
+                </rdf:RDF>
+              """.stripTrailing();
         assertEquals(expectedTuring, actualTuring);
 
+        // armbrust contains the armbrust entry only
         Path fileArmbrust = Path.of(file.getParent().toString(), entryArmbrust.getId() + "_Armbrust2010.xmp");
-        String actualArmbrust = String.join("\n", Files.readAllLines(fileArmbrust)); // we are using \n to join, so we need it in the expected string as well, \r\n would fail
-
-        String expectedArmbrust = "  <rdf:RDF xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\">\n" +
-                "    <rdf:Description xmlns:dc=\"http://purl.org/dc/elements/1.1/\" rdf:about=\"\">\n" +
-                "      <dc:creator>\n" +
-                "        <rdf:Seq>\n" +
-                "          <rdf:li>Michael Armbrust</rdf:li>\n" +
-                "        </rdf:Seq>\n" +
-                "      </dc:creator>\n" +
-                "      <dc:relation>\n" +
-                "        <rdf:Bag>\n" +
-                "          <rdf:li>bibtex/citationkey/Armbrust2010</rdf:li>\n" +
-                "        </rdf:Bag>\n" +
-                "      </dc:relation>\n" +
-                "      <dc:format>application/pdf</dc:format>\n" +
-                "      <dc:type>\n" +
-                "        <rdf:Bag>\n" +
-                "          <rdf:li>Misc</rdf:li>\n" +
-                "        </rdf:Bag>\n" +
-                "      </dc:type>\n" +
-                "    </rdf:Description>\n" +
-                "  </rdf:RDF>";
-
+        // we are using \n to join, so we need it in the expected string as well, \r\n would fail
+        String actualArmbrust = String.join("\n", Files.readAllLines(fileArmbrust));
+        String expectedArmbrust = """
+                  <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+                    <rdf:Description xmlns:dc="http://purl.org/dc/elements/1.1/" rdf:about="">
+                      <dc:creator>
+                        <rdf:Seq>
+                          <rdf:li>Michael Armbrust</rdf:li>
+                        </rdf:Seq>
+                      </dc:creator>
+                      <dc:relation>
+                        <rdf:Bag>
+                          <rdf:li>bibtex/citationkey/Armbrust2010</rdf:li>
+                        </rdf:Bag>
+                      </dc:relation>
+                      <dc:format>application/pdf</dc:format>
+                      <dc:type>
+                        <rdf:Bag>
+                          <rdf:li>Misc</rdf:li>
+                        </rdf:Bag>
+                      </dc:type>
+                    </rdf:Description>
+                  </rdf:RDF>
+                """.stripTrailing();
         assertEquals(expectedArmbrust, actualArmbrust);
     }
 
@@ -192,21 +194,25 @@ public void exportSingleEntryWithPrivacyFilter(@TempDir Path testFolder) throws
         Path file = testFolder.resolve("ThisIsARandomlyNamedFile");
         Files.createFile(file);
 
-        BibEntry entry = new BibEntry();
-        entry.setField(StandardField.AUTHOR, "Alan Turing");
+        BibEntry entry = new BibEntry()
+                .withField(StandardField.AUTHOR, "Alan Turing");
+
+        exporter.export(databaseContext, file, Collections.singletonList(entry));
 
-        exporter.export(databaseContext, file, encoding, Collections.singletonList(entry));
         String actual = String.join("\n", Files.readAllLines(file));
-        String expected = "  <rdf:RDF xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\">\n" +
-                "    <rdf:Description xmlns:dc=\"http://purl.org/dc/elements/1.1/\" rdf:about=\"\">\n" +
-                "      <dc:format>application/pdf</dc:format>\n" +
-                "      <dc:type>\n" +
-                "        <rdf:Bag>\n" +
-                "          <rdf:li>Misc</rdf:li>\n" +
-                "        </rdf:Bag>\n" +
-                "      </dc:type>\n" +
-                "    </rdf:Description>\n" +
-                "  </rdf:RDF>";
+        String expected = """
+                  <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+                    <rdf:Description xmlns:dc="http://purl.org/dc/elements/1.1/" rdf:about="">
+                      <dc:format>application/pdf</dc:format>
+                      <dc:type>
+                        <rdf:Bag>
+                          <rdf:li>Misc</rdf:li>
+                        </rdf:Bag>
+                      </dc:type>
+                    </rdf:Description>
+                  </rdf:RDF>
+                """.stripTrailing();
+
         assertEquals(expected, actual);
     }
 }
diff --git a/src/test/java/org/jabref/logic/exporter/XmpPdfExporterTest.java b/src/test/java/org/jabref/logic/exporter/XmpPdfExporterTest.java
index c6eee8dcd82..acfe7457bed 100644
--- a/src/test/java/org/jabref/logic/exporter/XmpPdfExporterTest.java
+++ b/src/test/java/org/jabref/logic/exporter/XmpPdfExporterTest.java
@@ -121,13 +121,13 @@ void setUp() throws IOException {
     @ParameterizedTest
     @MethodSource("provideBibEntriesWithValidPdfFileLinks")
     void successfulExportToAllFilesOfEntry(BibEntry bibEntryWithValidPdfFileLink) throws Exception {
-        assertTrue(exporter.exportToAllFilesOfEntry(databaseContext, encoding, filePreferences, bibEntryWithValidPdfFileLink, List.of(olly2018)));
+        assertTrue(exporter.exportToAllFilesOfEntry(databaseContext, filePreferences, bibEntryWithValidPdfFileLink, List.of(olly2018)));
     }
 
     @ParameterizedTest
     @MethodSource("provideBibEntriesWithInvalidPdfFileLinks")
     void unsuccessfulExportToAllFilesOfEntry(BibEntry bibEntryWithValidPdfFileLink) throws Exception {
-        assertFalse(exporter.exportToAllFilesOfEntry(databaseContext, encoding, filePreferences, bibEntryWithValidPdfFileLink, List.of(olly2018)));
+        assertFalse(exporter.exportToAllFilesOfEntry(databaseContext, filePreferences, bibEntryWithValidPdfFileLink, List.of(olly2018)));
     }
 
     public static Stream<Arguments> provideBibEntriesWithValidPdfFileLinks() {
@@ -141,13 +141,13 @@ public static Stream<Arguments> provideBibEntriesWithInvalidPdfFileLinks() {
     @ParameterizedTest
     @MethodSource("providePathsToValidPDFs")
     void successfulExportToFileByPath(Path path) throws Exception {
-        assertTrue(exporter.exportToFileByPath(databaseContext, dataBase, encoding, filePreferences, path));
+        assertTrue(exporter.exportToFileByPath(databaseContext, dataBase, filePreferences, path));
     }
 
     @ParameterizedTest
     @MethodSource("providePathsToInvalidPDFs")
     void unsuccessfulExportToFileByPath(Path path) throws Exception {
-        assertFalse(exporter.exportToFileByPath(databaseContext, dataBase, encoding, filePreferences, path));
+        assertFalse(exporter.exportToFileByPath(databaseContext, dataBase, filePreferences, path));
     }
 
     public static Stream<Arguments> providePathsToValidPDFs() {
diff --git a/src/test/java/org/jabref/logic/exporter/YamlExporterTest.java b/src/test/java/org/jabref/logic/exporter/YamlExporterTest.java
index dcef2c1e12e..6474a97d490 100644
--- a/src/test/java/org/jabref/logic/exporter/YamlExporterTest.java
+++ b/src/test/java/org/jabref/logic/exporter/YamlExporterTest.java
@@ -49,7 +49,7 @@ static void setUp() {
     public final void exportForNoEntriesWritesNothing(@TempDir Path tempFile) throws Exception {
         Path file = tempFile.resolve("ThisIsARandomlyNamedFile");
         Files.createFile(file);
-        yamlExporter.export(databaseContext, tempFile, charset, Collections.emptyList());
+        yamlExporter.export(databaseContext, tempFile, Collections.emptyList());
         assertEquals(Collections.emptyList(), Files.readAllLines(file));
     }
 
@@ -64,7 +64,7 @@ public final void exportsCorrectContent(@TempDir Path tempFile) throws Exception
 
         Path file = tempFile.resolve("RandomFileName");
         Files.createFile(file);
-        yamlExporter.export(databaseContext, file, charset, Collections.singletonList(entry));
+        yamlExporter.export(databaseContext, file, Collections.singletonList(entry));
 
         List<String> expected = List.of(
                 "---",
@@ -92,7 +92,7 @@ public final void formatsContentCorrect(@TempDir Path tempFile) throws Exception
 
         Path file = tempFile.resolve("RandomFileName");
         Files.createFile(file);
-        yamlExporter.export(databaseContext, file, charset, Collections.singletonList(entry));
+        yamlExporter.export(databaseContext, file, Collections.singletonList(entry));
 
         List<String> expected = List.of(
                 "---",
@@ -120,7 +120,7 @@ void passesModifiedCharset(@TempDir Path tempFile) throws Exception {
 
         Path file = tempFile.resolve("RandomFileName");
         Files.createFile(file);
-        yamlExporter.export(databaseContext, file, StandardCharsets.UTF_8, Collections.singletonList(entry));
+        yamlExporter.export(databaseContext, file, Collections.singletonList(entry));
 
         List<String> expected = List.of(
                 "---",
@@ -148,7 +148,7 @@ void passesModifiedCharsetNull(@TempDir Path tempFile) throws Exception {
 
         Path file = tempFile.resolve("RandomFileName");
         Files.createFile(file);
-        yamlExporter.export(databaseContext, file, null, Collections.singletonList(entry));
+        yamlExporter.export(databaseContext, file, Collections.singletonList(entry));
 
         List<String> expected = List.of(
                 "---",
@@ -161,36 +161,6 @@ void passesModifiedCharsetNull(@TempDir Path tempFile) throws Exception {
                 "  issued: 2020-10-14",
                 "  url: http://example.com",
                 "---");
-
-        assertEquals(expected, Files.readAllLines(file));
-    }
-
-    @Test
-    void passesModifiedCharsetASCII(@TempDir Path tempFile) throws Exception {
-        BibEntry entry = new BibEntry(StandardEntryType.Article)
-            .withCitationKey("test")
-            .withField(StandardField.AUTHOR, "谷崎 潤一郎")
-            .withField(StandardField.TITLE, "細雪")
-            .withField(StandardField.URL, "http://example.com")
-            .withField(StandardField.DATE, "2020-10-14");
-
-        Path file = tempFile.resolve("RandomFileName");
-        Files.createFile(file);
-        yamlExporter.export(databaseContext, file, StandardCharsets.US_ASCII, Collections.singletonList(entry));
-
-        List<String> expected = List.of(
-                "---",
-                "references:",
-                "- id: test",
-                "  type: article",
-                "  author:",
-                "  - literal: \"?? ???\"",
-                "  title: \"??\"",
-                "  issued: 2020-10-14",
-                "  url: http://example.com",
-                "---");
-
         assertEquals(expected, Files.readAllLines(file));
-
     }
 }
diff --git a/src/test/java/org/jabref/logic/formatter/bibtexfields/CleanupUrlFormatterTest.java b/src/test/java/org/jabref/logic/formatter/bibtexfields/CleanupUrlFormatterTest.java
index 8e577b44593..822eb6f082b 100644
--- a/src/test/java/org/jabref/logic/formatter/bibtexfields/CleanupUrlFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/bibtexfields/CleanupUrlFormatterTest.java
@@ -51,4 +51,12 @@ void formatExample() {
                         "gesundheit/ratgeber/herz/test/lebenserwartung-werden-sie-100-jahre-alt_aid_363828.html",
                 formatter.format(formatter.getExampleInput()));
     }
+
+    @Test
+    void shouldNotReplacePlusOperatorAsASignInURL() {
+        assertEquals(
+                "https://www.chicago.gov/content/dam/city/depts/cdot/Red Light Cameras/2022/Sutton+Tilahun_Chicago-Camera-Ticket_Exec Summary-Final-Jan10.pdf",
+                formatter.format("https://www.chicago.gov/content/dam/city/depts/cdot/Red Light Cameras/2022/Sutton+Tilahun_Chicago-Camera-Ticket_Exec Summary-Final-Jan10.pdf")
+        );
+    }
 }
diff --git a/src/test/java/org/jabref/logic/formatter/bibtexfields/EscapeDollarSignFormatterTest.java b/src/test/java/org/jabref/logic/formatter/bibtexfields/EscapeDollarSignFormatterTest.java
new file mode 100644
index 00000000000..55b4d543cc9
--- /dev/null
+++ b/src/test/java/org/jabref/logic/formatter/bibtexfields/EscapeDollarSignFormatterTest.java
@@ -0,0 +1,40 @@
+package org.jabref.logic.formatter.bibtexfields;
+
+import java.util.stream.Stream;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class EscapeDollarSignFormatterTest {
+
+    private EscapeDollarSignFormatter formatter = new EscapeDollarSignFormatter();
+
+    private static Stream<Arguments> correctlyFormats() {
+        return Stream.of(
+                // formatReturnsSameTextIfNoDollarSignPresent
+                Arguments.of("Lorem ipsum", "Lorem ipsum"),
+                // formatEscapesDollarSignIfPresent
+                Arguments.of("Lorem\\$ipsum", "Lorem$ipsum"),
+                // keeps escapings
+                Arguments.of("Lorem\\$ipsum", "Lorem\\$ipsum"),
+                Arguments.of("Dollar sign: 1x: \\$ 2x: \\$\\$ 3x: \\$\\$\\$", "Dollar sign: 1x: \\$ 2x: \\$\\$ 3x: \\$\\$\\$"),
+                // mixed field
+                Arguments.of("Dollar sign: 1x: \\$ 2x: \\$\\$ 3x: \\$\\$\\$", "Dollar sign: 1x: $ 2x: $$ 3x: $$$")
+        );
+    }
+
+    @ParameterizedTest
+    @MethodSource
+    void correctlyFormats(String expected, String input) throws Exception {
+        assertEquals(expected, formatter.format(input));
+    }
+
+    @Test
+    void formatExample() {
+        assertEquals("Text\\$with\\$dollar\\$sign", formatter.format(formatter.getExampleInput()));
+    }
+}
diff --git a/src/test/java/org/jabref/logic/formatter/bibtexfields/HtmlToLatexFormatterTest.java b/src/test/java/org/jabref/logic/formatter/bibtexfields/HtmlToLatexFormatterTest.java
index b8b6ac22ec3..3ecd073a917 100644
--- a/src/test/java/org/jabref/logic/formatter/bibtexfields/HtmlToLatexFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/bibtexfields/HtmlToLatexFormatterTest.java
@@ -58,6 +58,12 @@ public void testHTMLCombiningAccents() {
         assertEquals("{\\\"{a}}b", formatter.format("a&#x308;b"));
     }
 
+    @Test
+    public void keepsSingleLessThan() {
+        String text = "(p < 0.01)";
+        assertEquals(text, formatter.format(text));
+    }
+
     @Test
     public void formatExample() {
         assertEquals("JabRef", formatter.format(formatter.getExampleInput()));
diff --git a/src/test/java/org/jabref/logic/formatter/bibtexfields/UnicodeToLatexFormatterTest.java b/src/test/java/org/jabref/logic/formatter/bibtexfields/UnicodeToLatexFormatterTest.java
index c07d14fc8af..2f43db8a4fe 100644
--- a/src/test/java/org/jabref/logic/formatter/bibtexfields/UnicodeToLatexFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/bibtexfields/UnicodeToLatexFormatterTest.java
@@ -33,5 +33,4 @@ private static Stream<Arguments> testCases() {
     void testFormat(String expectedResult, String input) {
         assertEquals(expectedResult, formatter.format(input));
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/formatter/casechanger/TitleCaseFormatterTest.java b/src/test/java/org/jabref/logic/formatter/casechanger/TitleCaseFormatterTest.java
index 8d3cfe97d9e..20ebb96648f 100644
--- a/src/test/java/org/jabref/logic/formatter/casechanger/TitleCaseFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/casechanger/TitleCaseFormatterTest.java
@@ -45,6 +45,18 @@ private static Stream<Arguments> testData() {
                         "bibliographic software. a comparison."),
                 Arguments.of("Bibliographic Software. {A COMPARISON.}",
                         "bibliographic software. {A COMPARISON.}"),
+                Arguments.of("--Test~Ing Dash--Like Characters",
+                        "--test~ing dash--like characters"),
+                Arguments.of("-⸗Test⸗Ing Dash〰Like Cha᐀᐀Racters",
+                        "-⸗test⸗ing dash〰like cha᐀᐀racters"),
+                Arguments.of("︲︲Test־Ing Dash⁓⁓Like Characters",
+                        "︲︲test־ing dash⁓⁓like characters"),
+                Arguments.of("⁻⁻Test−Ing Dash⸻Like Characters",
+                        "⁻⁻test−ing dash⸻like characters"),
+                Arguments.of("--Test〰Ing M-U~L゠T︱I⁓P︲L--~~︲E Dash⸻-Like Characters",
+                        "--test〰ing M-u~l゠t︱i⁓p︲l--~~︲e dASH⸻-likE charACTErs"),
+                Arguments.of("Kinetic Studies on Enzyme-Catalyzed Reactions: Oxidation of Glucose, Decomposition of Hydrogen Peroxide and Their Combination",
+                        "kinetic studies on enzyme-catalyzed reactions: oxidation of glucose, decomposition of hydrogen peroxide and their combination"),
                 Arguments.of("{BPMN} Conformance in Open Source Engines",
                         new TitleCaseFormatter().getExampleInput()));
     }
diff --git a/src/test/java/org/jabref/logic/git/SlrGitHandlerTest.java b/src/test/java/org/jabref/logic/git/SlrGitHandlerTest.java
index d18c3374e7c..af4b13a1f1b 100644
--- a/src/test/java/org/jabref/logic/git/SlrGitHandlerTest.java
+++ b/src/test/java/org/jabref/logic/git/SlrGitHandlerTest.java
@@ -10,10 +10,14 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 class SlrGitHandlerTest {
+    private static final Logger LOGGER = LoggerFactory.getLogger(SlrGitHandlerTest.class);
+
     @TempDir
     Path repositoryPath;
     private SlrGitHandler gitHandler;
@@ -44,7 +48,7 @@ void calculateDiffOnBranch() throws IOException, GitAPIException {
         Files.writeString(Path.of(repositoryPath.toString(), "TestFolder", "Test1.txt"), "This is a new line of text 2\n" + Files.readString(Path.of(repositoryPath.toString(), "TestFolder", "Test1.txt")));
         gitHandler.createCommitOnCurrentBranch("Commit 2 on branch1", false);
 
-        System.out.println(gitHandler.calculatePatchOfNewSearchResults("branch1"));
+        LOGGER.debug(gitHandler.calculatePatchOfNewSearchResults("branch1"));
         assertEquals(expectedPatch, gitHandler.calculatePatchOfNewSearchResults("branch1"));
     }
 
diff --git a/src/test/java/org/jabref/logic/importer/DatabaseFileLookupTest.java b/src/test/java/org/jabref/logic/importer/DatabaseFileLookupTest.java
index 330d2dd22ba..e4990202d1e 100644
--- a/src/test/java/org/jabref/logic/importer/DatabaseFileLookupTest.java
+++ b/src/test/java/org/jabref/logic/importer/DatabaseFileLookupTest.java
@@ -1,6 +1,5 @@
 package org.jabref.logic.importer;
 
-import java.nio.charset.StandardCharsets;
 import java.util.Collection;
 
 import org.jabref.logic.importer.fileformat.BibtexImporter;
@@ -27,7 +26,7 @@ class DatabaseFileLookupTest {
     @BeforeEach
     void setUp() throws Exception {
         ParserResult result = new BibtexImporter(mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS), new DummyFileUpdateMonitor())
-                .importDatabase(ImportDataTest.UNLINKED_FILES_TEST_BIB, StandardCharsets.UTF_8);
+                .importDatabase(ImportDataTest.UNLINKED_FILES_TEST_BIB);
         database = result.getDatabase();
         entries = database.getEntries();
 
diff --git a/src/test/java/org/jabref/logic/importer/ImportDataTest.java b/src/test/java/org/jabref/logic/importer/ImportDataTest.java
index b31f0d5ddc4..5aa06c9be9c 100644
--- a/src/test/java/org/jabref/logic/importer/ImportDataTest.java
+++ b/src/test/java/org/jabref/logic/importer/ImportDataTest.java
@@ -22,7 +22,6 @@ public class ImportDataTest {
      */
     @Test
     void testTestingEnvironment() {
-
         assertTrue(Files.exists(ImportDataTest.EXISTING_FOLDER), "EXISTING_FOLDER does not exist");
         assertTrue(Files.isDirectory(ImportDataTest.EXISTING_FOLDER), "EXISTING_FOLDER is not a directory");
 
diff --git a/src/test/java/org/jabref/logic/importer/ImportFormatReaderIntegrationTest.java b/src/test/java/org/jabref/logic/importer/ImportFormatReaderIntegrationTest.java
index 16f7dfd36c0..8fc04e795b3 100644
--- a/src/test/java/org/jabref/logic/importer/ImportFormatReaderIntegrationTest.java
+++ b/src/test/java/org/jabref/logic/importer/ImportFormatReaderIntegrationTest.java
@@ -1,16 +1,14 @@
 package org.jabref.logic.importer;
 
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Set;
 import java.util.stream.Stream;
 
-import org.jabref.logic.xmp.XmpPreferences;
+import javafx.collections.FXCollections;
+
 import org.jabref.model.util.DummyFileUpdateMonitor;
-import org.jabref.preferences.GeneralPreferences;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -28,11 +26,12 @@ class ImportFormatReaderIntegrationTest {
     @BeforeEach
     void setUp() {
         reader = new ImportFormatReader();
-        ImportFormatPreferences importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        when(importFormatPreferences.getCustomImportList()).thenReturn(Set.of());
-        GeneralPreferences generalPreferences = mock(GeneralPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        when(generalPreferences.getDefaultEncoding()).thenReturn(StandardCharsets.UTF_8);
-        reader.resetImportFormats(mock(ImporterPreferences.class), generalPreferences, importFormatPreferences, mock(XmpPreferences.class), new DummyFileUpdateMonitor());
+        ImporterPreferences importerPreferences = mock(ImporterPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        when(importerPreferences.getCustomImportList()).thenReturn(FXCollections.emptyObservableSet());
+        reader.resetImportFormats(
+                importerPreferences,
+                mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS),
+                new DummyFileUpdateMonitor());
     }
 
     @ParameterizedTest
diff --git a/src/test/java/org/jabref/logic/importer/ImportFormatReaderTestParameterless.java b/src/test/java/org/jabref/logic/importer/ImportFormatReaderTestParameterless.java
index 7cd43538bc6..cdde8e71913 100644
--- a/src/test/java/org/jabref/logic/importer/ImportFormatReaderTestParameterless.java
+++ b/src/test/java/org/jabref/logic/importer/ImportFormatReaderTestParameterless.java
@@ -1,13 +1,11 @@
 package org.jabref.logic.importer;
 
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
-import java.util.Set;
 
-import org.jabref.logic.xmp.XmpPreferences;
+import javafx.collections.FXCollections;
+
 import org.jabref.model.util.DummyFileUpdateMonitor;
 import org.jabref.model.util.FileUpdateMonitor;
-import org.jabref.preferences.GeneralPreferences;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -25,11 +23,11 @@ class ImportFormatReaderTestParameterless {
     @BeforeEach
     void setUp() {
         reader = new ImportFormatReader();
-        GeneralPreferences generalPreferences = mock(GeneralPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        when(generalPreferences.getDefaultEncoding()).thenReturn(StandardCharsets.UTF_8);
+        ImporterPreferences importerPreferences = mock(ImporterPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        when(importerPreferences.getCustomImportList()).thenReturn(FXCollections.emptyObservableSet());
+
         ImportFormatPreferences importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        when(importFormatPreferences.getCustomImportList()).thenReturn(Set.of());
-        reader.resetImportFormats(mock(ImporterPreferences.class), generalPreferences, importFormatPreferences, mock(XmpPreferences.class), fileMonitor);
+        reader.resetImportFormats(importerPreferences, importFormatPreferences, fileMonitor);
     }
 
     @Test
@@ -39,17 +37,17 @@ void importUnknownFormatThrowsExceptionIfNoMatchingImporterWasFound() throws Exc
     }
 
     @Test
-    void importUnknownFormatThrowsExceptionIfPathIsNull() throws Exception {
+    void importUnknownFormatThrowsExceptionIfPathIsNull() {
         assertThrows(NullPointerException.class, () -> reader.importUnknownFormat(null, fileMonitor));
     }
 
     @Test
-    void importUnknownFormatThrowsExceptionIfDataIsNull() throws Exception {
+    void importUnknownFormatThrowsExceptionIfDataIsNull() {
         assertThrows(NullPointerException.class, () -> reader.importUnknownFormat(null));
     }
 
     @Test
-    void importFromFileWithUnknownFormatThrowsException() throws Exception {
+    void importFromFileWithUnknownFormatThrowsException() {
         assertThrows(ImportException.class, () -> reader.importFromFile("someunknownformat", Path.of("somepath")));
     }
 }
diff --git a/src/test/java/org/jabref/logic/importer/ImporterTest.java b/src/test/java/org/jabref/logic/importer/ImporterTest.java
index c3db3e1906d..5409b87fe1b 100644
--- a/src/test/java/org/jabref/logic/importer/ImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/ImporterTest.java
@@ -7,6 +7,7 @@
 import org.jabref.logic.importer.fileformat.BibTeXMLImporter;
 import org.jabref.logic.importer.fileformat.BiblioscapeImporter;
 import org.jabref.logic.importer.fileformat.BibtexImporter;
+import org.jabref.logic.importer.fileformat.CitaviXmlImporter;
 import org.jabref.logic.importer.fileformat.CopacImporter;
 import org.jabref.logic.importer.fileformat.EndnoteImporter;
 import org.jabref.logic.importer.fileformat.InspecImporter;
@@ -124,7 +125,8 @@ public static Stream<Importer> instancesToTest() {
                 new PdfXmpImporter(xmpPreferences),
                 new RepecNepImporter(importFormatPreferences),
                 new RisImporter(),
-                new SilverPlatterImporter()
+                new SilverPlatterImporter(),
+                new CitaviXmlImporter()
         );
         // @formatter:on
     }
diff --git a/src/test/java/org/jabref/logic/importer/OpenDatabaseTest.java b/src/test/java/org/jabref/logic/importer/OpenDatabaseTest.java
index 222f68e809a..d5fe3876d4b 100644
--- a/src/test/java/org/jabref/logic/importer/OpenDatabaseTest.java
+++ b/src/test/java/org/jabref/logic/importer/OpenDatabaseTest.java
@@ -21,7 +21,6 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
 
 class OpenDatabaseTest {
 
@@ -46,39 +45,36 @@ class OpenDatabaseTest {
     @BeforeEach
     void setUp() {
         generalPreferences = mock(GeneralPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        when(generalPreferences.getDefaultEncoding()).thenReturn(StandardCharsets.UTF_8);
         importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
     }
 
     @Test
     void useFallbackEncodingIfNoHeader() throws IOException {
-        ParserResult result = OpenDatabase.loadDatabase(bibNoHeader, generalPreferences, importFormatPreferences, fileMonitor);
+        ParserResult result = OpenDatabase.loadDatabase(bibNoHeader, importFormatPreferences, fileMonitor);
         assertEquals(defaultEncoding, result.getMetaData().getEncoding().get());
     }
 
     @Test
     void useFallbackEncodingIfUnknownHeader() throws IOException {
-        ParserResult result = OpenDatabase.loadDatabase(bibWrongHeader, generalPreferences, importFormatPreferences, fileMonitor);
+        ParserResult result = OpenDatabase.loadDatabase(bibWrongHeader, importFormatPreferences, fileMonitor);
         assertEquals(defaultEncoding, result.getMetaData().getEncoding().get());
     }
 
     @Test
     void useSpecifiedEncoding() throws IOException {
-        when(generalPreferences.getDefaultEncoding()).thenReturn(StandardCharsets.US_ASCII);
-        ParserResult result = OpenDatabase.loadDatabase(bibHeader, generalPreferences, importFormatPreferences, fileMonitor);
+        ParserResult result = OpenDatabase.loadDatabase(bibHeader, importFormatPreferences, fileMonitor);
         assertEquals(defaultEncoding, result.getMetaData().getEncoding().get());
     }
 
     @Test
     void useSpecifiedEncodingWithSignature() throws IOException {
-        when(generalPreferences.getDefaultEncoding()).thenReturn(StandardCharsets.US_ASCII);
-        ParserResult result = OpenDatabase.loadDatabase(bibHeaderAndSignature, generalPreferences, importFormatPreferences, fileMonitor);
+        ParserResult result = OpenDatabase.loadDatabase(bibHeaderAndSignature, importFormatPreferences, fileMonitor);
         assertEquals(defaultEncoding, result.getMetaData().getEncoding().get());
     }
 
     @Test
     void entriesAreParsedNoHeader() throws IOException {
-        ParserResult result = OpenDatabase.loadDatabase(bibNoHeader, generalPreferences, importFormatPreferences, fileMonitor);
+        ParserResult result = OpenDatabase.loadDatabase(bibNoHeader, importFormatPreferences, fileMonitor);
         BibDatabase db = result.getDatabase();
 
         // Entry
@@ -88,7 +84,7 @@ void entriesAreParsedNoHeader() throws IOException {
 
     @Test
     void entriesAreParsedHeader() throws IOException {
-        ParserResult result = OpenDatabase.loadDatabase(bibHeader, generalPreferences, importFormatPreferences, fileMonitor);
+        ParserResult result = OpenDatabase.loadDatabase(bibHeader, importFormatPreferences, fileMonitor);
         BibDatabase db = result.getDatabase();
 
         // Entry
@@ -98,7 +94,7 @@ void entriesAreParsedHeader() throws IOException {
 
     @Test
     void entriesAreParsedHeaderAndSignature() throws IOException {
-        ParserResult result = OpenDatabase.loadDatabase(bibHeaderAndSignature, generalPreferences, importFormatPreferences, fileMonitor);
+        ParserResult result = OpenDatabase.loadDatabase(bibHeaderAndSignature, importFormatPreferences, fileMonitor);
         BibDatabase db = result.getDatabase();
 
         // Entry
@@ -111,7 +107,7 @@ void entriesAreParsedHeaderAndSignature() throws IOException {
      */
     @Test
     void correctlyParseEncodingWithoutNewline() throws IOException {
-        ParserResult result = OpenDatabase.loadDatabase(bibEncodingWithoutNewline, generalPreferences, importFormatPreferences, fileMonitor);
+        ParserResult result = OpenDatabase.loadDatabase(bibEncodingWithoutNewline, importFormatPreferences, fileMonitor);
         assertEquals(StandardCharsets.US_ASCII, result.getMetaData().getEncoding().get());
 
         BibDatabase db = result.getDatabase();
diff --git a/src/test/java/org/jabref/logic/importer/WebFetchersTest.java b/src/test/java/org/jabref/logic/importer/WebFetchersTest.java
index 6c1aa5aeb4d..3486496f289 100644
--- a/src/test/java/org/jabref/logic/importer/WebFetchersTest.java
+++ b/src/test/java/org/jabref/logic/importer/WebFetchersTest.java
@@ -1,6 +1,5 @@
 package org.jabref.logic.importer;
 
-import java.nio.charset.Charset;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
@@ -11,9 +10,9 @@
 import org.jabref.logic.importer.fetcher.GoogleScholar;
 import org.jabref.logic.importer.fetcher.GrobidCitationFetcher;
 import org.jabref.logic.importer.fetcher.IsbnViaEbookDeFetcher;
-import org.jabref.logic.importer.fetcher.IsbnViaOttoBibFetcher;
 import org.jabref.logic.importer.fetcher.JstorFetcher;
 import org.jabref.logic.importer.fetcher.MrDLibFetcher;
+import org.jabref.logic.importer.fetcher.OpenLibraryFetcher;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.preferences.FilePreferences;
 
@@ -22,6 +21,7 @@
 import io.github.classgraph.ScanResult;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.mockito.Answers;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.Mockito.mock;
@@ -30,21 +30,22 @@
 class WebFetchersTest {
 
     private ImportFormatPreferences importFormatPreferences;
+    private ImporterPreferences importerPreferences;
     private final ClassGraph classGraph = new ClassGraph().enableAllInfo().acceptPackages("org.jabref");
 
     @BeforeEach
-    void setUp() throws Exception {
-        importFormatPreferences = mock(ImportFormatPreferences.class);
+    void setUp() {
+        importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        importerPreferences = mock(ImporterPreferences.class);
         FieldContentFormatterPreferences fieldContentFormatterPreferences = mock(FieldContentFormatterPreferences.class);
         when(importFormatPreferences.getFieldContentFormatterPreferences()).thenReturn(fieldContentFormatterPreferences);
     }
 
     @Test
-    void getIdBasedFetchersReturnsAllFetcherDerivingFromIdBasedFetcher() throws Exception {
-        Set<IdBasedFetcher> idFetchers = WebFetchers.getIdBasedFetchers(importFormatPreferences);
+    void getIdBasedFetchersReturnsAllFetcherDerivingFromIdBasedFetcher() {
+        Set<IdBasedFetcher> idFetchers = WebFetchers.getIdBasedFetchers(importFormatPreferences, importerPreferences);
 
         try (ScanResult scanResult = classGraph.scan()) {
-
             ClassInfoList controlClasses = scanResult.getClassesImplementing(IdBasedFetcher.class.getCanonicalName());
             Set<Class<?>> expected = new HashSet<>(controlClasses.loadClasses());
 
@@ -52,8 +53,8 @@ void getIdBasedFetchersReturnsAllFetcherDerivingFromIdBasedFetcher() throws Exce
             expected.remove(IdBasedParserFetcher.class);
 
             // Remove special ISBN fetcher since we don't want to expose them to the user
+            expected.remove(OpenLibraryFetcher.class);
             expected.remove(IsbnViaEbookDeFetcher.class);
-            expected.remove(IsbnViaOttoBibFetcher.class);
 
             // Remove the following, because they don't work at the moment
             expected.remove(JstorFetcher.class);
@@ -64,8 +65,12 @@ void getIdBasedFetchersReturnsAllFetcherDerivingFromIdBasedFetcher() throws Exce
     }
 
     @Test
-    void getEntryBasedFetchersReturnsAllFetcherDerivingFromEntryBasedFetcher() throws Exception {
-        Set<EntryBasedFetcher> idFetchers = WebFetchers.getEntryBasedFetchers(mock(ImporterPreferences.class), importFormatPreferences, mock(FilePreferences.class), mock(BibDatabaseContext.class), Charset.defaultCharset());
+    void getEntryBasedFetchersReturnsAllFetcherDerivingFromEntryBasedFetcher() {
+        Set<EntryBasedFetcher> idFetchers = WebFetchers.getEntryBasedFetchers(
+                mock(ImporterPreferences.class),
+                importFormatPreferences,
+                mock(FilePreferences.class),
+                mock(BibDatabaseContext.class));
 
         try (ScanResult scanResult = classGraph.scan()) {
             ClassInfoList controlClasses = scanResult.getClassesImplementing(EntryBasedFetcher.class.getCanonicalName());
@@ -78,8 +83,8 @@ void getEntryBasedFetchersReturnsAllFetcherDerivingFromEntryBasedFetcher() throw
     }
 
     @Test
-    void getSearchBasedFetchersReturnsAllFetcherDerivingFromSearchBasedFetcher() throws Exception {
-        Set<SearchBasedFetcher> searchBasedFetchers = WebFetchers.getSearchBasedFetchers(importFormatPreferences);
+    void getSearchBasedFetchersReturnsAllFetcherDerivingFromSearchBasedFetcher() {
+        Set<SearchBasedFetcher> searchBasedFetchers = WebFetchers.getSearchBasedFetchers(importFormatPreferences, importerPreferences);
         try (ScanResult scanResult = classGraph.scan()) {
             ClassInfoList controlClasses = scanResult.getClassesImplementing(SearchBasedFetcher.class.getCanonicalName());
             Set<Class<?>> expected = new HashSet<>(controlClasses.loadClasses());
@@ -102,8 +107,8 @@ void getSearchBasedFetchersReturnsAllFetcherDerivingFromSearchBasedFetcher() thr
     }
 
     @Test
-    void getFullTextFetchersReturnsAllFetcherDerivingFromFullTextFetcher() throws Exception {
-        Set<FulltextFetcher> fullTextFetchers = WebFetchers.getFullTextFetchers(importFormatPreferences);
+    void getFullTextFetchersReturnsAllFetcherDerivingFromFullTextFetcher() {
+        Set<FulltextFetcher> fullTextFetchers = WebFetchers.getFullTextFetchers(importFormatPreferences, importerPreferences);
 
         try (ScanResult scanResult = classGraph.scan()) {
             ClassInfoList controlClasses = scanResult.getClassesImplementing(FulltextFetcher.class.getCanonicalName());
@@ -118,7 +123,7 @@ void getFullTextFetchersReturnsAllFetcherDerivingFromFullTextFetcher() throws Ex
     }
 
     @Test
-    void getIdFetchersReturnsAllFetcherDerivingFromIdFetcher() throws Exception {
+    void getIdFetchersReturnsAllFetcherDerivingFromIdFetcher() {
         Set<IdFetcher<?>> idFetchers = WebFetchers.getIdFetchers(importFormatPreferences);
 
         try (ScanResult scanResult = classGraph.scan()) {
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/ACMPortalFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/ACMPortalFetcherTest.java
index 63a3354654f..65c379836c8 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/ACMPortalFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/ACMPortalFetcherTest.java
@@ -33,7 +33,6 @@ void setUp() {
 
     @Test
     void searchByQueryFindsEntry() throws Exception {
-
         BibEntry searchEntry = new BibEntry(StandardEntryType.Conference)
                         .withField(StandardField.AUTHOR, "Tobias Olsson and Morgan Ericsson and Anna Wingkvist")
                         .withField(StandardField.YEAR, "2017")
@@ -74,5 +73,4 @@ void testGetParser() {
         ACMPortalParser expected = new ACMPortalParser();
         assertEquals(expected.getClass(), fetcher.getParser().getClass());
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/AbstractIsbnFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/AbstractIsbnFetcherTest.java
index 4f40d09bf0a..72ec4e01f18 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/AbstractIsbnFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/AbstractIsbnFetcherTest.java
@@ -15,7 +15,7 @@
 public abstract class AbstractIsbnFetcherTest {
 
     protected AbstractIsbnFetcher fetcher;
-    protected BibEntry bibEntry;
+    protected BibEntry bibEntryEffectiveJava;
 
     public abstract void testName();
 
@@ -26,7 +26,7 @@ public abstract class AbstractIsbnFetcherTest {
     @Test
     public void searchByIdSuccessfulWithLongISBN() throws FetcherException {
         Optional<BibEntry> fetchedEntry = fetcher.performSearchById("978-0321356680");
-        assertEquals(Optional.of(bibEntry), fetchedEntry);
+        assertEquals(Optional.of(bibEntryEffectiveJava), fetchedEntry);
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/ArXivTest.java b/src/test/java/org/jabref/logic/importer/fetcher/ArXivTest.java
index 52930702d6e..0a65fd4bf9e 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/ArXivTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/ArXivTest.java
@@ -272,7 +272,6 @@ public void supportsYearSearch() throws Exception {
     @Test
     @Override
     public void supportsYearRangeSearch() throws Exception {
-
     }
 
     @Override
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 f7854d13f53..884b048d416 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/AstrophysicsDataSystemTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/AstrophysicsDataSystemTest.java
@@ -3,8 +3,11 @@
 import java.util.List;
 import java.util.Optional;
 
+import javafx.collections.FXCollections;
+
 import org.jabref.logic.bibtex.FieldContentFormatterPreferences;
 import org.jabref.logic.importer.ImportFormatPreferences;
+import org.jabref.logic.importer.ImporterPreferences;
 import org.jabref.logic.importer.PagedSearchBasedFetcher;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
@@ -35,9 +38,11 @@ public class AstrophysicsDataSystemTest implements PagedSearchFetcherTest {
     @BeforeEach
     public void setUp() throws Exception {
         ImportFormatPreferences importFormatPreferences = mock(ImportFormatPreferences.class);
+        ImporterPreferences importerPreferences = mock(ImporterPreferences.class);
+        when(importerPreferences.getApiKeys()).thenReturn(FXCollections.emptyObservableSet());
         when(importFormatPreferences.getFieldContentFormatterPreferences()).thenReturn(
                 mock(FieldContentFormatterPreferences.class));
-        fetcher = new AstrophysicsDataSystem(importFormatPreferences);
+        fetcher = new AstrophysicsDataSystem(importFormatPreferences, importerPreferences);
 
         diezSliceTheoremEntry = new BibEntry();
         diezSliceTheoremEntry.setType(StandardEntryType.Article);
@@ -134,6 +139,7 @@ public void setUp() throws Exception {
         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.");
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/BiodiversityLibraryTest.java b/src/test/java/org/jabref/logic/importer/fetcher/BiodiversityLibraryTest.java
new file mode 100644
index 00000000000..e1ee85d8fc8
--- /dev/null
+++ b/src/test/java/org/jabref/logic/importer/fetcher/BiodiversityLibraryTest.java
@@ -0,0 +1,178 @@
+package org.jabref.logic.importer.fetcher;
+
+import java.net.MalformedURLException;
+import java.net.URISyntaxException;
+import java.util.List;
+
+import javafx.collections.FXCollections;
+
+import org.jabref.logic.importer.FetcherException;
+import org.jabref.logic.importer.ImporterPreferences;
+import org.jabref.logic.util.BuildInfo;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.field.StandardField;
+import org.jabref.model.entry.types.StandardEntryType;
+import org.jabref.testutils.category.FetcherTest;
+
+import kong.unirest.json.JSONObject;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+@FetcherTest
+public class BiodiversityLibraryTest {
+    private final String BASE_URL = "https://www.biodiversitylibrary.org/api3?";
+    private final String RESPONSE_FORMAT = "&format=json";
+    private final BuildInfo buildInfo = new BuildInfo();
+
+    private BiodiversityLibrary fetcher;
+
+    @BeforeEach
+    void setUp() {
+        ImporterPreferences importerPreferences = mock(ImporterPreferences.class);
+        when(importerPreferences.getApiKeys()).thenReturn(FXCollections.emptyObservableSet());
+        fetcher = new BiodiversityLibrary(importerPreferences);
+    }
+
+    @Test
+    public void testGetName() {
+        assertEquals("Biodiversity Heritage", fetcher.getName());
+        assertNotEquals("Biodiversity Heritage Library", fetcher.getName());
+        assertNotEquals("Biodiversity Library", fetcher.getName());
+    }
+
+    @Test
+    public void biodiversityHeritageApiKeyIsNotEmpty() {
+        BuildInfo buildInfo = new BuildInfo();
+        assertNotNull(buildInfo.biodiversityHeritageApiKey);
+    }
+
+    @Test
+    public void baseURLConstruction() throws MalformedURLException, URISyntaxException {
+        String expected = fetcher
+                .getTestUrl()
+                .concat(buildInfo.biodiversityHeritageApiKey)
+                .concat(RESPONSE_FORMAT);
+
+        assertEquals(expected, fetcher.getBaseURL().toString());
+    }
+
+    @ParameterizedTest
+    @ValueSource(strings = {"1234", "331", "121"})
+    public void getPartMetadaUrl(String id) throws MalformedURLException, URISyntaxException {
+        String expected = fetcher
+                .getTestUrl()
+                .concat(buildInfo.biodiversityHeritageApiKey)
+                .concat(RESPONSE_FORMAT)
+                .concat("&op=GetPartMetadata&pages=f&names=f")
+                .concat("&id=");
+
+        assertEquals(expected.concat(id), fetcher.getPartMetadataURL(id).toString());
+    }
+
+    @ParameterizedTest
+    @ValueSource(strings = {"1234", "4321", "331"})
+    public void getItemMetadaUrl(String id) throws MalformedURLException, URISyntaxException {
+        String expected = fetcher
+                .getTestUrl()
+                .concat(buildInfo.biodiversityHeritageApiKey)
+                .concat(RESPONSE_FORMAT)
+                .concat("&op=GetItemMetadata&pages=f&ocr=f&ocr=f")
+                .concat("&id=");
+
+        assertEquals(expected.concat(id), fetcher.getItemMetadataURL(id).toString());
+    }
+
+    @Test
+    public void testPerformSearch() throws FetcherException {
+        BibEntry expected = new BibEntry(StandardEntryType.Book)
+            .withField(StandardField.AUTHOR, "Ingersoll, Ernest, ")
+            .withField(StandardField.EDITOR, "University of Illinois Urbana-Champaign Alternates")
+            .withField(StandardField.LANGUAGE, "English")
+            .withField(StandardField.PUBLISHER, "University Library, University of Illinois Urbana Champaign")
+            .withField(StandardField.LOCATION, "Chicago")
+            .withField(StandardField.TITLE, "Dogs")
+            .withField(StandardField.URL, "https://www.biodiversitylibrary.org/item/219826")
+            .withField(StandardField.YEAR, "1879");
+
+        // fetcher returns more than entry, by default up to 200, but we only want to check one here
+        assertEquals(List.of(expected), fetcher.performSearch("dogs").subList(0, 1));
+    }
+
+    @Test
+    public void jsonResultToBibEntry() {
+        JSONObject input = new JSONObject("{\n\"BHLType\": \"Part\",\n\"FoundIn\": \"Metadata\",\n\"Volume\": \"3\",\n\"Authors\": [\n{\n\"Name\": \"Dimmock, George,\"\n}\n],\n\"PartUrl\": \"https://www.biodiversitylibrary.org/part/181199\",\n\"PartID\": \"181199\",\n\"Genre\": \"Article\",\n\"Title\": \"The Cocoons of Cionus Scrophulariae\",\n\"ContainerTitle\": \"Psyche.\",\n\"Date\": \"1882\",\n\"PageRange\": \"411--413\"\n}");
+        BibEntry expected = new BibEntry(StandardEntryType.Article)
+                .withField(StandardField.TITLE, "The Cocoons of Cionus Scrophulariae")
+                .withField(StandardField.AUTHOR, "Dimmock, George, ")
+                .withField(StandardField.PAGES, "411--413")
+                .withField(StandardField.DATE, "1882")
+                .withField(StandardField.JOURNALTITLE, "Psyche.")
+                .withField(StandardField.VOLUME, "3");
+
+        assertEquals(expected, fetcher.jsonResultToBibEntry(input));
+
+        input = new JSONObject("""
+                {
+                            "BHLType": "Item",
+                            "FoundIn": "Metadata",
+                            "ItemID": "174333",
+                            "TitleID": "96205",
+                            "ItemUrl": "https://www.biodiversitylibrary.org/item/174333",
+                            "TitleUrl": "https://www.biodiversitylibrary.org/bibliography/96205",
+                            "MaterialType": "Published material",
+                            "PublisherPlace": "Salisbury",
+                            "PublisherName": "Frederick A. Blake,",
+                            "PublicationDate": "1861",
+                            "Authors": [
+                                {
+                                    "Name": "George, George"
+                                }
+                            ],
+                            "Genre": "Book",
+                            "Title": "Potatoes : the poor man's own crop : illustrated with plates, showing the decay and disease of the potatoe [sic] : with hints to improve the land and life of the poor man : published to aid the Industrial Marlborough Exhibition"
+                        }""");
+         expected = new BibEntry(StandardEntryType.Book)
+                .withField(StandardField.TITLE, "Potatoes : the poor man's own crop : illustrated with plates, showing the decay and disease of the potatoe [sic] : with hints to improve the land and life of the poor man : published to aid the Industrial Marlborough Exhibition")
+                .withField(StandardField.AUTHOR, "George, George ")
+                .withField(StandardField.YEAR, "1861")
+                .withField(StandardField.LOCATION, "Salisbury")
+                .withField(StandardField.PUBLISHER, "Frederick A. Blake,");
+        assertEquals(expected, fetcher.jsonResultToBibEntry(input));
+
+        input = new JSONObject("""
+                {
+                            "BHLType": "Item",
+                            "FoundIn": "Metadata",
+                            "ItemID": "200116",
+                            "TitleID": "115108",
+                            "ItemUrl": "https://www.biodiversitylibrary.org/item/200116",
+                            "TitleUrl": "https://www.biodiversitylibrary.org/bibliography/115108",
+                            "MaterialType": "Published material",
+                            "PublisherPlace": "Washington",
+                            "PublisherName": "Government Prining Office,",
+                            "PublicationDate": "1911",
+                            "Authors": [
+                                {
+                                    "Name": "Whitaker, George M. (George Mason)"
+                                }
+                            ],
+                            "Genre": "Book",
+                            "Title": "The extra cost of producing clean milk."
+                        }""");
+        expected = new BibEntry(StandardEntryType.Book)
+                .withField(StandardField.TITLE, "The extra cost of producing clean milk.")
+                .withField(StandardField.AUTHOR, "Whitaker, George M. (George Mason) ")
+                .withField(StandardField.YEAR, "1911")
+                .withField(StandardField.LOCATION, "Washington")
+                .withField(StandardField.PUBLISHER, "Government Prining Office,");
+        assertEquals(expected, fetcher.jsonResultToBibEntry(input));
+    }
+}
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 c0a08dd00b8..367e2f6be9a 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/CompositeIdFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/CompositeIdFetcherTest.java
@@ -9,7 +9,6 @@
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
-import org.jabref.model.entry.field.UnknownField;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.testutils.category.FetcherTest;
 
@@ -32,7 +31,7 @@ class CompositeIdFetcherTest {
 
     private CompositeIdFetcher compositeIdFetcher;
 
-    public static Stream<Arguments> provideTestData() {
+    public static Stream<Arguments> performSearchByIdReturnsCorrectEntryForIdentifier() {
         return Stream.of(
                 Arguments.arguments(
                         "performSearchByIdReturnsCorrectEntryForArXivId",
@@ -48,6 +47,7 @@ public static Stream<Arguments> provideTestData() {
                                 .withField(StandardField.KEYWORDS, "astro-ph.GA"),
                         "arXiv:2110.02957"
                 ),
+                /* disabled, because Iacr does not work
                 Arguments.arguments(
                         "performSearchByIdReturnsCorrectEntryForIacrEprintId",
                         new BibEntry(StandardEntryType.Misc)
@@ -62,26 +62,23 @@ public static Stream<Arguments> provideTestData() {
                                 .withField(StandardField.YEAR, "2017")
                                 .withCitationKey("cryptoeprint:2017:1118"),
                         "2017/1118"
-                ),
+                ), */
                 Arguments.arguments(
                         "performSearchByIdReturnsCorrectEntryForIsbnId",
                         new BibEntry(StandardEntryType.Book)
                                 .withField(StandardField.TITLE, "Effective Java")
-                                .withField(StandardField.PUBLISHER, "Addison Wesley")
-                                .withField(StandardField.YEAR, "2018")
+                                .withField(StandardField.PUBLISHER, "Addison-Wesley Professional")
+                                .withField(StandardField.YEAR, "2017")
                                 .withField(StandardField.AUTHOR, "Bloch, Joshua")
-                                .withField(StandardField.DATE, "2018-01-31")
-                                .withField(new UnknownField("ean"), "9780134685991")
-                                .withField(StandardField.ISBN, "0134685997")
-                                .withField(StandardField.URL, "https://www.ebook.de/de/product/28983211/joshua_bloch_effective_java.html")
-                                .withCitationKey("9780134685991"),
+                                .withField(StandardField.PAGES, "416")
+                                .withField(StandardField.ISBN, "9780134685991"),
                         "9780134685991"
                 ),
                 Arguments.arguments(
                         "performSearchByIdReturnsCorrectEntryForDoiId",
                         new BibEntry(StandardEntryType.Book)
                                 .withField(StandardField.TITLE, "Java{\\textregistered} For Dummies{\\textregistered}")
-                                .withField(StandardField.PUBLISHER, "Wiley Publishing, Inc.")
+                                .withField(StandardField.PUBLISHER, "Wiley")
                                 .withField(StandardField.YEAR, "2011")
                                 .withField(StandardField.AUTHOR, "Barry Burd")
                                 .withField(StandardField.MONTH, "jul")
@@ -107,9 +104,8 @@ void performSearchByIdReturnsEmptyForInvalidId(String groundInvalidArXivId) thro
     }
 
     @ParameterizedTest(name = "{index} {0}")
-    @MethodSource("provideTestData")
+    @MethodSource
     void performSearchByIdReturnsCorrectEntryForIdentifier(String name, BibEntry bibEntry, String identifier) throws FetcherException {
         assertEquals(Optional.of(bibEntry), compositeIdFetcher.performSearchById(identifier));
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/CompositeSearchBasedFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/CompositeSearchBasedFetcherTest.java
index 1c329d419a8..fe0db637765 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/CompositeSearchBasedFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/CompositeSearchBasedFetcherTest.java
@@ -7,10 +7,13 @@
 import java.util.Set;
 import java.util.stream.Stream;
 
+import javafx.collections.FXCollections;
+
 import org.jabref.logic.bibtex.FieldContentFormatterPreferences;
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.ImportCleanup;
 import org.jabref.logic.importer.ImportFormatPreferences;
+import org.jabref.logic.importer.ImporterPreferences;
 import org.jabref.logic.importer.SearchBasedFetcher;
 import org.jabref.model.database.BibDatabaseMode;
 import org.jabref.model.entry.BibEntry;
@@ -75,10 +78,10 @@ public void performSearchOnNonEmptyQuery(Set<SearchBasedFetcher> fetchers) throw
                 Assertions.assertTrue(compositeResult.containsAll(fetcherResult));
             } catch (FetcherException e) {
                 /* We catch the Fetcher exception here, since the failing fetcher also fails in the CompositeFetcher
-                 * and just leads to no additional results in the returned list. Therefore the test should not fail
+                 * and just leads to no additional results in the returned list. Therefore, the test should not fail
                  * due to the fetcher exception
                  */
-                LOGGER.debug(String.format("Fetcher %s failed ", fetcher.getName()), e);
+                LOGGER.debug("Fetcher {} failed ", fetcher.getName(), e);
             }
         }
     }
@@ -90,28 +93,31 @@ public void performSearchOnNonEmptyQuery(Set<SearchBasedFetcher> fetchers) throw
      */
     static Stream<Arguments> performSearchParameters() {
         ImportFormatPreferences importFormatPreferences = mock(ImportFormatPreferences.class);
+        ImporterPreferences importerPreferences = mock(ImporterPreferences.class);
+        when(importerPreferences.getApiKeys()).thenReturn(FXCollections.emptyObservableSet());
         when(importFormatPreferences.getFieldContentFormatterPreferences())
                 .thenReturn(mock(FieldContentFormatterPreferences.class));
         List<Set<SearchBasedFetcher>> fetcherParameters = new ArrayList<>();
-        List<SearchBasedFetcher> list = new ArrayList<>();
-
-        list.add(new ArXiv(importFormatPreferences));
-        list.add(new INSPIREFetcher(importFormatPreferences));
-        list.add(new GvkFetcher());
-        list.add(new AstrophysicsDataSystem(importFormatPreferences));
-        list.add(new MathSciNet(importFormatPreferences));
-        list.add(new ZbMATH(importFormatPreferences));
-        list.add(new GoogleScholar(importFormatPreferences));
-        list.add(new DBLPFetcher(importFormatPreferences));
-        list.add(new SpringerFetcher());
-        list.add(new CrossRef());
-        list.add(new CiteSeer());
-        list.add(new DOAJFetcher(importFormatPreferences));
-        list.add(new IEEE(importFormatPreferences));
+
+        List<SearchBasedFetcher> list = List.of(
+                new ArXiv(importFormatPreferences),
+                new INSPIREFetcher(importFormatPreferences),
+                new GvkFetcher(),
+                new AstrophysicsDataSystem(importFormatPreferences, importerPreferences),
+                new MathSciNet(importFormatPreferences),
+                new ZbMATH(importFormatPreferences),
+                new GoogleScholar(importFormatPreferences),
+                new DBLPFetcher(importFormatPreferences),
+                new SpringerFetcher(importerPreferences),
+                new CrossRef(),
+                new CiteSeer(),
+                new DOAJFetcher(importFormatPreferences),
+                new IEEE(importFormatPreferences, importerPreferences));
+
         /* Disabled due to an issue regarding comparison: Title fields of the entries that otherwise are equivalent differ
          * due to different JAXBElements.
          */
-        // list.add(new MedlineFetcher());
+        // new MedlineFetcher()
 
         // Create different sized sets of fetchers to use in the composite fetcher.
         // Selected 1173 to have differencing sets
@@ -120,7 +126,7 @@ static Stream<Arguments> performSearchParameters() {
             // Only shift i at maximum to its MSB to the right
             for (int j = 0; Math.pow(2, j) <= i; j++) {
                 // Add fetcher j to the list if the j-th bit of i is 1
-                if ((i >> j) % 2 == 1) {
+                if (((i >> j) % 2) == 1) {
                     fetchers.add(list.get(j));
                 }
             }
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/CrossRefTest.java b/src/test/java/org/jabref/logic/importer/fetcher/CrossRefTest.java
index 130206433ec..770290269ac 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/CrossRefTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/CrossRefTest.java
@@ -4,6 +4,7 @@
 import java.util.Locale;
 import java.util.Optional;
 
+import org.jabref.logic.importer.FetcherClientException;
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
@@ -14,6 +15,7 @@
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 @FetcherTest
 public class CrossRefTest {
@@ -145,6 +147,6 @@ public void performSearchByEmptyQuery() throws Exception {
      */
     @Test
     public void testPerformSearchValidReturnNothingDOI() throws FetcherException {
-        assertEquals(Optional.empty(), fetcher.performSearchById("10.1392/BC1.0"));
+        assertThrows(FetcherClientException.class, () -> fetcher.performSearchById("10.1392/BC1.0"));
     }
 }
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/DBLPFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/DBLPFetcherTest.java
index 001d5071fa5..0e6e3d767f1 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/DBLPFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/DBLPFetcherTest.java
@@ -43,7 +43,7 @@ public void setUp() {
         entry.setField(StandardField.NUMBER, "2");
         entry.setField(StandardField.YEAR, "2016");
         entry.setField(StandardField.URL,
-                "http://pi.informatik.uni-siegen.de/stt/36_2/./03_Technische_Beitraege/ZEUS2016/beitrag_2.pdf");
+                "http://pi.informatik.uni-siegen.de/stt/36_2/03_Technische_Beitraege/ZEUS2016/beitrag_2.pdf");
         entry.setField(new UnknownField("biburl"), "https://dblp.org/rec/journals/stt/GeigerHL16.bib");
         entry.setField(new UnknownField("bibsource"), "dblp computer science bibliography, https://dblp.org");
     }
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/DOABFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/DOABFetcherTest.java
new file mode 100644
index 00000000000..640c422bdbe
--- /dev/null
+++ b/src/test/java/org/jabref/logic/importer/fetcher/DOABFetcherTest.java
@@ -0,0 +1,114 @@
+package org.jabref.logic.importer.fetcher;
+
+import java.util.List;
+import java.util.stream.Stream;
+
+import org.jabref.logic.importer.FetcherException;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.field.StandardField;
+import org.jabref.model.entry.types.StandardEntryType;
+import org.jabref.support.DisabledOnCIServer;
+import org.jabref.testutils.category.FetcherTest;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+@FetcherTest
+@DisabledOnCIServer("Disable on CI Server to not hit the API call limit")
+public class DOABFetcherTest {
+    private DOABFetcher fetcher = new DOABFetcher();
+
+    @Test
+    public void testGetName() {
+        assertEquals("DOAB", fetcher.getName());
+    }
+
+    public static Stream<Arguments> testPerformSearch() {
+        return Stream.of(
+                Arguments.of(
+                        new BibEntry(StandardEntryType.Book)
+                                .withField(StandardField.AUTHOR, "David Pol")
+                                .withField(StandardField.TITLE, "I Open Fire")
+                                .withField(StandardField.DOI, "10.21983/P3.0086.1.00")
+                                .withField(StandardField.PAGES, "56")
+                                .withField(StandardField.YEAR, "2014")
+                                .withField(StandardField.URL, "http://library.oapen.org/handle/20.500.12657/25535")
+                                .withField(StandardField.URI, "https://directory.doabooks.org/handle/20.500.12854/34739")
+                                .withField(StandardField.LANGUAGE, "English")
+                                .withField(StandardField.KEYWORDS, "poetry, love, warfare")
+                                .withField(StandardField.PUBLISHER, "punctum books"),
+                        "i open fire"
+                ),
+                Arguments.of(
+                        new BibEntry(StandardEntryType.Book)
+                                .withField(StandardField.AUTHOR, "Ronald Snijder")
+                                .withField(StandardField.TITLE, "The deliverance of open access books")
+                                .withField(StandardField.SUBTITLE, "Examining usage and dissemination")
+                                .withField(StandardField.DOI, "10.26530/OAPEN_1004809")
+                                .withField(StandardField.PAGES, "234")
+                                .withField(StandardField.YEAR, "2019")
+                                .withField(StandardField.URL, "http://library.oapen.org/handle/20.500.12657/25287")
+                                .withField(StandardField.URI, "https://directory.doabooks.org/handle/20.500.12854/26303")
+                                .withField(StandardField.LANGUAGE, "English")
+                                .withField(StandardField.KEYWORDS, "Open Access, Monographs, OAPEN Library, " +
+                                        "Directory of Open Access Books")
+                                .withField(StandardField.PUBLISHER, "Amsterdam University Press"),
+                        "the deliverance of open access books"
+                ),
+                Arguments.of(
+                        new BibEntry(StandardEntryType.Book)
+                                .withField(StandardField.EDITOR, "Andrew Perrin and Loren T. Stuckenbruck")
+                                .withField(StandardField.TITLE, "Four Kingdom Motifs before and beyond the Book of Daniel")
+                                .withField(StandardField.DOI, "10.1163/9789004443280")
+                                .withField(StandardField.PAGES, "354")
+                                .withField(StandardField.YEAR, "2020")
+                                .withField(StandardField.URL, "https://library.oapen.org/handle/20.500.12657/48312")
+                                .withField(StandardField.URI, "https://directory.doabooks.org/handle/20.500.12854/68086")
+                                .withField(StandardField.LANGUAGE, "English")
+                                .withField(StandardField.KEYWORDS, "Religion")
+                                .withField(StandardField.PUBLISHER, "Brill"),
+                        "Four Kingdom Motifs before and beyond the Book of Daniel"
+                ),
+                Arguments.of(
+                        new BibEntry(StandardEntryType.Book)
+                                .withField(StandardField.EDITOR, "Felipe Gonzalez Toro and Antonios Tsourdos")
+                                .withField(StandardField.TITLE, "UAV Sensors for Environmental Monitoring")
+                                .withField(StandardField.DOI, "10.3390/books978-3-03842-754-4")
+                                .withField(StandardField.PAGES, "670")
+                                .withField(StandardField.YEAR, "2018")
+                                .withField(StandardField.URI, "https://directory.doabooks.org/handle/20.500.12854/39793")
+                                .withField(StandardField.LANGUAGE, "English")
+                                .withField(StandardField.KEYWORDS, "UAV sensors, Environmental Monitoring, drones, unmanned aerial vehicles")
+                                .withField(StandardField.PUBLISHER, "MDPI - Multidisciplinary Digital Publishing Institute"),
+                        "UAV Sensors for Environmental Monitoring"
+                ),
+                Arguments.of(
+                        new BibEntry(StandardEntryType.Book)
+                                .withField(StandardField.AUTHOR, "Carl Marnewick and Wikus Erasmus and Joseph Nazeer")
+                                .withField(StandardField.TITLE, "The symbiosis between information system project complexity and information system project success")
+                                .withField(StandardField.DOI, "10.4102/aosis.2017.itpsc45")
+                                .withField(StandardField.PAGES, "184")
+                                .withField(StandardField.YEAR, "2017")
+                                .withField(StandardField.URL, "http://library.oapen.org/handle/20.500.12657/30652")
+                                .withField(StandardField.URI, "https://directory.doabooks.org/handle/20.500.12854/38792")
+                                .withField(StandardField.LANGUAGE, "English")
+                                .withField(StandardField.KEYWORDS, "agile, structural equation modelling, information technology, success, models, strategic alignment, complexity, waterfall, project management, quantitative, Agile software development, Change management, Deliverable, Exploratory factor analysis, South Africa")
+                                .withField(StandardField.PUBLISHER, "AOSIS"),
+                        "The symbiosis between information system project complexity and information system project success"
+                )
+        );
+    }
+
+    @ParameterizedTest
+    @MethodSource
+    public void testPerformSearch(BibEntry expected, String query) throws FetcherException {
+        List<BibEntry> entries = fetcher.performSearch(query);
+        // We must not contain abstracts in our code base; thus we remove the abstracts from the fetched results
+        entries.stream().forEach(entry -> entry.clearField(StandardField.ABSTRACT));
+        assertEquals(List.of(expected), entries);
+    }
+}
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/DoiFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/DoiFetcherTest.java
index d824e77cc4c..da157b42347 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/DoiFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/DoiFetcherTest.java
@@ -9,7 +9,6 @@
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.testutils.category.FetcherTest;
 
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Answers;
 
@@ -20,70 +19,54 @@
 @FetcherTest
 public class DoiFetcherTest {
 
-    private DoiFetcher fetcher;
-    private BibEntry bibEntryBurd2011;
-    private BibEntry bibEntryDecker2007;
-    private BibEntry bibEntryIannarelli2019;
-    private BibEntry bibEntryStenzel2020;
-
-    @BeforeEach
-    public void setUp() {
-        fetcher = new DoiFetcher(mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS));
-
-        bibEntryBurd2011 = new BibEntry();
-        bibEntryBurd2011.setType(StandardEntryType.Book);
-        bibEntryBurd2011.setCitationKey("Burd_2011");
-        bibEntryBurd2011.setField(StandardField.TITLE, "Java{\\textregistered} For Dummies{\\textregistered}");
-        bibEntryBurd2011.setField(StandardField.PUBLISHER, "Wiley Publishing, Inc.");
-        bibEntryBurd2011.setField(StandardField.YEAR, "2011");
-        bibEntryBurd2011.setField(StandardField.AUTHOR, "Barry Burd");
-        bibEntryBurd2011.setField(StandardField.MONTH, "jul");
-        bibEntryBurd2011.setField(StandardField.DOI, "10.1002/9781118257517");
-
-        bibEntryDecker2007 = new BibEntry();
-        bibEntryDecker2007.setType(StandardEntryType.InProceedings);
-        bibEntryDecker2007.setCitationKey("Decker_2007");
-        bibEntryDecker2007.setField(StandardField.AUTHOR, "Gero Decker and Oliver Kopp and Frank Leymann and Mathias Weske");
-        bibEntryDecker2007.setField(StandardField.BOOKTITLE, "{IEEE} International Conference on Web Services ({ICWS} 2007)");
-        bibEntryDecker2007.setField(StandardField.MONTH, "jul");
-        bibEntryDecker2007.setField(StandardField.PUBLISHER, "{IEEE}");
-        bibEntryDecker2007.setField(StandardField.TITLE, "{BPEL}4Chor: Extending {BPEL} for Modeling Choreographies");
-        bibEntryDecker2007.setField(StandardField.YEAR, "2007");
-        bibEntryDecker2007.setField(StandardField.DOI, "10.1109/icws.2007.59");
-
-        // mEDRA BibEntry
-        bibEntryIannarelli2019 = new BibEntry(StandardEntryType.Article)
-                                                                        .withField(StandardField.AUTHOR,
-                                                                                   ""
-                                                                                                         + "Iannarelli Riccardo  and "
-                                                                                                         + "Novello Anna  and "
-                                                                                                         + "Stricker Damien  and "
-                                                                                                         + "Cisternino Marco  and "
-                                                                                                         + "Gallizio Federico  and "
-                                                                                                         + "Telib Haysam  and "
-                                                                                                         + "Meyer Thierry ")
-                                                                        .withField(StandardField.PUBLISHER, "AIDIC: Italian Association of Chemical Engineering")
-                                                                        .withField(StandardField.TITLE, "Safety in research institutions: how to better communicate the risks using numerical simulations")
-                                                                        .withField(StandardField.YEAR, "2019")
-                                                                        .withField(StandardField.DOI, "10.3303/CET1977146")
-                                                                        .withField(StandardField.JOURNAL, "Chemical Engineering Transactions")
-                                                                        .withField(StandardField.PAGES, "871-876")
-                                                                        .withField(StandardField.VOLUME, "77");
-        bibEntryStenzel2020 = new BibEntry();
-        bibEntryStenzel2020.setType(StandardEntryType.Article);
-        bibEntryStenzel2020.setCitationKey("Stenzel_2020");
-        bibEntryStenzel2020.setField(StandardField.AUTHOR, "L. Stenzel and A. L. C. Hayward and U. Schollwöck and F. Heidrich-Meisner");
-        bibEntryStenzel2020.setField(StandardField.JOURNAL, "Physical Review A");
-        bibEntryStenzel2020.setField(StandardField.TITLE, "Topological phases in the Fermi-Hofstadter-Hubbard model on hybrid-space ladders");
-        bibEntryStenzel2020.setField(StandardField.YEAR, "2020");
-        bibEntryStenzel2020.setField(StandardField.MONTH, "aug");
-        bibEntryStenzel2020.setField(StandardField.VOLUME, "102");
-        bibEntryStenzel2020.setField(StandardField.DOI, "10.1103/physreva.102.023315");
-        bibEntryStenzel2020.setField(StandardField.PUBLISHER, "American Physical Society ({APS})");
-        bibEntryStenzel2020.setField(StandardField.PAGES, "023315");
-        bibEntryStenzel2020.setField(StandardField.NUMBER, "2");
-
-    }
+    private final DoiFetcher fetcher = new DoiFetcher(mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS));
+
+    private final BibEntry bibEntryBurd2011 = new BibEntry(StandardEntryType.Book)
+            .withCitationKey("Burd_2011")
+            .withField(StandardField.TITLE, "Java{\\textregistered} For Dummies{\\textregistered}")
+            .withField(StandardField.PUBLISHER, "Wiley")
+            .withField(StandardField.YEAR, "2011")
+            .withField(StandardField.AUTHOR, "Barry Burd")
+            .withField(StandardField.MONTH, "jul")
+            .withField(StandardField.DOI, "10.1002/9781118257517");
+    private final BibEntry bibEntryDecker2007 = new BibEntry(StandardEntryType.InProceedings)
+            .withCitationKey("Decker_2007")
+            .withField(StandardField.AUTHOR, "Gero Decker and Oliver Kopp and Frank Leymann and Mathias Weske")
+            .withField(StandardField.BOOKTITLE, "{IEEE} International Conference on Web Services ({ICWS} 2007)")
+            .withField(StandardField.MONTH, "jul")
+            .withField(StandardField.PUBLISHER, "{IEEE}")
+            .withField(StandardField.TITLE, "{BPEL}4Chor: Extending {BPEL} for Modeling Choreographies")
+            .withField(StandardField.YEAR, "2007")
+            .withField(StandardField.DOI, "10.1109/icws.2007.59");
+    private final BibEntry bibEntryIannarelli2019 = new BibEntry(StandardEntryType.Article)
+            .withField(StandardField.AUTHOR,
+                    ""
+                            + "Iannarelli Riccardo  and "
+                            + "Novello Anna  and "
+                            + "Stricker Damien  and "
+                            + "Cisternino Marco  and "
+                            + "Gallizio Federico  and "
+                            + "Telib Haysam  and "
+                            + "Meyer Thierry ")
+            .withField(StandardField.PUBLISHER, "AIDIC: Italian Association of Chemical Engineering")
+            .withField(StandardField.TITLE, "Safety in research institutions: how to better communicate the risks using numerical simulations")
+            .withField(StandardField.YEAR, "2019")
+            .withField(StandardField.DOI, "10.3303/CET1977146")
+            .withField(StandardField.JOURNAL, "Chemical Engineering Transactions")
+            .withField(StandardField.PAGES, "871-876")
+            .withField(StandardField.VOLUME, "77");
+    private final BibEntry bibEntryStenzel2020 = new BibEntry(StandardEntryType.Article)
+            .withCitationKey("Stenzel_2020")
+            .withField(StandardField.AUTHOR, "L. Stenzel and A. L. C. Hayward and U. Schollwöck and F. Heidrich-Meisner")
+            .withField(StandardField.JOURNAL, "Physical Review A")
+            .withField(StandardField.TITLE, "Topological phases in the Fermi-Hofstadter-Hubbard model on hybrid-space ladders")
+            .withField(StandardField.YEAR, "2020")
+            .withField(StandardField.MONTH, "aug")
+            .withField(StandardField.VOLUME, "102")
+            .withField(StandardField.DOI, "10.1103/physreva.102.023315")
+            .withField(StandardField.PUBLISHER, "American Physical Society ({APS})")
+            .withField(StandardField.PAGES, "023315")
+            .withField(StandardField.NUMBER, "2");
 
     @Test
     public void testGetName() {
@@ -118,6 +101,16 @@ public void testPerformSearchInvalidDOI() {
         assertThrows(FetcherException.class, () -> fetcher.performSearchById("10.1002/9781118257517F"));
     }
 
+    @Test
+    public void testPerformSearchInvalidDOIClientResultsinFetcherClientException() {
+        assertThrows(FetcherException.class, () -> fetcher.performSearchById("10.1002/9781118257517F"));
+    }
+
+    @Test
+    public void testPerformSearchInvalidDOIClientResultsinFetcherClientException2() {
+        assertThrows(FetcherException.class, () -> fetcher.performSearchById("10.1002/9781517F"));
+    }
+
     @Test
     public void testPerformSearchNonTrimmedDOI() throws FetcherException {
         Optional<BibEntry> fetchedEntry = fetcher.performSearchById("http s://doi.org/ 10.1109 /ICWS .2007.59 ");
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/DoiResolutionTest.java b/src/test/java/org/jabref/logic/importer/fetcher/DoiResolutionTest.java
index 4ba961fa076..5ee602c8fa4 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/DoiResolutionTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/DoiResolutionTest.java
@@ -10,6 +10,7 @@
 import org.jabref.testutils.category.FetcherTest;
 
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -39,6 +40,7 @@ void linkWithPdfInTitleTag() throws IOException {
         );
     }
 
+    @Disabled("Cannot fetch due to Cloudflare protection")
     @Test
     void linkWithPdfStringLeadsToFulltext() throws IOException {
         entry.setField(StandardField.DOI, "10.1002/acr2.11101");
@@ -48,7 +50,7 @@ void linkWithPdfStringLeadsToFulltext() throws IOException {
     @Test
     void citationMetaTagLeadsToFulltext() throws IOException {
         entry.setField(StandardField.DOI, "10.1007/978-3-319-89963-3_28");
-        assertEquals(Optional.of(new URL("https://link.springer.com/content/pdf/10.1007%2F978-3-319-89963-3_28.pdf")), finder.findFullText(entry));
+        assertEquals(Optional.of(new URL("https://link.springer.com/content/pdf/10.1007/978-3-319-89963-3_28.pdf")), finder.findFullText(entry));
     }
 
     @Test
@@ -59,11 +61,11 @@ void notReturnAnythingWhenMultipleLinksAreFound() throws IOException {
 
     @Test
     void returnAnythingWhenBehindSpringerPayWall() throws IOException {
-        // Springer returns a HTML page instead of an empty page,
+        // Springer returns an HTML page instead of an empty page,
         // even if the user does not have access
         // We cannot easily handle this case, because other publisher return the wrong media type.
         entry.setField(StandardField.DOI, "10.1007/978-3-319-62594-2_12");
-        assertEquals(Optional.of(new URL("https://link.springer.com/content/pdf/10.1007%2F978-3-319-62594-2_12.pdf")), finder.findFullText(entry));
+        assertEquals(Optional.of(new URL("https://link.springer.com/content/pdf/10.1007/978-3-319-62594-2_12.pdf")), finder.findFullText(entry));
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/FulltextFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/FulltextFetcherTest.java
index 183e011a84b..7ac8d4e0216 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/FulltextFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/FulltextFetcherTest.java
@@ -5,6 +5,7 @@
 
 import org.jabref.logic.importer.FulltextFetcher;
 import org.jabref.logic.importer.ImportFormatPreferences;
+import org.jabref.logic.importer.ImporterPreferences;
 import org.jabref.logic.importer.WebFetchers;
 import org.jabref.model.entry.BibEntry;
 
@@ -19,7 +20,7 @@ class FulltextFetcherTest {
 
     @SuppressWarnings("unused")
     private static Set<FulltextFetcher> fetcherProvider() {
-        return WebFetchers.getFullTextFetchers(mock(ImportFormatPreferences.class));
+        return WebFetchers.getFullTextFetchers(mock(ImportFormatPreferences.class), mock(ImporterPreferences.class));
     }
 
     @ParameterizedTest
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/GrobidCitationFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/GrobidCitationFetcherTest.java
index a2bac4b6ce8..2852909d212 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/GrobidCitationFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/GrobidCitationFetcherTest.java
@@ -8,7 +8,6 @@
 
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.ImportFormatPreferences;
-import org.jabref.logic.importer.ImporterPreferences;
 import org.jabref.logic.importer.ParseException;
 import org.jabref.logic.importer.util.GrobidService;
 import org.jabref.model.entry.BibEntry;
@@ -33,8 +32,11 @@
 public class GrobidCitationFetcherTest {
 
     static ImportFormatPreferences importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
-    static ImporterPreferences importerPreferences = new ImporterPreferences(false, true, false, "http://grobid.jabref.org:8070");
-    static GrobidCitationFetcher grobidCitationFetcher = new GrobidCitationFetcher(importerPreferences, importFormatPreferences);
+    static GrobidPreferences grobidPreferences = new GrobidPreferences(
+            true,
+            false,
+            "http://grobid.jabref.org:8070");
+    static GrobidCitationFetcher grobidCitationFetcher = new GrobidCitationFetcher(grobidPreferences, importFormatPreferences);
 
     static String example1 = "Derwing, T. M., Rossiter, M. J., & Munro, M. J. (2002). Teaching native speakers to listen to foreign-accented speech. Journal of Multilingual and Multicultural Development, 23(4), 245-259.";
     static BibEntry example1AsBibEntry = new BibEntry(StandardEntryType.Article).withCitationKey("-1")
@@ -43,8 +45,8 @@ public class GrobidCitationFetcherTest {
                                                                                 .withField(StandardField.JOURNAL, "Journal of Multilingual and Multicultural Development")
                                                                                 .withField(StandardField.DOI, "10.1080/01434630208666468")
                                                                                 .withField(StandardField.DATE, "2002-09")
-                                                                                .withField(StandardField.YEAR, "2002")
                                                                                 .withField(StandardField.MONTH, "9")
+                                                                                .withField(StandardField.YEAR, "2002")
                                                                                 .withField(StandardField.PAGES, "245-259")
                                                                                 .withField(StandardField.VOLUME, "23")
                                                                                 .withField(StandardField.PUBLISHER, "Informa UK Limited")
@@ -60,11 +62,13 @@ public class GrobidCitationFetcherTest {
 
     static String example3 = "Turk, J., Graham, P., & Verhulst, F. (2007). Child and adolescent psychiatry : A developmental approach. Oxford, England: Oxford University Press.";
     static BibEntry example3AsBibEntry = new BibEntry(BibEntry.DEFAULT_TYPE).withCitationKey("-1")
-                                                                            .withField(StandardField.AUTHOR, "Turk, J and Graham, P and Verhulst, F")
-                                                                            .withField(StandardField.TITLE, "Child and adolescent psychiatry : A developmental approach")
+                                                                            .withField(StandardField.AUTHOR, "Turk, Jeremy and Graham, Philip and Verhulst, Frank")
+                                                                            .withField(StandardField.TITLE, "Child and Adolescent Psychiatry")
                                                                             .withField(StandardField.PUBLISHER, "Oxford University Press")
-                                                                            .withField(StandardField.DATE, "2007")
+                                                                            .withField(StandardField.DATE, "2007-02")
                                                                             .withField(StandardField.YEAR, "2007")
+                                                                            .withField(StandardField.MONTH, "2")
+                                                                            .withField(StandardField.DOI, "10.1093/med/9780199216697.001.0001")
                                                                             .withField(StandardField.ADDRESS, "Oxford, England");
 
     static String example4 = "Carr, I., & Kidner, R. (2003). Statutes and conventions on international trade law (4th ed.). London, England: Cavendish.";
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/IEEETest.java b/src/test/java/org/jabref/logic/importer/fetcher/IEEETest.java
index 7eab1cf0fb1..a6921608ce4 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/IEEETest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/IEEETest.java
@@ -5,7 +5,10 @@
 import java.util.List;
 import java.util.Optional;
 
+import javafx.collections.FXCollections;
+
 import org.jabref.logic.importer.ImportFormatPreferences;
+import org.jabref.logic.importer.ImporterPreferences;
 import org.jabref.logic.importer.PagedSearchBasedFetcher;
 import org.jabref.logic.importer.SearchBasedFetcher;
 import org.jabref.model.entry.BibEntry;
@@ -47,7 +50,9 @@ class IEEETest implements SearchBasedFetcherCapabilityTest, PagedSearchFetcherTe
     void setUp() {
         ImportFormatPreferences importFormatPreferences = mock(ImportFormatPreferences.class);
         when(importFormatPreferences.getKeywordSeparator()).thenReturn(',');
-        fetcher = new IEEE(importFormatPreferences);
+        ImporterPreferences importerPreferences = mock(ImporterPreferences.class);
+        when(importerPreferences.getApiKeys()).thenReturn(FXCollections.emptyObservableSet());
+        fetcher = new IEEE(importFormatPreferences, importerPreferences);
         entry = new BibEntry();
     }
 
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/IacrEprintFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/IacrEprintFetcherTest.java
index d30abe26e1b..bf5bf9eef3a 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/IacrEprintFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/IacrEprintFetcherTest.java
@@ -43,44 +43,42 @@ public class IacrEprintFetcherTest {
     public void setUp() {
         fetcher = new IacrEprintFetcher(mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS));
 
-        abram2017 = new BibEntry();
-        abram2017.setType(StandardEntryType.Misc);
-        abram2017.setCitationKey("cryptoeprint:2017:1118");
-        abram2017.setField(StandardField.ABSTRACT, "dummy");
-        abram2017.setField(StandardField.AUTHOR, "Ittai Abraham and Dahlia Malkhi and Kartik Nayak and Ling Ren and Alexander Spiegelman");
-        abram2017.setField(StandardField.DATE, "2017-11-18");
-        abram2017.setField(StandardField.HOWPUBLISHED, "Cryptology ePrint Archive, Report 2017/1118");
-        abram2017.setField(StandardField.NOTE, "\\url{https://ia.cr/2017/1118}");
-        abram2017.setField(StandardField.TITLE, "Solida: A Blockchain Protocol Based on Reconfigurable Byzantine Consensus");
-        abram2017.setField(StandardField.URL, "https://eprint.iacr.org/2017/1118/20171124:064527");
-        abram2017.setField(StandardField.VERSION, "20171124:064527");
-        abram2017.setField(StandardField.YEAR, "2017");
-
-        beierle2016 = new BibEntry();
-        beierle2016.setType(StandardEntryType.Misc);
-        beierle2016.setCitationKey("cryptoeprint:2016:119");
-        beierle2016.setField(StandardField.ABSTRACT, "dummy");
-        beierle2016.setField(StandardField.AUTHOR, "Christof Beierle and Thorsten Kranz and Gregor Leander");
-        beierle2016.setField(StandardField.DATE, "2017-02-17");
-        beierle2016.setField(StandardField.HOWPUBLISHED, "Cryptology ePrint Archive, Report 2016/119");
-        beierle2016.setField(StandardField.NOTE, "\\url{https://ia.cr/2016/119}");
-        beierle2016.setField(StandardField.TITLE, "Lightweight Multiplication in GF(2^n) with Applications to MDS Matrices");
-        beierle2016.setField(StandardField.URL, "https://eprint.iacr.org/2016/119/20170217:150415");
-        beierle2016.setField(StandardField.VERSION, "20170217:150415");
-        beierle2016.setField(StandardField.YEAR, "2016");
-
-        delgado2017 = new BibEntry();
-        delgado2017.setType(StandardEntryType.Misc);
-        delgado2017.setCitationKey("cryptoeprint:2017:1095");
-        delgado2017.setField(StandardField.ABSTRACT, "dummy");
-        delgado2017.setField(StandardField.AUTHOR, "Sergi Delgado-Segura and Cristina Pérez-Solà and Guillermo Navarro-Arribas and Jordi Herrera-Joancomartí");
-        delgado2017.setField(StandardField.DATE, "2018-01-19");
-        delgado2017.setField(StandardField.HOWPUBLISHED, "Cryptology ePrint Archive, Report 2017/1095");
-        delgado2017.setField(StandardField.NOTE, "\\url{https://ia.cr/2017/1095}");
-        delgado2017.setField(StandardField.TITLE, "Analysis of the Bitcoin UTXO set");
-        delgado2017.setField(StandardField.URL, "https://eprint.iacr.org/2017/1095/20180119:113352");
-        delgado2017.setField(StandardField.VERSION, "20180119:113352");
-        delgado2017.setField(StandardField.YEAR, "2017");
+        abram2017 = new BibEntry(StandardEntryType.Misc)
+                .withCitationKey("cryptoeprint:2017/1118")
+                .withField(StandardField.ABSTRACT, "dummy")
+                .withField(StandardField.AUTHOR, "Ittai Abraham and Dahlia Malkhi and Kartik Nayak and Ling Ren and Alexander Spiegelman")
+                .withField(StandardField.DATE, "2017-11-24")
+                .withField(StandardField.HOWPUBLISHED, "Cryptology ePrint Archive, Paper 2017/1118")
+                .withField(StandardField.NOTE, "\\url{https://eprint.iacr.org/2017/1118}")
+                .withField(StandardField.TITLE, "Solida: A Blockchain Protocol Based on Reconfigurable Byzantine Consensus")
+                .withField(StandardField.URL, "https://eprint.iacr.org/2017/1118/20171124:064527")
+                .withField(StandardField.VERSION, "20171124:064527")
+                .withField(StandardField.YEAR, "2017");
+
+        beierle2016 = new BibEntry(StandardEntryType.Misc)
+                .withCitationKey("cryptoeprint:2016/119")
+                .withField(StandardField.ABSTRACT, "dummy")
+                .withField(StandardField.AUTHOR, "Christof Beierle and Thorsten Kranz and Gregor Leander")
+                .withField(StandardField.DATE, "2017-02-17")
+                .withField(StandardField.DOI, "10.1007/978-3-662-53018-4_23")
+                .withField(StandardField.HOWPUBLISHED, "Cryptology ePrint Archive, Paper 2016/119")
+                .withField(StandardField.NOTE, "\\url{https://eprint.iacr.org/2016/119}")
+                .withField(StandardField.TITLE, "Lightweight Multiplication in GF(2^n) with Applications to MDS Matrices")
+                .withField(StandardField.URL, "https://eprint.iacr.org/2016/119/20170217:150415")
+                .withField(StandardField.VERSION, "20170217:150415")
+                .withField(StandardField.YEAR, "2016");
+
+        delgado2017 = new BibEntry(StandardEntryType.Misc)
+                .withCitationKey("cryptoeprint:2017/1095")
+                .withField(StandardField.ABSTRACT, "dummy")
+                .withField(StandardField.AUTHOR, "Sergi Delgado-Segura and Cristina Pérez-Solà and Guillermo Navarro-Arribas and Jordi Herrera-Joancomartí")
+                .withField(StandardField.DATE, "2018-01-19")
+                .withField(StandardField.HOWPUBLISHED, "Cryptology ePrint Archive, Paper 2017/1095")
+                .withField(StandardField.NOTE, "\\url{https://eprint.iacr.org/2017/1095}")
+                .withField(StandardField.TITLE, "Analysis of the Bitcoin UTXO set")
+                .withField(StandardField.URL, "https://eprint.iacr.org/2017/1095/20180119:113352")
+                .withField(StandardField.VERSION, "20180119:113352")
+                .withField(StandardField.YEAR, "2017");
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/IsbnFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/IsbnFetcherTest.java
index 8554135e268..f6b7d3fd665 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/IsbnFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/IsbnFetcherTest.java
@@ -8,7 +8,6 @@
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
-import org.jabref.model.entry.field.UnknownField;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.testutils.category.FetcherTest;
 
@@ -31,17 +30,13 @@ class IsbnFetcherTest {
     void setUp() {
         fetcher = new IsbnFetcher(mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS));
 
-        bibEntry = new BibEntry();
-        bibEntry.setType(StandardEntryType.Book);
-        bibEntry.setCitationKey("9780134685991");
-        bibEntry.setField(StandardField.TITLE, "Effective Java");
-        bibEntry.setField(StandardField.PUBLISHER, "Addison Wesley");
-        bibEntry.setField(StandardField.YEAR, "2018");
-        bibEntry.setField(StandardField.AUTHOR, "Bloch, Joshua");
-        bibEntry.setField(StandardField.DATE, "2018-01-31");
-        bibEntry.setField(new UnknownField("ean"), "9780134685991");
-        bibEntry.setField(StandardField.ISBN, "0134685997");
-        bibEntry.setField(StandardField.URL, "https://www.ebook.de/de/product/28983211/joshua_bloch_effective_java.html");
+        bibEntry = new BibEntry(StandardEntryType.Book)
+                .withField(StandardField.AUTHOR, "Bloch, Joshua")
+                .withField(StandardField.TITLE, "Effective Java")
+                .withField(StandardField.PUBLISHER, "Addison-Wesley Professional")
+                .withField(StandardField.YEAR, "2017")
+                .withField(StandardField.PAGES, "416")
+                .withField(StandardField.ISBN, "9780134685991");
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/IsbnViaEbookDeFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/IsbnViaEbookDeFetcherTest.java
index 86221b56344..b00d3523d6d 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/IsbnViaEbookDeFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/IsbnViaEbookDeFetcherTest.java
@@ -2,6 +2,7 @@
 
 import java.util.Optional;
 
+import org.jabref.logic.importer.FetcherClientException;
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.model.entry.BibEntry;
@@ -15,6 +16,7 @@
 import org.mockito.Answers;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.Mockito.mock;
 
 @FetcherTest
@@ -22,17 +24,16 @@ public class IsbnViaEbookDeFetcherTest extends AbstractIsbnFetcherTest {
 
     @BeforeEach
     public void setUp() {
-        bibEntry = new BibEntry();
-        bibEntry.setType(StandardEntryType.Book);
-        bibEntry.setCitationKey("9780134685991");
-        bibEntry.setField(StandardField.TITLE, "Effective Java");
-        bibEntry.setField(StandardField.PUBLISHER, "Addison Wesley");
-        bibEntry.setField(StandardField.YEAR, "2018");
-        bibEntry.setField(StandardField.AUTHOR, "Bloch, Joshua");
-        bibEntry.setField(StandardField.DATE, "2018-01-31");
-        bibEntry.setField(new UnknownField("ean"), "9780134685991");
-        bibEntry.setField(StandardField.ISBN, "0134685997");
-        bibEntry.setField(StandardField.URL, "https://www.ebook.de/de/product/28983211/joshua_bloch_effective_java.html");
+        bibEntryEffectiveJava = new BibEntry(StandardEntryType.Book)
+                .withCitationKey("9780134685991")
+                .withField(StandardField.TITLE, "Effective Java")
+                .withField(StandardField.PUBLISHER, "Addison Wesley")
+                .withField(StandardField.YEAR, "2018")
+                .withField(StandardField.AUTHOR, "Bloch, Joshua")
+                .withField(StandardField.DATE, "2018-01-15")
+                .withField(new UnknownField("ean"), "9780134685991")
+                .withField(StandardField.ISBN, "0134685997")
+                .withField(StandardField.URL, "https://www.ebook.de/de/product/28983211/joshua_bloch_effective_java.html");
 
         fetcher = new IsbnViaEbookDeFetcher(mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS));
     }
@@ -47,31 +48,30 @@ public void testName() {
     @Override
     public void searchByIdSuccessfulWithShortISBN() throws FetcherException {
         Optional<BibEntry> fetchedEntry = fetcher.performSearchById("0134685997");
-        assertEquals(Optional.of(bibEntry), fetchedEntry);
+        assertEquals(Optional.of(bibEntryEffectiveJava), fetchedEntry);
     }
 
     @Test
     @Override
     public void searchByIdSuccessfulWithLongISBN() throws FetcherException {
         Optional<BibEntry> fetchedEntry = fetcher.performSearchById("9780134685991");
-        assertEquals(Optional.of(bibEntry), fetchedEntry);
+        assertEquals(Optional.of(bibEntryEffectiveJava), fetchedEntry);
     }
 
     @Test
     @Override
     public void authorsAreCorrectlyFormatted() throws Exception {
-        BibEntry bibEntry = new BibEntry();
-        bibEntry.setType(StandardEntryType.Book);
-        bibEntry.setCitationKey("9783662585856");
-        bibEntry.setField(StandardField.TITLE, "Fundamentals of Business Process Management");
-        bibEntry.setField(StandardField.PUBLISHER, "Springer Berlin Heidelberg");
-        bibEntry.setField(StandardField.YEAR, "2019");
-        bibEntry.setField(StandardField.AUTHOR, "Dumas, Marlon and Rosa, Marcello La and Mendling, Jan and Reijers, Hajo A.");
-        bibEntry.setField(StandardField.DATE, "2019-02-01");
-        bibEntry.setField(StandardField.PAGETOTAL, "560");
-        bibEntry.setField(new UnknownField("ean"), "9783662585856");
-        bibEntry.setField(StandardField.ISBN, "3662585855");
-        bibEntry.setField(StandardField.URL, "https://www.ebook.de/de/product/35805105/marlon_dumas_marcello_la_rosa_jan_mendling_hajo_a_reijers_fundamentals_of_business_process_management.html");
+        BibEntry bibEntry = new BibEntry(StandardEntryType.Book)
+                .withCitationKey("9783662585856")
+                .withField(StandardField.TITLE, "Fundamentals of Business Process Management")
+                .withField(StandardField.PUBLISHER, "Springer Berlin Heidelberg")
+                .withField(StandardField.YEAR, "2019")
+                .withField(StandardField.AUTHOR, "Dumas, Marlon and Rosa, Marcello La and Mendling, Jan and Reijers, Hajo A.")
+                .withField(StandardField.DATE, "2019-02-01")
+                .withField(StandardField.PAGETOTAL, "560")
+                .withField(new UnknownField("ean"), "9783662585856")
+                .withField(StandardField.ISBN, "3662585855")
+                .withField(StandardField.URL, "https://www.ebook.de/de/product/35805105/marlon_dumas_marcello_la_rosa_jan_mendling_hajo_a_reijers_fundamentals_of_business_process_management.html");
 
         Optional<BibEntry> fetchedEntry = fetcher.performSearchById("3662585855");
         assertEquals(Optional.of(bibEntry), fetchedEntry);
@@ -79,12 +79,10 @@ public void authorsAreCorrectlyFormatted() throws Exception {
 
     /**
      * This test searches for a valid ISBN. See https://www.amazon.de/dp/3728128155/?tag=jabref-21 However, this ISBN is
-     * not available on ebook.de. The fetcher should return nothing rather than throwing an exception.
+     * not available on ebook.de.
      */
     @Test
     public void searchForValidButNotFoundISBN() throws Exception {
-        Optional<BibEntry> fetchedEntry = fetcher.performSearchById("3728128155");
-        assertEquals(Optional.empty(), fetchedEntry);
+        assertThrows(FetcherClientException.class, ()-> fetcher.performSearchById("3728128155"));
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/IsbnViaOttoBibFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/IsbnViaOttoBibFetcherTest.java
deleted file mode 100644
index f04ba245f28..00000000000
--- a/src/test/java/org/jabref/logic/importer/fetcher/IsbnViaOttoBibFetcherTest.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package org.jabref.logic.importer.fetcher;
-
-import java.util.Optional;
-
-import org.jabref.logic.importer.FetcherException;
-import org.jabref.logic.importer.ImportFormatPreferences;
-import org.jabref.model.entry.BibEntry;
-import org.jabref.model.entry.field.StandardField;
-import org.jabref.model.entry.types.StandardEntryType;
-import org.jabref.testutils.category.FetcherTest;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.mockito.Answers;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.mock;
-
-@FetcherTest
-public class IsbnViaOttoBibFetcherTest extends AbstractIsbnFetcherTest {
-
-    @BeforeEach
-    public void setUp() {
-        bibEntry = new BibEntry();
-        bibEntry.setType(StandardEntryType.Book);
-        bibEntry.setCitationKey("bloch2008effective");
-        bibEntry.setField(StandardField.TITLE, "Effective Java");
-        bibEntry.setField(StandardField.PUBLISHER, "Addison-Wesley");
-        bibEntry.setField(StandardField.YEAR, "2008");
-        bibEntry.setField(StandardField.AUTHOR, "Bloch, Joshua");
-        bibEntry.setField(StandardField.ISBN, "9780321356680");
-        bibEntry.setField(StandardField.ADDRESS, "Upper Saddle River, NJ");
-
-        fetcher = new IsbnViaOttoBibFetcher(mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS));
-    }
-
-    @Test
-    @Override
-    public void testName() {
-        assertEquals("ISBN (OttoBib)", fetcher.getName());
-    }
-
-    @Test
-    @Override
-    public void searchByIdSuccessfulWithShortISBN() throws FetcherException {
-        Optional<BibEntry> fetchedEntry = fetcher.performSearchById("0321356683");
-        bibEntry.setField(StandardField.ISBN, "0321356683");
-        assertEquals(Optional.of(bibEntry), fetchedEntry);
-    }
-
-    @Test
-    @Override
-    public void searchByIdSuccessfulWithLongISBN() throws FetcherException {
-        Optional<BibEntry> fetchedEntry = fetcher.performSearchById("9780321356680");
-        bibEntry.setField(StandardField.ISBN, "9780321356680");
-        assertEquals(Optional.of(bibEntry), fetchedEntry);
-    }
-
-    @Test
-    @Override
-    public void authorsAreCorrectlyFormatted() throws Exception {
-        bibEntry = new BibEntry();
-        bibEntry.setType(StandardEntryType.Book);
-        bibEntry.setCitationKey("dumas2018fundamentals");
-        bibEntry.setField(StandardField.TITLE, "Fundamentals of business process management");
-        bibEntry.setField(StandardField.PUBLISHER, "Springer");
-        bibEntry.setField(StandardField.AUTHOR, "Dumas, Marlon");
-        bibEntry.setField(StandardField.ADDRESS, "Berlin, Germany");
-        bibEntry.setField(StandardField.ISBN, "9783662565094");
-        bibEntry.setField(StandardField.YEAR, "2018");
-
-        Optional<BibEntry> fetchedEntry = fetcher.performSearchById("978-3-662-56509-4");
-        assertEquals(Optional.of(bibEntry), fetchedEntry);
-    }
-
-    /**
-     * Checks whether the given ISBN is <emph>NOT</emph> available at any ISBN fetcher
-     */
-    @Test
-    public void testIsbnNeitherAvaiableOnEbookDeNorOrViaChimbori() throws Exception {
-        // In this test, the ISBN needs to be a valid (syntax+checksum) ISBN number
-        // However, the ISBN number must not be assigned to a real book
-        Optional<BibEntry> fetchedEntry = fetcher.performSearchById("978-8-8264-2303-6");
-        assertEquals(Optional.empty(), fetchedEntry);
-
-    }
-
-}
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/JstorFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/JstorFetcherTest.java
index 8511275ec29..1f1b0a521f7 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/JstorFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/JstorFetcherTest.java
@@ -1,12 +1,12 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.io.IOException;
 import java.net.URL;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 
-import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.SearchBasedFetcher;
 import org.jabref.model.entry.BibEntry;
@@ -63,13 +63,19 @@ void searchByTitle() throws Exception {
     }
 
     @Test
-    void searchById() throws FetcherException {
+    void searchById() throws Exception {
+        bibEntry.setField(StandardField.URLDATE, LocalDate.now().format(DateTimeFormatter.ISO_DATE));
         assertEquals(Optional.of(bibEntry), fetcher.performSearchById("90002164"));
+    }
+
+    @Test
+    void searchByUrlUsingId() throws Exception {
+        doiEntry.setField(StandardField.URLDATE, LocalDate.now().format(DateTimeFormatter.ISO_DATE));
         assertEquals(Optional.of(doiEntry), fetcher.performSearchById("https://www.jstor.org/stable/10.1086/501484?seq=1"));
     }
 
     @Test
-    void fetchPDF() throws IOException, FetcherException {
+    void fetchPDF() throws Exception {
         Optional<URL> url = fetcher.findFullText(bibEntry);
         assertEquals(Optional.of(new URL("https://www.jstor.org/stable/pdf/90002164.pdf")), url);
     }
@@ -93,18 +99,15 @@ public String getTestJournal() {
     @Disabled("jstor does not support search only based on year")
     @Override
     public void supportsYearRangeSearch() throws Exception {
-
     }
 
     @Disabled("jstor does not provide articles with journals")
     @Override
     public void supportsJournalSearch() throws Exception {
-
     }
 
     @Disabled("jstor does not support search only based on year")
     @Override
     public void supportsYearSearch() throws Exception {
-
     }
 }
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/LibraryOfCongressTest.java b/src/test/java/org/jabref/logic/importer/fetcher/LibraryOfCongressTest.java
index b18e2b88ba6..562ded1f3bd 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/LibraryOfCongressTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/LibraryOfCongressTest.java
@@ -2,6 +2,7 @@
 
 import java.util.Optional;
 
+import org.jabref.logic.importer.FetcherClientException;
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
@@ -12,6 +13,7 @@
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -54,6 +56,6 @@ public void performSearchByEmptyId() throws Exception {
 
     @Test
     public void performSearchByInvalidId() throws Exception {
-        assertEquals(Optional.empty(), fetcher.performSearchById("xxx"));
+        assertThrows(FetcherClientException.class, () -> fetcher.performSearchById("xxx"));
     }
 }
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/MedlineFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/MedlineFetcherTest.java
index 843f1838917..ed156ef4c04 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/MedlineFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/MedlineFetcherTest.java
@@ -4,6 +4,7 @@
 import java.util.List;
 import java.util.Optional;
 
+import org.jabref.logic.importer.FetcherClientException;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.field.UnknownField;
@@ -14,6 +15,7 @@
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 @FetcherTest
@@ -32,100 +34,96 @@ public void setUp() throws InterruptedException {
 
         fetcher = new MedlineFetcher();
 
-        entryWijedasa = new BibEntry();
-        entryWijedasa.setType(StandardEntryType.Article);
-        entryWijedasa.setField(StandardField.AUTHOR, "Wijedasa, Lahiru S. and Jauhiainen, Jyrki and Könönen, Mari and Lampela, Maija and Vasander, Harri and Leblanc, Marie-Claire and Evers, Stephanie and Smith, Thomas E. L. and Yule, Catherine M. and Varkkey, Helena and Lupascu, Massimo and Parish, Faizal and Singleton, Ian and Clements, Gopalasamy R. and Aziz, Sheema Abdul and Harrison, Mark E. and Cheyne, Susan and Anshari, Gusti Z. and Meijaard, Erik and Goldstein, Jenny E. and Waldron, Susan and Hergoualc'h, Kristell and Dommain, Rene and Frolking, Steve and Evans, Christopher D. and Posa, Mary Rose C. and Glaser, Paul H. and Suryadiputra, Nyoman and Lubis, Reza and Santika, Truly and Padfield, Rory and Kurnianto, Sofyan and Hadisiswoyo, Panut and Lim, Teck Wyn and Page, Susan E. and Gauci, Vincent and Van Der Meer, Peter J. and Buckland, Helen and Garnier, Fabien and Samuel, Marshall K. and Choo, Liza Nuriati Lim Kim and O'Reilly, Patrick and Warren, Matthew and Suksuwan, Surin and Sumarga, Elham and Jain, Anuj and Laurance, William F. and Couwenberg, John and Joosten, Hans and Vernimmen, Ronald and Hooijer, Aljosja and Malins, Chris and Cochrane, Mark A. and Perumal, Balu and Siegert, Florian and Peh, Kelvin S.-H. and Comeau, Louis-Pierre and Verchot, Louis and Harvey, Charles F. and Cobb, Alex and Jaafar, Zeehan and Wösten, Henk and Manuri, Solichin and Müller, Moritz and Giesen, Wim and Phelps, Jacob and Yong, Ding Li and Silvius, Marcel and Wedeux, Béatrice M. M. and Hoyt, Alison and Osaki, Mitsuru and Hirano, Takashi and Takahashi, Hidenori and Kohyama, Takashi S. and Haraguchi, Akira and Nugroho, Nunung P. and Coomes, David A. and Quoi, Le Phat and Dohong, Alue and Gunawan, Haris and Gaveau, David L. A. and Langner, Andreas and Lim, Felix K. S. and Edwards, David P. and Giam, Xingli and Van Der Werf, Guido and Carmenta, Rachel and Verwer, Caspar C. and Gibson, Luke and Gandois, Laure and Graham, Laura Linda Bozena and Regalino, Jhanson and Wich, Serge A. and Rieley, Jack and Kettridge, Nicholas and Brown, Chloe and Pirard, Romain and Moore, Sam and Capilla, B. Ripoll and Ballhorn, Uwe and Ho, Hua Chew and Hoscilo, Agata and Lohberger, Sandra and Evans, Theodore A. and Yulianti, Nina and Blackham, Grace and Onrizal and Husson, Simon and Murdiyarso, Daniel and Pangala, Sunita and Cole, Lydia E. S. and Tacconi, Luca and Segah, Hendrik and Tonoto, Prayoto and Lee, Janice S. H. and Schmilewski, Gerald and Wulffraat, Stephan and Putra, Erianto Indra and Cattau, Megan E. and Clymo, R. S. and Morrison, Ross and Mujahid, Aazani and Miettinen, Jukka and Liew, Soo Chin and Valpola, Samu and Wilson, David and D'Arcy, Laura and Gerding, Michiel and Sundari, Siti and Thornton, Sara A. and Kalisz, Barbara and Chapman, Stephen J. and Su, Ahmad Suhaizi Mat and Basuki, Imam and Itoh, Masayuki and Traeholt, Carl and Sloan, Sean and Sayok, Alexander K. and Andersen, Roxane");
-        entryWijedasa.setField(new UnknownField("country"), "England");
-        entryWijedasa.setField(StandardField.DOI, "10.1111/gcb.13516");
-        entryWijedasa.setField(StandardField.ISSN, "1365-2486");
-        entryWijedasa.setField(new UnknownField("issn-linking"), "1354-1013");
-        entryWijedasa.setField(StandardField.ISSUE, "3");
-        entryWijedasa.setField(StandardField.JOURNAL, "Global change biology");
-        entryWijedasa.setField(StandardField.MONTH, "#mar#");
-        entryWijedasa.setField(new UnknownField("nlm-id"), "9888746");
-        entryWijedasa.setField(StandardField.OWNER, "NLM");
-        entryWijedasa.setField(StandardField.PAGES, "977--982");
-        entryWijedasa.setField(StandardField.PMID, "27670948");
-        entryWijedasa.setField(new UnknownField("pubmodel"), "Print-Electronic");
-        entryWijedasa.setField(StandardField.PUBSTATE, "ppublish");
-        entryWijedasa.setField(new UnknownField("revised"), "2019-11-20");
-        entryWijedasa.setField(StandardField.TITLE, "Denial of long-term issues with agriculture on tropical peatlands will have devastating consequences.");
-        entryWijedasa.setField(StandardField.VOLUME, "23");
-        entryWijedasa.setField(StandardField.YEAR, "2017");
-
-        entryEndharti = new BibEntry();
-        entryEndharti.setType(StandardEntryType.Article);
-        entryEndharti.setField(StandardField.TITLE, "Dendrophthoe pentandra (L.) Miq extract effectively inhibits inflammation, proliferation and induces p53 expression on colitis-associated colon cancer.");
-        entryEndharti.setField(StandardField.AUTHOR, "Endharti, Agustina Tri and Wulandari, Adisti and Listyana, Anik and Norahmawati, Eviana and Permana, Sofy");
-        entryEndharti.setField(new UnknownField("country"), "England");
-        entryEndharti.setField(StandardField.DOI, "10.1186/s12906-016-1345-0");
-        entryEndharti.setField(new UnknownField("pii"), "10.1186/s12906-016-1345-0");
-        entryEndharti.setField(new UnknownField("pmc"), "PMC5037598");
-        entryEndharti.setField(StandardField.ISSN, "1472-6882");
-        entryEndharti.setField(new UnknownField("issn-linking"), "1472-6882");
-        entryEndharti.setField(StandardField.ISSUE, "1");
-        entryEndharti.setField(StandardField.JOURNAL, "BMC complementary and alternative medicine");
-        entryEndharti.setField(StandardField.KEYWORDS, "CAC; Dendrophtoe pentandra; IL-22; MPO; Proliferation; p53");
-        entryEndharti.setField(new UnknownField("nlm-id"), "101088661");
-        entryEndharti.setField(StandardField.OWNER, "NLM");
-        entryEndharti.setField(StandardField.PAGES, "374");
-        entryEndharti.setField(StandardField.MONTH, "#sep#");
-        entryEndharti.setField(StandardField.PMID, "27670445");
-        entryEndharti.setField(new UnknownField("pubmodel"), "Electronic");
-        entryEndharti.setField(StandardField.PUBSTATE, "epublish");
-        entryEndharti.setField(new UnknownField("revised"), "2019-11-20");
-        entryEndharti.setField(StandardField.VOLUME, "16");
-        entryEndharti.setField(StandardField.YEAR, "2016");
-
-        bibEntryIchikawa = new BibEntry();
-        bibEntryIchikawa.setType(StandardEntryType.Article);
-        bibEntryIchikawa.setField(StandardField.AUTHOR, "Ichikawa-Seki, Madoka and Guswanto, Azirwan and Allamanda, Puttik and Mariamah, Euis Siti and Wibowo, Putut Eko and Igarashi, Ikuo and Nishikawa, Yoshifumi");
-        bibEntryIchikawa.setField(new UnknownField("chemicals"), "Antibodies, Protozoan, Antigens, Protozoan, GRA7 protein, Toxoplasma gondii, Protozoan Proteins");
-        bibEntryIchikawa.setField(new UnknownField("citation-subset"), "IM");
-        bibEntryIchikawa.setField(new UnknownField("completed"), "2016-07-26");
-        bibEntryIchikawa.setField(new UnknownField("country"), "Netherlands");
-        bibEntryIchikawa.setField(StandardField.DOI, "10.1016/j.parint.2015.07.004");
-        bibEntryIchikawa.setField(StandardField.ISSN, "1873-0329");
-        bibEntryIchikawa.setField(StandardField.PUBSTATE, "ppublish");
-        bibEntryIchikawa.setField(new UnknownField("revised"), "2015-09-26");
-        bibEntryIchikawa.setField(new UnknownField("issn-linking"), "1383-5769");
-        bibEntryIchikawa.setField(StandardField.ISSUE, "6");
-        bibEntryIchikawa.setField(StandardField.JOURNAL, "Parasitology international");
-        bibEntryIchikawa.setField(StandardField.KEYWORDS, "Animals; Antibodies, Protozoan, blood; Antigens, Protozoan, immunology; Cattle, parasitology; Cattle Diseases, epidemiology, parasitology; Enzyme-Linked Immunosorbent Assay, veterinary; Geography; Humans; Indonesia, epidemiology; Livestock, immunology, parasitology; Meat, parasitology; Protozoan Proteins, immunology; Seroepidemiologic Studies; Swine, parasitology; Swine Diseases, epidemiology, parasitology; Toxoplasma, immunology; Toxoplasmosis, Animal, epidemiology, immunology, parasitology; Cattle; ELISA; Indonesia; Pig; TgGRA7; Toxoplasma gondii");
-        bibEntryIchikawa.setField(StandardField.MONTH, "#dec#");
-        bibEntryIchikawa.setField(new UnknownField("nlm-id"), "9708549");
-        bibEntryIchikawa.setField(StandardField.OWNER, "NLM");
-        bibEntryIchikawa.setField(StandardField.PAGES, "484--486");
-        bibEntryIchikawa.setField(new UnknownField("pii"), "S1383-5769(15)00124-5");
-        bibEntryIchikawa.setField(StandardField.PMID, "26197440");
-        bibEntryIchikawa.setField(new UnknownField("pubmodel"), "Print-Electronic");
-        bibEntryIchikawa.setField(StandardField.TITLE, "Seroprevalence of antibody to TgGRA7 antigen of Toxoplasma gondii in livestock animals from Western Java, Indonesia.");
-        bibEntryIchikawa.setField(StandardField.VOLUME, "64");
-        bibEntryIchikawa.setField(StandardField.YEAR, "2015");
-
-        bibEntrySari = new BibEntry();
-        bibEntrySari.setType(StandardEntryType.Article);
-        bibEntrySari.setField(StandardField.AUTHOR, "Sari, Yulia and Haryati, Sri and Raharjo, Irvan and Prasetyo, Afiono Agung");
-        bibEntrySari.setField(new UnknownField("chemicals"), "Antibodies, Protozoan, Antibodies, Viral, HTLV-I Antibodies, HTLV-II Antibodies, Hepatitis Antibodies, Hepatitis B Antibodies, Hepatitis C Antibodies, Immunoglobulin G, Immunoglobulin M");
-        bibEntrySari.setField(new UnknownField("citation-subset"), "IM");
-        bibEntrySari.setField(new UnknownField("completed"), "2016-04-21");
-        bibEntrySari.setField(new UnknownField("country"), "Thailand");
-        bibEntrySari.setField(StandardField.ISSN, "0125-1562");
-        bibEntrySari.setField(new UnknownField("issn-linking"), "0125-1562");
-        bibEntrySari.setField(StandardField.ISSUE, "6");
-        bibEntrySari.setField(StandardField.JOURNAL, "The Southeast Asian journal of tropical medicine and public health");
-        bibEntrySari.setField(StandardField.KEYWORDS, "Antibodies, Protozoan; Antibodies, Viral, immunology; Coinfection, epidemiology, immunology; Female; HIV Infections, epidemiology; HTLV-I Antibodies, immunology; HTLV-I Infections, epidemiology, immunology; HTLV-II Antibodies, immunology; HTLV-II Infections, epidemiology, immunology; Hepatitis Antibodies, immunology; Hepatitis B Antibodies, immunology; Hepatitis C Antibodies, immunology; Hepatitis Delta Virus, immunology; Hepatitis, Viral, Human, epidemiology, immunology; Humans; Immunoglobulin G, immunology; Immunoglobulin M, immunology; Indonesia, epidemiology; Male; Prisoners; Seroepidemiologic Studies; Toxoplasma, immunology; Toxoplasmosis, epidemiology, immunology");
-        bibEntrySari.setField(StandardField.MONTH, "#nov#");
-        bibEntrySari.setField(StandardField.PUBSTATE, "ppublish");
-        bibEntrySari.setField(new UnknownField("revised"), "2018-12-02");
-        bibEntrySari.setField(new UnknownField("nlm-id"), "0266303");
-        bibEntrySari.setField(StandardField.OWNER, "NLM");
-        bibEntrySari.setField(StandardField.PAGES, "977--985");
-        bibEntrySari.setField(StandardField.PMID, "26867355");
-        bibEntrySari.setField(new UnknownField("pubmodel"), "Print");
-        bibEntrySari.setField(StandardField.TITLE, "TOXOPLASMA AND VIRAL ANTIBODIES AMONG HIV PATIENTS AND INMATES IN CENTRAL JAVA, INDONESIA.");
-        bibEntrySari.setField(StandardField.VOLUME, "46");
-        bibEntrySari.setField(StandardField.YEAR, "2015");
+        entryWijedasa = new BibEntry(StandardEntryType.Article)
+                .withField(StandardField.AUTHOR, "Wijedasa, Lahiru S. and Jauhiainen, Jyrki and Könönen, Mari and Lampela, Maija and Vasander, Harri and Leblanc, Marie-Claire and Evers, Stephanie and Smith, Thomas E. L. and Yule, Catherine M. and Varkkey, Helena and Lupascu, Massimo and Parish, Faizal and Singleton, Ian and Clements, Gopalasamy R. and Aziz, Sheema Abdul and Harrison, Mark E. and Cheyne, Susan and Anshari, Gusti Z. and Meijaard, Erik and Goldstein, Jenny E. and Waldron, Susan and Hergoualc'h, Kristell and Dommain, Rene and Frolking, Steve and Evans, Christopher D. and Posa, Mary Rose C. and Glaser, Paul H. and Suryadiputra, Nyoman and Lubis, Reza and Santika, Truly and Padfield, Rory and Kurnianto, Sofyan and Hadisiswoyo, Panut and Lim, Teck Wyn and Page, Susan E. and Gauci, Vincent and Van Der Meer, Peter J. and Buckland, Helen and Garnier, Fabien and Samuel, Marshall K. and Choo, Liza Nuriati Lim Kim and O'Reilly, Patrick and Warren, Matthew and Suksuwan, Surin and Sumarga, Elham and Jain, Anuj and Laurance, William F. and Couwenberg, John and Joosten, Hans and Vernimmen, Ronald and Hooijer, Aljosja and Malins, Chris and Cochrane, Mark A. and Perumal, Balu and Siegert, Florian and Peh, Kelvin S.-H. and Comeau, Louis-Pierre and Verchot, Louis and Harvey, Charles F. and Cobb, Alex and Jaafar, Zeehan and Wösten, Henk and Manuri, Solichin and Müller, Moritz and Giesen, Wim and Phelps, Jacob and Yong, Ding Li and Silvius, Marcel and Wedeux, Béatrice M. M. and Hoyt, Alison and Osaki, Mitsuru and Hirano, Takashi and Takahashi, Hidenori and Kohyama, Takashi S. and Haraguchi, Akira and Nugroho, Nunung P. and Coomes, David A. and Quoi, Le Phat and Dohong, Alue and Gunawan, Haris and Gaveau, David L. A. and Langner, Andreas and Lim, Felix K. S. and Edwards, David P. and Giam, Xingli and Van Der Werf, Guido and Carmenta, Rachel and Verwer, Caspar C. and Gibson, Luke and Gandois, Laure and Graham, Laura Linda Bozena and Regalino, Jhanson and Wich, Serge A. and Rieley, Jack and Kettridge, Nicholas and Brown, Chloe and Pirard, Romain and Moore, Sam and Capilla, B. Ripoll and Ballhorn, Uwe and Ho, Hua Chew and Hoscilo, Agata and Lohberger, Sandra and Evans, Theodore A. and Yulianti, Nina and Blackham, Grace and Onrizal and Husson, Simon and Murdiyarso, Daniel and Pangala, Sunita and Cole, Lydia E. S. and Tacconi, Luca and Segah, Hendrik and Tonoto, Prayoto and Lee, Janice S. H. and Schmilewski, Gerald and Wulffraat, Stephan and Putra, Erianto Indra and Cattau, Megan E. and Clymo, R. S. and Morrison, Ross and Mujahid, Aazani and Miettinen, Jukka and Liew, Soo Chin and Valpola, Samu and Wilson, David and D'Arcy, Laura and Gerding, Michiel and Sundari, Siti and Thornton, Sara A. and Kalisz, Barbara and Chapman, Stephen J. and Su, Ahmad Suhaizi Mat and Basuki, Imam and Itoh, Masayuki and Traeholt, Carl and Sloan, Sean and Sayok, Alexander K. and Andersen, Roxane")
+                .withField(new UnknownField("country"), "England")
+                .withField(StandardField.DOI, "10.1111/gcb.13516")
+                .withField(StandardField.ISSN, "1365-2486")
+                .withField(new UnknownField("issn-linking"), "1354-1013")
+                .withField(StandardField.ISSUE, "3")
+                .withField(StandardField.JOURNAL, "Global change biology")
+                .withField(StandardField.MONTH, "#mar#")
+                .withField(new UnknownField("nlm-id"), "9888746")
+                .withField(StandardField.OWNER, "NLM")
+                .withField(StandardField.PAGES, "977--982")
+                .withField(StandardField.PMID, "27670948")
+                .withField(new UnknownField("pubmodel"), "Print-Electronic")
+                .withField(StandardField.PUBSTATE, "ppublish")
+                .withField(new UnknownField("revised"), "2019-11-20")
+                .withField(StandardField.TITLE, "Denial of long-term issues with agriculture on tropical peatlands will have devastating consequences.")
+                .withField(StandardField.VOLUME, "23")
+                .withField(StandardField.YEAR, "2017");
+
+        entryEndharti = new BibEntry(StandardEntryType.Article)
+                .withField(StandardField.TITLE, "Dendrophthoe pentandra (L.) Miq extract effectively inhibits inflammation, proliferation and induces p53 expression on colitis-associated colon cancer.")
+                .withField(StandardField.AUTHOR, "Endharti, Agustina Tri and Wulandari, Adisti and Listyana, Anik and Norahmawati, Eviana and Permana, Sofy")
+                .withField(new UnknownField("country"), "England")
+                .withField(StandardField.DOI, "10.1186/s12906-016-1345-0")
+                .withField(new UnknownField("pii"), "10.1186/s12906-016-1345-0")
+                .withField(new UnknownField("pmc"), "PMC5037598")
+                .withField(StandardField.ISSN, "1472-6882")
+                .withField(new UnknownField("issn-linking"), "1472-6882")
+                .withField(StandardField.ISSUE, "1")
+                .withField(StandardField.JOURNAL, "BMC complementary and alternative medicine")
+                .withField(StandardField.KEYWORDS, "CAC; Dendrophtoe pentandra; IL-22; MPO; Proliferation; p53")
+                .withField(new UnknownField("nlm-id"), "101088661")
+                .withField(StandardField.OWNER, "NLM")
+                .withField(StandardField.PAGES, "374")
+                .withField(StandardField.MONTH, "#sep#")
+                .withField(StandardField.PMID, "27670445")
+                .withField(new UnknownField("pubmodel"), "Electronic")
+                .withField(StandardField.PUBSTATE, "epublish")
+                .withField(new UnknownField("revised"), "2022-04-08")
+                .withField(StandardField.VOLUME, "16")
+                .withField(StandardField.YEAR, "2016");
+
+        bibEntryIchikawa = new BibEntry(StandardEntryType.Article)
+                .withField(StandardField.AUTHOR, "Ichikawa-Seki, Madoka and Guswanto, Azirwan and Allamanda, Puttik and Mariamah, Euis Siti and Wibowo, Putut Eko and Igarashi, Ikuo and Nishikawa, Yoshifumi")
+                .withField(new UnknownField("chemicals"), "Antibodies, Protozoan, Antigens, Protozoan, GRA7 protein, Toxoplasma gondii, Protozoan Proteins")
+                .withField(new UnknownField("citation-subset"), "IM")
+                .withField(new UnknownField("completed"), "2016-07-26")
+                .withField(new UnknownField("country"), "Netherlands")
+                .withField(StandardField.DOI, "10.1016/j.parint.2015.07.004")
+                .withField(StandardField.ISSN, "1873-0329")
+                .withField(StandardField.PUBSTATE, "ppublish")
+                .withField(new UnknownField("revised"), "2015-09-26")
+                .withField(new UnknownField("issn-linking"), "1383-5769")
+                .withField(StandardField.ISSUE, "6")
+                .withField(StandardField.JOURNAL, "Parasitology international")
+                .withField(StandardField.KEYWORDS, "Animals; Antibodies, Protozoan, blood; Antigens, Protozoan, immunology; Cattle, parasitology; Cattle Diseases, epidemiology, parasitology; Enzyme-Linked Immunosorbent Assay, veterinary; Geography; Humans; Indonesia, epidemiology; Livestock, immunology, parasitology; Meat, parasitology; Protozoan Proteins, immunology; Seroepidemiologic Studies; Swine, parasitology; Swine Diseases, epidemiology, parasitology; Toxoplasma, immunology; Toxoplasmosis, Animal, epidemiology, immunology, parasitology; Cattle; ELISA; Indonesia; Pig; TgGRA7; Toxoplasma gondii")
+                .withField(StandardField.MONTH, "#dec#")
+                .withField(new UnknownField("nlm-id"), "9708549")
+                .withField(StandardField.OWNER, "NLM")
+                .withField(StandardField.PAGES, "484--486")
+                .withField(new UnknownField("pii"), "S1383-5769(15)00124-5")
+                .withField(StandardField.PMID, "26197440")
+                .withField(new UnknownField("pubmodel"), "Print-Electronic")
+                .withField(StandardField.TITLE, "Seroprevalence of antibody to TgGRA7 antigen of Toxoplasma gondii in livestock animals from Western Java, Indonesia.")
+                .withField(StandardField.VOLUME, "64")
+                .withField(StandardField.YEAR, "2015");
+
+        bibEntrySari = new BibEntry(StandardEntryType.Article)
+                .withField(StandardField.AUTHOR, "Sari, Yulia and Haryati, Sri and Raharjo, Irvan and Prasetyo, Afiono Agung")
+                .withField(new UnknownField("chemicals"), "Antibodies, Protozoan, Antibodies, Viral, HTLV-I Antibodies, HTLV-II Antibodies, Hepatitis Antibodies, Hepatitis B Antibodies, Hepatitis C Antibodies, Immunoglobulin G, Immunoglobulin M")
+                .withField(new UnknownField("citation-subset"), "IM")
+                .withField(new UnknownField("completed"), "2016-04-21")
+                .withField(new UnknownField("country"), "Thailand")
+                .withField(StandardField.ISSN, "0125-1562")
+                .withField(new UnknownField("issn-linking"), "0125-1562")
+                .withField(StandardField.ISSUE, "6")
+                .withField(StandardField.JOURNAL, "The Southeast Asian journal of tropical medicine and public health")
+                .withField(StandardField.KEYWORDS, "Antibodies, Protozoan; Antibodies, Viral, immunology; Coinfection, epidemiology, immunology; Female; HIV Infections, epidemiology; HTLV-I Antibodies, immunology; HTLV-I Infections, epidemiology, immunology; HTLV-II Antibodies, immunology; HTLV-II Infections, epidemiology, immunology; Hepatitis Antibodies, immunology; Hepatitis B Antibodies, immunology; Hepatitis C Antibodies, immunology; Hepatitis Delta Virus, immunology; Hepatitis, Viral, Human, epidemiology, immunology; Humans; Immunoglobulin G, immunology; Immunoglobulin M, immunology; Indonesia, epidemiology; Male; Prisoners; Seroepidemiologic Studies; Toxoplasma, immunology; Toxoplasmosis, epidemiology, immunology")
+                .withField(StandardField.MONTH, "#nov#")
+                .withField(StandardField.PUBSTATE, "ppublish")
+                .withField(new UnknownField("revised"), "2018-12-02")
+                .withField(new UnknownField("nlm-id"), "0266303")
+                .withField(StandardField.OWNER, "NLM")
+                .withField(StandardField.PAGES, "977--985")
+                .withField(StandardField.PMID, "26867355")
+                .withField(new UnknownField("pubmodel"), "Print")
+                .withField(StandardField.TITLE, "TOXOPLASMA AND VIRAL ANTIBODIES AMONG HIV PATIENTS AND INMATES IN CENTRAL JAVA, INDONESIA.")
+                .withField(StandardField.VOLUME, "46")
+                .withField(StandardField.YEAR, "2015");
     }
 
     @Test
@@ -173,13 +171,26 @@ public void testSearchByIDSari() throws Exception {
     public void testMultipleEntries() throws Exception {
         List<BibEntry> entryList = fetcher.performSearch("java");
         entryList.forEach(entry -> entry.clearField(StandardField.ABSTRACT)); // Remove abstract due to copyright);
-        System.out.println(entryList);
         assertEquals(50, entryList.size());
     }
 
+    @Test
+    public void testWithLuceneQueryAuthorDate() throws Exception {
+        List<BibEntry> entryList = fetcher.performSearch("author:vigmond AND year:2021");
+        entryList.forEach(entry -> entry.clearField(StandardField.ABSTRACT)); // Remove abstract due to copyright);
+        assertEquals(18, entryList.size());
+    }
+
+    @Test
+    public void testWithLuceneQueryAuthorDateRange() throws Exception {
+        List<BibEntry> entryList = fetcher.performSearch("author:vigmond AND year-range:2020-2021");
+        entryList.forEach(entry -> entry.clearField(StandardField.ABSTRACT)); // Remove abstract due to copyright);
+        assertEquals(28, entryList.size());
+    }
+
     @Test
     public void testInvalidSearchTerm() throws Exception {
-        assertEquals(Optional.empty(), fetcher.performSearchById("this.is.a.invalid.search.term.for.the.medline.fetcher"));
+        assertThrows(FetcherClientException.class, () -> fetcher.performSearchById("this.is.a.invalid.search.term.for.the.medline.fetcher"));
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/MedraTest.java b/src/test/java/org/jabref/logic/importer/fetcher/MedraTest.java
index 7439475b691..3d940312fa1 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/MedraTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/MedraTest.java
@@ -3,6 +3,7 @@
 import java.util.Optional;
 import java.util.stream.Stream;
 
+import org.jabref.logic.importer.FetcherClientException;
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
@@ -15,6 +16,7 @@
 import org.junit.jupiter.params.provider.MethodSource;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 @FetcherTest
 public class MedraTest {
@@ -23,9 +25,6 @@ public class MedraTest {
 
     private static Stream<Arguments> getDoiBibEntryPairs() {
         return Stream.of(
-                Arguments.of("10.1016/j.bjoms.2007.08.004",
-                        Optional.empty()),
-
                 Arguments.of("10.2143/TVF.80.3.3285690",
                         Optional.of(
                                 new BibEntry(StandardEntryType.Article)
@@ -82,11 +81,15 @@ public void testPerformSearchEmptyDOI() throws FetcherException {
         assertEquals(Optional.empty(), fetcher.performSearchById(""));
     }
 
+    @Test
+    public void testPerformNonExistent() throws FetcherException {
+        assertThrows(FetcherClientException.class, () -> fetcher.performSearchById("10.1016/j.bjoms.2007.08.004"));
+    }
+
     @ParameterizedTest
     @MethodSource("getDoiBibEntryPairs")
     public void testDoiBibEntryPairs(String identifier, Optional<BibEntry> expected) throws FetcherException {
         Optional<BibEntry> fetchedEntry = fetcher.performSearchById(identifier);
         assertEquals(expected, fetchedEntry);
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/OpenLibraryFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/OpenLibraryFetcherTest.java
new file mode 100644
index 00000000000..6161b3b9879
--- /dev/null
+++ b/src/test/java/org/jabref/logic/importer/fetcher/OpenLibraryFetcherTest.java
@@ -0,0 +1,78 @@
+package org.jabref.logic.importer.fetcher;
+
+import java.util.Optional;
+
+import org.jabref.logic.importer.FetcherClientException;
+import org.jabref.logic.importer.FetcherException;
+import org.jabref.logic.importer.ImportFormatPreferences;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.field.StandardField;
+import org.jabref.model.entry.types.StandardEntryType;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.Answers;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.Mockito.mock;
+
+public class OpenLibraryFetcherTest extends AbstractIsbnFetcherTest {
+
+    @BeforeEach
+    public void setUp() {
+        bibEntryEffectiveJava = new BibEntry(StandardEntryType.Book)
+                .withField(StandardField.TITLE, "Effective Java(TM) Programming Language Guide (2nd Edition) (The Java Series)")
+                .withField(StandardField.PUBLISHER, "Prentice Hall PTR")
+                .withField(StandardField.YEAR, "2007")
+                .withField(StandardField.AUTHOR, "Bloch, Joshua")
+                .withField(StandardField.ISBN, "9780321356680")
+                .withField(StandardField.PAGES, "256");
+
+        fetcher = new OpenLibraryFetcher(mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS));
+    }
+
+    @Test
+    @Override
+    public void testName() {
+        assertEquals("OpenLibrary", fetcher.getName());
+    }
+
+    @Test
+    @Override
+    public void searchByIdSuccessfulWithShortISBN() throws FetcherException {
+        Optional<BibEntry> fetchedEntry = fetcher.performSearchById("0321356683");
+        assertEquals(Optional.of(bibEntryEffectiveJava), fetchedEntry);
+    }
+
+    @Test
+    @Override
+    public void searchByIdSuccessfulWithLongISBN() throws FetcherException {
+        Optional<BibEntry> fetchedEntry = fetcher.performSearchById("9780321356680");
+        assertEquals(Optional.of(bibEntryEffectiveJava), fetchedEntry);
+    }
+
+    @Test
+    @Override
+    public void authorsAreCorrectlyFormatted() throws Exception {
+        BibEntry bibEntry = new BibEntry(StandardEntryType.Book)
+                .withField(StandardField.TITLE, "Repository Eine Einführung")
+                .withField(StandardField.SUBTITLE, "Eine Einführung")
+                .withField(StandardField.PUBLISHER, "de Gruyter GmbH, Walter")
+                .withField(StandardField.AUTHOR, "Habermann, Hans-Joachim and Leymann, Frank")
+                .withField(StandardField.ISBN, "9783110702125")
+                .withField(StandardField.YEAR, "2020");
+        Optional<BibEntry> fetchedEntry = fetcher.performSearchById("9783110702125");
+        assertEquals(Optional.of(bibEntry), fetchedEntry);
+    }
+
+    /**
+     * Checks whether the given ISBN is <emph>NOT</emph> available at any ISBN fetcher
+     */
+    @Test
+    public void testIsbnNeitherAvailableOnEbookDeNorOrViaOpenLibrary() throws Exception {
+        // In this test, the ISBN needs to be a valid (syntax+checksum) ISBN number
+        // However, the ISBN number must not be assigned to a real book
+        assertThrows(FetcherClientException.class, () -> fetcher.performSearchById("9785646216541"));
+    }
+}
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/ResearchGateTest.java b/src/test/java/org/jabref/logic/importer/fetcher/ResearchGateTest.java
new file mode 100644
index 00000000000..5fdccc287c6
--- /dev/null
+++ b/src/test/java/org/jabref/logic/importer/fetcher/ResearchGateTest.java
@@ -0,0 +1,141 @@
+package org.jabref.logic.importer.fetcher;
+
+import java.io.IOException;
+import java.net.URL;
+import java.util.List;
+import java.util.Optional;
+
+import org.jabref.logic.importer.FetcherException;
+import org.jabref.logic.importer.ImportFormatPreferences;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.field.StandardField;
+import org.jabref.model.entry.types.StandardEntryType;
+import org.jabref.model.entry.types.UnknownEntryType;
+import org.jabref.support.DisabledOnCIServer;
+import org.jabref.testutils.category.FetcherTest;
+
+import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
+import org.apache.lucene.queryparser.flexible.standard.parser.StandardSyntaxParser;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.Answers;
+
+import static org.jabref.logic.importer.fetcher.transformers.AbstractQueryTransformer.NO_EXPLICIT_FIELD;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
+
+@FetcherTest
+@DisabledOnCIServer("Blocked by Cloudflare")
+public class ResearchGateTest {
+
+    private static final String URL_PDF = "https://www.researchgate.net/profile/Abdurrazzak-Gehani/publication/4207355_Paranoid_a_global_secure_file_access_control_system/links/5457747d0cf2cf516480995e/Paranoid-a-global-secure-file-access-control-system.pdf";
+    private final String URL_PAGE = "https://www.researchgate.net/publication/4207355_Paranoid_a_global_secure_file_access_control_system";
+    private ResearchGate fetcher;
+    private BibEntry entry;
+
+    @BeforeEach
+    public void setUp() {
+        fetcher = new ResearchGate(mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS));
+        entry = new BibEntry(StandardEntryType.InProceedings);
+        entry.setField(StandardField.DOI, "10.1109/CSAC.2005.42");
+        entry.setField(StandardField.TITLE, "Paranoid: a global secure file access control system");
+    }
+
+    @Test
+    @DisabledOnCIServer("CI server is unreliable")
+    void fullTextFoundByDOI() throws IOException, FetcherException {
+        assertEquals(Optional.of(new URL(URL_PDF)), fetcher.findFullText(entry));
+    }
+
+    @Test
+    @DisabledOnCIServer("CI server is unreliable")
+    void fullTextNotFoundByDOI() throws IOException, FetcherException {
+        BibEntry entry2 = new BibEntry().withField(StandardField.DOI, "10.1021/bk-2006-WWW.ch014");
+        assertEquals(Optional.empty(), fetcher.findFullText(entry2));
+    }
+
+    @Test
+    void getDocumentByTitle() throws IOException, NullPointerException {
+        Optional<String> source = fetcher.getURLByString(entry.getTitle().get());
+        assertTrue(source.isPresent() && source.get().startsWith(URL_PAGE));
+    }
+
+    @Test
+    void getDocumentByDOI() throws IOException, NullPointerException {
+        Optional<String> source = fetcher.getURLByDoi(entry.getDOI().get());
+        assertEquals(URL_PAGE, source.orElse(""));
+    }
+
+    @Test
+    void trustLevel() {
+        assertEquals(TrustLevel.META_SEARCH, fetcher.getTrustLevel());
+    }
+
+    @Test
+    void performSearchWithString() throws Exception {
+        BibEntry master = new BibEntry(StandardEntryType.PhdThesis)
+                .withCitationKey("phdthesis")
+                .withField(StandardField.AUTHOR, "Diez, Tobias")
+                .withField(StandardField.TITLE, "Slice theorem for Fréchet group actions and covariant symplectic field theory")
+                .withField(StandardField.MONTH, "10")
+                .withField(StandardField.YEAR, "2013");
+        List<BibEntry> fetchedEntries = fetcher.performSearch("Slice theorem for Fréchet group actions and covariant symplectic");
+        assertEquals(Optional.of(master), fetchedEntries.stream().findFirst());
+    }
+
+    @Test
+    void performSearchWithLuceneQuery() throws Exception {
+        BibEntry master = new BibEntry(StandardEntryType.Article)
+                .withCitationKey("article")
+                .withField(StandardField.TITLE, "Wine Microbiology and Predictive Microbiology: " +
+                        "A Short Overview on Application, and Perspectives")
+                .withField(StandardField.DOI, "10.3390/microorganisms10020421")
+                .withField(StandardField.JOURNAL, "Microorganisms")
+                .withField(StandardField.MONTH, "02")
+                .withField(StandardField.PAGES, "421")
+                .withField(StandardField.VOLUME, "10")
+                .withField(StandardField.YEAR, "2022")
+                .withField(StandardField.AUTHOR, "Petruzzi, Leonardo and Campaniello, Daniela and Corbo," +
+                        " Maria and Speranza, Barbara and Altieri, Clelia and Sinigaglia, Milena and Bevilacqua, Antonio");
+
+        QueryNode queryNode = new StandardSyntaxParser().parse("Wine Microbiology and Predictive " +
+                "Microbiology: A Short Overview on Application, and Perspectives", NO_EXPLICIT_FIELD);
+        assertEquals(Optional.of(master), fetcher.performSearch(queryNode).stream().findFirst());
+    }
+
+    @Test
+    void performSearchWithBibEntry() throws FetcherException {
+        BibEntry entryZaffar = new BibEntry(StandardEntryType.InProceedings)
+                .withCitationKey("inproceedings")
+                .withField(StandardField.ISBN, "0-7695-2461-3")
+                .withField(StandardField.TITLE, "Looking Back at the Bell-La Padula Model")
+                .withField(StandardField.MONTH, "01")
+                .withField(StandardField.PAGES, "15 pp. - 351")
+                .withField(StandardField.DOI, "10.1109/CSAC.2005.37")
+                .withField(StandardField.VOLUME, "2005")
+                .withField(StandardField.YEAR, "2006")
+                .withField(StandardField.JOURNAL, "Proceedings - Annual Computer Security Applications Conference, ACSAC")
+                .withField(StandardField.AUTHOR, "Bell, D.E.");
+        assertEquals(Optional.of(entryZaffar), fetcher.performSearch(entryZaffar).stream().findFirst());
+    }
+
+    @Test
+    @DisabledOnCIServer("CI server is unreliable")
+    void performSearchWithTitleWithCurlyBraces() throws FetcherException {
+        BibEntry entryInput = new BibEntry(StandardEntryType.Misc)
+                .withField(StandardField.TITLE, "Communicating {COVID}-19 against the backdrop of conspiracy ideologies: {HOW} {PUBLIC} {FIGURES} {DISCUSS} {THE} {MATTER} {ON} {FACEBOOK} {AND} {TELEGRAM}");
+
+        Optional<BibEntry> expected = Optional.of(new BibEntry(new UnknownEntryType("unknown"))
+                .withCitationKey("unknown")
+                .withField(StandardField.TITLE, "Communicating COVID-19 against the backdrop of conspiracy ideologies: HOW PUBLIC FIGURES DISCUSS THE MATTER ON FACEBOOK AND TELEGRAM")
+                .withField(StandardField.MONTH, "05")
+                .withField(StandardField.YEAR, "2021")
+                .withField(StandardField.AUTHOR, "Hohlfeld, Ralf and Bauerfeind, Franziska and Braglia, Ilenia and Butt, Aqib and Dietz, Anna-Lena and Drexel, Denise and Fedlmeier, Julia and Fischer, Lana and Gandl, Vanessa and Glaser, Felia and Haberzettel, Eva and Helling, Teresa and Käsbauer, Isabel and Kast, Matthias and Krieger, Anja and Lächner, Anja and Malkanova, Adriana and Raab, Marie-Kristin and Rech, Anastasia and Weymar, Pia")
+                .withField(StandardField.DOI, "10.13140/RG.2.2.36822.78406"));
+
+        Optional<BibEntry> actual = fetcher.performSearch(entryInput)
+                                                     .stream().findFirst();
+        assertEquals(expected, actual);
+    }
+}
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/RfcFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/RfcFetcherTest.java
index 63db56f9a81..ea04ddca1f4 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/RfcFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/RfcFetcherTest.java
@@ -2,6 +2,7 @@
 
 import java.util.Optional;
 
+import org.jabref.logic.importer.FetcherClientException;
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.InternalField;
@@ -14,6 +15,7 @@
 import org.mockito.Answers;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.Mockito.mock;
 
 @FetcherTest
@@ -63,7 +65,7 @@ public void performSearchByIdFindsEntryWithDraftIdentifier() throws Exception {
         bibDraftEntry.setField(StandardField.PUBLISHER, "Internet Engineering Task Force");
         bibDraftEntry.setField(StandardField.TITLE, "{Hypertext Transfer Protocol -- HTTP/1.0}");
         bibDraftEntry.setField(StandardField.TYPE, "Internet-Draft");
-        bibDraftEntry.setField(StandardField.URL, "https://datatracker.ietf.org/doc/html/draft-fielding-http-spec-01");
+        bibDraftEntry.setField(StandardField.URL, "https://datatracker.ietf.org/doc/draft-fielding-http-spec/01/");
         bibDraftEntry.setField(StandardField.YEAR, "1994");
         bibDraftEntry.setField(StandardField.ABSTRACT, "The Hypertext Transfer Protocol (HTTP) is an application-level protocol with the lightness and speed necessary for distributed, collaborative, hypermedia information systems. It is a generic, stateless, object-oriented protocol which can be used for many tasks, such as name servers and distributed object management systems, through extension of its request methods (commands). A feature of HTTP is the typing and negotiation of data representation, allowing systems to be built independently of the data being transferred. HTTP has been in use by the World-Wide Web global information initiative since 1990. This specification reflects preferred usage of the protocol referred to as 'HTTP/1.0', and is compatible with the most commonly used HTTP server and client programs implemented prior to November 1994.");
         bibDraftEntry.setCommentsBeforeEntry("%% You should probably cite draft-ietf-http-v10-spec instead of this I-D.\n");
@@ -88,16 +90,16 @@ public void performSearchByIdFindsNothingWithoutIdentifier() throws Exception {
 
     @Test
     public void performSearchByIdFindsNothingWithValidDraftIdentifier() throws Exception {
-        assertEquals(Optional.empty(), fetcher.performSearchById("draft-test-draft-spec"));
+        assertThrows(FetcherClientException.class, () -> fetcher.performSearchById("draft-test-draft-spec"));
     }
 
     @Test
     public void performSearchByIdFindsNothingWithValidIdentifier() throws Exception {
-        assertEquals(Optional.empty(), fetcher.performSearchById("RFC9999"));
+        assertThrows(FetcherClientException.class, () -> fetcher.performSearchById("RFC9999"));
     }
 
     @Test
     public void performSearchByIdFindsNothingWithInvalidIdentifier() throws Exception {
-        assertEquals(Optional.empty(), fetcher.performSearchById("banana"));
+        assertThrows(FetcherClientException.class, () -> fetcher.performSearchById("banana"));
     }
 }
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/ScienceDirectTest.java b/src/test/java/org/jabref/logic/importer/fetcher/ScienceDirectTest.java
index 7c955863f24..1348ef88a6a 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/ScienceDirectTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/ScienceDirectTest.java
@@ -4,6 +4,9 @@
 import java.net.URL;
 import java.util.Optional;
 
+import javafx.collections.FXCollections;
+
+import org.jabref.logic.importer.ImporterPreferences;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.support.DisabledOnCIServer;
@@ -13,16 +16,20 @@
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 @FetcherTest
 class ScienceDirectTest {
 
+    private final ImporterPreferences importerPreferences = mock(ImporterPreferences.class);
     private ScienceDirect finder;
     private BibEntry entry;
 
     @BeforeEach
     void setUp() {
-        finder = new ScienceDirect();
+        when(importerPreferences.getApiKeys()).thenReturn(FXCollections.emptyObservableSet());
+        finder = new ScienceDirect(importerPreferences);
         entry = new BibEntry();
     }
 
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/SemanticScholarTest.java b/src/test/java/org/jabref/logic/importer/fetcher/SemanticScholarTest.java
new file mode 100644
index 00000000000..b8f2d42eb2e
--- /dev/null
+++ b/src/test/java/org/jabref/logic/importer/fetcher/SemanticScholarTest.java
@@ -0,0 +1,178 @@
+package org.jabref.logic.importer.fetcher;
+
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+
+import org.jabref.logic.importer.FetcherException;
+import org.jabref.logic.importer.PagedSearchBasedFetcher;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.field.StandardField;
+import org.jabref.model.entry.types.StandardEntryType;
+import org.jabref.support.DisabledOnCIServer;
+import org.jabref.testutils.category.FetcherTest;
+
+import org.apache.lucene.queryparser.flexible.core.QueryNodeParseException;
+import org.apache.lucene.queryparser.flexible.core.parser.SyntaxParser;
+import org.apache.lucene.queryparser.flexible.standard.parser.StandardSyntaxParser;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+@FetcherTest
+public class SemanticScholarTest implements PagedSearchFetcherTest {
+
+    private static final String DOI = "10.23919/IFIPNetworking52078.2021.9472772";
+
+    private final BibEntry IGOR_NEWCOMERS = new BibEntry(StandardEntryType.Article)
+            .withField(StandardField.AUTHOR, "Igor Steinmacher and Tayana Conte and Christoph Treude and M. Gerosa")
+            .withField(StandardField.YEAR, "2016")
+            .withField(StandardField.DOI, "10.1145/2884781.2884806")
+            .withField(StandardField.TITLE, "Overcoming Open Source Project Entry Barriers with a Portal for Newcomers")
+            .withField(StandardField.URL, "https://www.semanticscholar.org/paper/4bea2b4029a895bf898701329409e5a784fc2090")
+            .withField(StandardField.VENUE, "2016 IEEE/ACM 38th International Conference on Software Engineering (ICSE)");
+
+    private SemanticScholar fetcher;
+    private BibEntry entry;
+
+    @BeforeEach
+    void setUp() {
+        fetcher = new SemanticScholar();
+        entry = new BibEntry();
+    }
+
+    @Test
+    void getDocument() throws IOException, FetcherException {
+        String source = fetcher.getURLBySource(
+                String.format("https://api.semanticscholar.org/v1/paper/%s", DOI));
+
+        assertEquals("https://www.semanticscholar.org/paper/7f7b38604a2c167f6d5fb1c5dffcbb127d0525c0", source);
+    }
+
+    @Test
+    @DisabledOnCIServer("CI server is unreliable")
+    void fullTextFindByDOI() throws IOException, FetcherException {
+        entry.withField(StandardField.DOI, "10.1038/nrn3241");
+        assertEquals(
+                Optional.of(new URL("https://europepmc.org/articles/pmc4907333?pdf=render")),
+                fetcher.findFullText(entry)
+        );
+    }
+
+    @Test
+    @DisabledOnCIServer("CI server is unreliable")
+    void fullTextFindByDOIAlternate() throws IOException, FetcherException {
+        assertEquals(
+                Optional.of(new URL("https://pdfs.semanticscholar.org/7f6e/61c254bc2df38a784c1228f56c13317caded.pdf")),
+                fetcher.findFullText(new BibEntry()
+                        .withField(StandardField.DOI, "10.3390/healthcare9020206")));
+    }
+
+    @Test
+    @DisabledOnCIServer("CI server is unreliable")
+    void fullTextSearchOnEmptyEntry() throws IOException, FetcherException {
+
+        assertEquals(Optional.empty(), fetcher.findFullText(new BibEntry()));
+    }
+
+    @Test
+    @DisabledOnCIServer("CI server is unreliable")
+    void fullTextNotFoundByDOI() throws IOException, FetcherException {
+        entry = new BibEntry().withField(StandardField.DOI, DOI);
+        entry.setField(StandardField.DOI, "10.1021/bk-2006-WWW.ch014");
+
+        assertEquals(Optional.empty(), fetcher.findFullText(entry));
+    }
+
+    @Test
+    @DisabledOnCIServer("CI server is unreliable")
+    void fullTextFindByArXiv() throws IOException, FetcherException {
+        entry = new BibEntry().withField(StandardField.EPRINT, "1407.3561")
+                              .withField(StandardField.ARCHIVEPREFIX, "arXiv");
+        assertEquals(
+                Optional.of(new URL("https://arxiv.org/pdf/1407.3561.pdf")),
+                fetcher.findFullText(entry)
+        );
+    }
+
+    @Test
+    void fullTextEntityWithoutDoi() throws IOException, FetcherException {
+        assertEquals(Optional.empty(), fetcher.findFullText(new BibEntry()));
+    }
+
+    @Test
+    void trustLevel() {
+        assertEquals(TrustLevel.META_SEARCH, fetcher.getTrustLevel());
+    }
+
+    @Override
+    public PagedSearchBasedFetcher getPagedFetcher() {
+        return fetcher;
+    }
+
+    @Test
+    void getURLForQueryWithLucene() throws QueryNodeParseException, MalformedURLException, FetcherException, URISyntaxException {
+        String query = "Software engineering";
+        SyntaxParser parser = new StandardSyntaxParser();
+        URL url = fetcher.getURLForQuery(parser.parse(query, "default"), 0);
+        assertEquals("https://api.semanticscholar.org/graph/v1/paper/search?query=Software+engineering&offset=0&limit=20&fields=paperId%2CexternalIds%2Curl%2Ctitle%2Cabstract%2Cvenue%2Cyear%2Cauthors", url.toString());
+    }
+
+    @Test
+    void searchByQueryFindsEntry() throws Exception {
+        BibEntry master = new BibEntry(StandardEntryType.Article)
+                .withField(StandardField.AUTHOR, "Tobias Diez")
+                .withField(StandardField.TITLE, "Slice theorem for Fréchet group actions and covariant symplectic field theory")
+                .withField(StandardField.YEAR, "2014")
+                .withField(StandardField.EPRINT, "1405.2249")
+                .withField(StandardField.EPRINTTYPE, "arXiv")
+                .withField(StandardField.URL, "https://www.semanticscholar.org/paper/4986c1060236e7190b63f934df7806fbf2056cec");
+        List<BibEntry> fetchedEntries = fetcher.performSearch("Slice theorem for Fréchet group actions and covariant symplectic");
+        // Abstract should not be included in JabRef tests
+        fetchedEntries.forEach(entry -> entry.clearField(StandardField.ABSTRACT));
+        assertEquals(Collections.singletonList(master), fetchedEntries);
+    }
+
+    @Test
+    void searchByPlainQueryFindsEntry() throws Exception {
+        List<BibEntry> fetchedEntries = fetcher.performSearch("Overcoming Open Source Project Entry Barriers with a Portal for Newcomers");
+        // Abstract should not be included in JabRef tests
+        fetchedEntries.forEach(entry -> entry.clearField(StandardField.ABSTRACT));
+        assertEquals(Collections.singletonList(IGOR_NEWCOMERS), fetchedEntries);
+    }
+
+    @Test
+    void searchByQuotedQueryFindsEntry() throws Exception {
+        List<BibEntry> fetchedEntries = fetcher.performSearch("\"Overcoming Open Source Project Entry Barriers with a Portal for Newcomers\"");
+        // Abstract should not be included in JabRef tests
+        fetchedEntries.forEach(entry -> entry.clearField(StandardField.ABSTRACT));
+        assertEquals(Collections.singletonList(IGOR_NEWCOMERS), fetchedEntries);
+    }
+
+    @Test
+    public void performSearchByEmptyQuery() throws Exception {
+        assertEquals(Collections.emptyList(), fetcher.performSearch(""));
+    }
+
+    @Test
+    public void findByEntry() throws Exception {
+        BibEntry barrosEntry = new BibEntry(StandardEntryType.Article)
+                .withField(StandardField.TITLE, "Formalising BPMN Service Interaction Patterns")
+                .withField(StandardField.AUTHOR, "Chiara Muzi and Luise Pufahl and Lorenzo Rossi and M. Weske and F. Tiezzi")
+                .withField(StandardField.YEAR, "2018")
+                .withField(StandardField.DOI, "10.1007/978-3-030-02302-7_1")
+                .withField(StandardField.URL, "https://www.semanticscholar.org/paper/3bb026fd67db7d8e0e25de3189d6b7031b12783e")
+                .withField(StandardField.VENUE, "PoEM");
+
+        entry.withField(StandardField.TITLE, "Formalising BPMN Service Interaction Patterns");
+        BibEntry actual = fetcher.performSearch(entry).get(0);
+        // Abstract should not be included in JabRef tests
+        actual.clearField(StandardField.ABSTRACT);
+        assertEquals(barrosEntry, actual);
+    }
+}
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/SpringerFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/SpringerFetcherTest.java
index 915e5ed6573..ad466a8e8c4 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/SpringerFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/SpringerFetcherTest.java
@@ -3,8 +3,10 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
-import java.util.stream.Collectors;
 
+import javafx.collections.FXCollections;
+
+import org.jabref.logic.importer.ImporterPreferences;
 import org.jabref.logic.importer.PagedSearchBasedFetcher;
 import org.jabref.logic.importer.SearchBasedFetcher;
 import org.jabref.model.entry.BibEntry;
@@ -20,15 +22,19 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 @FetcherTest
 class SpringerFetcherTest implements SearchBasedFetcherCapabilityTest, PagedSearchFetcherTest {
 
+    ImporterPreferences importerPreferences = mock(ImporterPreferences.class);
     SpringerFetcher fetcher;
 
     @BeforeEach
     void setUp() {
-        fetcher = new SpringerFetcher();
+        when(importerPreferences.getApiKeys()).thenReturn(FXCollections.emptyObservableSet());
+        fetcher = new SpringerFetcher(importerPreferences);
     }
 
     @Test
@@ -78,21 +84,43 @@ void searchByQueryFindsEntry() throws Exception {
             .withField(StandardField.TITLE, "How to Find My Task? Chatbot to Assist Newcomers in Choosing Tasks in OSS Projects")
             .withField(StandardField.ABSTRACT, "Open Source Software (OSS) is making a meteoric rise in the software industry since several big companies have entered this market. Unfortunately, newcomers enter these projects and usually lose interest in contributing because of several factors. This paper aims to reduce the problems users face when they walk their first steps into OSS projects: finding the appropriate task. This paper presents a chatbot that filters tasks to help newcomers choose a task that fits their skills. We performed a quantitative and a qualitative study comparing the chatbot with the current GitHub issue tracker interface, which uses labels to categorize and identify tasks. The results show that users perceived the chatbot as easier to use than the GitHub issue tracker. Additionally, users tend to interpret the use of chatbots as situational, helping mainly newcomers and inexperienced contributors.");
 
+        BibEntry fourthArticle = new BibEntry(StandardEntryType.Article)
+            .withField(StandardField.AUTHOR, "Calefato, Fabio and Gerosa, Marco Aurélio and Iaffaldano, Giuseppe and Lanubile, Filippo and Steinmacher, Igor")
+            .withField(StandardField.DATE, "2022-03-19")
+            .withField(StandardField.DOI, "10.1007/s10664-021-10012-6")
+            .withField(StandardField.FILE, ":http\\://link.springer.com/openurl/pdf?id=doi\\:10.1007/s10664-021-10012-6:PDF")
+            .withField(StandardField.ISSN, "1382-3256")
+            .withField(StandardField.JOURNAL, "Empirical Software Engineering")
+            .withField(StandardField.MONTH, "#mar#")
+            .withField(StandardField.NUMBER, "3")
+            .withField(StandardField.PAGES, "1--41")
+            .withField(StandardField.PUBLISHER, "Springer")
+            .withField(StandardField.TITLE, "Will you come back to contribute? Investigating the inactivity of OSS core developers in GitHub")
+            .withField(StandardField.VOLUME, "27")
+            .withField(StandardField.YEAR, "2022")
+            .withField(StandardField.ABSTRACT, "Several Open-Source Software (OSS) projects depend on the continuity of their development communities to remain sustainable. Understanding how developers become inactive or why they take breaks can help communities prevent abandonment and incentivize developers to come back. In this paper, we propose a novel method to identify developers’ inactive periods by analyzing the individual rhythm of contributions to the projects. Using this method, we quantitatively analyze the inactivity of core developers in 18 OSS organizations hosted on GitHub. We also survey core developers to receive their feedback about the identified breaks and transitions. Our results show that our method was effective for identifying developers’ breaks. About 94% of the surveyed core developers agreed with our state model of inactivity; 71% and 79% of them acknowledged their breaks and state transition, respectively. We also show that all core developers take breaks (at least once) and about a half of them (~45%) have completely disengaged from a project for at least one year. We also analyzed the probability of transitions to/from inactivity and found that developers who pause their activity have a ~35 to ~55% chance to return to an active state; yet, if the break lasts for a year or longer, then the probability of resuming activities drops to ~21–26%, with a ~54% chance of complete disengagement. These results may support the creation of policies and mechanisms to make OSS community managers aware of breaks and potential project abandonment.");
+
         List<BibEntry> fetchedEntries = fetcher.performSearch("JabRef Social Barriers Steinmacher");
-        assertEquals(List.of(thirdArticle, firstArticle, secondArticle), fetchedEntries);
+        assertEquals(List.of(fourthArticle, thirdArticle, firstArticle, secondArticle), fetchedEntries);
     }
 
     @Test
     void testSpringerJSONToBibtex() {
-        String jsonString = "{\r\n" + "            \"identifier\":\"doi:10.1007/BF01201962\",\r\n"
-                + "            \"title\":\"Book reviews\",\r\n"
-                + "            \"publicationName\":\"World Journal of Microbiology & Biotechnology\",\r\n"
-                + "            \"issn\":\"1573-0972\",\r\n" + "            \"isbn\":\"\",\r\n"
-                + "            \"doi\":\"10.1007/BF01201962\",\r\n" + "            \"publisher\":\"Springer\",\r\n"
-                + "            \"publicationDate\":\"1992-09-01\",\r\n" + "            \"volume\":\"8\",\r\n"
-                + "            \"number\":\"5\",\r\n" + "            \"startingPage\":\"550\",\r\n"
-                + "            \"url\":\"http://dx.doi.org/10.1007/BF01201962\",\"copyright\":\"©1992 Rapid Communications of Oxford Ltd.\"\r\n"
-                + "        }";
+        String jsonString = """
+                {\r
+                            "identifier":"doi:10.1007/BF01201962",\r
+                            "title":"Book reviews",\r
+                            "publicationName":"World Journal of Microbiology & Biotechnology",\r
+                            "issn":"1573-0972",\r
+                            "isbn":"",\r
+                            "doi":"10.1007/BF01201962",\r
+                            "publisher":"Springer",\r
+                            "publicationDate":"1992-09-01",\r
+                            "volume":"8",\r
+                            "number":"5",\r
+                            "startingPage":"550",\r
+                            "url":"http://dx.doi.org/10.1007/BF01201962","copyright":"©1992 Rapid Communications of Oxford Ltd."\r
+                        }""";
 
         JSONObject jsonObject = new JSONObject(jsonString);
         BibEntry bibEntry = SpringerFetcher.parseSpringerJSONtoBibtex(jsonObject);
@@ -113,13 +141,13 @@ void searchByEmptyQueryFindsNothing() throws Exception {
     @Test
     @Disabled("Year search is currently broken, because the API returns mutliple years.")
     @Override
-    public void supportsYearSearch() throws Exception {
+    public void supportsYearSearch() {
     }
 
     @Test
     @Disabled("Year range search is not natively supported by the API, but can be emulated by multiple single year searches.")
     @Override
-    public void supportsYearRangeSearch() throws Exception {
+    public void supportsYearRangeSearch() {
     }
 
     @Test
@@ -154,8 +182,10 @@ public void supportsBooleanANDSearch() throws Exception {
 
         Assertions.assertTrue(resultJustByAuthor.containsAll(result));
         List<BibEntry> allEntriesFromCSCW = result.stream()
-                                                  .filter(bibEntry -> bibEntry.getField(StandardField.JOURNAL).orElse("").equals("Computer Supported Cooperative Work (CSCW)"))
-                                                  .collect(Collectors.toList());
+                                                  .filter(bibEntry -> bibEntry.getField(StandardField.JOURNAL)
+                                                                              .orElse("")
+                                                                              .equals("Computer Supported Cooperative Work (CSCW)"))
+                                                  .toList();
         allEntriesFromCSCW.stream()
                           .map(bibEntry -> bibEntry.getField(StandardField.AUTHOR))
                           .filter(Optional::isPresent)
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/SpringerLinkTest.java b/src/test/java/org/jabref/logic/importer/fetcher/SpringerLinkTest.java
index 1a84ae82cfa..67663cc27e6 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/SpringerLinkTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/SpringerLinkTest.java
@@ -4,6 +4,9 @@
 import java.net.URL;
 import java.util.Optional;
 
+import javafx.collections.FXCollections;
+
+import org.jabref.logic.importer.ImporterPreferences;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.support.DisabledOnCIServer;
@@ -14,16 +17,20 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 @FetcherTest
 public class SpringerLinkTest {
 
+    private final ImporterPreferences importerPreferences = mock(ImporterPreferences.class);
     private SpringerLink finder;
     private BibEntry entry;
 
     @BeforeEach
     public void setUp() {
-        finder = new SpringerLink();
+        when(importerPreferences.getApiKeys()).thenReturn(FXCollections.emptyObservableSet());
+        finder = new SpringerLink(importerPreferences);
         entry = new BibEntry();
     }
 
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/ZbMATHTest.java b/src/test/java/org/jabref/logic/importer/fetcher/ZbMATHTest.java
index a78b9b0227c..b88d95b94a8 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/ZbMATHTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/ZbMATHTest.java
@@ -8,6 +8,7 @@
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
+import org.jabref.model.entry.field.UnknownField;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.testutils.category.FetcherTest;
 
@@ -33,18 +34,18 @@ void setUp() throws Exception {
         donaldsonEntry = new BibEntry();
         donaldsonEntry.setType(StandardEntryType.Article);
         donaldsonEntry.setCitationKey("zbMATH03800580");
-        donaldsonEntry.setField(StandardField.AUTHOR, "S. K. {Donaldson}");
+        donaldsonEntry.setField(StandardField.AUTHOR, "Donaldson, S. K.");
         donaldsonEntry.setField(StandardField.JOURNAL, "Journal of Differential Geometry");
         donaldsonEntry.setField(StandardField.DOI, "10.4310/jdg/1214437665");
         donaldsonEntry.setField(StandardField.ISSN, "0022-040X");
         donaldsonEntry.setField(StandardField.LANGUAGE, "English");
-        donaldsonEntry.setField(StandardField.KEYWORDS, "57N13 57R10 53C05 58J99 57R65");
+        donaldsonEntry.setField(StandardField.KEYWORDS, "57N13,57R10,53C05,58J99,57R65");
         donaldsonEntry.setField(StandardField.PAGES, "279--315");
-        donaldsonEntry.setField(StandardField.PUBLISHER, "International Press of Boston, Somerville, MA");
         donaldsonEntry.setField(StandardField.TITLE, "An application of gauge theory to four dimensional topology");
         donaldsonEntry.setField(StandardField.VOLUME, "18");
         donaldsonEntry.setField(StandardField.YEAR, "1983");
         donaldsonEntry.setField(StandardField.ZBL_NUMBER, "0507.57010");
+        donaldsonEntry.setField(new UnknownField("zbmath"), "3800580");
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/transformers/ArXivQueryTransformerTest.java b/src/test/java/org/jabref/logic/importer/fetcher/transformers/ArXivQueryTransformerTest.java
index 0eba3b200aa..e501ea694ae 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/transformers/ArXivQueryTransformerTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/transformers/ArXivQueryTransformerTest.java
@@ -44,5 +44,4 @@ public void convertYearField() throws Exception {
         assertEquals(2018, transformer.getStartYear());
         assertEquals(2018, transformer.getEndYear());
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/transformers/CollectionOfComputerScienceBibliographiesQueryTransformerTest.java b/src/test/java/org/jabref/logic/importer/fetcher/transformers/CollectionOfComputerScienceBibliographiesQueryTransformerTest.java
index 305421a3db1..effd799f4bf 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/transformers/CollectionOfComputerScienceBibliographiesQueryTransformerTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/transformers/CollectionOfComputerScienceBibliographiesQueryTransformerTest.java
@@ -49,5 +49,4 @@ public void convertYearRangeField() throws Exception {
         Optional<String> query = getTransformer().transformLuceneQuery(luceneQuery);
         assertEquals(Optional.of("year:2018 OR year:2019 OR year:2020 OR year:2021"), query);
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/transformers/IEEEQueryTransformerTest.java b/src/test/java/org/jabref/logic/importer/fetcher/transformers/IEEEQueryTransformerTest.java
index 3a9e6cd275e..b9673370292 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/transformers/IEEEQueryTransformerTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/transformers/IEEEQueryTransformerTest.java
@@ -39,7 +39,7 @@ public String getTitlePrefix() {
     }
 
     @Override
-    public void convertJournalField() throws Exception {
+    public void convertJournalFieldPrefix() throws Exception {
         IEEEQueryTransformer transformer = getTransformer();
 
         String queryString = "journal:Nature";
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/transformers/InfixTransformerTest.java b/src/test/java/org/jabref/logic/importer/fetcher/transformers/InfixTransformerTest.java
index 70088f66604..c27584fa1b8 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/transformers/InfixTransformerTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/transformers/InfixTransformerTest.java
@@ -19,16 +19,24 @@ public abstract class InfixTransformerTest<T extends AbstractQueryTransformer> {
      * Example in the case of ':': <code>"author:"</code>
      */
 
-    protected abstract String getAuthorPrefix();
+    protected String getAuthorPrefix() {
+        return "";
+    }
 
-    protected abstract String getUnFieldedPrefix();
+    protected String getUnFieldedPrefix() {
+        return "";
+    }
 
-    protected abstract String getJournalPrefix();
+    protected String getJournalPrefix() {
+        return "";
+    }
 
-    protected abstract String getTitlePrefix();
+    protected String getTitlePrefix() {
+        return "";
+    }
 
     @Test
-    public void convertAuthorField() throws Exception {
+    public void convertAuthorFieldPrefix() throws Exception {
         String queryString = "author:\"Igor Steinmacher\"";
         QueryNode luceneQuery = new StandardSyntaxParser().parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
         Optional<String> searchQuery = getTransformer().transformLuceneQuery(luceneQuery);
@@ -37,7 +45,7 @@ public void convertAuthorField() throws Exception {
     }
 
     @Test
-    public void convertUnFieldedTerm() throws Exception {
+    public void convertUnFieldedTermPrefix() throws Exception {
         String queryString = "\"default value\"";
         QueryNode luceneQuery = new StandardSyntaxParser().parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
         Optional<String> searchQuery = getTransformer().transformLuceneQuery(luceneQuery);
@@ -46,7 +54,7 @@ public void convertUnFieldedTerm() throws Exception {
     }
 
     @Test
-    public void convertExplicitUnFieldedTerm() throws Exception {
+    public void convertExplicitUnFieldedTermPrefix() throws Exception {
         String queryString = "default:\"default value\"";
         QueryNode luceneQuery = new StandardSyntaxParser().parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
         Optional<String> searchQuery = getTransformer().transformLuceneQuery(luceneQuery);
@@ -55,7 +63,7 @@ public void convertExplicitUnFieldedTerm() throws Exception {
     }
 
     @Test
-    public void convertJournalField() throws Exception {
+    public void convertJournalFieldPrefix() throws Exception {
         String queryString = "journal:Nature";
         QueryNode luceneQuery = new StandardSyntaxParser().parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
         Optional<String> searchQuery = getTransformer().transformLuceneQuery(luceneQuery);
@@ -70,7 +78,7 @@ public void convertJournalField() throws Exception {
     public abstract void convertYearRangeField() throws Exception;
 
     @Test
-    public void convertMultipleValuesWithTheSameField() throws Exception {
+    public void convertMultipleValuesWithTheSameFieldPrefix() throws Exception {
         String queryString = "author:\"Igor Steinmacher\" author:\"Christoph Treude\"";
         QueryNode luceneQuery = new StandardSyntaxParser().parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
         Optional<String> searchQuery = getTransformer().transformLuceneQuery(luceneQuery);
@@ -79,7 +87,7 @@ public void convertMultipleValuesWithTheSameField() throws Exception {
     }
 
     @Test
-    public void groupedOperations() throws Exception {
+    public void groupedOperationsPrefix() throws Exception {
         String queryString = "(author:\"Igor Steinmacher\" OR author:\"Christoph Treude\" AND author:\"Christoph Freunde\") AND title:test";
         QueryNode luceneQuery = new StandardSyntaxParser().parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
         Optional<String> searchQuery = getTransformer().transformLuceneQuery(luceneQuery);
@@ -88,7 +96,7 @@ public void groupedOperations() throws Exception {
     }
 
     @Test
-    public void notOperator() throws Exception {
+    public void notOperatorPrefix() throws Exception {
         String queryString = "!(author:\"Igor Steinmacher\" OR author:\"Christoph Treude\")";
         QueryNode luceneQuery = new StandardSyntaxParser().parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
         Optional<String> searchQuery = getTransformer().transformLuceneQuery(luceneQuery);
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/transformers/ScholarQueryTransformerTest.java b/src/test/java/org/jabref/logic/importer/fetcher/transformers/ScholarQueryTransformerTest.java
index f2264ca0735..069c356290c 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/transformers/ScholarQueryTransformerTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/transformers/ScholarQueryTransformerTest.java
@@ -26,5 +26,4 @@ public String getJournalPrefix() {
     public String getTitlePrefix() {
         return "allintitle:";
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/transformers/SuffixTransformerTest.java b/src/test/java/org/jabref/logic/importer/fetcher/transformers/SuffixTransformerTest.java
new file mode 100644
index 00000000000..31b3b2239a6
--- /dev/null
+++ b/src/test/java/org/jabref/logic/importer/fetcher/transformers/SuffixTransformerTest.java
@@ -0,0 +1,94 @@
+package org.jabref.logic.importer.fetcher.transformers;
+
+import java.util.Optional;
+
+import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
+import org.apache.lucene.queryparser.flexible.standard.parser.StandardSyntaxParser;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+/**
+ * Test Interface for all transformers that use suffix notation for their logical binary operators
+ */
+public abstract class SuffixTransformerTest<T extends AbstractQueryTransformer> {
+
+    protected abstract T getTransformer();
+
+    protected abstract String getAuthorSuffix();
+
+    protected abstract String getUnFieldedSuffix();
+
+    protected abstract String getJournalSuffix();
+
+    protected abstract String getTitleSuffix();
+
+    @Test
+    public void convertAuthorFieldSuffix() throws Exception {
+        String queryString = "author:\"Igor Steinmacher\"";
+        QueryNode luceneQuery = new StandardSyntaxParser().parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
+        Optional<String> searchQuery = getTransformer().transformLuceneQuery(luceneQuery);
+        Optional<String> expected = Optional.of("\"Igor Steinmacher\"" + getAuthorSuffix());
+        assertEquals(expected, searchQuery);
+    }
+
+    @Test
+    public void convertUnFieldedTermSuffix() throws Exception {
+        String queryString = "\"default value\"";
+        QueryNode luceneQuery = new StandardSyntaxParser().parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
+        Optional<String> searchQuery = getTransformer().transformLuceneQuery(luceneQuery);
+        Optional<String> expected = Optional.of(queryString + getUnFieldedSuffix());
+        assertEquals(expected, searchQuery);
+    }
+
+    @Test
+    public void convertExplicitUnFieldedTermSuffix() throws Exception {
+        String queryString = "default:\"default value\"";
+        QueryNode luceneQuery = new StandardSyntaxParser().parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
+        Optional<String> searchQuery = getTransformer().transformLuceneQuery(luceneQuery);
+        Optional<String> expected = Optional.of("\"default value\"" + getUnFieldedSuffix());
+        assertEquals(expected, searchQuery);
+    }
+
+    @Test
+    public void convertJournalFieldSuffix() throws Exception {
+        String queryString = "journal:Nature";
+        QueryNode luceneQuery = new StandardSyntaxParser().parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
+        Optional<String> searchQuery = getTransformer().transformLuceneQuery(luceneQuery);
+        Optional<String> expected = Optional.of("Nature" + getJournalSuffix());
+        assertEquals(expected, searchQuery);
+    }
+
+    @Test
+    public abstract void convertYearField() throws Exception;
+
+    @Test
+    public abstract void convertYearRangeField() throws Exception;
+
+    @Test
+    public void convertMultipleValuesWithTheSameSuffix() throws Exception {
+        String queryString = "author:\"Igor Steinmacher\" author:\"Christoph Treude\"";
+        QueryNode luceneQuery = new StandardSyntaxParser().parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
+        Optional<String> searchQuery = getTransformer().transformLuceneQuery(luceneQuery);
+        Optional<String> expected = Optional.of("\"Igor Steinmacher\"" + getAuthorSuffix() + getTransformer().getLogicalAndOperator() + "\"Christoph Treude\"" + getAuthorSuffix());
+        assertEquals(expected, searchQuery);
+    }
+
+    @Test
+    public void groupedOperationsSuffix() throws Exception {
+        String queryString = "(author:\"Igor Steinmacher\" OR author:\"Christoph Treude\" AND author:\"Christoph Freunde\") AND title:test";
+        QueryNode luceneQuery = new StandardSyntaxParser().parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
+        Optional<String> searchQuery = getTransformer().transformLuceneQuery(luceneQuery);
+        Optional<String> expected = Optional.of("(" + "\"Igor Steinmacher\"" + getAuthorSuffix() + getTransformer().getLogicalOrOperator() + "(" + "\"Christoph Treude\"" + getAuthorSuffix() + getTransformer().getLogicalAndOperator() + "\"Christoph Freunde\"" + getAuthorSuffix() + "))" + getTransformer().getLogicalAndOperator() + "test" + getTitleSuffix());
+        assertEquals(expected, searchQuery);
+    }
+
+    @Test
+    public void notOperatorSufix() throws Exception {
+        String queryString = "!(author:\"Igor Steinmacher\" OR author:\"Christoph Treude\")";
+        QueryNode luceneQuery = new StandardSyntaxParser().parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
+        Optional<String> searchQuery = getTransformer().transformLuceneQuery(luceneQuery);
+        Optional<String> expected = Optional.of(getTransformer().getLogicalNotOperator() + "(" + "\"Igor Steinmacher\"" + getAuthorSuffix() + getTransformer().getLogicalOrOperator() + "\"Christoph Treude\")" + getAuthorSuffix());
+        assertEquals(expected, searchQuery);
+    }
+}
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/transformers/YearRangeByFilteringQueryTransformerTest.java b/src/test/java/org/jabref/logic/importer/fetcher/transformers/YearRangeByFilteringQueryTransformerTest.java
index 244f2ed8e4a..b9410fa6c7b 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/transformers/YearRangeByFilteringQueryTransformerTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/transformers/YearRangeByFilteringQueryTransformerTest.java
@@ -27,5 +27,4 @@ public void convertYearRangeField() throws Exception {
         assertEquals(2018, transformer.getStartYear());
         assertEquals(2021, transformer.getEndYear());
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/BiblioscapeImporterTest.java b/src/test/java/org/jabref/logic/importer/fileformat/BiblioscapeImporterTest.java
index 5fa5ab65a1e..d83d80e5a0d 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/BiblioscapeImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/BiblioscapeImporterTest.java
@@ -1,6 +1,5 @@
 package org.jabref.logic.importer.fileformat;
 
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.util.Collections;
 
@@ -45,6 +44,6 @@ public void testGetCLIID() {
     public void testImportEntriesAbortion() throws Throwable {
         Path file = Path.of(BiblioscapeImporter.class.getResource("BiblioscapeImporterTestCorrupt.txt").toURI());
         assertEquals(Collections.emptyList(),
-                importer.importDatabase(file, StandardCharsets.UTF_8).getDatabase().getEntries());
+                importer.importDatabase(file).getDatabase().getEntries());
     }
 }
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/BibtexImporterTest.java b/src/test/java/org/jabref/logic/importer/fileformat/BibtexImporterTest.java
index 12c9d381a2f..e34b469f320 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/BibtexImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/BibtexImporterTest.java
@@ -7,21 +7,29 @@
 import java.nio.file.Path;
 import java.util.List;
 import java.util.Optional;
+import java.util.stream.Stream;
 
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.ParserResult;
 import org.jabref.logic.util.StandardFileType;
+import org.jabref.model.database.BibDatabaseMode;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.field.UnknownField;
 import org.jabref.model.entry.types.StandardEntryType;
+import org.jabref.model.metadata.MetaData;
 import org.jabref.model.util.DummyFileUpdateMonitor;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.CsvSource;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Answers;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.Mockito.mock;
 
@@ -42,18 +50,17 @@ public void setUp() {
     @Test
     public void testIsRecognizedFormat() throws IOException, URISyntaxException {
         Path file = Path.of(BibtexImporterTest.class.getResource("BibtexImporter.examples.bib").toURI());
-        assertTrue(importer.isRecognizedFormat(file, StandardCharsets.UTF_8));
+        assertTrue(importer.isRecognizedFormat(file));
     }
 
     @Test
     public void testImportEntries() throws IOException, URISyntaxException {
         Path file = Path.of(BibtexImporterTest.class.getResource("BibtexImporter.examples.bib").toURI());
-        List<BibEntry> bibEntries = importer.importDatabase(file, StandardCharsets.UTF_8).getDatabase().getEntries();
+        List<BibEntry> bibEntries = importer.importDatabase(file).getDatabase().getEntries();
 
         assertEquals(4, bibEntries.size());
 
         for (BibEntry entry : bibEntries) {
-
             if (entry.getCitationKey().get().equals("aksin")) {
                 assertEquals(
                         Optional.of(
@@ -125,26 +132,84 @@ public void testGetDescription() {
     @Test
     public void testRecognizesDatabaseID() throws Exception {
         Path file = Path.of(BibtexImporterTest.class.getResource("AutosavedSharedDatabase.bib").toURI());
-        String sharedDatabaseID = importer.importDatabase(file, StandardCharsets.UTF_8).getDatabase().getSharedDatabaseID().get();
+        String sharedDatabaseID = importer.importDatabase(file).getDatabase().getSharedDatabaseID().get();
         assertEquals("13ceoc8dm42f5g1iitao3dj2ap", sharedDatabaseID);
     }
 
+    static Stream<Arguments> testParsingOfEncodedFileWithHeader() {
+        return Stream.of(
+                Arguments.of(StandardCharsets.US_ASCII, "encoding-us-ascii-with-header.bib"),
+                Arguments.of(StandardCharsets.UTF_8, "encoding-utf-8-with-header.bib"),
+                Arguments.of(Charset.forName("Windows-1252"), "encoding-windows-1252-with-header.bib")
+        );
+    }
+
+    @ParameterizedTest
+    @MethodSource
+    public void testParsingOfEncodedFileWithHeader(Charset charset, String fileName) throws Exception {
+        ParserResult parserResult = importer.importDatabase(
+                Path.of(BibtexImporterTest.class.getResource(fileName).toURI()));
+        assertEquals(Optional.of(charset), parserResult.getMetaData().getEncoding());
+    }
+
+    @ParameterizedTest
+    @CsvSource({"encoding-windows-1252-with-header.bib", "encoding-windows-1252-without-header.bib"})
+    public void testParsingOfWindows1252EncodedFileReadsDegreeCharacterCorrectly(String filename) throws Exception {
+        ParserResult parserResult = importer.importDatabase(
+                Path.of(BibtexImporterTest.class.getResource(filename).toURI()));
+        assertEquals(
+                List.of(new BibEntry(StandardEntryType.Article).withField(StandardField.ABSTRACT, "25° C")),
+                parserResult.getDatabase().getEntries());
+    }
+
+    @ParameterizedTest
+    @CsvSource({"encoding-utf-8-with-header.bib", "encoding-utf-8-without-header.bib"})
+    public void testParsingOfUtf8EncodedFileReadsUmlautCharacterCorrectly(String filename) throws Exception {
+        ParserResult parserResult = importer.importDatabase(
+                Path.of(BibtexImporterTest.class.getResource(filename).toURI()));
+        assertEquals(
+                List.of(new BibEntry(StandardEntryType.Article).withField(StandardField.TITLE, "Ü ist ein Umlaut")),
+                parserResult.getDatabase().getEntries());
+    }
+
+    @ParameterizedTest
+    @CsvSource({"encoding-utf-16BE-with-header.bib", "encoding-utf-16BE-without-header.bib"})
+    public void testParsingOfUtf16EncodedFileReadsUmlautCharacterCorrectly(String filename) throws Exception {
+        ParserResult parserResult = importer.importDatabase(
+                Path.of(BibtexImporterTest.class.getResource(filename).toURI()));
+
+        assertEquals(
+                List.of(new BibEntry(StandardEntryType.Article).withField(StandardField.TITLE, "Ü ist ein Umlaut")),
+                parserResult.getDatabase().getEntries());
+
+        MetaData metaData = new MetaData();
+        metaData.setMode(BibDatabaseMode.BIBTEX);
+        metaData.setEncoding(StandardCharsets.UTF_16BE);
+        assertEquals(metaData, parserResult.getMetaData());
+    }
+
     @Test
-    public void testParsingOfWindows1252EncodedFileReturnsCorrectHeader() throws Exception {
+    public void encodingSupplied() throws Exception {
         ParserResult parserResult = importer.importDatabase(
-                Path.of(BibtexImporterTest.class.getResource("encoding-windows-1252-with-header.bib").toURI()),
-                StandardCharsets.UTF_8);
-        assertEquals(Optional.of(Charset.forName("Windows-1252")), parserResult.getMetaData().getEncoding());
+                Path.of(BibtexImporterTest.class.getResource("encoding-utf-8-with-header.bib").toURI()));
+        assertTrue(parserResult.getMetaData().getEncodingExplicitlySupplied());
     }
 
     @Test
-    public void testParsingOfWindows1252EncodedFileReadsDegreeCharacterCorrectly() throws Exception {
+    public void wrongEncodingSupplied() throws Exception {
         ParserResult parserResult = importer.importDatabase(
-                Path.of(BibtexImporterTest.class.getResource("encoding-windows-1252-with-header.bib").toURI()),
-                StandardCharsets.UTF_8);
-        List<BibEntry> bibEntries = parserResult.getDatabase().getEntries();
+                Path.of(BibtexImporterTest.class.getResource("encoding-windows-1252-but-utf-8-declared--decoding-fails.bib").toURI()));
+
+        // The test file contains "Test{NBSP}I. Last" where the character "{NBSP}" is encoded using Windows-1252 instead of UTF-8
         assertEquals(
-                List.of(new BibEntry(StandardEntryType.Article).withField(StandardField.ABSTRACT, "25° C")),
-                bibEntries);
+                List.of(new BibEntry(StandardEntryType.Article).withField(StandardField.AUTHOR, "Test�I. Last")),
+                parserResult.getDatabase().getEntries());
+    }
+
+    @Test
+    public void encodingNotSupplied() throws Exception {
+        ParserResult parserResult = importer.importDatabase(
+                Path.of(BibtexImporterTest.class.getResource("encoding-utf-8-without-header.bib").toURI()));
+        assertFalse(parserResult.getMetaData().getEncodingExplicitlySupplied());
     }
 }
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/CffImporterTest.java b/src/test/java/org/jabref/logic/importer/fileformat/CffImporterTest.java
index 5dd61a6d262..cc3e27cae1f 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/CffImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/CffImporterTest.java
@@ -2,13 +2,13 @@
 
 import java.io.IOException;
 import java.net.URISyntaxException;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.util.Arrays;
 import java.util.List;
 
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.field.BiblatexSoftwareField;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.field.UnknownField;
 import org.jabref.model.entry.types.StandardEntryType;
@@ -53,7 +53,7 @@ public void testGetDescription() {
     @Test
     public void testIsRecognizedFormat() throws IOException, URISyntaxException {
         Path file = Path.of(CffImporterTest.class.getResource("CffImporterTestValid.cff").toURI());
-        assertTrue(importer.isRecognizedFormat(file, StandardCharsets.UTF_8));
+        assertTrue(importer.isRecognizedFormat(file));
     }
 
     @Test
@@ -62,14 +62,14 @@ public void testIsRecognizedFormatReject() throws IOException, URISyntaxExceptio
 
         for (String string : list) {
             Path file = Path.of(CffImporterTest.class.getResource(string).toURI());
-            assertFalse(importer.isRecognizedFormat(file, StandardCharsets.UTF_8));
+            assertFalse(importer.isRecognizedFormat(file));
         }
     }
 
     @Test
     public void testImportEntriesBasic() throws IOException, URISyntaxException {
         Path file = Path.of(CffImporterTest.class.getResource("CffImporterTestValid.cff").toURI());
-        List<BibEntry> bibEntries = importer.importDatabase(file, StandardCharsets.UTF_8).getDatabase().getEntries();
+        List<BibEntry> bibEntries = importer.importDatabase(file).getDatabase().getEntries();
         BibEntry entry = bibEntries.get(0);
 
         BibEntry expected = getPopulatedEntry().withField(StandardField.AUTHOR, "Joe van Smith");
@@ -80,22 +80,21 @@ public void testImportEntriesBasic() throws IOException, URISyntaxException {
     @Test
     public void testImportEntriesMultipleAuthors() throws IOException, URISyntaxException {
         Path file = Path.of(CffImporterTest.class.getResource("CffImporterTestValidMultAuthors.cff").toURI());
-        List<BibEntry> bibEntries = importer.importDatabase(file, StandardCharsets.UTF_8).getDatabase().getEntries();
+        List<BibEntry> bibEntries = importer.importDatabase(file).getDatabase().getEntries();
         BibEntry entry = bibEntries.get(0);
 
         BibEntry expected = getPopulatedEntry();
 
         assertEquals(entry, expected);
-
     }
 
     @Test
     public void testImportEntriesSwhIdSelect1() throws IOException, URISyntaxException {
         Path file = Path.of(CffImporterTest.class.getResource("CffImporterTestValidSwhIdSelect1.cff").toURI());
-        List<BibEntry> bibEntries = importer.importDatabase(file, StandardCharsets.UTF_8).getDatabase().getEntries();
+        List<BibEntry> bibEntries = importer.importDatabase(file).getDatabase().getEntries();
         BibEntry entry = bibEntries.get(0);
 
-        BibEntry expected = getPopulatedEntry().withField(StandardField.SWHID, "swh:1:rel:22ece559cc7cc2364edc5e5593d63ae8bd229f9f");
+        BibEntry expected = getPopulatedEntry().withField(BiblatexSoftwareField.SWHID, "swh:1:rel:22ece559cc7cc2364edc5e5593d63ae8bd229f9f");
 
         assertEquals(entry, expected);
     }
@@ -103,10 +102,10 @@ public void testImportEntriesSwhIdSelect1() throws IOException, URISyntaxExcepti
     @Test
     public void testImportEntriesSwhIdSelect2() throws IOException, URISyntaxException {
         Path file = Path.of(CffImporterTest.class.getResource("CffImporterTestValidSwhIdSelect2.cff").toURI());
-        List<BibEntry> bibEntries = importer.importDatabase(file, StandardCharsets.UTF_8).getDatabase().getEntries();
+        List<BibEntry> bibEntries = importer.importDatabase(file).getDatabase().getEntries();
         BibEntry entry = bibEntries.get(0);
 
-        BibEntry expected = getPopulatedEntry().withField(StandardField.SWHID, "swh:1:cnt:94a9ed024d3859793618152ea559a168bbcbb5e2");
+        BibEntry expected = getPopulatedEntry().withField(BiblatexSoftwareField.SWHID, "swh:1:cnt:94a9ed024d3859793618152ea559a168bbcbb5e2");
 
         assertEquals(entry, expected);
     }
@@ -114,7 +113,7 @@ public void testImportEntriesSwhIdSelect2() throws IOException, URISyntaxExcepti
     @Test
     public void testImportEntriesDataset() throws IOException, URISyntaxException {
         Path file = Path.of(CffImporterTest.class.getResource("CffImporterTestDataset.cff").toURI());
-        List<BibEntry> bibEntries = importer.importDatabase(file, StandardCharsets.UTF_8).getDatabase().getEntries();
+        List<BibEntry> bibEntries = importer.importDatabase(file).getDatabase().getEntries();
         BibEntry entry = bibEntries.get(0);
 
         BibEntry expected = getPopulatedEntry();
@@ -126,7 +125,7 @@ public void testImportEntriesDataset() throws IOException, URISyntaxException {
     @Test
     public void testImportEntriesDoiSelect() throws IOException, URISyntaxException {
         Path file = Path.of(CffImporterTest.class.getResource("CffImporterTestDoiSelect.cff").toURI());
-        List<BibEntry> bibEntries = importer.importDatabase(file, StandardCharsets.UTF_8).getDatabase().getEntries();
+        List<BibEntry> bibEntries = importer.importDatabase(file).getDatabase().getEntries();
         BibEntry entry = bibEntries.get(0);
 
         BibEntry expected = getPopulatedEntry();
@@ -137,7 +136,7 @@ public void testImportEntriesDoiSelect() throws IOException, URISyntaxException
     @Test
     public void testImportEntriesUnknownFields() throws IOException, URISyntaxException {
         Path file = Path.of(CffImporterTest.class.getResource("CffImporterTestUnknownFields.cff").toURI());
-        List<BibEntry> bibEntries = importer.importDatabase(file, StandardCharsets.UTF_8).getDatabase().getEntries();
+        List<BibEntry> bibEntries = importer.importDatabase(file).getDatabase().getEntries();
         BibEntry entry = bibEntries.get(0);
 
         BibEntry expected = getPopulatedEntry().withField(new UnknownField("commit"), "10ad");
@@ -152,12 +151,12 @@ public BibEntry getPopulatedEntry() {
         entry.setField(StandardField.AUTHOR, "Joe van Smith and Bob Jones, Jr.");
         entry.setField(StandardField.TITLE, "Test");
         entry.setField(StandardField.URL, "www.google.com");
-        entry.setField(StandardField.REPOSITORY, "www.github.com");
+        entry.setField(BiblatexSoftwareField.REPOSITORY, "www.github.com");
         entry.setField(StandardField.DOI, "10.0000/TEST");
         entry.setField(StandardField.DATE, "2000-07-02");
         entry.setField(StandardField.COMMENT, "Test entry.");
         entry.setField(StandardField.ABSTRACT, "Test abstract.");
-        entry.setField(StandardField.LICENSE, "MIT");
+        entry.setField(BiblatexSoftwareField.LICENSE, "MIT");
         entry.setField(StandardField.VERSION, "1.0");
 
         return entry;
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/CitaviXmlImporterTest.java b/src/test/java/org/jabref/logic/importer/fileformat/CitaviXmlImporterTest.java
new file mode 100644
index 00000000000..ab8ddd6e1e6
--- /dev/null
+++ b/src/test/java/org/jabref/logic/importer/fileformat/CitaviXmlImporterTest.java
@@ -0,0 +1,27 @@
+package org.jabref.logic.importer.fileformat;
+
+import java.util.stream.Stream;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class CitaviXmlImporterTest {
+
+    CitaviXmlImporter citaviXmlImporter = new CitaviXmlImporter();
+
+    public static Stream<Arguments> cleanUpText() {
+        return Stream.of(
+                Arguments.of("no action", "no action"),
+                Arguments.of("\\{action\\}", "{action}"),
+                Arguments.of("\\}", "}"));
+    }
+
+    @ParameterizedTest
+    @MethodSource
+    void cleanUpText(String expected, String input) {
+        assertEquals(expected, citaviXmlImporter.cleanUpText(input));
+    }
+}
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/CitaviXmlImporterTestFiles.java b/src/test/java/org/jabref/logic/importer/fileformat/CitaviXmlImporterTestFiles.java
new file mode 100644
index 00000000000..c3f6e6f2892
--- /dev/null
+++ b/src/test/java/org/jabref/logic/importer/fileformat/CitaviXmlImporterTestFiles.java
@@ -0,0 +1,56 @@
+package org.jabref.logic.importer.fileformat;
+
+import java.io.IOException;
+import java.util.function.Predicate;
+import java.util.stream.Stream;
+
+import org.jabref.logic.importer.ImportFormatPreferences;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+public class CitaviXmlImporterTestFiles {
+
+    private static final String FILE_ENDING = ".ctv6bak";
+    private final CitaviXmlImporter citaviXmlImporter = new CitaviXmlImporter();
+
+    private ImportFormatPreferences preferences;
+
+    private static Stream<String> fileNames() throws IOException {
+        Predicate<String> fileName = name -> name.startsWith("CitaviXmlImporterTest") && name.endsWith(FILE_ENDING);
+        return ImporterTestEngine.getTestFiles(fileName).stream();
+    }
+
+    private static Stream<String> invalidFileNames() throws IOException {
+        Predicate<String> fileName = name -> !name.startsWith("CitaviXmlImporterTest");
+        return ImporterTestEngine.getTestFiles(fileName).stream();
+    }
+
+    @BeforeEach
+    void setUp() {
+        preferences = mock(ImportFormatPreferences.class);
+        when(preferences.getKeywordSeparator()).thenReturn(';');
+    }
+
+    @ParameterizedTest
+    @MethodSource("fileNames")
+    void testIsRecognizedFormat(String fileName) throws IOException {
+        ImporterTestEngine.testIsRecognizedFormat(citaviXmlImporter, fileName);
+    }
+
+    @ParameterizedTest
+    @MethodSource("invalidFileNames")
+    void testIsNotRecognizedFormat(String fileName) throws IOException {
+        ImporterTestEngine.testIsNotRecognizedFormat(citaviXmlImporter, fileName);
+    }
+
+    @ParameterizedTest
+    @MethodSource("fileNames")
+    void testImportEntries(String fileName) throws Exception {
+        ImporterTestEngine.testImportEntries(citaviXmlImporter, fileName, FILE_ENDING);
+    }
+}
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/CopacImporterTest.java b/src/test/java/org/jabref/logic/importer/fileformat/CopacImporterTest.java
index 9955c85fa76..3ecf3760a49 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/CopacImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/CopacImporterTest.java
@@ -1,6 +1,5 @@
 package org.jabref.logic.importer.fileformat;
 
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.util.Collections;
 import java.util.List;
@@ -35,7 +34,7 @@ public void testGetDescription() {
     @Test
     public void testImportEmptyEntries() throws Exception {
         Path path = Path.of(CopacImporterTest.class.getResource("Empty.txt").toURI());
-        List<BibEntry> entries = importer.importDatabase(path, StandardCharsets.UTF_8).getDatabase().getEntries();
+        List<BibEntry> entries = importer.importDatabase(path).getDatabase().getEntries();
         assertEquals(Collections.emptyList(), entries);
     }
 }
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/EndnoteImporterTest.java b/src/test/java/org/jabref/logic/importer/fileformat/EndnoteImporterTest.java
index 74bdbe43ca3..37e163a87e3 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/EndnoteImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/EndnoteImporterTest.java
@@ -4,8 +4,6 @@
 import java.io.IOException;
 import java.io.StringReader;
 import java.net.URISyntaxException;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.util.Arrays;
 import java.util.List;
@@ -62,7 +60,7 @@ public void testIsRecognizedFormat() throws IOException, URISyntaxException {
 
         for (String string : list) {
             Path file = Path.of(EndnoteImporterTest.class.getResource(string).toURI());
-            assertTrue(importer.isRecognizedFormat(file, StandardCharsets.UTF_8));
+            assertTrue(importer.isRecognizedFormat(file));
         }
     }
 
@@ -74,14 +72,14 @@ public void testIsRecognizedFormatReject() throws IOException, URISyntaxExceptio
 
         for (String string : list) {
             Path file = Path.of(EndnoteImporterTest.class.getResource(string).toURI());
-            assertFalse(importer.isRecognizedFormat(file, Charset.defaultCharset()));
+            assertFalse(importer.isRecognizedFormat(file));
         }
     }
 
     @Test
     public void testImportEntries0() throws IOException, URISyntaxException {
         Path file = Path.of(EndnoteImporterTest.class.getResource("Endnote.entries.enw").toURI());
-        List<BibEntry> bibEntries = importer.importDatabase(file, StandardCharsets.UTF_8).getDatabase().getEntries();
+        List<BibEntry> bibEntries = importer.importDatabase(file).getDatabase().getEntries();
 
         assertEquals(5, bibEntries.size());
 
@@ -141,7 +139,7 @@ public void testImportEntries1() throws IOException {
     @Test
     public void testImportEntriesBookExample() throws IOException, URISyntaxException {
         Path file = Path.of(EndnoteImporterTest.class.getResource("Endnote.book.example.enw").toURI());
-        List<BibEntry> bibEntries = importer.importDatabase(file, StandardCharsets.UTF_8).getDatabase().getEntries();
+        List<BibEntry> bibEntries = importer.importDatabase(file).getDatabase().getEntries();
 
         BibEntry entry = bibEntries.get(0);
 
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/ImporterTestEngine.java b/src/test/java/org/jabref/logic/importer/fileformat/ImporterTestEngine.java
index 010ad110236..9d24b9c96d7 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/ImporterTestEngine.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/ImporterTestEngine.java
@@ -2,7 +2,6 @@
 
 import java.io.IOException;
 import java.net.URISyntaxException;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
@@ -41,15 +40,15 @@ public static Collection<String> getTestFiles(Predicate<String> fileNamePredicat
     }
 
     public static void testIsRecognizedFormat(Importer importer, String fileName) throws IOException {
-        Assertions.assertTrue(importer.isRecognizedFormat(getPath(fileName), StandardCharsets.UTF_8));
+        Assertions.assertTrue(importer.isRecognizedFormat(getPath(fileName)));
     }
 
     public static void testIsNotRecognizedFormat(Importer importer, String fileName) throws IOException {
-        Assertions.assertFalse(importer.isRecognizedFormat(getPath(fileName), StandardCharsets.UTF_8));
+        Assertions.assertFalse(importer.isRecognizedFormat(getPath(fileName)));
     }
 
     public static void testImportEntries(Importer importer, String fileName, String fileType) throws IOException, ImportException {
-        ParserResult parserResult = importer.importDatabase(getPath(fileName), StandardCharsets.UTF_8);
+        ParserResult parserResult = importer.importDatabase(getPath(fileName));
         if (parserResult.isInvalid()) {
             throw new ImportException(parserResult.getErrorMessage());
         }
@@ -67,7 +66,7 @@ private static Path getPath(String fileName) throws IOException {
     }
 
     public static void testImportMalformedFiles(Importer importer, String fileName) throws IOException {
-        List<BibEntry> entries = importer.importDatabase(getPath(fileName), StandardCharsets.UTF_8).getDatabase()
+        List<BibEntry> entries = importer.importDatabase(getPath(fileName)).getDatabase()
                                          .getEntries();
         assertEquals(entries, new ArrayList<BibEntry>());
     }
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/IsiImporterTest.java b/src/test/java/org/jabref/logic/importer/fileformat/IsiImporterTest.java
index f71618c1afb..b77c78660d2 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/IsiImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/IsiImporterTest.java
@@ -2,7 +2,6 @@
 
 import java.io.IOException;
 import java.net.URISyntaxException;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.util.HashMap;
 import java.util.List;
@@ -127,7 +126,7 @@ public void testProcessSubSup() {
     @Test
     public void testImportEntries1() throws IOException, URISyntaxException {
         Path file = Path.of(IsiImporterTest.class.getResource("IsiImporterTest1.isi").toURI());
-        List<BibEntry> entries = importer.importDatabase(file, StandardCharsets.UTF_8).getDatabase().getEntries();
+        List<BibEntry> entries = importer.importDatabase(file).getDatabase().getEntries();
         BibEntry entry = entries.get(0);
 
         assertEquals(1, entries.size());
@@ -148,7 +147,7 @@ public void testImportEntries1() throws IOException, URISyntaxException {
     @Test
     public void testImportEntries2() throws IOException, URISyntaxException {
         Path file = Path.of(IsiImporterTest.class.getResource("IsiImporterTest2.isi").toURI());
-        List<BibEntry> entries = importer.importDatabase(file, StandardCharsets.UTF_8).getDatabase().getEntries();
+        List<BibEntry> entries = importer.importDatabase(file).getDatabase().getEntries();
         BibEntry entry = entries.get(0);
 
         assertEquals(3, entries.size());
@@ -165,7 +164,7 @@ public void testImportEntries2() throws IOException, URISyntaxException {
     @Test
     public void testImportEntriesINSPEC() throws IOException, URISyntaxException {
         Path file = Path.of(IsiImporterTest.class.getResource("IsiImporterTestInspec.isi").toURI());
-        List<BibEntry> entries = importer.importDatabase(file, StandardCharsets.UTF_8).getDatabase().getEntries();
+        List<BibEntry> entries = importer.importDatabase(file).getDatabase().getEntries();
 
         BibEntry first = entries.get(0);
         BibEntry second = entries.get(1);
@@ -202,7 +201,7 @@ public void testImportEntriesINSPEC() throws IOException, URISyntaxException {
     @Test
     public void testImportEntriesWOS() throws IOException, URISyntaxException {
         Path file = Path.of(IsiImporterTest.class.getResource("IsiImporterTestWOS.isi").toURI());
-        List<BibEntry> entries = importer.importDatabase(file, StandardCharsets.UTF_8).getDatabase().getEntries();
+        List<BibEntry> entries = importer.importDatabase(file).getDatabase().getEntries();
 
         BibEntry first = entries.get(0);
         BibEntry second = entries.get(1);
@@ -214,7 +213,7 @@ public void testImportEntriesWOS() throws IOException, URISyntaxException {
         assertEquals(Optional.of("Optical waveguides in Sn2P2S6 by low fluence MeV He+ ion implantation"),
                 second.getField(StandardField.TITLE));
 
-        assertEquals(Optional.of("Journal of Physics-condensed Matter"), first.getField(StandardField.JOURNAL));
+        assertEquals(Optional.of("Journal of Physics-Condensed Matter"), first.getField(StandardField.JOURNAL));
     }
 
     @Test
@@ -258,7 +257,7 @@ public void testIsiAuthorConvert() {
     @Test
     public void testImportIEEEExport() throws IOException, URISyntaxException {
         Path file = Path.of(IsiImporterTest.class.getResource("IEEEImport1.txt").toURI());
-        List<BibEntry> entries = importer.importDatabase(file, StandardCharsets.UTF_8).getDatabase().getEntries();
+        List<BibEntry> entries = importer.importDatabase(file).getDatabase().getEntries();
         BibEntry entry = entries.get(0);
 
         assertEquals(1, entries.size());
@@ -281,7 +280,7 @@ public void testImportIEEEExport() throws IOException, URISyntaxException {
     @Test
     public void testIEEEImport() throws IOException, URISyntaxException {
         Path file = Path.of(IsiImporterTest.class.getResource("IEEEImport1.txt").toURI());
-        List<BibEntry> entries = importer.importDatabase(file, StandardCharsets.UTF_8).getDatabase().getEntries();
+        List<BibEntry> entries = importer.importDatabase(file).getDatabase().getEntries();
         BibEntry entry = entries.get(0);
 
         assertEquals(1, entries.size());
@@ -305,7 +304,7 @@ public void testIEEEImport() throws IOException, URISyntaxException {
     @Test
     public void testImportEntriesMedline() throws IOException, URISyntaxException {
         Path file = Path.of(IsiImporterTest.class.getResource("IsiImporterTestMedline.isi").toURI());
-        List<BibEntry> entries = importer.importDatabase(file, StandardCharsets.UTF_8).getDatabase().getEntries();
+        List<BibEntry> entries = importer.importDatabase(file).getDatabase().getEntries();
 
         BibEntry first = entries.get(0);
         BibEntry second = entries.get(1);
@@ -342,7 +341,7 @@ public void testImportEntriesMedline() throws IOException, URISyntaxException {
     public void testImportEntriesEmpty() throws IOException, URISyntaxException {
         Path file = Path.of(IsiImporterTest.class.getResource("IsiImporterTestEmpty.isi").toURI());
 
-        List<BibEntry> entries = importer.importDatabase(file, StandardCharsets.UTF_8).getDatabase().getEntries();
+        List<BibEntry> entries = importer.importDatabase(file).getDatabase().getEntries();
 
         assertEquals(1, entries.size());
     }
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/MedlinePlainImporterTest.java b/src/test/java/org/jabref/logic/importer/fileformat/MedlinePlainImporterTest.java
index fe48bcb86ca..bc25e3359eb 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/MedlinePlainImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/MedlinePlainImporterTest.java
@@ -5,7 +5,6 @@
 import java.io.InputStream;
 import java.io.StringReader;
 import java.net.URISyntaxException;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.util.Arrays;
 import java.util.Collections;
@@ -20,7 +19,6 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
 
-import org.apache.commons.codec.Charsets;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.function.Executable;
@@ -78,7 +76,7 @@ void doesNotRecognizeEmptyFiles() throws IOException {
     void testImportMultipleEntriesInSingleFile() throws IOException, URISyntaxException {
         Path inputFile = Path.of(MedlinePlainImporter.class.getResource("MedlinePlainImporterTestMultipleEntries.txt").toURI());
 
-        List<BibEntry> entries = importer.importDatabase(inputFile, StandardCharsets.UTF_8).getDatabase()
+        List<BibEntry> entries = importer.importDatabase(inputFile).getDatabase()
                                          .getEntries();
         BibEntry testEntry = entries.get(0);
 
@@ -147,7 +145,7 @@ private void assertImportOfMedlineFileEqualsBibtexFile(String medlineFile, Strin
         Path file = Path.of(MedlinePlainImporter.class.getResource(medlineFile).toURI());
 
         try (InputStream nis = MedlinePlainImporter.class.getResourceAsStream(bibtexFile)) {
-            List<BibEntry> entries = importer.importDatabase(file, StandardCharsets.UTF_8).getDatabase().getEntries();
+            List<BibEntry> entries = importer.importDatabase(file).getDatabase().getEntries();
             assertNotNull(entries);
             assertEquals(1, entries.size());
             BibEntryAssert.assertEquals(nis, entries.get(0));
@@ -189,7 +187,7 @@ void testKeyWords() throws IOException {
     void testWithNbibFile() throws IOException, URISyntaxException {
         Path file = Path.of(MedlinePlainImporter.class.getResource("NbibImporterTest.nbib").toURI());
 
-        List<BibEntry> entries = importer.importDatabase(file, StandardCharsets.UTF_8).getDatabase().getEntries();
+        List<BibEntry> entries = importer.importDatabase(file).getDatabase().getEntries();
 
         BibEntryAssert.assertEquals(MedlinePlainImporter.class, "NbibImporterTest.bib", entries);
     }
@@ -198,7 +196,7 @@ void testWithNbibFile() throws IOException, URISyntaxException {
     void testWithMultipleEntries() throws IOException, URISyntaxException {
         Path file = Path.of(MedlinePlainImporter.class.getResource("MedlinePlainImporterStringOutOfBounds.txt").toURI());
 
-        List<BibEntry> entries = importer.importDatabase(file, Charsets.UTF_8).getDatabase().getEntries();
+        List<BibEntry> entries = importer.importDatabase(file).getDatabase().getEntries();
 
         BibEntryAssert.assertEquals(MedlinePlainImporter.class, "MedlinePlainImporterStringOutOfBounds.bib", entries);
     }
@@ -207,7 +205,7 @@ void testWithMultipleEntries() throws IOException, URISyntaxException {
     void testInvalidFormat() throws URISyntaxException, IOException {
         Path file = Path.of(MedlinePlainImporter.class.getResource("MedlinePlainImporterTestInvalidFormat.xml").toURI());
 
-        List<BibEntry> entries = importer.importDatabase(file, Charsets.UTF_8).getDatabase().getEntries();
+        List<BibEntry> entries = importer.importDatabase(file).getDatabase().getEntries();
 
         assertEquals(Collections.emptyList(), entries);
     }
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/MsBibImporterTest.java b/src/test/java/org/jabref/logic/importer/fileformat/MsBibImporterTest.java
index beaeb16c49f..c87c3d77cc0 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/MsBibImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/MsBibImporterTest.java
@@ -2,7 +2,6 @@
 
 import java.io.IOException;
 import java.net.URISyntaxException;
-import java.nio.charset.Charset;
 import java.nio.file.Path;
 import java.util.Arrays;
 import java.util.Collections;
@@ -37,7 +36,7 @@ public final void testIsNotRecognizedFormat() throws Exception {
                 "IsiImporterTestInspec.isi", "emptyFile.xml", "IsiImporterTestWOS.isi");
         for (String s : notAccepted) {
             Path file = Path.of(MsBibImporter.class.getResource(s).toURI());
-            assertFalse(testImporter.isRecognizedFormat(file, Charset.defaultCharset()));
+            assertFalse(testImporter.isRecognizedFormat(file));
         }
     }
 
@@ -45,7 +44,7 @@ public final void testIsNotRecognizedFormat() throws Exception {
     public final void testImportEntriesEmpty() throws IOException, URISyntaxException {
         MsBibImporter testImporter = new MsBibImporter();
         Path file = Path.of(MsBibImporter.class.getResource("EmptyMsBib_Test.xml").toURI());
-        List<BibEntry> entries = testImporter.importDatabase(file, Charset.defaultCharset()).getDatabase().getEntries();
+        List<BibEntry> entries = testImporter.importDatabase(file).getDatabase().getEntries();
         assertEquals(Collections.emptyList(), entries);
     }
 
@@ -53,7 +52,7 @@ public final void testImportEntriesEmpty() throws IOException, URISyntaxExceptio
     public final void testImportEntriesNotRecognizedFormat() throws IOException, URISyntaxException {
         MsBibImporter testImporter = new MsBibImporter();
         Path file = Path.of(MsBibImporter.class.getResource("CopacImporterTest1.txt").toURI());
-        List<BibEntry> entries = testImporter.importDatabase(file, Charset.defaultCharset()).getDatabase().getEntries();
+        List<BibEntry> entries = testImporter.importDatabase(file).getDatabase().getEntries();
         assertEquals(0, entries.size());
     }
 
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/OvidImporterTest.java b/src/test/java/org/jabref/logic/importer/fileformat/OvidImporterTest.java
index 695ca2e9d7b..a948ecf75b0 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/OvidImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/OvidImporterTest.java
@@ -3,7 +3,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URISyntaxException;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.util.Collections;
 import java.util.List;
@@ -83,14 +82,14 @@ public void testIsRecognizedFormatRejected(String fileName) throws IOException,
     @Test
     public void testImportEmpty() throws IOException, URISyntaxException {
         Path file = Path.of(OvidImporter.class.getResource("Empty.txt").toURI());
-        List<BibEntry> entries = importer.importDatabase(file, StandardCharsets.UTF_8).getDatabase().getEntries();
+        List<BibEntry> entries = importer.importDatabase(file).getDatabase().getEntries();
         assertEquals(Collections.emptyList(), entries);
     }
 
     @Test
     public void testImportEntries1() throws IOException, URISyntaxException {
         Path file = Path.of(OvidImporter.class.getResource("OvidImporterTest1.txt").toURI());
-        List<BibEntry> entries = importer.importDatabase(file, StandardCharsets.UTF_8).getDatabase().getEntries();
+        List<BibEntry> entries = importer.importDatabase(file).getDatabase().getEntries();
         assertEquals(5, entries.size());
 
         BibEntry entry = entries.get(0);
@@ -143,7 +142,7 @@ public void testImportEntries1() throws IOException, URISyntaxException {
     @Test
     public void testImportEntries2() throws IOException, URISyntaxException {
         Path file = Path.of(OvidImporter.class.getResource("OvidImporterTest2Invalid.txt").toURI());
-        List<BibEntry> entries = importer.importDatabase(file, StandardCharsets.UTF_8).getDatabase().getEntries();
+        List<BibEntry> entries = importer.importDatabase(file).getDatabase().getEntries();
         assertEquals(Collections.emptyList(), entries);
     }
 
@@ -153,7 +152,7 @@ public void testImportSingleEntries() throws IOException, URISyntaxException {
         for (int n = 3; n <= 7; n++) {
             Path file = Path.of(OvidImporter.class.getResource("OvidImporterTest" + n + ".txt").toURI());
             try (InputStream nis = OvidImporter.class.getResourceAsStream("OvidImporterTestBib" + n + ".bib")) {
-                List<BibEntry> entries = importer.importDatabase(file, StandardCharsets.UTF_8).getDatabase()
+                List<BibEntry> entries = importer.importDatabase(file).getDatabase()
                                                  .getEntries();
                 assertNotNull(entries);
                 assertEquals(1, entries.size());
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/PdfContentImporterTest.java b/src/test/java/org/jabref/logic/importer/fileformat/PdfContentImporterTest.java
index faf37949972..65af83e403f 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/PdfContentImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/PdfContentImporterTest.java
@@ -1,6 +1,5 @@
 package org.jabref.logic.importer.fileformat;
 
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.util.Collections;
 import java.util.List;
@@ -42,28 +41,27 @@ void testGetDescription() {
     @Test
     void doesNotHandleEncryptedPdfs() throws Exception {
         Path file = Path.of(PdfContentImporter.class.getResource("/pdfs/encrypted.pdf").toURI());
-        List<BibEntry> result = importer.importDatabase(file, StandardCharsets.UTF_8).getDatabase().getEntries();
+        List<BibEntry> result = importer.importDatabase(file).getDatabase().getEntries();
         assertEquals(Collections.emptyList(), result);
     }
 
     @Test
     void importTwiceWorksAsExpected() throws Exception {
         Path file = Path.of(PdfContentImporter.class.getResource("/pdfs/minimal.pdf").toURI());
-        List<BibEntry> result = importer.importDatabase(file, StandardCharsets.UTF_8).getDatabase().getEntries();
+        List<BibEntry> result = importer.importDatabase(file).getDatabase().getEntries();
 
         BibEntry expected = new BibEntry(StandardEntryType.InProceedings);
         expected.setField(StandardField.AUTHOR, "1 ");
         expected.setField(StandardField.TITLE, "Hello World");
         expected.setFiles(Collections.singletonList(new LinkedFile("", file.toAbsolutePath(), "PDF")));
 
-        List<BibEntry> resultSecondImport = importer.importDatabase(file, StandardCharsets.UTF_8).getDatabase().getEntries();
+        List<BibEntry> resultSecondImport = importer.importDatabase(file).getDatabase().getEntries();
         assertEquals(Collections.singletonList(expected), result);
         assertEquals(Collections.singletonList(expected), resultSecondImport);
     }
 
     @Test
     void testParsingEditorWithoutPagesorSeriesInformation() {
-
         BibEntry entry = new BibEntry(StandardEntryType.InProceedings);
         entry.setField(StandardField.AUTHOR, "Anke Lüdeling and Merja Kytö (Eds.)");
         entry.setField(StandardField.EDITOR, "Anke Lüdeling and Merja Kytö");
@@ -108,6 +106,5 @@ void testParsingWithoutActualDOINumber() {
                                    + "Master of Research (MRes) thesis, University of Kent,.";
 
         assertEquals(Optional.of(entry), importer.getEntryFromPDFContent(firstPageContents, "\n"));
-
     }
 }
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/PdfEmbeddedBibFileImporterTest.java b/src/test/java/org/jabref/logic/importer/fileformat/PdfEmbeddedBibFileImporterTest.java
index dc5dc085672..b00746f8eb8 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/PdfEmbeddedBibFileImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/PdfEmbeddedBibFileImporterTest.java
@@ -1,6 +1,5 @@
 package org.jabref.logic.importer.fileformat;
 
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.util.Collections;
 import java.util.List;
@@ -45,14 +44,14 @@ void testGetDescription() {
     @Test
     void doesNotHandleEncryptedPdfs() throws Exception {
         Path file = Path.of(PdfEmbeddedBibFileImporter.class.getResource("/pdfs/encrypted.pdf").toURI());
-        List<BibEntry> result = importer.importDatabase(file, StandardCharsets.UTF_8).getDatabase().getEntries();
+        List<BibEntry> result = importer.importDatabase(file).getDatabase().getEntries();
         assertEquals(Collections.emptyList(), result);
     }
 
     @Test
     void importWorksAsExpected() throws Exception {
         Path file = Path.of(PdfEmbeddedBibFileImporterTest.class.getResource("mixedMetadata.pdf").toURI());
-        List<BibEntry> result = importer.importDatabase(file, StandardCharsets.UTF_8).getDatabase().getEntries();
+        List<BibEntry> result = importer.importDatabase(file).getDatabase().getEntries();
 
         BibEntry expected = new BibEntry(StandardEntryType.Misc);
         expected.setCitationKey("jabreftext2021");
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/PdfGrobidImporterTest.java b/src/test/java/org/jabref/logic/importer/fileformat/PdfGrobidImporterTest.java
index 296fd455c68..196c3aae38c 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/PdfGrobidImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/PdfGrobidImporterTest.java
@@ -2,13 +2,12 @@
 
 import java.io.IOException;
 import java.net.URISyntaxException;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.util.List;
 import java.util.Optional;
 
 import org.jabref.logic.importer.ImportFormatPreferences;
-import org.jabref.logic.importer.ImporterPreferences;
+import org.jabref.logic.importer.fetcher.GrobidPreferences;
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
@@ -28,16 +27,18 @@
 public class PdfGrobidImporterTest {
 
     private PdfGrobidImporter importer;
-    private ImportFormatPreferences importFormatPreferences;
 
     @BeforeEach
     public void setUp() {
-        ImporterPreferences importerPreferences = mock(ImporterPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        when(importerPreferences.isGrobidEnabled()).thenReturn(true);
-        when(importerPreferences.getGrobidURL()).thenReturn("http://grobid.jabref.org:8070");
-        importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        GrobidPreferences grobidPreferences = mock(GrobidPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        when(grobidPreferences.isGrobidEnabled()).thenReturn(true);
+        when(grobidPreferences.getGrobidURL()).thenReturn("http://grobid.jabref.org:8070");
+
+        ImportFormatPreferences importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
         when(importFormatPreferences.getKeywordSeparator()).thenReturn(',');
-        importer = new PdfGrobidImporter(importerPreferences, importFormatPreferences);
+        when(importFormatPreferences.getGrobidPreferences()).thenReturn(grobidPreferences);
+
+        importer = new PdfGrobidImporter(importFormatPreferences);
     }
 
     @Test
@@ -48,7 +49,7 @@ public void testsGetExtensions() {
     @Test
     public void testImportEntries() throws URISyntaxException {
         Path file = Path.of(PdfGrobidImporterTest.class.getResource("LNCS-minimal.pdf").toURI());
-        List<BibEntry> bibEntries = importer.importDatabase(file, StandardCharsets.UTF_8).getDatabase().getEntries();
+        List<BibEntry> bibEntries = importer.importDatabase(file).getDatabase().getEntries();
 
         assertEquals(1, bibEntries.size());
 
@@ -60,13 +61,13 @@ public void testImportEntries() throws URISyntaxException {
     @Test
     public void testIsRecognizedFormat() throws IOException, URISyntaxException {
         Path file = Path.of(PdfGrobidImporterTest.class.getResource("annotated.pdf").toURI());
-        assertTrue(importer.isRecognizedFormat(file, StandardCharsets.UTF_8));
+        assertTrue(importer.isRecognizedFormat(file));
     }
 
     @Test
     public void testIsRecognizedFormatReject() throws IOException, URISyntaxException {
         Path file = Path.of(PdfGrobidImporterTest.class.getResource("BibtexImporter.examples.bib").toURI());
-        assertFalse(importer.isRecognizedFormat(file, StandardCharsets.UTF_8));
+        assertFalse(importer.isRecognizedFormat(file));
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/PdfMergeMetadataImporterTest.java b/src/test/java/org/jabref/logic/importer/fileformat/PdfMergeMetadataImporterTest.java
index fbf2eb763dd..1afa5056d18 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/PdfMergeMetadataImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/PdfMergeMetadataImporterTest.java
@@ -1,12 +1,11 @@
 package org.jabref.logic.importer.fileformat;
 
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.util.Collections;
 import java.util.List;
 
 import org.jabref.logic.importer.ImportFormatPreferences;
-import org.jabref.logic.importer.ImporterPreferences;
+import org.jabref.logic.importer.fetcher.GrobidPreferences;
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.LinkedFile;
@@ -16,6 +15,7 @@
 import org.jabref.testutils.category.FetcherTest;
 
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.mockito.Answers;
 
@@ -27,16 +27,18 @@
 class PdfMergeMetadataImporterTest {
 
     private PdfMergeMetadataImporter importer;
-    private ImportFormatPreferences importFormatPreferences;
 
     @BeforeEach
     void setUp() {
-        ImporterPreferences importerPreferences = mock(ImporterPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        when(importerPreferences.isGrobidEnabled()).thenReturn(true);
-        when(importerPreferences.getGrobidURL()).thenReturn("http://grobid.jabref.org:8070");
-        importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        GrobidPreferences grobidPreferences = mock(GrobidPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        when(grobidPreferences.isGrobidEnabled()).thenReturn(true);
+        when(grobidPreferences.getGrobidURL()).thenReturn("http://grobid.jabref.org:8070");
+
+        ImportFormatPreferences importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
         when(importFormatPreferences.getFieldContentFormatterPreferences().getNonWrappableFields()).thenReturn(List.of());
-        importer = new PdfMergeMetadataImporter(importerPreferences, importFormatPreferences);
+        when(importFormatPreferences.getGrobidPreferences()).thenReturn(grobidPreferences);
+
+        importer = new PdfMergeMetadataImporter(importFormatPreferences);
     }
 
     @Test
@@ -53,14 +55,15 @@ void testGetDescription() {
     @Test
     void doesNotHandleEncryptedPdfs() throws Exception {
         Path file = Path.of(PdfMergeMetadataImporter.class.getResource("/pdfs/encrypted.pdf").toURI());
-        List<BibEntry> result = importer.importDatabase(file, StandardCharsets.UTF_8).getDatabase().getEntries();
+        List<BibEntry> result = importer.importDatabase(file).getDatabase().getEntries();
         assertEquals(Collections.emptyList(), result);
     }
 
     @Test
+    @Disabled("Switch from ottobib to OpenLibraryFetcher changed the results")
     void importWorksAsExpected() throws Exception {
         Path file = Path.of(PdfMergeMetadataImporterTest.class.getResource("mixedMetadata.pdf").toURI());
-        List<BibEntry> result = importer.importDatabase(file, StandardCharsets.UTF_8).getDatabase().getEntries();
+        List<BibEntry> result = importer.importDatabase(file).getDatabase().getEntries();
 
         // From DOI (contained in embedded bib file)
         BibEntry expected = new BibEntry(StandardEntryType.Book);
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/PdfVerbatimBibTextImporterTest.java b/src/test/java/org/jabref/logic/importer/fileformat/PdfVerbatimBibTextImporterTest.java
index 334f0cb76c0..404427a7207 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/PdfVerbatimBibTextImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/PdfVerbatimBibTextImporterTest.java
@@ -1,6 +1,5 @@
 package org.jabref.logic.importer.fileformat;
 
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.util.Collections;
 import java.util.List;
@@ -46,14 +45,14 @@ void testGetDescription() {
     @Test
     void doesNotHandleEncryptedPdfs() throws Exception {
         Path file = Path.of(PdfVerbatimBibTextImporter.class.getResource("/pdfs/encrypted.pdf").toURI());
-        List<BibEntry> result = importer.importDatabase(file, StandardCharsets.UTF_8).getDatabase().getEntries();
+        List<BibEntry> result = importer.importDatabase(file).getDatabase().getEntries();
         assertEquals(Collections.emptyList(), result);
     }
 
     @Test
     void importTwiceWorksAsExpected() throws Exception {
         Path file = Path.of(PdfVerbatimBibTextImporterTest.class.getResource("mixedMetadata.pdf").toURI());
-        List<BibEntry> result = importer.importDatabase(file, StandardCharsets.UTF_8).getDatabase().getEntries();
+        List<BibEntry> result = importer.importDatabase(file).getDatabase().getEntries();
 
         BibEntry expected = new BibEntry(StandardEntryType.Article);
         expected.setCitationKey("jabreftest2021");
@@ -65,7 +64,7 @@ void importTwiceWorksAsExpected() throws Exception {
         expected.setField(StandardField.ISBN, "0134685997");
         expected.setFiles(Collections.singletonList(new LinkedFile("", file.toAbsolutePath(), "PDF")));
 
-        List<BibEntry> resultSecondImport = importer.importDatabase(file, StandardCharsets.UTF_8).getDatabase().getEntries();
+        List<BibEntry> resultSecondImport = importer.importDatabase(file).getDatabase().getEntries();
         assertEquals(Collections.singletonList(expected), result);
         assertEquals(Collections.singletonList(expected), resultSecondImport);
     }
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/PdfXmpImporterTest.java b/src/test/java/org/jabref/logic/importer/fileformat/PdfXmpImporterTest.java
index d76c05b520a..b6a530ff29f 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/PdfXmpImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/PdfXmpImporterTest.java
@@ -2,7 +2,6 @@
 
 import java.io.IOException;
 import java.net.URISyntaxException;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.util.List;
 import java.util.Optional;
@@ -16,6 +15,7 @@
 import org.jabref.model.entry.field.StandardField;
 
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
@@ -53,17 +53,18 @@ public void testGetDescription() {
         assertEquals("Wraps the XMPUtility function to be used as an Importer.", importer.getDescription());
     }
 
+    @Disabled("XMP reader prints warnings to the logger when parsing does not work")
     @Test
     public void importEncryptedFileReturnsError() throws URISyntaxException {
         Path file = Path.of(PdfXmpImporterTest.class.getResource("/pdfs/encrypted.pdf").toURI());
-        ParserResult result = importer.importDatabase(file, StandardCharsets.UTF_8);
+        ParserResult result = importer.importDatabase(file);
         assertTrue(result.hasWarnings());
     }
 
     @Test
     public void testImportEntries() throws URISyntaxException {
         Path file = Path.of(PdfXmpImporterTest.class.getResource("annotated.pdf").toURI());
-        List<BibEntry> bibEntries = importer.importDatabase(file, StandardCharsets.UTF_8).getDatabase().getEntries();
+        List<BibEntry> bibEntries = importer.importDatabase(file).getDatabase().getEntries();
 
         assertEquals(1, bibEntries.size());
 
@@ -77,7 +78,7 @@ public void testImportEntries() throws URISyntaxException {
     @Test
     public void testIsRecognizedFormat() throws IOException, URISyntaxException {
         Path file = Path.of(PdfXmpImporterTest.class.getResource("annotated.pdf").toURI());
-        assertTrue(importer.isRecognizedFormat(file, StandardCharsets.UTF_8));
+        assertTrue(importer.isRecognizedFormat(file));
     }
 
     @ParameterizedTest
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/RISImporterTest.java b/src/test/java/org/jabref/logic/importer/fileformat/RISImporterTest.java
index c086370b0ae..11ad5bb9782 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/RISImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/RISImporterTest.java
@@ -2,7 +2,6 @@
 
 import java.io.IOException;
 import java.net.URISyntaxException;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 
 import org.jabref.logic.util.StandardFileType;
@@ -45,6 +44,6 @@ public void testGetDescription() {
     @Test
     public void testIfNotRecognizedFormat() throws IOException, URISyntaxException {
         Path file = Path.of(RISImporterTest.class.getResource("RisImporterCorrupted.ris").toURI());
-        assertFalse(importer.isRecognizedFormat(file, StandardCharsets.UTF_8));
+        assertFalse(importer.isRecognizedFormat(file));
     }
 }
diff --git a/src/test/java/org/jabref/logic/importer/util/FileFieldParserTest.java b/src/test/java/org/jabref/logic/importer/util/FileFieldParserTest.java
index 4ccf9a150b6..cfe53630acb 100644
--- a/src/test/java/org/jabref/logic/importer/util/FileFieldParserTest.java
+++ b/src/test/java/org/jabref/logic/importer/util/FileFieldParserTest.java
@@ -138,17 +138,34 @@ private static Stream<Arguments> stringsToParseTestData() throws Exception {
                         "desc:file.pdf:PDF:asdf"
                 ),
 
+                // www inside filename
+                Arguments.of(
+                        Collections.singletonList(new LinkedFile("", Path.of("/home/www.google.de.pdf"), "")),
+                        ":/home/www.google.de.pdf"
+                ),
+
                 // url
                 Arguments.of(
                          Collections.singletonList(new LinkedFile(new URL("https://books.google.de/"), "")),
                          "https://books.google.de/"
                 ),
 
+                // url with www
+                Arguments.of(
+                             Collections.singletonList(new LinkedFile(new URL("https://www.google.de/"), "")),
+                             "https://www.google.de/"
+                ),
+
                 // url as file
                 Arguments.of(
                              Collections.singletonList(new LinkedFile("", new URL("http://ceur-ws.org/Vol-438"), "URL")),
                              ":http\\://ceur-ws.org/Vol-438:URL"
-                )
+                ),
+                // url as file with desc
+                Arguments.of(
+                             Collections.singletonList(new LinkedFile("desc", new URL("http://ceur-ws.org/Vol-438"), "URL")),
+                             "desc:http\\://ceur-ws.org/Vol-438:URL"
+               )
         );
     }
 
diff --git a/src/test/java/org/jabref/logic/importer/util/GrobidServiceTest.java b/src/test/java/org/jabref/logic/importer/util/GrobidServiceTest.java
index 01d725d6398..9e81c64ede5 100644
--- a/src/test/java/org/jabref/logic/importer/util/GrobidServiceTest.java
+++ b/src/test/java/org/jabref/logic/importer/util/GrobidServiceTest.java
@@ -7,8 +7,8 @@
 import java.util.Optional;
 
 import org.jabref.logic.importer.ImportFormatPreferences;
-import org.jabref.logic.importer.ImporterPreferences;
 import org.jabref.logic.importer.ParseException;
+import org.jabref.logic.importer.fetcher.GrobidPreferences;
 import org.jabref.logic.importer.fileformat.PdfGrobidImporterTest;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
@@ -30,12 +30,15 @@
 public class GrobidServiceTest {
 
     private static GrobidService grobidService;
-    private static ImporterPreferences importerPreferences = new ImporterPreferences(false, true, false, "http://grobid.jabref.org:8070");
+    private static GrobidPreferences grobidPreferences = new GrobidPreferences(
+            true,
+            false,
+            "http://grobid.jabref.org:8070");
     private static ImportFormatPreferences importFormatPreferences;
 
     @BeforeAll
     public static void setup() {
-        grobidService = new GrobidService(importerPreferences);
+        grobidService = new GrobidService(grobidPreferences);
         importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
         when(importFormatPreferences.getKeywordSeparator()).thenReturn(',');
     }
@@ -70,12 +73,18 @@ public void processEmptyStringTest() throws IOException, ParseException {
 
     @Test
     public void processInvalidCitationTest() {
-        assertThrows(IOException.class, () -> grobidService.processCitation("iiiiiiiiiiiiiiiiiiiiiiii", importFormatPreferences, GrobidService.ConsolidateCitations.WITH_METADATA));
+        assertThrows(IOException.class, () -> grobidService.processCitation(
+                "iiiiiiiiiiiiiiiiiiiiiiii",
+                importFormatPreferences,
+                GrobidService.ConsolidateCitations.WITH_METADATA));
     }
 
     @Test
     public void failsWhenGrobidDisabled() {
-        ImporterPreferences importSettingsWithGrobidDisabled = new ImporterPreferences(false, false, false, "http://grobid.jabref.org:8070");
+        GrobidPreferences importSettingsWithGrobidDisabled = new GrobidPreferences(
+                false,
+                false,
+                "http://grobid.jabref.org:8070");
         assertThrows(UnsupportedOperationException.class, () -> new GrobidService(importSettingsWithGrobidDisabled));
     }
 
@@ -89,5 +98,4 @@ public void processPdfTest() throws IOException, ParseException, URISyntaxExcept
         assertEquals(Optional.of("Paper Title"), be0.getField(StandardField.TITLE));
         assertEquals(Optional.of("2014-10-05"), be0.getField(StandardField.DATE));
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/importer/util/GroupsParserTest.java b/src/test/java/org/jabref/logic/importer/util/GroupsParserTest.java
index 29580b7be2a..e600056b879 100644
--- a/src/test/java/org/jabref/logic/importer/util/GroupsParserTest.java
+++ b/src/test/java/org/jabref/logic/importer/util/GroupsParserTest.java
@@ -139,6 +139,5 @@ void fromStringParsesSearchGroup() throws Exception {
         SearchGroup expected = new SearchGroup("Data", GroupHierarchyType.INCLUDING, "project=data|number|quant*", EnumSet.of(SearchRules.SearchFlags.REGULAR_EXPRESSION));
         AbstractGroup parsed = GroupsParser.fromString("SearchGroup:Data;2;project=data|number|quant*;0;1;1;;;;;", ',', fileMonitor, metaData);
         assertEquals(expected, parsed);
-
     }
 }
diff --git a/src/test/java/org/jabref/logic/importer/util/JsonReaderTest.java b/src/test/java/org/jabref/logic/importer/util/JsonReaderTest.java
index cc486623512..50030b02e91 100644
--- a/src/test/java/org/jabref/logic/importer/util/JsonReaderTest.java
+++ b/src/test/java/org/jabref/logic/importer/util/JsonReaderTest.java
@@ -46,5 +46,4 @@ void exampleJsonResultsInSameJson() throws Exception {
         JSONObject result = JsonReader.toJsonObject(new ByteArrayInputStream(input.getBytes()));
         assertEquals(input, result.toString());
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/integrity/ASCIICharacterCheckerTest.java b/src/test/java/org/jabref/logic/integrity/ASCIICharacterCheckerTest.java
index 5a6af99aad3..09efadebe2d 100644
--- a/src/test/java/org/jabref/logic/integrity/ASCIICharacterCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/ASCIICharacterCheckerTest.java
@@ -49,5 +49,4 @@ void fieldDoesNotAcceptNonAsciiCharacters() {
         entry.setField(StandardField.TITLE, field);
         assertEquals(List.of(new IntegrityMessage("Non-ASCII encoded character found", entry, StandardField.TITLE)), checker.check(entry));
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/integrity/AbbreviationCheckerTest.java b/src/test/java/org/jabref/logic/integrity/AbbreviationCheckerTest.java
index 802e1d7c042..ebc1b3bd67f 100644
--- a/src/test/java/org/jabref/logic/integrity/AbbreviationCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/AbbreviationCheckerTest.java
@@ -44,5 +44,4 @@ void checkValueDoesNotComplainAboutJournalNameThatHasSameAbbreviation() {
     void checkValueDoesNotComplainAboutJournalNameThatHasΝοInput() {
         assertEquals(Optional.empty(), checker.checkValue(""));
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/integrity/BooktitleCheckerTest.java b/src/test/java/org/jabref/logic/integrity/BooktitleCheckerTest.java
index f021a93e3f1..7ce09e1bd3a 100644
--- a/src/test/java/org/jabref/logic/integrity/BooktitleCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/BooktitleCheckerTest.java
@@ -25,5 +25,4 @@ void booktitleDoesNotAcceptsIfItEndsWithConferenceOn() {
     void booktitleIsBlank() {
         assertEquals(Optional.empty(), checker.checkValue(" "));
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/integrity/HowPublishedCheckerTest.java b/src/test/java/org/jabref/logic/integrity/HowPublishedCheckerTest.java
index f1ec32ad5e2..cea5ae468a2 100644
--- a/src/test/java/org/jabref/logic/integrity/HowPublishedCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/HowPublishedCheckerTest.java
@@ -55,5 +55,4 @@ void bibLaTexAcceptsStringWithCapitalFirstLetter() {
     void bibLaTexAcceptsStringWithLowercaseFirstLetter() {
         assertEquals(Optional.empty(), checkerBiblatex.checkValue("lorem ipsum"));
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/integrity/ISSNCheckerTest.java b/src/test/java/org/jabref/logic/integrity/ISSNCheckerTest.java
index ddf7ffa82b0..f06dccfdfce 100644
--- a/src/test/java/org/jabref/logic/integrity/ISSNCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/ISSNCheckerTest.java
@@ -55,5 +55,4 @@ private static Stream<Arguments> provideIncorrectFormatArguments() {
                 Arguments.of("0020~72109")
         );
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/integrity/IntegrityCheckTest.java b/src/test/java/org/jabref/logic/integrity/IntegrityCheckTest.java
index a35bbb4a490..8f0a1cac867 100644
--- a/src/test/java/org/jabref/logic/integrity/IntegrityCheckTest.java
+++ b/src/test/java/org/jabref/logic/integrity/IntegrityCheckTest.java
@@ -1,7 +1,6 @@
 package org.jabref.logic.integrity;
 
 import java.io.IOException;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Collections;
@@ -140,7 +139,6 @@ void testEntryIsUnchangedAfterChecks() {
         new IntegrityCheck(context,
                 mock(FilePreferences.class),
                 createCitationKeyPatternPreferences(),
-                StandardCharsets.UTF_8,
                 JournalAbbreviationLoader.loadBuiltInRepository(), false)
                 .check();
 
@@ -174,7 +172,6 @@ private void assertWrong(BibDatabaseContext context) {
         List<IntegrityMessage> messages = new IntegrityCheck(context,
                 mock(FilePreferences.class),
                 createCitationKeyPatternPreferences(),
-                StandardCharsets.UTF_8,
                 JournalAbbreviationLoader.loadBuiltInRepository(), false)
                 .check();
         assertNotEquals(Collections.emptyList(), messages);
@@ -186,7 +183,6 @@ private void assertCorrect(BibDatabaseContext context) {
         List<IntegrityMessage> messages = new IntegrityCheck(context,
                 filePreferencesMock,
                 createCitationKeyPatternPreferences(),
-                StandardCharsets.UTF_8,
                 JournalAbbreviationLoader.loadBuiltInRepository(), false
         ).check();
         assertEquals(Collections.emptyList(), messages);
diff --git a/src/test/java/org/jabref/logic/integrity/NoteCheckerTest.java b/src/test/java/org/jabref/logic/integrity/NoteCheckerTest.java
index aada4446f23..ffd5781695b 100644
--- a/src/test/java/org/jabref/logic/integrity/NoteCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/NoteCheckerTest.java
@@ -24,7 +24,6 @@ void setUp() {
         checker = new NoteChecker(database);
         databaseBiblatex.setMode(BibDatabaseMode.BIBLATEX);
         checkerBiblatex = new NoteChecker(databaseBiblatex);
-
     }
 
     @Test
@@ -56,5 +55,4 @@ void bibTexAcceptsUrl() {
     void bibLaTexAcceptsFirstLowercaseLetter() {
         assertEquals(Optional.empty(), checkerBiblatex.checkValue("lorem ipsum"));
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/integrity/PagesCheckerBibLatexTest.java b/src/test/java/org/jabref/logic/integrity/PagesCheckerBibLatexTest.java
deleted file mode 100644
index 07e17a0ac3f..00000000000
--- a/src/test/java/org/jabref/logic/integrity/PagesCheckerBibLatexTest.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package org.jabref.logic.integrity;
-
-import java.util.Optional;
-
-import org.jabref.model.database.BibDatabaseContext;
-import org.jabref.model.database.BibDatabaseMode;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
-
-class PagesCheckerBibLatexTest {
-
-    private PagesChecker checker;
-
-    @BeforeEach
-    void setUp() {
-        BibDatabaseContext database = new BibDatabaseContext();
-        database.setMode(BibDatabaseMode.BIBLATEX);
-        checker = new PagesChecker(database);
-    }
-
-    @Test
-    void acceptsSinglePage() {
-        assertEquals(Optional.empty(), checker.checkValue("12"));
-    }
-
-    @Test
-    void acceptsSinglePageRange() {
-        assertEquals(Optional.empty(), checker.checkValue("12-15"));
-    }
-
-    @Test
-    void acceptsSinglePageRangeWithDoubleDashes() {
-        assertEquals(Optional.empty(), checker.checkValue("12--15"));
-    }
-
-    @Test
-    void acceptsSinglePageRangeWithEnDashes() {
-        assertEquals(Optional.empty(), checker.checkValue("12–15"));
-    }
-
-    @Test
-    void acceptsSinglePageRangeWithPagePrefix() {
-        assertEquals(Optional.empty(), checker.checkValue("R795--R804"));
-    }
-
-    @Test
-    void acceptsMultiplePageRange() {
-        assertEquals(Optional.empty(), checker.checkValue("12-15,18-29"));
-    }
-
-    @Test
-    void acceptsOpenEndPageRange() {
-        assertEquals(Optional.empty(), checker.checkValue("-15"));
-    }
-
-    @Test
-    void acceptsOpenStartPageRange() {
-        assertEquals(Optional.empty(), checker.checkValue("12-"));
-    }
-
-    @Test
-    void complainsAboutPPrefix() {
-        assertEquals(Optional.of("should contain a valid page number range"), checker.checkValue("p. 12"));
-    }
-
-    @Test
-    void complainsAboutPPPrefix() {
-        assertEquals(Optional.of("should contain a valid page number range"), checker.checkValue("pp. 12-15"));
-    }
-
-    @Test
-    void bibLaTexAcceptsRangeOfNumbersWithDoubleDash() {
-        assertEquals(Optional.empty(), checker.checkValue("1--2"));
-    }
-
-    @Test
-    void bibLaTexAcceptsOnePageNumber() {
-        assertEquals(Optional.empty(), checker.checkValue("12"));
-    }
-
-    @Test
-    void bibLaTexAcceptsRangeOfNumbersWithSingleDash() {
-        assertEquals(Optional.empty(), checker.checkValue("1-2"));
-    }
-
-    @Test
-    void bibLaTexAcceptsMorePageNumbers() {
-        assertEquals(Optional.empty(), checker.checkValue("1,2,3"));
-    }
-
-    @Test
-    void bibLaTexAcceptsNoSimpleRangeOfNumbers() {
-        assertEquals(Optional.empty(), checker.checkValue("43+"));
-    }
-
-    @Test
-    void bibLaTexDoesNotAcceptMorePageNumbersWithoutComma() {
-        assertNotEquals(Optional.empty(), checker.checkValue("1 2"));
-    }
-
-    @Test
-    void bibLaTexDoesNotAcceptBrackets() {
-        assertNotEquals(Optional.empty(), checker.checkValue("{1}-{2}"));
-    }
-
-    @Test
-    void bibLaTexAcceptsMorePageNumbersWithRangeOfNumbers() {
-        assertEquals(Optional.empty(), checker.checkValue("7+,41--43,73"));
-    }
-
-}
diff --git a/src/test/java/org/jabref/logic/integrity/PagesCheckerBiblatexTest.java b/src/test/java/org/jabref/logic/integrity/PagesCheckerBiblatexTest.java
new file mode 100644
index 00000000000..13ffba0fb58
--- /dev/null
+++ b/src/test/java/org/jabref/logic/integrity/PagesCheckerBiblatexTest.java
@@ -0,0 +1,66 @@
+package org.jabref.logic.integrity;
+
+import java.util.Optional;
+import java.util.stream.Stream;
+
+import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.model.database.BibDatabaseMode;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+
+public class PagesCheckerBiblatexTest {
+
+    private PagesChecker checker;
+
+    @BeforeEach
+    void setUp() {
+        BibDatabaseContext database = new BibDatabaseContext();
+        database.setMode(BibDatabaseMode.BIBLATEX);
+        checker = new PagesChecker(database);
+    }
+
+    public static Stream<String> bibtexAccepts() {
+        return Stream.of("",
+                // single dash
+                "1-2",
+                // double dash
+                "1--2",
+                // one page number
+                "12",
+                // Multiple numbers
+                "1,2,3",
+                // bibTexAcceptsNoSimpleRangeOfNumbers
+                "43+",
+                // bibTexAcceptsMorePageNumbersWithRangeOfNumbers
+                "7+,41--43,73"
+                );
+    }
+
+    @ParameterizedTest
+    @MethodSource
+    void bibtexAccepts(String source) {
+        assertEquals(Optional.empty(), checker.checkValue(source));
+    }
+
+    public static Stream<String> bibtexRejects() {
+        return Stream.of(
+                // hex numbers forbidden
+                "777e23",
+                // bibTexDoesNotAcceptMorePageNumbersWithoutComma
+                "1 2",
+                // bibTexDoesNotAcceptBrackets
+                "{1}-{2}"
+                );
+    }
+
+    @ParameterizedTest
+    @MethodSource
+    void bibtexRejects(String source) {
+        assertNotEquals(Optional.empty(), checker.checkValue(source));
+    }
+}
diff --git a/src/test/java/org/jabref/logic/integrity/PagesCheckerBibtexTest.java b/src/test/java/org/jabref/logic/integrity/PagesCheckerBibtexTest.java
new file mode 100644
index 00000000000..d9cdac14197
--- /dev/null
+++ b/src/test/java/org/jabref/logic/integrity/PagesCheckerBibtexTest.java
@@ -0,0 +1,66 @@
+package org.jabref.logic.integrity;
+
+import java.util.Optional;
+import java.util.stream.Stream;
+
+import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.model.database.BibDatabaseMode;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+
+public class PagesCheckerBibtexTest {
+
+    private PagesChecker checker;
+
+    @BeforeEach
+    void setUp() {
+        BibDatabaseContext database = new BibDatabaseContext();
+        database.setMode(BibDatabaseMode.BIBTEX);
+        checker = new PagesChecker(database);
+    }
+
+    public static Stream<String> bibtexAccepts() {
+        return Stream.of("",
+                // double dash
+                "1--2",
+                // one page number
+                "12",
+                // Multiple numbers
+                "1,2,3",
+                // bibTexAcceptsNoSimpleRangeOfNumbers
+                "43+",
+                // bibTexAcceptsMorePageNumbersWithRangeOfNumbers
+                "7+,41--43,73"
+                );
+    }
+
+    @ParameterizedTest
+    @MethodSource
+    void bibtexAccepts(String source) {
+        assertEquals(Optional.empty(), checker.checkValue(source));
+    }
+
+    public static Stream<String> bibtexRejects() {
+        return Stream.of(
+                // hex numbers forbidden
+                "777e23",
+                // bibTexDoesNotAcceptRangeOfNumbersWithSingleDash
+                "1-2",
+                // bibTexDoesNotAcceptMorePageNumbersWithoutComma
+                "1 2",
+                // bibTexDoesNotAcceptBrackets
+                "{1}-{2}"
+                );
+    }
+
+    @ParameterizedTest
+    @MethodSource
+    void bibtexRejects(String source) {
+        assertNotEquals(Optional.empty(), checker.checkValue(source));
+    }
+}
diff --git a/src/test/java/org/jabref/logic/integrity/PagesCheckerTest.java b/src/test/java/org/jabref/logic/integrity/PagesCheckerTest.java
deleted file mode 100644
index a6c5cd385c2..00000000000
--- a/src/test/java/org/jabref/logic/integrity/PagesCheckerTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package org.jabref.logic.integrity;
-
-import java.util.Optional;
-
-import org.jabref.model.database.BibDatabaseContext;
-import org.jabref.model.database.BibDatabaseMode;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
-
-public class PagesCheckerTest {
-
-    private PagesChecker checker;
-
-    @BeforeEach
-    void setUp() {
-        BibDatabaseContext database = new BibDatabaseContext();
-        database.setMode(BibDatabaseMode.BIBTEX);
-        checker = new PagesChecker(database);
-    }
-
-    @Test
-    void bibTexAcceptsRangeOfNumbersWithDoubleDash() {
-        assertEquals(Optional.empty(), checker.checkValue("1--2"));
-    }
-
-    @Test
-    void bibTexAcceptsOnePageNumber() {
-        assertEquals(Optional.empty(), checker.checkValue("12"));
-    }
-
-    @Test
-    void bibTexDoesNotAcceptRangeOfNumbersWithSingleDash() {
-        assertNotEquals(Optional.empty(), checker.checkValue("1-2"));
-    }
-
-    @Test
-    void bibTexAcceptsMorePageNumbers() {
-        assertEquals(Optional.empty(), checker.checkValue("1,2,3"));
-    }
-
-    @Test
-    void bibTexAcceptsNoSimpleRangeOfNumbers() {
-        assertEquals(Optional.empty(), checker.checkValue("43+"));
-    }
-
-    @Test
-    void bibTexDoesNotAcceptMorePageNumbersWithoutComma() {
-        assertNotEquals(Optional.empty(), checker.checkValue("1 2"));
-    }
-
-    @Test
-    void bibTexDoesNotAcceptBrackets() {
-        assertNotEquals(Optional.empty(), checker.checkValue("{1}-{2}"));
-    }
-
-    @Test
-    void bibTexAcceptsMorePageNumbersWithRangeOfNumbers() {
-        assertEquals(Optional.empty(), checker.checkValue("7+,41--43,73"));
-    }
-
-}
diff --git a/src/test/java/org/jabref/logic/integrity/PersonNamesCheckerTest.java b/src/test/java/org/jabref/logic/integrity/PersonNamesCheckerTest.java
index 44bdb3465ac..e6ed2c2b743 100644
--- a/src/test/java/org/jabref/logic/integrity/PersonNamesCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/PersonNamesCheckerTest.java
@@ -93,5 +93,4 @@ private static Stream<String> provideIncorrectFormats() {
                                       ", and Kurt Cobain and A. Einstein", "Donald E. Knuth and Kurt Cobain and ,",
                          "and Kurt Cobain and A. Einstein", "Donald E. Knuth and Kurt Cobain and");
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/integrity/TitleCheckerTest.java b/src/test/java/org/jabref/logic/integrity/TitleCheckerTest.java
index 9238fdc73ef..bfc720b77b3 100644
--- a/src/test/java/org/jabref/logic/integrity/TitleCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/TitleCheckerTest.java
@@ -220,5 +220,4 @@ void bibLaTexAcceptsCapitalLetterAfterSpecialCharacter() {
     void bibLaTexAcceptsCapitalLetterNotOnlyAfterSpecialCharacter() {
         assertEquals(Optional.empty(), checkerBiblatex.checkValue("This!is!!A!TitlE??"));
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/integrity/TypeCheckerTest.java b/src/test/java/org/jabref/logic/integrity/TypeCheckerTest.java
index 28827390074..38969eb0fcd 100644
--- a/src/test/java/org/jabref/logic/integrity/TypeCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/TypeCheckerTest.java
@@ -29,5 +29,4 @@ void proceedingsDoesNotHavePageNumbers() {
         entry.setField(StandardField.PAGES, "11--15");
         assertEquals(List.of(new IntegrityMessage("wrong entry type as proceedings has page numbers", entry, StandardField.PAGES)), checker.check(entry));
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/integrity/UTF8CheckerTest.java b/src/test/java/org/jabref/logic/integrity/UTF8CheckerTest.java
index aac597ee93e..cb0e81e2c56 100644
--- a/src/test/java/org/jabref/logic/integrity/UTF8CheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/UTF8CheckerTest.java
@@ -34,7 +34,8 @@ void fieldAcceptsUTF8() {
      * fieldDoesNotAcceptUmlauts to check UTF8Checker's result set
      * when the entry is encoded in Non-Utf-8 charset and the Library
      * environment is Non UTF-8.
-     * Finally we need to reset the environment charset.
+     * Finally, we need to reset the environment charset.
+     *
      * @throws UnsupportedEncodingException initial a String in charset GBK
      * Demo: new String(StringDemo.getBytes(), "GBK");
      */
@@ -57,7 +58,6 @@ void fieldDoesNotAcceptUmlauts() throws UnsupportedEncodingException {
     void NonUTF8EncodingCheckerTest() throws UnsupportedEncodingException {
         String NonUTF8 = new String("你好，这条语句使用GBK字符集".getBytes(), "GBK");
             assertFalse(UTF8Checker.UTF8EncodingChecker(NonUTF8.getBytes("GBK")));
-
     }
 
     /**
diff --git a/src/test/java/org/jabref/logic/l10n/LocalizationParser.java b/src/test/java/org/jabref/logic/l10n/LocalizationParser.java
index 7d756933a56..0fee3a33613 100644
--- a/src/test/java/org/jabref/logic/l10n/LocalizationParser.java
+++ b/src/test/java/org/jabref/logic/l10n/LocalizationParser.java
@@ -182,7 +182,6 @@ private static List<LocalizationEntry> getLanguageKeysInFxmlFile(Path path, Loca
 
         // Record which keys are requested; we pretend that we have all keys
         ResourceBundle registerUsageResourceBundle = new ResourceBundle() {
-
             @Override
             protected Object handleGetObject(String key) {
                 result.add(key);
diff --git a/src/test/java/org/jabref/logic/layout/LayoutEntryTest.java b/src/test/java/org/jabref/logic/layout/LayoutEntryTest.java
index 53a4ff0bf34..aaceee79574 100644
--- a/src/test/java/org/jabref/logic/layout/LayoutEntryTest.java
+++ b/src/test/java/org/jabref/logic/layout/LayoutEntryTest.java
@@ -69,7 +69,6 @@ public String layout(String layoutFile, BibEntry entry) throws IOException {
 
     @Test
     public void testParseMethodCalls() {
-
         assertEquals(1, LayoutEntry.parseMethodsCalls("bla").size());
         assertEquals("bla", (LayoutEntry.parseMethodsCalls("bla").get(0)).get(0));
 
diff --git a/src/test/java/org/jabref/logic/layout/LayoutTest.java b/src/test/java/org/jabref/logic/layout/LayoutTest.java
index 46ffe8edd21..b9700d9faf5 100644
--- a/src/test/java/org/jabref/logic/layout/LayoutTest.java
+++ b/src/test/java/org/jabref/logic/layout/LayoutTest.java
@@ -127,7 +127,6 @@ void beginConditionals() throws IOException {
                 "\\begin{editor&&!author}\\format[HTMLChars]{\\editor} (eds.)\\end{editor&&!author}", entry);
 
         assertEquals("Author", layoutText);
-
     }
 
     /**
diff --git a/src/test/java/org/jabref/logic/layout/format/AuthorAbbreviatorTest.java b/src/test/java/org/jabref/logic/layout/format/AuthorAbbreviatorTest.java
index 9ed893e166d..10fd71c68c5 100644
--- a/src/test/java/org/jabref/logic/layout/format/AuthorAbbreviatorTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/AuthorAbbreviatorTest.java
@@ -13,7 +13,6 @@ public class AuthorAbbreviatorTest {
 
     @Test
     public void testFormat() {
-
         LayoutFormatter a = new AuthorLastFirstAbbreviator();
         LayoutFormatter b = new AuthorAbbreviator();
 
diff --git a/src/test/java/org/jabref/logic/layout/format/AuthorAndsCommaReplacerTest.java b/src/test/java/org/jabref/logic/layout/format/AuthorAndsCommaReplacerTest.java
index f19b4681d6e..0bdb1740918 100644
--- a/src/test/java/org/jabref/logic/layout/format/AuthorAndsCommaReplacerTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/AuthorAndsCommaReplacerTest.java
@@ -13,7 +13,6 @@ public class AuthorAndsCommaReplacerTest {
      */
     @Test
     public void testFormat() {
-
         LayoutFormatter a = new AuthorAndsCommaReplacer();
 
         // Empty case
diff --git a/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstCommasTest.java b/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstCommasTest.java
index 8a544a5a7d0..35d262ccffd 100644
--- a/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstCommasTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstCommasTest.java
@@ -13,7 +13,6 @@ public class AuthorLastFirstCommasTest {
      */
     @Test
     public void testFormat() {
-
         LayoutFormatter a = new AuthorLastFirstCommas();
 
         // Empty case
diff --git a/src/test/java/org/jabref/logic/layout/format/HTMLCharsTest.java b/src/test/java/org/jabref/logic/layout/format/HTMLCharsTest.java
index 45c289890f2..fd4a9c54b77 100644
--- a/src/test/java/org/jabref/logic/layout/format/HTMLCharsTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/HTMLCharsTest.java
@@ -18,7 +18,6 @@ public void setUp() {
 
     @Test
     public void testBasicFormat() {
-
         assertEquals("", layout.format(""));
 
         assertEquals("hallo", layout.format("hallo"));
diff --git a/src/test/java/org/jabref/logic/layout/format/LastPageTest.java b/src/test/java/org/jabref/logic/layout/format/LastPageTest.java
index d18836a04c7..c7cf743dc22 100644
--- a/src/test/java/org/jabref/logic/layout/format/LastPageTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/LastPageTest.java
@@ -29,6 +29,5 @@ private static Stream<Arguments> provideArguments() {
                 Arguments.of("350", "345--350"),
                 Arguments.of("", "--")
         );
-
     }
 }
diff --git a/src/test/java/org/jabref/logic/layout/format/NameFormatterTest.java b/src/test/java/org/jabref/logic/layout/format/NameFormatterTest.java
index 41ff6b2ff5d..5a4b1b6581b 100644
--- a/src/test/java/org/jabref/logic/layout/format/NameFormatterTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/NameFormatterTest.java
@@ -8,7 +8,6 @@ public class NameFormatterTest {
 
     @Test
     public void testFormatStringStringBibtexEntry() {
-
         NameFormatter l = new NameFormatter();
 
         assertEquals("Doe", l.format("Joe Doe", "1@*@{ll}"));
@@ -32,7 +31,6 @@ public void testFormatStringStringBibtexEntry() {
 
     @Test
     public void testFormat() {
-
         NameFormatter a = new NameFormatter();
 
         // Empty case
diff --git a/src/test/java/org/jabref/logic/layout/format/RTFCharsTest.java b/src/test/java/org/jabref/logic/layout/format/RTFCharsTest.java
index b39d06e6be3..3e65598c117 100644
--- a/src/test/java/org/jabref/logic/layout/format/RTFCharsTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/RTFCharsTest.java
@@ -130,7 +130,6 @@ void testSpecialCharacters() {
         assertEquals("\\u182P", formatter.format("{\\P}")); // ¶
         assertEquals("\\u169?", formatter.format("{\\copyright}")); // ©
         assertEquals("\\u163?", formatter.format("{\\pounds}")); // £
-
     }
 
     @ParameterizedTest(name = "specialChar={0}, formattedStr={1}")
diff --git a/src/test/java/org/jabref/logic/msbib/MsBibAuthorTest.java b/src/test/java/org/jabref/logic/msbib/MsBibAuthorTest.java
index 8736b6542e1..3b09b26c7d9 100644
--- a/src/test/java/org/jabref/logic/msbib/MsBibAuthorTest.java
+++ b/src/test/java/org/jabref/logic/msbib/MsBibAuthorTest.java
@@ -24,7 +24,6 @@ public void testGetMiddleName() {
 
     @Test
     public void testGetNoMiddleName() {
-
         Author author = new Author("Gustav", null, null, "Bach", null);
         MsBibAuthor msBibAuthor = new MsBibAuthor(author);
         assertEquals(null, msBibAuthor.getMiddleName());
@@ -32,7 +31,6 @@ public void testGetNoMiddleName() {
 
     @Test
     public void testGetNoFirstName() {
-
         Author author = new Author(null, null, null, "Bach", null);
         MsBibAuthor msBibAuthor = new MsBibAuthor(author);
         assertEquals(null, msBibAuthor.getMiddleName());
diff --git a/src/test/java/org/jabref/logic/net/URLDownloadTest.java b/src/test/java/org/jabref/logic/net/URLDownloadTest.java
index 8891cb91579..b7788d961fb 100644
--- a/src/test/java/org/jabref/logic/net/URLDownloadTest.java
+++ b/src/test/java/org/jabref/logic/net/URLDownloadTest.java
@@ -7,10 +7,14 @@
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 
+import org.jabref.logic.importer.FetcherClientException;
+import org.jabref.logic.importer.FetcherServerException;
 import org.jabref.support.DisabledOnCIServer;
 
 import kong.unirest.UnirestException;
 import org.junit.jupiter.api.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -18,6 +22,8 @@
 
 public class URLDownloadTest {
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(URLDownloadTest.class);
+
     @Test
     public void testStringDownloadWithSetEncoding() throws IOException {
         URLDownload dl = new URLDownload(new URL("http://www.google.com"));
@@ -42,7 +48,7 @@ public void testFileDownload() throws IOException {
         } finally {
             // cleanup
             if (!destination.delete()) {
-                System.err.println("Cannot delete downloaded file");
+                LOGGER.error("Cannot delete downloaded file");
             }
         }
     }
@@ -117,4 +123,20 @@ public void connectTimeoutIsNeverNull() throws MalformedURLException {
         urlDownload.setConnectTimeout(null);
         assertNotNull(urlDownload.getConnectTimeout(), "no null value can be set");
     }
+
+    @Test
+    public void test503ErrorThrowsNestedIOExceptionWithFetcherServerException() throws Exception {
+        URLDownload urlDownload = new URLDownload(new URL("http://httpstat.us/503"));
+
+        Exception exception = assertThrows(IOException.class, () -> urlDownload.asString());
+        assertTrue(exception.getCause() instanceof FetcherServerException);
+    }
+
+    @Test
+    public void test429ErrorThrowsNestedIOExceptionWithFetcherServerException() throws Exception {
+        URLDownload urlDownload = new URLDownload(new URL("http://httpstat.us/429"));
+
+        Exception exception = assertThrows(IOException.class, () -> urlDownload.asString());
+        assertTrue(exception.getCause() instanceof FetcherClientException);
+    }
 }
diff --git a/src/test/java/org/jabref/logic/net/URLUtilTest.java b/src/test/java/org/jabref/logic/net/URLUtilTest.java
index 6a6cfc12972..d69d7a1df7e 100644
--- a/src/test/java/org/jabref/logic/net/URLUtilTest.java
+++ b/src/test/java/org/jabref/logic/net/URLUtilTest.java
@@ -74,4 +74,8 @@ void isURLshouldRejectInvalidURL() {
         assertFalse(URLUtil.isURL("google.com"));
     }
 
+    @Test
+    void isURLshouldRejectEmbeddedURL() {
+        assertFalse(URLUtil.isURL("dblp computer science bibliography, http://dblp.org"));
+    }
 }
diff --git a/src/test/java/org/jabref/logic/openoffice/style/OOBibStyleTest.java b/src/test/java/org/jabref/logic/openoffice/style/OOBibStyleTest.java
index 82d7888afd8..a76c9ae91b3 100644
--- a/src/test/java/org/jabref/logic/openoffice/style/OOBibStyleTest.java
+++ b/src/test/java/org/jabref/logic/openoffice/style/OOBibStyleTest.java
@@ -1,12 +1,9 @@
 package org.jabref.logic.openoffice.style;
 
-import java.io.File;
 import java.io.IOException;
 import java.net.URISyntaxException;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -62,9 +59,9 @@ void testAuthorYear() throws IOException {
 
     @Test
     void testAuthorYearAsFile() throws URISyntaxException, IOException {
-        File defFile = Path.of(OOBibStyleTest.class.getResource(StyleLoader.DEFAULT_AUTHORYEAR_STYLE_PATH).toURI())
-                           .toFile();
-        OOBibStyle style = new OOBibStyle(defFile, layoutFormatterPreferences, StandardCharsets.UTF_8);
+        Path defFile = Path.of(OOBibStyleTest.class.getResource(StyleLoader.DEFAULT_AUTHORYEAR_STYLE_PATH).toURI());
+
+        OOBibStyle style = new OOBibStyle(defFile, layoutFormatterPreferences);
         assertTrue(style.isValid());
         assertFalse(style.isInternalStyle());
         assertFalse(style.isCitationKeyCiteMarkers());
@@ -118,10 +115,10 @@ static CitationMarkerEntry makeCitationMarkerEntry(BibEntry entry,
                                                        String pageInfoQ,
                                                        boolean isFirstAppearanceOfSource) {
         return OOBibStyleTestHelper.makeCitationMarkerEntry(entry,
-                                                            database,
-                                                            uniqueLetterQ,
-                                                            pageInfoQ,
-                                                            isFirstAppearanceOfSource);
+                database,
+                uniqueLetterQ,
+                pageInfoQ,
+                isFirstAppearanceOfSource);
     }
 
     /*
@@ -136,12 +133,28 @@ static String getCitationMarker2(OOBibStyle style,
                                      Boolean[] isFirstAppearanceOfSource,
                                      String[] pageInfo) {
         return OOBibStyleTestHelper.getCitationMarker2(style,
-                                                       entries,
-                                                       entryDBMap,
-                                                       inParenthesis,
-                                                       uniquefiers,
-                                                       isFirstAppearanceOfSource,
-                                                       pageInfo);
+                entries,
+                entryDBMap,
+                inParenthesis,
+                uniquefiers,
+                isFirstAppearanceOfSource,
+                pageInfo);
+    }
+
+    static String getCitationMarker2b(OOBibStyle style,
+                                      List<BibEntry> entries,
+                                      Map<BibEntry, BibDatabase> entryDBMap,
+                                      boolean inParenthesis,
+                                      String[] uniquefiers,
+                                      Boolean[] isFirstAppearanceOfSource,
+                                      String[] pageInfo) {
+        return OOBibStyleTestHelper.getCitationMarker2b(style,
+                entries,
+                entryDBMap,
+                inParenthesis,
+                uniquefiers,
+                isFirstAppearanceOfSource,
+                pageInfo);
     }
 
     /*
@@ -152,35 +165,16 @@ static String getCitationMarker2(OOBibStyle style,
     void testGetNumCitationMarker() throws IOException {
         OOBibStyle style = new OOBibStyle(StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
                 layoutFormatterPreferences);
-        assertEquals("[1] ", style.getNumCitationMarker(Arrays.asList(1), -1, true));
-        assertEquals("[1] ", runGetNumCitationMarker2a(style, Arrays.asList(1), -1, true));
+        assertEquals("[1] ", runGetNumCitationMarker2a(style, List.of(1), -1, true));
 
-        assertEquals("[1]", style.getNumCitationMarker(Arrays.asList(1), -1, false));
-        assertEquals("[1]", runGetNumCitationMarker2a(style, Arrays.asList(1), -1, false));
+        assertEquals("[1]", runGetNumCitationMarker2a(style, List.of(1), -1, false));
         assertEquals("[1]", runGetNumCitationMarker2b(style, -1, numEntry("key", 1, null)));
 
-        assertEquals("[1] ", style.getNumCitationMarker(Arrays.asList(1), 0, true));
-        assertEquals("[1] ", runGetNumCitationMarker2a(style, Arrays.asList(1), 0, true));
-
-        /*
-         * The following tests as for a numeric label for a
-         * bibliography entry containing more than one numbers.
-         * We do not need this, not reproduced.
-         */
-        assertEquals("[1-3] ", style.getNumCitationMarker(Arrays.asList(1, 2, 3), 1, true));
-        assertEquals("[1; 2; 3] ", style.getNumCitationMarker(Arrays.asList(1, 2, 3), 5, true));
-        assertEquals("[1; 2; 3] ", style.getNumCitationMarker(Arrays.asList(1, 2, 3), -1, true));
-        assertEquals("[1; 3; 12] ", style.getNumCitationMarker(Arrays.asList(1, 12, 3), 1, true));
-        assertEquals("[3-5; 7; 10-12] ", style.getNumCitationMarker(Arrays.asList(12, 7, 3, 4, 11, 10, 5), 1, true));
-
-        String citation = style.getNumCitationMarker(Arrays.asList(1), -1, false);
-        assertEquals("[1; pp. 55-56]", style.insertPageInfo(citation, "pp. 55-56"));
+        assertEquals("[1] ", runGetNumCitationMarker2a(style, List.of(1), 0, true));
 
         CitationMarkerNumericEntry e2 = numEntry("key", 1, "pp. 55-56");
-        assertEquals(true, e2.getPageInfo().isPresent());
+        assertTrue(e2.getPageInfo().isPresent());
         assertEquals("pp. 55-56", e2.getPageInfo().get().toString());
-        citation = runGetNumCitationMarker2b(style, -1, e2);
-        assertEquals("[1; pp. 55-56]", citation);
 
         OOBibStyleTestHelper.testGetNumCitationMarkerExtra(style);
     }
@@ -189,68 +183,48 @@ void testGetNumCitationMarker() throws IOException {
     void testGetNumCitationMarkerUndefined() throws IOException {
         OOBibStyle style = new OOBibStyle(StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
                 layoutFormatterPreferences);
-        /*
-         * Testing bibliography labels with multiple numbers again.
-         * Not reproduced.
-         */
-        assertEquals("[" + OOBibStyle.UNDEFINED_CITATION_MARKER + "; 2-4] ",
-                style.getNumCitationMarker(Arrays.asList(4, 2, 3, 0), 1, true));
-
-        assertEquals("[" + OOBibStyle.UNDEFINED_CITATION_MARKER + "] ",
-                style.getNumCitationMarker(Arrays.asList(0), 1, true));
-
-        assertEquals("[" + OOBibStyle.UNDEFINED_CITATION_MARKER + "; 1-3] ",
-                style.getNumCitationMarker(Arrays.asList(1, 2, 3, 0), 1, true));
-
-        assertEquals("[" + OOBibStyle.UNDEFINED_CITATION_MARKER + "; " + OOBibStyle.UNDEFINED_CITATION_MARKER + "; "
-                        + OOBibStyle.UNDEFINED_CITATION_MARKER + "] ",
-                style.getNumCitationMarker(Arrays.asList(0, 0, 0), 1, true));
-
-        /*
-         * We have these instead:
-         */
 
         // unresolved citations look like [??key]
         assertEquals("[" + OOBibStyle.UNDEFINED_CITATION_MARKER + "key" + "]",
-                     runGetNumCitationMarker2b(style, 1,
-                                               numEntry("key", 0, null)));
+                runGetNumCitationMarker2b(style, 1,
+                        numEntry("key", 0, null)));
 
         // pageInfo is shown for unresolved citations
         assertEquals("[" + OOBibStyle.UNDEFINED_CITATION_MARKER + "key" + "; p1]",
-                     runGetNumCitationMarker2b(style, 1,
-                                               numEntry("key", 0, "p1")));
+                runGetNumCitationMarker2b(style, 1,
+                        numEntry("key", 0, "p1")));
 
         // unresolved citations sorted to the front
         assertEquals("[" + OOBibStyle.UNDEFINED_CITATION_MARKER + "key" + "; 2-4]",
-                     runGetNumCitationMarker2b(style, 1,
-                                               numEntry("x4", 4, ""),
-                                               numEntry("x2", 2, ""),
-                                               numEntry("x3", 3, ""),
-                                               numEntry("key", 0, "")));
+                runGetNumCitationMarker2b(style, 1,
+                        numEntry("x4", 4, ""),
+                        numEntry("x2", 2, ""),
+                        numEntry("x3", 3, ""),
+                        numEntry("key", 0, "")));
 
         assertEquals("[" + OOBibStyle.UNDEFINED_CITATION_MARKER + "key" + "; 1-3]",
-                     runGetNumCitationMarker2b(style, 1,
-                                               numEntry("x1", 1, ""),
-                                               numEntry("x2", 2, ""),
-                                               numEntry("y3", 3, ""),
-                                               numEntry("key", 0, "")));
+                runGetNumCitationMarker2b(style, 1,
+                        numEntry("x1", 1, ""),
+                        numEntry("x2", 2, ""),
+                        numEntry("y3", 3, ""),
+                        numEntry("key", 0, "")));
 
         // multiple unresolved citations are not collapsed
         assertEquals("["
-                     + OOBibStyle.UNDEFINED_CITATION_MARKER + "x1" + "; "
-                     + OOBibStyle.UNDEFINED_CITATION_MARKER + "x2" + "; "
-                     + OOBibStyle.UNDEFINED_CITATION_MARKER + "x3" + "]",
-                     runGetNumCitationMarker2b(style, 1,
-                                               numEntry("x1", 0, ""),
-                                               numEntry("x2", 0, ""),
-                                               numEntry("x3", 0, "")));
+                        + OOBibStyle.UNDEFINED_CITATION_MARKER + "x1" + "; "
+                        + OOBibStyle.UNDEFINED_CITATION_MARKER + "x2" + "; "
+                        + OOBibStyle.UNDEFINED_CITATION_MARKER + "x3" + "]",
+                runGetNumCitationMarker2b(style, 1,
+                        numEntry("x1", 0, ""),
+                        numEntry("x2", 0, ""),
+                        numEntry("x3", 0, "")));
 
         /*
          * BIBLIOGRAPHY
          */
         CitationMarkerNumericBibEntry x = numBibEntry("key", Optional.empty());
         assertEquals("[" + OOBibStyle.UNDEFINED_CITATION_MARKER + "key" + "] ",
-                     style.getNumCitationMarkerForBibliography(x).toString());
+                style.getNumCitationMarkerForBibliography(x).toString());
     }
 
     @Test
@@ -293,28 +267,22 @@ void testGetCitationMarker() throws IOException {
         assertEquals(-1, style.getMaxAuthorsFirst());
 
         assertEquals("[Boström et al., 2006]",
-                style.getCitationMarker(Collections.singletonList(entry), entryDBMap, true, null, null));
-        assertEquals("[Boström et al., 2006]",
-                     getCitationMarker2(style,
-                                        Collections.singletonList(entry), entryDBMap,
-                                        true, null, null, null));
+                getCitationMarker2(style,
+                        Collections.singletonList(entry), entryDBMap,
+                        true, null, null, null));
 
         assertEquals("Boström et al. [2006]",
-                style.getCitationMarker(Collections.singletonList(entry), entryDBMap, false, null, new int[]{3}));
-        assertEquals("Boström et al. [2006]",
-                     getCitationMarker2(style,
-                                        Collections.singletonList(entry), entryDBMap,
-                                        false, null, new Boolean[]{false}, null));
+                getCitationMarker2(style,
+                        Collections.singletonList(entry), entryDBMap,
+                        false, null, new Boolean[] {false}, null));
 
         assertEquals("[Boström, Wäyrynen, Bodén, Beznosov & Kruchten, 2006]",
-                style.getCitationMarker(Collections.singletonList(entry), entryDBMap, true, null, new int[]{5}));
-        assertEquals("[Boström, Wäyrynen, Bodén, Beznosov & Kruchten, 2006]",
-                     getCitationMarker2(style,
-                                        Collections.singletonList(entry), entryDBMap,
-                                        true,
-                                        null,
-                                        new Boolean[]{true}  /* corresponds to -1, not 5 */,
-                                        null));
+                getCitationMarker2(style,
+                        Collections.singletonList(entry), entryDBMap,
+                        true,
+                        null,
+                        new Boolean[] {true},
+                        null));
     }
 
     @Test
@@ -399,11 +367,10 @@ void testInstitutionAuthorMarker() throws IOException {
         database.insertEntry(entry);
         entries.add(entry);
         entryDBMap.put(entry, database);
-        assertEquals("[JabRef Development Team, 2016]", style.getCitationMarker(entries, entryDBMap, true, null, null));
 
         assertEquals("[JabRef Development Team, 2016]",
-                     getCitationMarker2(style,
-                                        entries, entryDBMap, true, null, null, null));
+                getCitationMarker2(style,
+                        entries, entryDBMap, true, null, null, null));
     }
 
     @Test
@@ -420,10 +387,11 @@ void testVonAuthorMarker() throws IOException {
         entry.setField(StandardField.AUTHOR, "Alpha von Beta");
         entry.setField(StandardField.TITLE, "JabRef Manual");
         entry.setField(StandardField.YEAR, "2016");
+        entry.setCitationKey("a1");
         database.insertEntry(entry);
         entries.add(entry);
         entryDBMap.put(entry, database);
-        assertEquals("[von Beta, 2016]", style.getCitationMarker(entries, entryDBMap, true, null, null));
+        assertEquals("[von Beta, 2016]", getCitationMarker2(style, entries, entryDBMap, true, null, null, null));
     }
 
     @Test
@@ -438,10 +406,11 @@ void testNullAuthorMarker() throws IOException {
         BibEntry entry = new BibEntry();
         entry.setType(StandardEntryType.Article);
         entry.setField(StandardField.YEAR, "2016");
+        entry.setCitationKey("a1");
         database.insertEntry(entry);
         entries.add(entry);
         entryDBMap.put(entry, database);
-        assertEquals("[, 2016]", style.getCitationMarker(entries, entryDBMap, true, null, null));
+        assertEquals("[, 2016]", getCitationMarker2(style, entries, entryDBMap, true, null, null, null));
     }
 
     @Test
@@ -456,10 +425,11 @@ void testNullYearMarker() throws IOException {
         BibEntry entry = new BibEntry();
         entry.setType(StandardEntryType.Article);
         entry.setField(StandardField.AUTHOR, "Alpha von Beta");
+        entry.setCitationKey("a1");
         database.insertEntry(entry);
         entries.add(entry);
         entryDBMap.put(entry, database);
-        assertEquals("[von Beta, ]", style.getCitationMarker(entries, entryDBMap, true, null, null));
+        assertEquals("[von Beta, ]", getCitationMarker2(style, entries, entryDBMap, true, null, null, null));
     }
 
     @Test
@@ -473,10 +443,11 @@ void testEmptyEntryMarker() throws IOException {
 
         BibEntry entry = new BibEntry();
         entry.setType(StandardEntryType.Article);
+        entry.setCitationKey("a1");
         database.insertEntry(entry);
         entries.add(entry);
         entryDBMap.put(entry, database);
-        assertEquals("[, ]", style.getCitationMarker(entries, entryDBMap, true, null, null));
+        assertEquals("[, ]", getCitationMarker2(style, entries, entryDBMap, true, null, null, null));
     }
 
     @Test
@@ -492,17 +463,20 @@ void testGetCitationMarkerInParenthesisUniquefiers() throws IOException {
         entry1.setField(StandardField.AUTHOR, "Alpha Beta");
         entry1.setField(StandardField.TITLE, "Paper 1");
         entry1.setField(StandardField.YEAR, "2000");
+        entry1.setCitationKey("a1");
         entries.add(entry1);
         database.insertEntry(entry1);
         BibEntry entry3 = new BibEntry();
         entry3.setField(StandardField.AUTHOR, "Alpha Beta");
         entry3.setField(StandardField.TITLE, "Paper 2");
         entry3.setField(StandardField.YEAR, "2000");
+        entry3.setCitationKey("a3");
         entries.add(entry3);
         database.insertEntry(entry3);
         BibEntry entry2 = new BibEntry();
         entry2.setField(StandardField.AUTHOR, "Gamma Epsilon");
         entry2.setField(StandardField.YEAR, "2001");
+        entry2.setCitationKey("a2");
         entries.add(entry2);
         database.insertEntry(entry2);
         for (BibEntry entry : database.getEntries()) {
@@ -510,9 +484,12 @@ void testGetCitationMarkerInParenthesisUniquefiers() throws IOException {
         }
 
         assertEquals("[Beta, 2000; Beta, 2000; Epsilon, 2001]",
-                style.getCitationMarker(entries, entryDBMap, true, null, null));
+                getCitationMarker2b(style, entries, entryDBMap, true, null, null, null));
         assertEquals("[Beta, 2000a,b; Epsilon, 2001]",
-                style.getCitationMarker(entries, entryDBMap, true, new String[]{"a", "b", ""}, new int[]{1, 1, 1}));
+                getCitationMarker2(style, entries, entryDBMap, true,
+                        new String[] {"a", "b", ""},
+                        new Boolean[] {false, false, false},
+                        null));
     }
 
     @Test
@@ -528,27 +505,33 @@ void testGetCitationMarkerInTextUniquefiers() throws IOException {
         entry1.setField(StandardField.AUTHOR, "Alpha Beta");
         entry1.setField(StandardField.TITLE, "Paper 1");
         entry1.setField(StandardField.YEAR, "2000");
+        entry1.setCitationKey("a1");
         entries.add(entry1);
         database.insertEntry(entry1);
         BibEntry entry3 = new BibEntry();
         entry3.setField(StandardField.AUTHOR, "Alpha Beta");
         entry3.setField(StandardField.TITLE, "Paper 2");
         entry3.setField(StandardField.YEAR, "2000");
+        entry3.setCitationKey("a3");
         entries.add(entry3);
         database.insertEntry(entry3);
         BibEntry entry2 = new BibEntry();
         entry2.setField(StandardField.AUTHOR, "Gamma Epsilon");
         entry2.setField(StandardField.YEAR, "2001");
         entries.add(entry2);
+        entry2.setCitationKey("a2");
         database.insertEntry(entry2);
         for (BibEntry entry : database.getEntries()) {
             entryDBMap.put(entry, database);
         }
 
         assertEquals("Beta [2000]; Beta [2000]; Epsilon [2001]",
-                style.getCitationMarker(entries, entryDBMap, false, null, null));
+                getCitationMarker2b(style, entries, entryDBMap, false, null, null, null));
         assertEquals("Beta [2000a,b]; Epsilon [2001]",
-                style.getCitationMarker(entries, entryDBMap, false, new String[]{"a", "b", ""}, new int[]{1, 1, 1}));
+                getCitationMarker2(style, entries, entryDBMap, false,
+                        new String[] {"a", "b", ""},
+                        new Boolean[] {false, false, false},
+                        null));
     }
 
     @Test
@@ -564,18 +547,21 @@ void testGetCitationMarkerInParenthesisUniquefiersThreeSameAuthor() throws IOExc
         entry1.setField(StandardField.AUTHOR, "Alpha Beta");
         entry1.setField(StandardField.TITLE, "Paper 1");
         entry1.setField(StandardField.YEAR, "2000");
+        entry1.setCitationKey("a1");
         entries.add(entry1);
         database.insertEntry(entry1);
         BibEntry entry2 = new BibEntry();
         entry2.setField(StandardField.AUTHOR, "Alpha Beta");
         entry2.setField(StandardField.TITLE, "Paper 2");
         entry2.setField(StandardField.YEAR, "2000");
+        entry2.setCitationKey("a2");
         entries.add(entry2);
         database.insertEntry(entry2);
         BibEntry entry3 = new BibEntry();
         entry3.setField(StandardField.AUTHOR, "Alpha Beta");
         entry3.setField(StandardField.TITLE, "Paper 3");
         entry3.setField(StandardField.YEAR, "2000");
+        entry3.setCitationKey("a3");
         entries.add(entry3);
         database.insertEntry(entry3);
         for (BibEntry entry : database.getEntries()) {
@@ -583,7 +569,10 @@ void testGetCitationMarkerInParenthesisUniquefiersThreeSameAuthor() throws IOExc
         }
 
         assertEquals("[Beta, 2000a,b,c]",
-                style.getCitationMarker(entries, entryDBMap, true, new String[]{"a", "b", "c"}, new int[]{1, 1, 1}));
+                getCitationMarker2(style, entries, entryDBMap, true,
+                        new String[] {"a", "b", "c"},
+                        new Boolean[] {false, false, false},
+                        null));
     }
 
     @Test
@@ -599,18 +588,21 @@ void testGetCitationMarkerInTextUniquefiersThreeSameAuthor() throws IOException
         entry1.setField(StandardField.AUTHOR, "Alpha Beta");
         entry1.setField(StandardField.TITLE, "Paper 1");
         entry1.setField(StandardField.YEAR, "2000");
+        entry1.setCitationKey("a1");
         entries.add(entry1);
         database.insertEntry(entry1);
         BibEntry entry2 = new BibEntry();
         entry2.setField(StandardField.AUTHOR, "Alpha Beta");
         entry2.setField(StandardField.TITLE, "Paper 2");
         entry2.setField(StandardField.YEAR, "2000");
+        entry2.setCitationKey("a2");
         entries.add(entry2);
         database.insertEntry(entry2);
         BibEntry entry3 = new BibEntry();
         entry3.setField(StandardField.AUTHOR, "Alpha Beta");
         entry3.setField(StandardField.TITLE, "Paper 3");
         entry3.setField(StandardField.YEAR, "2000");
+        entry3.setCitationKey("a3");
         entries.add(entry3);
         database.insertEntry(entry3);
         for (BibEntry entry : database.getEntries()) {
@@ -618,11 +610,14 @@ void testGetCitationMarkerInTextUniquefiersThreeSameAuthor() throws IOException
         }
 
         assertEquals("Beta [2000a,b,c]",
-                style.getCitationMarker(entries, entryDBMap, false, new String[]{"a", "b", "c"}, new int[]{1, 1, 1}));
+                getCitationMarker2(style, entries, entryDBMap, false,
+                        new String[] {"a", "b", "c"},
+                        new Boolean[] {false, false, false},
+                        null));
     }
 
     @Test
-    // TODO: equals only work when initialized from file, not from reader
+        // TODO: equals only work when initialized from file, not from reader
     void testEquals() throws IOException {
         OOBibStyle style1 = new OOBibStyle(StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
                 layoutFormatterPreferences);
@@ -632,7 +627,7 @@ void testEquals() throws IOException {
     }
 
     @Test
-    // TODO: equals only work when initialized from file, not from reader
+        // TODO: equals only work when initialized from file, not from reader
     void testNotEquals() throws IOException {
         OOBibStyle style1 = new OOBibStyle(StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
                 layoutFormatterPreferences);
@@ -672,11 +667,12 @@ void testEmptyStringPropertyAndOxfordComma() throws Exception {
         entry.setField(StandardField.AUTHOR, "Alpha von Beta and Gamma Epsilon and Ypsilon Tau");
         entry.setField(StandardField.TITLE, "JabRef Manual");
         entry.setField(StandardField.YEAR, "2016");
+        entry.setCitationKey("a1");
         database.insertEntry(entry);
         entries.add(entry);
         entryDBMap.put(entry, database);
         assertEquals("von Beta, Epsilon, & Tau, 2016",
-                style.getCitationMarker(entries, entryDBMap, true, null, null));
+                getCitationMarker2(style, entries, entryDBMap, true, null, null, null));
     }
 
     @Test
@@ -688,20 +684,20 @@ void testIsValidWithDefaultSectionAtTheStart() throws Exception {
     @Test
     void testGetCitationMarkerJoinFirst() throws IOException {
         OOBibStyle style = new OOBibStyle(StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
-                                          layoutFormatterPreferences);
+                layoutFormatterPreferences);
 
-        // Question: What should happen if some of the sources is
+        // Question: What should happen if some sources are
         // marked as isFirstAppearanceOfSource?
         // This test documents what is happening now.
 
         // Two entries with identical normalizedMarkers and many authors.
         BibEntry entry1 = new BibEntry()
                 .withField(StandardField.AUTHOR,
-                           "Gustav Bostr\\\"{o}m"
-                           + " and Jaana W\\\"{a}yrynen"
-                           + " and Marine Bod\\'{e}n"
-                           + " and Konstantin Beznosov"
-                           + " and Philippe Kruchten")
+                        "Gustav Bostr\\\"{o}m"
+                                + " and Jaana W\\\"{a}yrynen"
+                                + " and Marine Bod\\'{e}n"
+                                + " and Konstantin Beznosov"
+                                + " and Philippe Kruchten")
                 .withField(StandardField.YEAR, "2006")
                 .withField(StandardField.BOOKTITLE, "A book 1")
                 .withField(StandardField.PUBLISHER, "ACM")
@@ -711,11 +707,11 @@ void testGetCitationMarkerJoinFirst() throws IOException {
 
         BibEntry entry2 = new BibEntry()
                 .withField(StandardField.AUTHOR,
-                           "Gustav Bostr\\\"{o}m"
-                           + " and Jaana W\\\"{a}yrynen"
-                           + " and Marine Bod\\'{e}n"
-                           + " and Konstantin Beznosov"
-                           + " and Philippe Kruchten")
+                        "Gustav Bostr\\\"{o}m"
+                                + " and Jaana W\\\"{a}yrynen"
+                                + " and Marine Bod\\'{e}n"
+                                + " and Konstantin Beznosov"
+                                + " and Philippe Kruchten")
                 .withField(StandardField.YEAR, "2006")
                 .withField(StandardField.BOOKTITLE, "A book 2")
                 .withField(StandardField.PUBLISHER, "ACM")
@@ -726,11 +722,11 @@ void testGetCitationMarkerJoinFirst() throws IOException {
         // Last Author differs.
         BibEntry entry3 = new BibEntry()
                 .withField(StandardField.AUTHOR,
-                           "Gustav Bostr\\\"{o}m"
-                           + " and Jaana W\\\"{a}yrynen"
-                           + " and Marine Bod\\'{e}n"
-                           + " and Konstantin Beznosov"
-                           + " and Philippe NotKruchten")
+                        "Gustav Bostr\\\"{o}m"
+                                + " and Jaana W\\\"{a}yrynen"
+                                + " and Marine Bod\\'{e}n"
+                                + " and Konstantin Beznosov"
+                                + " and Philippe NotKruchten")
                 .withField(StandardField.YEAR, "2006")
                 .withField(StandardField.BOOKTITLE, "A book 3")
                 .withField(StandardField.PUBLISHER, "ACM")
@@ -748,26 +744,26 @@ void testGetCitationMarkerJoinFirst() throws IOException {
         if (true) {
             List<CitationMarkerEntry> citationMarkerEntries = new ArrayList<>();
             CitationMarkerEntry cm1 =
-                makeCitationMarkerEntry(entry1, database, "a", null, true);
+                    makeCitationMarkerEntry(entry1, database, "a", null, true);
             citationMarkerEntries.add(cm1);
             CitationMarkerEntry cm2 =
-                makeCitationMarkerEntry(entry2, database, "b", null, true);
+                    makeCitationMarkerEntry(entry2, database, "b", null, true);
             citationMarkerEntries.add(cm2);
             CitationMarkerEntry cm3 =
-                makeCitationMarkerEntry(entry3, database, "c", null, true);
+                    makeCitationMarkerEntry(entry3, database, "c", null, true);
             citationMarkerEntries.add(cm3);
 
             assertEquals("[Boström, Wäyrynen, Bodén, Beznosov & Kruchten, 2006a,b"
-                         + "; Boström, Wäyrynen, Bodén, Beznosov & NotKruchten, 2006c]",
-                         style.createCitationMarker(citationMarkerEntries,
-                                                    true,
-                                                    NonUniqueCitationMarker.THROWS).toString());
+                            + "; Boström, Wäyrynen, Bodén, Beznosov & NotKruchten, 2006c]",
+                    style.createCitationMarker(citationMarkerEntries,
+                            true,
+                            NonUniqueCitationMarker.THROWS).toString());
 
             assertEquals("Boström, Wäyrynen, Bodén, Beznosov & Kruchten [2006a,b]"
-                         + "; Boström, Wäyrynen, Bodén, Beznosov & NotKruchten [2006c]",
-                         style.createCitationMarker(citationMarkerEntries,
-                                                    false,
-                                                    NonUniqueCitationMarker.THROWS).toString());
+                            + "; Boström, Wäyrynen, Bodén, Beznosov & NotKruchten [2006c]",
+                    style.createCitationMarker(citationMarkerEntries,
+                            false,
+                            NonUniqueCitationMarker.THROWS).toString());
         }
 
         // Without pageInfo, only the first is isFirstAppearanceOfSource.
@@ -776,21 +772,20 @@ void testGetCitationMarkerJoinFirst() throws IOException {
         if (true) {
             List<CitationMarkerEntry> citationMarkerEntries = new ArrayList<>();
             CitationMarkerEntry cm1 =
-                makeCitationMarkerEntry(entry1, database, "a", null, true);
+                    makeCitationMarkerEntry(entry1, database, "a", null, true);
             citationMarkerEntries.add(cm1);
             CitationMarkerEntry cm2 =
-                makeCitationMarkerEntry(entry2, database, "b", null, false);
+                    makeCitationMarkerEntry(entry2, database, "b", null, false);
             citationMarkerEntries.add(cm2);
             CitationMarkerEntry cm3 =
-                makeCitationMarkerEntry(entry3, database, "c", null, false);
+                    makeCitationMarkerEntry(entry3, database, "c", null, false);
             citationMarkerEntries.add(cm3);
 
             assertEquals("[Boström, Wäyrynen, Bodén, Beznosov & Kruchten, 2006a,b"
-                         + "; Boström et al., 2006c]",
-                         style.createCitationMarker(citationMarkerEntries,
-                                                    true,
-                                                    NonUniqueCitationMarker.THROWS).toString());
-
+                            + "; Boström et al., 2006c]",
+                    style.createCitationMarker(citationMarkerEntries,
+                            true,
+                            NonUniqueCitationMarker.THROWS).toString());
         }
         // Without pageInfo, only the second is isFirstAppearanceOfSource.
         // The second is not joined, because it is a first appearance, thus
@@ -799,21 +794,21 @@ void testGetCitationMarkerJoinFirst() throws IOException {
         if (true) {
             List<CitationMarkerEntry> citationMarkerEntries = new ArrayList<>();
             CitationMarkerEntry cm1 =
-                makeCitationMarkerEntry(entry1, database, "a", null, false);
+                    makeCitationMarkerEntry(entry1, database, "a", null, false);
             citationMarkerEntries.add(cm1);
             CitationMarkerEntry cm2 =
-                makeCitationMarkerEntry(entry2, database, "b", null, true);
+                    makeCitationMarkerEntry(entry2, database, "b", null, true);
             citationMarkerEntries.add(cm2);
             CitationMarkerEntry cm3 =
-                makeCitationMarkerEntry(entry3, database, "c", null, false);
+                    makeCitationMarkerEntry(entry3, database, "c", null, false);
             citationMarkerEntries.add(cm3);
 
             assertEquals("[Boström et al., 2006a"
-                         + "; Boström, Wäyrynen, Bodén, Beznosov & Kruchten, 2006b"
-                         + "; Boström et al., 2006c]",
-                         style.createCitationMarker(citationMarkerEntries,
-                                                    true,
-                                                    NonUniqueCitationMarker.THROWS).toString());
+                            + "; Boström, Wäyrynen, Bodén, Beznosov & Kruchten, 2006b"
+                            + "; Boström et al., 2006c]",
+                    style.createCitationMarker(citationMarkerEntries,
+                            true,
+                            NonUniqueCitationMarker.THROWS).toString());
         }
 
         // Without pageInfo, neither is isFirstAppearanceOfSource.
@@ -823,19 +818,19 @@ void testGetCitationMarkerJoinFirst() throws IOException {
         if (true) {
             List<CitationMarkerEntry> citationMarkerEntries = new ArrayList<>();
             CitationMarkerEntry cm1 =
-                makeCitationMarkerEntry(entry1, database, "a", null, false);
+                    makeCitationMarkerEntry(entry1, database, "a", null, false);
             citationMarkerEntries.add(cm1);
             CitationMarkerEntry cm2 =
-                makeCitationMarkerEntry(entry2, database, "b", null, false);
+                    makeCitationMarkerEntry(entry2, database, "b", null, false);
             citationMarkerEntries.add(cm2);
             CitationMarkerEntry cm3 =
-                makeCitationMarkerEntry(entry3, database, "c", null, false);
+                    makeCitationMarkerEntry(entry3, database, "c", null, false);
             citationMarkerEntries.add(cm3);
 
             assertEquals("[Boström et al., 2006a,b,c]",
-                         style.createCitationMarker(citationMarkerEntries,
-                                                    true,
-                                                    NonUniqueCitationMarker.THROWS).toString());
+                    style.createCitationMarker(citationMarkerEntries,
+                            true,
+                            NonUniqueCitationMarker.THROWS).toString());
         }
 
         // With pageInfo: different entries with identical non-null pageInfo: not joined.
@@ -843,21 +838,21 @@ void testGetCitationMarkerJoinFirst() throws IOException {
         if (true) {
             List<CitationMarkerEntry> citationMarkerEntries = new ArrayList<>();
             CitationMarkerEntry cm1 =
-                makeCitationMarkerEntry(entry1, database, "a", "p1", false);
+                    makeCitationMarkerEntry(entry1, database, "a", "p1", false);
             citationMarkerEntries.add(cm1);
             CitationMarkerEntry cm2 =
-                makeCitationMarkerEntry(entry2, database, "b", "p1", false);
+                    makeCitationMarkerEntry(entry2, database, "b", "p1", false);
             citationMarkerEntries.add(cm2);
             CitationMarkerEntry cm3 =
-                makeCitationMarkerEntry(entry3, database, "c", "p1", false);
+                    makeCitationMarkerEntry(entry3, database, "c", "p1", false);
             citationMarkerEntries.add(cm3);
 
             assertEquals("[Boström et al., 2006a; p1"
-                         + "; Boström et al., 2006b; p1"
-                         + "; Boström et al., 2006c; p1]",
-                         style.createCitationMarker(citationMarkerEntries,
-                                                    true,
-                                                    NonUniqueCitationMarker.THROWS).toString());
+                            + "; Boström et al., 2006b; p1"
+                            + "; Boström et al., 2006c; p1]",
+                    style.createCitationMarker(citationMarkerEntries,
+                            true,
+                            NonUniqueCitationMarker.THROWS).toString());
         }
 
         // With pageInfo: same entries with identical non-null pageInfo: collapsed.
@@ -866,43 +861,43 @@ void testGetCitationMarkerJoinFirst() throws IOException {
         if (true) {
             List<CitationMarkerEntry> citationMarkerEntries = new ArrayList<>();
             CitationMarkerEntry cm1 =
-                makeCitationMarkerEntry(entry1, database, "a", "p1", false);
+                    makeCitationMarkerEntry(entry1, database, "a", "p1", false);
             citationMarkerEntries.add(cm1);
             CitationMarkerEntry cm2 =
-                makeCitationMarkerEntry(entry1, database, "a", "p1", false);
+                    makeCitationMarkerEntry(entry1, database, "a", "p1", false);
             citationMarkerEntries.add(cm2);
             CitationMarkerEntry cm3 =
-                makeCitationMarkerEntry(entry1, database, "a", "p1", false);
+                    makeCitationMarkerEntry(entry1, database, "a", "p1", false);
             citationMarkerEntries.add(cm3);
 
             assertEquals("[Boström et al., 2006a; p1]",
-                         style.createCitationMarker(citationMarkerEntries,
-                                                    true,
-                                                    NonUniqueCitationMarker.THROWS).toString());
+                    style.createCitationMarker(citationMarkerEntries,
+                            true,
+                            NonUniqueCitationMarker.THROWS).toString());
         }
         // With pageInfo: same entries with different pageInfo: kept separate.
         // Empty ("") and missing pageInfos considered equal, thus collapsed.
         if (true) {
             List<CitationMarkerEntry> citationMarkerEntries = new ArrayList<>();
             CitationMarkerEntry cm1 =
-                makeCitationMarkerEntry(entry1, database, "a", "p1", false);
+                    makeCitationMarkerEntry(entry1, database, "a", "p1", false);
             citationMarkerEntries.add(cm1);
             CitationMarkerEntry cm2 =
-                makeCitationMarkerEntry(entry1, database, "a", "p2", false);
+                    makeCitationMarkerEntry(entry1, database, "a", "p2", false);
             citationMarkerEntries.add(cm2);
             CitationMarkerEntry cm3 =
-                makeCitationMarkerEntry(entry1, database, "a", "", false);
+                    makeCitationMarkerEntry(entry1, database, "a", "", false);
             citationMarkerEntries.add(cm3);
             CitationMarkerEntry cm4 =
-                makeCitationMarkerEntry(entry1, database, "a", null, false);
+                    makeCitationMarkerEntry(entry1, database, "a", null, false);
             citationMarkerEntries.add(cm4);
 
             assertEquals("[Boström et al., 2006a; p1"
-                         + "; Boström et al., 2006a; p2"
-                         + "; Boström et al., 2006a]",
-                         style.createCitationMarker(citationMarkerEntries,
-                                                    true,
-                                                    NonUniqueCitationMarker.THROWS).toString());
+                            + "; Boström et al., 2006a; p2"
+                            + "; Boström et al., 2006a]",
+                    style.createCitationMarker(citationMarkerEntries,
+                            true,
+                            NonUniqueCitationMarker.THROWS).toString());
         }
     }
 }
diff --git a/src/test/java/org/jabref/logic/openoffice/style/OOBibStyleTestHelper.java b/src/test/java/org/jabref/logic/openoffice/style/OOBibStyleTestHelper.java
index ae5e83abd2f..4ab0c6ef5d3 100644
--- a/src/test/java/org/jabref/logic/openoffice/style/OOBibStyleTestHelper.java
+++ b/src/test/java/org/jabref/logic/openoffice/style/OOBibStyleTestHelper.java
@@ -1,6 +1,5 @@
 package org.jabref.logic.openoffice.style;
 
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -23,10 +22,6 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 class OOBibStyleTestHelper {
-    /*
-     * begin Helpers for testing style.getNumCitationMarker2
-     */
-
     /*
      * Minimal implementation for CitationMarkerNumericEntry
      */
@@ -37,15 +32,15 @@ static class CitationMarkerNumericEntryImpl implements CitationMarkerNumericEntr
          */
         public final static int UNRESOLVED_ENTRY_NUMBER = 0;
 
-        private String citationKey;
-        private Optional<Integer> num;
-        private Optional<OOText> pageInfo;
+        private final String citationKey;
+        private final Optional<Integer> num;
+        private final Optional<OOText> pageInfo;
 
         public CitationMarkerNumericEntryImpl(String citationKey, int num, Optional<OOText> pageInfo) {
             this.citationKey = citationKey;
             this.num = (num == UNRESOLVED_ENTRY_NUMBER
-                        ? Optional.empty()
-                        : Optional.of(num));
+                    ? Optional.empty()
+                    : Optional.of(num));
             this.pageInfo = PageInfo.normalizePageInfo(pageInfo);
         }
 
@@ -98,22 +93,21 @@ static String runGetNumCitationMarker2a(OOBibStyle style,
                                             List<Integer> num, int minGroupingCount, boolean inList) {
         if (inList) {
             if (num.size() != 1) {
-                throw new IllegalArgumentException("Numeric label for the bibliography with "
-                                                   + String.valueOf(num.size()) + " numbers?");
+                throw new IllegalArgumentException("Numeric label for the bibliography with " + num.size() + " numbers?");
             }
             int n = num.get(0);
             CitationMarkerNumericBibEntryImpl x =
-                new CitationMarkerNumericBibEntryImpl("key",
-                                                      (n == 0) ? Optional.empty() : Optional.of(n));
+                    new CitationMarkerNumericBibEntryImpl("key",
+                            (n == 0) ? Optional.empty() : Optional.of(n));
             return style.getNumCitationMarkerForBibliography(x).toString();
         } else {
             List<CitationMarkerNumericEntry> input =
-                num.stream()
-                .map(n ->
-                     new CitationMarkerNumericEntryImpl("key" + String.valueOf(n),
-                                                        n,
-                                                        Optional.empty()))
-                .collect(Collectors.toList());
+                    num.stream()
+                       .map(n ->
+                               new CitationMarkerNumericEntryImpl("key" + n,
+                                       n,
+                                       Optional.empty()))
+                       .collect(Collectors.toList());
             return style.getNumCitationMarker2(input, minGroupingCount).toString();
         }
     }
@@ -163,13 +157,14 @@ static CitationMarkerEntry makeCitationMarkerEntry(BibEntry entry,
      * Similar to old API. pageInfo is new, and unlimAuthors is
      * replaced with isFirstAppearanceOfSource
      */
-    static String getCitationMarker2(OOBibStyle style,
-                                     List<BibEntry> entries,
-                                     Map<BibEntry, BibDatabase> entryDBMap,
-                                     boolean inParenthesis,
-                                     String[] uniquefiers,
-                                     Boolean[] isFirstAppearanceOfSource,
-                                     String[] pageInfo) {
+    static String getCitationMarker2ab(OOBibStyle style,
+                                       List<BibEntry> entries,
+                                       Map<BibEntry, BibDatabase> entryDBMap,
+                                       boolean inParenthesis,
+                                       String[] uniquefiers,
+                                       Boolean[] isFirstAppearanceOfSource,
+                                       String[] pageInfo,
+                                       NonUniqueCitationMarker nonunique) {
         if (uniquefiers == null) {
             uniquefiers = new String[entries.size()];
             Arrays.fill(uniquefiers, null);
@@ -186,151 +181,185 @@ static String getCitationMarker2(OOBibStyle style,
         for (int i = 0; i < entries.size(); i++) {
             BibEntry entry = entries.get(i);
             CitationMarkerEntry e = makeCitationMarkerEntry(entry,
-                                                            entryDBMap.get(entry),
-                                                            uniquefiers[i],
-                                                            pageInfo[i],
-                                                            isFirstAppearanceOfSource[i]);
+                    entryDBMap.get(entry),
+                    uniquefiers[i],
+                    pageInfo[i],
+                    isFirstAppearanceOfSource[i]);
             citationMarkerEntries.add(e);
         }
         return style.createCitationMarker(citationMarkerEntries,
-                                          inParenthesis,
-                                          NonUniqueCitationMarker.THROWS).toString();
+                inParenthesis,
+                nonunique).toString();
+    }
+
+    static String getCitationMarker2(OOBibStyle style,
+                                     List<BibEntry> entries,
+                                     Map<BibEntry, BibDatabase> entryDBMap,
+                                     boolean inParenthesis,
+                                     String[] uniquefiers,
+                                     Boolean[] isFirstAppearanceOfSource,
+                                     String[] pageInfo) {
+        return getCitationMarker2ab(style,
+                entries,
+                entryDBMap,
+                inParenthesis,
+                uniquefiers,
+                isFirstAppearanceOfSource,
+                pageInfo,
+                NonUniqueCitationMarker.THROWS);
+    }
+
+    static String getCitationMarker2b(OOBibStyle style,
+                                      List<BibEntry> entries,
+                                      Map<BibEntry, BibDatabase> entryDBMap,
+                                      boolean inParenthesis,
+                                      String[] uniquefiers,
+                                      Boolean[] isFirstAppearanceOfSource,
+                                      String[] pageInfo) {
+        return getCitationMarker2ab(style,
+                entries,
+                entryDBMap,
+                inParenthesis,
+                uniquefiers,
+                isFirstAppearanceOfSource,
+                pageInfo,
+                NonUniqueCitationMarker.FORGIVEN);
     }
 
     /*
      * end helper
      */
 
-    static void testGetNumCitationMarkerExtra(OOBibStyle style) throws IOException {
+    static void testGetNumCitationMarkerExtra(OOBibStyle style) {
         // Identical numeric entries are joined.
         assertEquals("[1; 2]", runGetNumCitationMarker2b(style, 3,
-                                     numEntry("x1", 1, null),
-                                     numEntry("x2", 2, null),
-                                     numEntry("x1", 2, null),
-                                     numEntry("x2", 1, null)));
+                numEntry("x1", 1, null),
+                numEntry("x2", 2, null),
+                numEntry("x1", 2, null),
+                numEntry("x2", 1, null)));
 
         // ... unless minGroupingCount <= 0
         assertEquals("[1; 1; 2; 2]", runGetNumCitationMarker2b(style, 0,
-                                     numEntry("x1", 1, null),
-                                     numEntry("x2", 2, null),
-                                     numEntry("x1", 2, null),
-                                     numEntry("x2", 1, null)));
+                numEntry("x1", 1, null),
+                numEntry("x2", 2, null),
+                numEntry("x1", 2, null),
+                numEntry("x2", 1, null)));
 
         // ... or have different pageInfos
         assertEquals("[1; p1a; 1; p1b; 2; p2; 3]", runGetNumCitationMarker2b(style, 1,
-                                                         numEntry("x1", 1, "p1a"),
-                                                         numEntry("x1", 1, "p1b"),
-                                                         numEntry("x2", 2, "p2"),
-                                                         numEntry("x2", 2, "p2"),
-                                                         numEntry("x3", 3, null),
-                                                         numEntry("x3", 3, null)));
+                numEntry("x1", 1, "p1a"),
+                numEntry("x1", 1, "p1b"),
+                numEntry("x2", 2, "p2"),
+                numEntry("x2", 2, "p2"),
+                numEntry("x3", 3, null),
+                numEntry("x3", 3, null)));
 
         // Consecutive numbers can become a range ...
         assertEquals("[1-3]", runGetNumCitationMarker2b(style, 1,
-                                    numEntry("x1", 1, null),
-                                    numEntry("x2", 2, null),
-                                    numEntry("x3", 3, null)));
+                numEntry("x1", 1, null),
+                numEntry("x2", 2, null),
+                numEntry("x3", 3, null)));
 
         // ... unless minGroupingCount is too high
         assertEquals("[1; 2; 3]", runGetNumCitationMarker2b(style, 4,
-                                        numEntry("x1", 1, null),
-                                        numEntry("x2", 2, null),
-                                        numEntry("x3", 3, null)));
+                numEntry("x1", 1, null),
+                numEntry("x2", 2, null),
+                numEntry("x3", 3, null)));
 
         // ... or if minGroupingCount <= 0
         assertEquals("[1; 2; 3]", runGetNumCitationMarker2b(style, 0,
-                                        numEntry("x1", 1, null),
-                                        numEntry("x2", 2, null),
-                                        numEntry("x3", 3, null)));
+                numEntry("x1", 1, null),
+                numEntry("x2", 2, null),
+                numEntry("x3", 3, null)));
 
         // ... a pageInfo needs to be emitted
         assertEquals("[1; p1; 2-3]", runGetNumCitationMarker2b(style, 1,
-                                           numEntry("x1", 1, "p1"),
-                                           numEntry("x2", 2, null),
-                                           numEntry("x3", 3, null)));
+                numEntry("x1", 1, "p1"),
+                numEntry("x2", 2, null),
+                numEntry("x3", 3, null)));
 
         // null and "" pageInfos are taken as equal.
         // Due to trimming, "   " is the same as well.
         assertEquals("[1]", runGetNumCitationMarker2b(style, 1,
-                                  numEntry("x1", 1, ""),
-                                  numEntry("x1", 1, null),
-                                  numEntry("x1", 1, "  ")));
+                numEntry("x1", 1, ""),
+                numEntry("x1", 1, null),
+                numEntry("x1", 1, "  ")));
 
         // pageInfos are trimmed
         assertEquals("[1; p1]", runGetNumCitationMarker2b(style, 1,
-                                      numEntry("x1", 1, "p1"),
-                                      numEntry("x1", 1, " p1"),
-                                      numEntry("x1", 1, "p1 ")));
+                numEntry("x1", 1, "p1"),
+                numEntry("x1", 1, " p1"),
+                numEntry("x1", 1, "p1 ")));
 
         // The citation numbers come out sorted
         assertEquals("[3-5; 7; 10-12]", runGetNumCitationMarker2b(style, 1,
-                                              numEntry("x12", 12, null),
-                                              numEntry("x7", 7, null),
-                                              numEntry("x3", 3, null),
-                                              numEntry("x4", 4, null),
-                                              numEntry("x11", 11, null),
-                                              numEntry("x10", 10, null),
-                                              numEntry("x5", 5, null)));
+                numEntry("x12", 12, null),
+                numEntry("x7", 7, null),
+                numEntry("x3", 3, null),
+                numEntry("x4", 4, null),
+                numEntry("x11", 11, null),
+                numEntry("x10", 10, null),
+                numEntry("x5", 5, null)));
 
         // pageInfos are sorted together with the numbers
         // (but they inhibit ranges where they are, even if they are identical,
         //  but not empty-or-null)
         assertEquals("[3; p3; 4; p4; 5; p5; 7; p7; 10; px; 11; px; 12; px]",
-                     runGetNumCitationMarker2b(style, 1,
-                                               numEntry("x12", 12, "px"),
-                                               numEntry("x7", 7, "p7"),
-                                               numEntry("x3", 3, "p3"),
-                                               numEntry("x4", 4, "p4"),
-                                               numEntry("x11", 11, "px"),
-                                               numEntry("x10", 10, "px"),
-                                               numEntry("x5", 5, "p5")));
+                runGetNumCitationMarker2b(style, 1,
+                        numEntry("x12", 12, "px"),
+                        numEntry("x7", 7, "p7"),
+                        numEntry("x3", 3, "p3"),
+                        numEntry("x4", 4, "p4"),
+                        numEntry("x11", 11, "px"),
+                        numEntry("x10", 10, "px"),
+                        numEntry("x5", 5, "p5")));
 
         // pageInfo sorting (for the same number)
         assertEquals("[1; 1; a; 1; b]",
-                     runGetNumCitationMarker2b(style, 1,
-                                               numEntry("x1", 1, ""),
-                                               numEntry("x1", 1, "b"),
-                                               numEntry("x1", 1, "a")));
+                runGetNumCitationMarker2b(style, 1,
+                        numEntry("x1", 1, ""),
+                        numEntry("x1", 1, "b"),
+                        numEntry("x1", 1, "a")));
 
         // pageInfo sorting (for the same number) is not numeric.
         assertEquals("[1; p100; 1; p20; 1; p9]",
-                     runGetNumCitationMarker2b(style, 1,
-                                               numEntry("x1", 1, "p20"),
-                                               numEntry("x1", 1, "p9"),
-                                               numEntry("x1", 1, "p100")));
+                runGetNumCitationMarker2b(style, 1,
+                        numEntry("x1", 1, "p20"),
+                        numEntry("x1", 1, "p9"),
+                        numEntry("x1", 1, "p100")));
 
         assertEquals("[1-3]",
-                     runGetNumCitationMarker2b(style, 1,
-                                               numEntry("x1", 1, null),
-                                               numEntry("x2", 2, null),
-                                               numEntry("x3", 3, null)));
+                runGetNumCitationMarker2b(style, 1,
+                        numEntry("x1", 1, null),
+                        numEntry("x2", 2, null),
+                        numEntry("x3", 3, null)));
 
         assertEquals("[1; 2; 3]",
-                     runGetNumCitationMarker2b(style, 5,
-                                               numEntry("x1", 1, null),
-                                               numEntry("x2", 2, null),
-                                               numEntry("x3", 3, null)));
+                runGetNumCitationMarker2b(style, 5,
+                        numEntry("x1", 1, null),
+                        numEntry("x2", 2, null),
+                        numEntry("x3", 3, null)));
 
         assertEquals("[1; 2; 3]",
-                     runGetNumCitationMarker2b(style, -1,
-                                               numEntry("x1", 1, null),
-                                               numEntry("x2", 2, null),
-                                               numEntry("x3", 3, null)));
+                runGetNumCitationMarker2b(style, -1,
+                        numEntry("x1", 1, null),
+                        numEntry("x2", 2, null),
+                        numEntry("x3", 3, null)));
 
         assertEquals("[1; 3; 12]",
-                     runGetNumCitationMarker2b(style, 1,
-                                               numEntry("x1", 1, null),
-                                               numEntry("x12", 12, null),
-                                               numEntry("x3", 3, null)));
+                runGetNumCitationMarker2b(style, 1,
+                        numEntry("x1", 1, null),
+                        numEntry("x12", 12, null),
+                        numEntry("x3", 3, null)));
 
         assertEquals("[3-5; 7; 10-12]",
-                     runGetNumCitationMarker2b(style, 1,
-                                               numEntry("x12", 12, ""),
-                                               numEntry("x7", 7, ""),
-                                               numEntry("x3", 3, ""),
-                                               numEntry("x4", 4, ""),
-                                               numEntry("x11", 11, ""),
-                                               numEntry("x10", 10, ""),
-                                               numEntry("x5", 5, "")));
+                runGetNumCitationMarker2b(style, 1,
+                        numEntry("x12", 12, ""),
+                        numEntry("x7", 7, ""),
+                        numEntry("x3", 3, ""),
+                        numEntry("x4", 4, ""),
+                        numEntry("x11", 11, ""),
+                        numEntry("x10", 10, ""),
+                        numEntry("x5", 5, "")));
     }
 }
diff --git a/src/test/java/org/jabref/logic/openoffice/style/StyleLoaderTest.java b/src/test/java/org/jabref/logic/openoffice/style/StyleLoaderTest.java
index 9b5a58f4de5..50382895b56 100644
--- a/src/test/java/org/jabref/logic/openoffice/style/StyleLoaderTest.java
+++ b/src/test/java/org/jabref/logic/openoffice/style/StyleLoaderTest.java
@@ -40,23 +40,18 @@ public void setUp() {
 
     @Test
     public void throwNPEWithNullPreferences() {
-        assertThrows(NullPointerException.class, () -> loader = new StyleLoader(null, layoutPreferences, mock(Charset.class)));
+        assertThrows(NullPointerException.class, () -> loader = new StyleLoader(null, layoutPreferences));
     }
 
     @Test
     public void throwNPEWithNullLayoutPreferences() {
-        assertThrows(NullPointerException.class, () -> loader = new StyleLoader(mock(OpenOfficePreferences.class), null, mock(Charset.class)));
-    }
-
-    @Test
-    public void throwNPEWithNullCharset() {
-        assertThrows(NullPointerException.class, () -> loader = new StyleLoader(mock(OpenOfficePreferences.class), layoutPreferences, null));
+        assertThrows(NullPointerException.class, () -> loader = new StyleLoader(mock(OpenOfficePreferences.class), null));
     }
 
     @Test
     public void testGetStylesWithEmptyExternal() {
         preferences.setExternalStyles(Collections.emptyList());
-        loader = new StyleLoader(preferences, layoutPreferences, encoding);
+        loader = new StyleLoader(preferences, layoutPreferences);
 
         assertEquals(2, loader.getStyles().size());
     }
@@ -64,7 +59,7 @@ public void testGetStylesWithEmptyExternal() {
     @Test
     public void testAddStyleLeadsToOneMoreStyle() throws URISyntaxException {
         preferences.setExternalStyles(Collections.emptyList());
-        loader = new StyleLoader(preferences, layoutPreferences, encoding);
+        loader = new StyleLoader(preferences, layoutPreferences);
 
         String filename = Path.of(StyleLoader.class.getResource(StyleLoader.DEFAULT_AUTHORYEAR_STYLE_PATH).toURI())
                               .toFile().getPath();
@@ -75,7 +70,7 @@ public void testAddStyleLeadsToOneMoreStyle() throws URISyntaxException {
     @Test
     public void testAddInvalidStyleLeadsToNoMoreStyle() {
         preferences.setExternalStyles(Collections.emptyList());
-        loader = new StyleLoader(preferences, layoutPreferences, encoding);
+        loader = new StyleLoader(preferences, layoutPreferences);
         int beforeAdding = loader.getStyles().size();
         loader.addStyleIfValid("DefinitelyNotAValidFileNameOrWeAreExtremelyUnlucky");
         assertEquals(beforeAdding, loader.getStyles().size());
@@ -84,9 +79,9 @@ public void testAddInvalidStyleLeadsToNoMoreStyle() {
     @Test
     public void testInitalizeWithOneExternalFile() throws URISyntaxException {
         String filename = Path.of(StyleLoader.class.getResource(StyleLoader.DEFAULT_AUTHORYEAR_STYLE_PATH).toURI())
-                               .toFile().getPath();
+                              .toFile().getPath();
         when(preferences.getExternalStyles()).thenReturn(Collections.singletonList(filename));
-        loader = new StyleLoader(preferences, layoutPreferences, encoding);
+        loader = new StyleLoader(preferences, layoutPreferences);
         assertEquals(NUMBER_OF_INTERNAL_STYLES + 1, loader.getStyles().size());
     }
 
@@ -94,17 +89,17 @@ public void testInitalizeWithOneExternalFile() throws URISyntaxException {
     public void testInitalizeWithIncorrectExternalFile() {
         preferences.setExternalStyles(Collections.singletonList("DefinitelyNotAValidFileNameOrWeAreExtremelyUnlucky"));
 
-        loader = new StyleLoader(preferences, layoutPreferences, encoding);
+        loader = new StyleLoader(preferences, layoutPreferences);
         assertEquals(NUMBER_OF_INTERNAL_STYLES, loader.getStyles().size());
     }
 
     @Test
     public void testInitalizeWithOneExternalFileRemoveStyle() throws URISyntaxException {
         String filename = Path.of(StyleLoader.class.getResource(StyleLoader.DEFAULT_AUTHORYEAR_STYLE_PATH).toURI())
-                               .toFile().getPath();
+                              .toFile().getPath();
         when(preferences.getExternalStyles()).thenReturn(Collections.singletonList(filename));
 
-        loader = new StyleLoader(preferences, layoutPreferences, encoding);
+        loader = new StyleLoader(preferences, layoutPreferences);
         List<OOBibStyle> toremove = new ArrayList<>();
         int beforeRemoving = loader.getStyles().size();
         for (OOBibStyle style : loader.getStyles()) {
@@ -122,10 +117,10 @@ public void testInitalizeWithOneExternalFileRemoveStyle() throws URISyntaxExcept
     @Test
     public void testInitalizeWithOneExternalFileRemoveStyleUpdatesPreferences() throws URISyntaxException {
         String filename = Path.of(StyleLoader.class.getResource(StyleLoader.DEFAULT_AUTHORYEAR_STYLE_PATH).toURI())
-                               .toFile().getPath();
+                              .toFile().getPath();
         when(preferences.getExternalStyles()).thenReturn(Collections.singletonList(filename));
 
-        loader = new StyleLoader(preferences, layoutPreferences, encoding);
+        loader = new StyleLoader(preferences, layoutPreferences);
         List<OOBibStyle> toremove = new ArrayList<>();
         for (OOBibStyle style : loader.getStyles()) {
             if (!style.isInternalStyle()) {
@@ -143,10 +138,10 @@ public void testInitalizeWithOneExternalFileRemoveStyleUpdatesPreferences() thro
     @Test
     public void testAddSameStyleTwiceLeadsToOneMoreStyle() throws URISyntaxException {
         preferences.setExternalStyles(Collections.emptyList());
-        loader = new StyleLoader(preferences, layoutPreferences, encoding);
+        loader = new StyleLoader(preferences, layoutPreferences);
         int beforeAdding = loader.getStyles().size();
         String filename = Path.of(StyleLoader.class.getResource(StyleLoader.DEFAULT_AUTHORYEAR_STYLE_PATH).toURI())
-                               .toFile().getPath();
+                              .toFile().getPath();
         loader.addStyleIfValid(filename);
         loader.addStyleIfValid(filename);
         assertEquals(beforeAdding + 1, loader.getStyles().size());
@@ -154,7 +149,7 @@ public void testAddSameStyleTwiceLeadsToOneMoreStyle() throws URISyntaxException
 
     @Test
     public void testAddNullStyleThrowsNPE() {
-        loader = new StyleLoader(preferences, layoutPreferences, encoding);
+        loader = new StyleLoader(preferences, layoutPreferences);
         assertThrows(NullPointerException.class, () -> loader.addStyleIfValid(null));
     }
 
@@ -162,7 +157,7 @@ public void testAddNullStyleThrowsNPE() {
     public void testGetDefaultUsedStyleWhenEmpty() {
         when(preferences.getCurrentStyle()).thenReturn(StyleLoader.DEFAULT_AUTHORYEAR_STYLE_PATH);
         preferences.clearCurrentStyle();
-        loader = new StyleLoader(preferences, layoutPreferences, encoding);
+        loader = new StyleLoader(preferences, layoutPreferences);
         OOBibStyle style = loader.getUsedStyle();
         assertTrue(style.isValid());
         assertEquals(StyleLoader.DEFAULT_AUTHORYEAR_STYLE_PATH, style.getPath());
@@ -172,7 +167,7 @@ public void testGetDefaultUsedStyleWhenEmpty() {
     @Test
     public void testGetStoredUsedStyle() {
         when(preferences.getCurrentStyle()).thenReturn(StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH);
-        loader = new StyleLoader(preferences, layoutPreferences, encoding);
+        loader = new StyleLoader(preferences, layoutPreferences);
         OOBibStyle style = loader.getUsedStyle();
         assertTrue(style.isValid());
         assertEquals(StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH, style.getPath());
@@ -182,7 +177,7 @@ public void testGetStoredUsedStyle() {
     @Test
     public void testGetDefaultUsedStyleWhenIncorrect() {
         when(preferences.getCurrentStyle()).thenReturn("ljlkjlkjnljnvdlsjniuhwelfhuewfhlkuewhfuwhelu");
-        loader = new StyleLoader(preferences, layoutPreferences, encoding);
+        loader = new StyleLoader(preferences, layoutPreferences);
         OOBibStyle style = loader.getUsedStyle();
         assertTrue(style.isValid());
         assertEquals(StyleLoader.DEFAULT_AUTHORYEAR_STYLE_PATH, style.getPath());
@@ -192,7 +187,7 @@ public void testGetDefaultUsedStyleWhenIncorrect() {
     public void testRemoveInternalStyleReturnsFalseAndDoNotRemove() {
         preferences.setExternalStyles(Collections.emptyList());
 
-        loader = new StyleLoader(preferences, layoutPreferences, encoding);
+        loader = new StyleLoader(preferences, layoutPreferences);
         List<OOBibStyle> toremove = new ArrayList<>();
         for (OOBibStyle style : loader.getStyles()) {
             if (style.isInternalStyle()) {
diff --git a/src/test/java/org/jabref/logic/protectedterms/ProtectedTermsLoaderTest.java b/src/test/java/org/jabref/logic/protectedterms/ProtectedTermsLoaderTest.java
index 65efb43cb4a..2124d7a63ae 100644
--- a/src/test/java/org/jabref/logic/protectedterms/ProtectedTermsLoaderTest.java
+++ b/src/test/java/org/jabref/logic/protectedterms/ProtectedTermsLoaderTest.java
@@ -105,7 +105,6 @@ void testReadProtectedTermsListFromFileNoDescriptionGivesDefaultDescription()
 
     @Test
     void testNewListsAreIncluded() {
-
         ProtectedTermsLoader localLoader = new ProtectedTermsLoader(
                 new ProtectedTermsPreferences(Collections.emptyList(),
                         Collections.emptyList(), Collections.emptyList(), Collections.emptyList()));
@@ -114,7 +113,6 @@ void testNewListsAreIncluded() {
 
     @Test
     void testNewListsAreEnabled() {
-
         ProtectedTermsLoader localLoader = new ProtectedTermsLoader(
                 new ProtectedTermsPreferences(Collections.emptyList(),
                         Collections.emptyList(), Collections.emptyList(), Collections.emptyList()));
@@ -125,7 +123,6 @@ void testNewListsAreEnabled() {
 
     @Test
     void testInitalizedAllInternalDisabled() {
-
         ProtectedTermsLoader localLoader = new ProtectedTermsLoader(
                 new ProtectedTermsPreferences(Collections.emptyList(), Collections.emptyList(),
                         ProtectedTermsLoader.getInternalLists(), Collections.emptyList()));
@@ -136,7 +133,6 @@ void testInitalizedAllInternalDisabled() {
 
     @Test
     void testUnknownExternalFileWillNotLoad() {
-
         ProtectedTermsLoader localLoader = new ProtectedTermsLoader(
                 new ProtectedTermsPreferences(ProtectedTermsLoader.getInternalLists(),
                         Collections.singletonList("someUnlikelyNameThatNeverWillExist"), Collections.emptyList(),
@@ -146,7 +142,6 @@ void testUnknownExternalFileWillNotLoad() {
 
     @Test
     void testAllDisabledNoWords() {
-
         ProtectedTermsLoader localLoader = new ProtectedTermsLoader(
                 new ProtectedTermsPreferences(Collections.emptyList(), Collections.emptyList(),
                         ProtectedTermsLoader.getInternalLists(), Collections.emptyList()));
@@ -155,7 +150,6 @@ void testAllDisabledNoWords() {
 
     @Test
     void testDoNotLoadTheSameInternalListTwice() {
-
         ProtectedTermsLoader localLoader = new ProtectedTermsLoader(
                 new ProtectedTermsPreferences(ProtectedTermsLoader.getInternalLists(), Collections.emptyList(),
                         ProtectedTermsLoader.getInternalLists(), Collections.emptyList()));
@@ -164,7 +158,6 @@ void testDoNotLoadTheSameInternalListTwice() {
 
     @Test
     void testAddNewTermListAddsList(@TempDir Path tempDir) {
-
         ProtectedTermsLoader localLoader = new ProtectedTermsLoader(
                 new ProtectedTermsPreferences(Collections.emptyList(), Collections.emptyList(),
                         ProtectedTermsLoader.getInternalLists(), Collections.emptyList()));
@@ -174,7 +167,6 @@ void testAddNewTermListAddsList(@TempDir Path tempDir) {
 
     @Test
     void testAddNewTermListNewListInList(@TempDir Path tempDir) {
-
         ProtectedTermsLoader localLoader = new ProtectedTermsLoader(
                 new ProtectedTermsPreferences(Collections.emptyList(), Collections.emptyList(),
                         ProtectedTermsLoader.getInternalLists(), Collections.emptyList()));
@@ -185,7 +177,6 @@ void testAddNewTermListNewListInList(@TempDir Path tempDir) {
 
     @Test
     void testRemoveTermList(@TempDir Path tempDir) {
-
         ProtectedTermsLoader localLoader = new ProtectedTermsLoader(
                 new ProtectedTermsPreferences(Collections.emptyList(), Collections.emptyList(),
                         ProtectedTermsLoader.getInternalLists(), Collections.emptyList()));
@@ -195,7 +186,6 @@ void testRemoveTermList(@TempDir Path tempDir) {
 
     @Test
     void testRemoveTermListReduceTheCount(@TempDir Path tempDir) {
-
         ProtectedTermsLoader localLoader = new ProtectedTermsLoader(
                 new ProtectedTermsPreferences(Collections.emptyList(), Collections.emptyList(),
                         ProtectedTermsLoader.getInternalLists(), Collections.emptyList()));
@@ -207,7 +197,6 @@ void testRemoveTermListReduceTheCount(@TempDir Path tempDir) {
 
     @Test
     void testAddNewTermListSetsCorrectDescription(@TempDir Path tempDir) {
-
         ProtectedTermsLoader localLoader = new ProtectedTermsLoader(
                 new ProtectedTermsPreferences(Collections.emptyList(), Collections.emptyList(),
                         ProtectedTermsLoader.getInternalLists(), Collections.emptyList()));
diff --git a/src/test/java/org/jabref/logic/remote/RemoteSetupTest.java b/src/test/java/org/jabref/logic/remote/RemoteSetupTest.java
index 37598a854ec..cd3f7905c13 100644
--- a/src/test/java/org/jabref/logic/remote/RemoteSetupTest.java
+++ b/src/test/java/org/jabref/logic/remote/RemoteSetupTest.java
@@ -20,6 +20,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assumptions.assumeFalse;
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
@@ -94,7 +95,7 @@ void testPortAlreadyInUse() throws IOException {
                 assertFalse(server.isOpen());
                 server.openAndStart(messageHandler, port, preferencesService);
                 assertFalse(server.isOpen());
-                verify(messageHandler, never()).handleCommandLineArguments(any(), preferencesService);
+                verify(messageHandler, never()).handleCommandLineArguments(any(), eq(preferencesService));
             }
         }
     }
diff --git a/src/test/java/org/jabref/logic/shared/SynchronizationTestSimulator.java b/src/test/java/org/jabref/logic/shared/SynchronizationTestSimulator.java
index 2ddf1826f33..ff3ad198af5 100644
--- a/src/test/java/org/jabref/logic/shared/SynchronizationTestSimulator.java
+++ b/src/test/java/org/jabref/logic/shared/SynchronizationTestSimulator.java
@@ -165,5 +165,4 @@ public void simulateEntryChangeConflicts() {
         // In this case an BibEntry merge dialog pops up.
         assertNotNull(eventListenerB.getUpdateRefusedEvent());
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/texparser/LatexParserTest.java b/src/test/java/org/jabref/logic/texparser/LatexParserTest.java
index 6cdfc20d9df..97929726abb 100644
--- a/src/test/java/org/jabref/logic/texparser/LatexParserTest.java
+++ b/src/test/java/org/jabref/logic/texparser/LatexParserTest.java
@@ -1,7 +1,6 @@
 package org.jabref.logic.texparser;
 
 import java.net.URISyntaxException;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.util.Arrays;
 
@@ -22,7 +21,6 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
 
 public class LatexParserTest {
     private final static String DARWIN = "Darwin1888";
@@ -39,9 +37,8 @@ public class LatexParserTest {
     private BibDatabase database2;
 
     @BeforeEach
-    private void setUp() {
+    void setUp() {
         generalPreferences = mock(GeneralPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        when(generalPreferences.getDefaultEncoding()).thenReturn(StandardCharsets.UTF_8);
         importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
 
         database = new BibDatabase();
diff --git a/src/test/java/org/jabref/logic/texparser/TexBibEntriesResolverTest.java b/src/test/java/org/jabref/logic/texparser/TexBibEntriesResolverTest.java
index 773851c147d..a3870bafb72 100644
--- a/src/test/java/org/jabref/logic/texparser/TexBibEntriesResolverTest.java
+++ b/src/test/java/org/jabref/logic/texparser/TexBibEntriesResolverTest.java
@@ -1,7 +1,6 @@
 package org.jabref.logic.texparser;
 
 import java.net.URISyntaxException;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.util.Arrays;
 
@@ -22,7 +21,6 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
 
 public class TexBibEntriesResolverTest {
     private final static String DARWIN = "Darwin1888";
@@ -40,9 +38,8 @@ public class TexBibEntriesResolverTest {
     private BibEntry bibEntry;
 
     @BeforeEach
-    private void setUp() {
+    void setUp() {
         generalPreferences = mock(GeneralPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        when(generalPreferences.getDefaultEncoding()).thenReturn(StandardCharsets.UTF_8);
         importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
 
         database = new BibDatabase();
diff --git a/src/test/java/org/jabref/logic/util/VersionTest.java b/src/test/java/org/jabref/logic/util/VersionTest.java
index 438225fa712..5e04e7d234a 100644
--- a/src/test/java/org/jabref/logic/util/VersionTest.java
+++ b/src/test/java/org/jabref/logic/util/VersionTest.java
@@ -193,6 +193,20 @@ public void versionNotNewerPatch() {
         assertFalse(older.isNewerThan(newer));
     }
 
+    @Test
+    public void versionNewerDevelopmentNumber() {
+        Version older = Version.parse("4.2-beta1");
+        Version newer = Version.parse("4.2-beta2");
+        assertFalse(older.isNewerThan(newer));
+    }
+
+    @Test
+    public void versionNotNewerThanSameVersionWithBeta() {
+        Version version1 = Version.parse("4.2-beta2");
+        Version version2 = Version.parse("4.2-beta2");
+        assertFalse(version2.isNewerThan(version1));
+    }
+
     @Test
     public void equalVersionsNotNewer() {
         Version version1 = Version.parse("4.2.2");
@@ -203,13 +217,25 @@ public void equalVersionsNotNewer() {
     @Test
     public void changelogOfDevelopmentVersionWithDash() {
         Version version = Version.parse("4.0-dev");
-        assertEquals("https://github.com/JabRef/jabref/blob/master/CHANGELOG.md#unreleased", version.getChangelogUrl());
+        assertEquals("https://github.com/JabRef/jabref/blob/main/CHANGELOG.md#unreleased", version.getChangelogUrl());
     }
 
     @Test
     public void changelogOfDevelopmentVersionWithoutDash() {
         Version version = Version.parse("3.7dev");
-        assertEquals("https://github.com/JabRef/jabref/blob/master/CHANGELOG.md#unreleased", version.getChangelogUrl());
+        assertEquals("https://github.com/JabRef/jabref/blob/main/CHANGELOG.md#unreleased", version.getChangelogUrl());
+    }
+
+    @Test
+    public void changelogOfDevelopmentStageSubNumber() {
+        Version version1 = Version.parse("4.0");
+        Version version2 = Version.parse("4.0-beta");
+        Version version3 = Version.parse("4.0-beta2");
+        Version version4 = Version.parse("4.0-beta3");
+        assertEquals("https://github.com/JabRef/jabref/blob/v4.0/CHANGELOG.md", version1.getChangelogUrl());
+        assertEquals("https://github.com/JabRef/jabref/blob/v4.0-beta/CHANGELOG.md", version2.getChangelogUrl());
+        assertEquals("https://github.com/JabRef/jabref/blob/v4.0-beta2/CHANGELOG.md", version3.getChangelogUrl());
+        assertEquals("https://github.com/JabRef/jabref/blob/v4.0-beta3/CHANGELOG.md", version4.getChangelogUrl());
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/util/io/BackupFileUtilTest.java b/src/test/java/org/jabref/logic/util/io/BackupFileUtilTest.java
new file mode 100644
index 00000000000..f44e6a45e1e
--- /dev/null
+++ b/src/test/java/org/jabref/logic/util/io/BackupFileUtilTest.java
@@ -0,0 +1,44 @@
+package org.jabref.logic.util.io;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+import org.jabref.logic.util.BackupFileType;
+
+import org.junit.jupiter.api.Test;
+import org.mockito.Answers;
+import org.mockito.MockedStatic;
+import org.mockito.Mockito;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+
+public class BackupFileUtilTest {
+
+    @Test
+    void uniqueFilePrefix() {
+        // We cannot test for a concrete hash code, because hashing implementation differs from environment to environment
+        assertNotEquals("", BackupFileUtil.getUniqueFilePrefix(Path.of("test.bib")));
+    }
+
+    @Test
+    void getPathOfBackupFileAndCreateDirectoryReturnsAppDirectoryInCaseOfNoError() {
+        String start = BackupFileUtil.getAppDataBackupDir().toString();
+        String result = BackupFileUtil.getPathForNewBackupFileAndCreateDirectory(Path.of("test.bib"), BackupFileType.BACKUP).toString();
+        // We just check the prefix
+        assertEquals(start, result.substring(0, start.length()));
+    }
+
+    @Test
+    void getPathOfBackupFileAndCreateDirectoryReturnsSameDirectoryInCaseOfException() {
+        try (MockedStatic<Files> files = Mockito.mockStatic(Files.class, Answers.RETURNS_DEEP_STUBS)) {
+            files.when(() -> Files.createDirectories(BackupFileUtil.getAppDataBackupDir()))
+                 .thenThrow(new IOException());
+            Path testPath = Path.of("tmp", "test.bib");
+            Path result = BackupFileUtil.getPathForNewBackupFileAndCreateDirectory(testPath, BackupFileType.BACKUP);
+            // The intended fallback behavior is to put the .bak file in the same directory as the .bib file
+            assertEquals(Path.of("tmp", "test.bib.bak"), result);
+        }
+    }
+}
diff --git a/src/test/java/org/jabref/logic/util/io/FileNameUniquenessTest.java b/src/test/java/org/jabref/logic/util/io/FileNameUniquenessTest.java
index 6aaffd430ac..a54aadf58b4 100644
--- a/src/test/java/org/jabref/logic/util/io/FileNameUniquenessTest.java
+++ b/src/test/java/org/jabref/logic/util/io/FileNameUniquenessTest.java
@@ -101,5 +101,4 @@ public void testTaseDuplicateMarksReturnsSameName2() throws IOException {
         String fileName2 = FileNameUniqueness.eraseDuplicateMarks(fileName1);
         assertEquals("abc def", fileName2);
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/util/io/FileUtilTest.java b/src/test/java/org/jabref/logic/util/io/FileUtilTest.java
index f1b9d1f76d2..8cb061fc99e 100644
--- a/src/test/java/org/jabref/logic/util/io/FileUtilTest.java
+++ b/src/test/java/org/jabref/logic/util/io/FileUtilTest.java
@@ -20,6 +20,8 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 import org.mockito.Answers;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -29,6 +31,8 @@
 import static org.mockito.Mockito.mock;
 
 class FileUtilTest {
+    private static final Logger LOGGER = LoggerFactory.getLogger(FileUtilTest.class);
+
     private final Path nonExistingTestPath = Path.of("nonExistingTestPath");
     private Path existingTestFile;
     private Path otherExistingTestFile;
@@ -319,7 +323,7 @@ void testRenameFileSuccessful(@TempDir Path otherTemporaryFolder) {
         // in the @BeforeEach method.
         Path temp = Path.of(otherTemporaryFolder.resolve("123").toString());
 
-        System.out.println(temp);
+        LOGGER.debug("Temp dir {}", temp);
         FileUtil.renameFile(existingTestFile, temp);
         assertFalse(Files.exists(existingTestFile));
     }
@@ -383,4 +387,18 @@ void testIsNotBibFile() throws IOException {
         Path bibFile = Files.createFile(rootDir.resolve("test.pdf"));
         assertFalse(FileUtil.isBibFile(bibFile));
     }
+
+    @Test
+    void testFindinPath() {
+        Optional<Path> resultPath1 = FileUtil.find("existingTestFile.txt", rootDir);
+        assertEquals(resultPath1.get().toString(), existingTestFile.toString());
+    }
+
+    @Test
+    void testFindInListOfPath() {
+        List<Path> paths = List.of(existingTestFile, otherExistingTestFile, rootDir);
+        List<Path> resultPaths = List.of(existingTestFile, existingTestFile);
+        List<Path> result = FileUtil.find("existingTestFile.txt", paths);
+        assertEquals(resultPaths, result);
+    }
 }
diff --git a/src/test/java/org/jabref/logic/xmp/XmpUtilReaderTest.java b/src/test/java/org/jabref/logic/xmp/XmpUtilReaderTest.java
index b93181f7562..074b4fbf34f 100644
--- a/src/test/java/org/jabref/logic/xmp/XmpUtilReaderTest.java
+++ b/src/test/java/org/jabref/logic/xmp/XmpUtilReaderTest.java
@@ -2,7 +2,6 @@
 
 import java.io.IOException;
 import java.net.URISyntaxException;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.util.Arrays;
 import java.util.Collections;
@@ -10,13 +9,12 @@
 import java.util.Optional;
 
 import org.jabref.logic.importer.ImportFormatPreferences;
-import org.jabref.logic.importer.ParseException;
-import org.jabref.logic.importer.fileformat.BibtexParser;
+import org.jabref.logic.importer.fileformat.BibtexImporter;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.LinkedFile;
+import org.jabref.model.schema.DublinCoreSchemaCustom;
 import org.jabref.model.util.DummyFileUpdateMonitor;
 
-import com.google.common.io.Resources;
 import org.apache.xmpbox.XMPMetadata;
 import org.apache.xmpbox.schema.DublinCoreSchema;
 import org.junit.jupiter.api.BeforeEach;
@@ -30,57 +28,71 @@
 class XmpUtilReaderTest {
 
     private XmpPreferences xmpPreferences;
-    private BibtexParser parser;
+    private BibtexImporter testImporter;
+    private final XmpUtilReader xmpUtilReader = new XmpUtilReader();
 
     /**
      * Create a temporary PDF-file with a single empty page.
      */
     @BeforeEach
     void setUp() {
-        ImportFormatPreferences importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
         xmpPreferences = mock(XmpPreferences.class);
         // The code assumes privacy filters to be off
         when(xmpPreferences.shouldUseXmpPrivacyFilter()).thenReturn(false);
 
         when(xmpPreferences.getKeywordSeparator()).thenReturn(',');
 
-        parser = new BibtexParser(importFormatPreferences, new DummyFileUpdateMonitor());
+        testImporter = new BibtexImporter(mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS), new DummyFileUpdateMonitor());
     }
 
     /**
      * Tests reading of dublinCore metadata.
      */
     @Test
-    void testReadArticleDublinCoreReadRawXmp() throws IOException, URISyntaxException, ParseException {
-        Path path = Path.of(XmpUtilShared.class.getResource("article_dublinCore.pdf").toURI());
-        List<XMPMetadata> meta = XmpUtilReader.readRawXmp(path);
+    void testReadArticleDublinCoreReadRawXmp() throws IOException, URISyntaxException {
+        Path path = Path.of(XmpUtilShared.class.getResource("article_dublinCore_without_day.pdf").toURI());
+        List<XMPMetadata> meta = xmpUtilReader.readRawXmp(path);
 
-        DublinCoreSchema dcSchema = meta.get(0).getDublinCoreSchema();
+        DublinCoreSchema dcSchema = DublinCoreSchemaCustom.copyDublinCoreSchema(meta.get(0).getDublinCoreSchema());
         DublinCoreExtractor dcExtractor = new DublinCoreExtractor(dcSchema, xmpPreferences, new BibEntry());
         Optional<BibEntry> entry = dcExtractor.extractBibtexEntry();
-        String bibString = Resources.toString(XmpUtilShared.class.getResource("article_dublinCore.bib"), StandardCharsets.UTF_8);
-        Optional<BibEntry> entryFromBibFile = parser.parseSingleEntry(bibString);
 
-        assertEquals(entryFromBibFile.get(), entry.get());
+        Path bibFile = Path.of(XmpUtilShared.class.getResource("article_dublinCore_without_day.bib").toURI());
+        List<BibEntry> expected = testImporter.importDatabase(bibFile).getDatabase().getEntries();
+
+        assertEquals(expected, Collections.singletonList(entry.get()));
     }
 
     /**
      * Tests reading of dublinCore metadata.
      */
     @Test
-    void testReadArticleDublinCoreReadXmp() throws IOException, URISyntaxException, ParseException {
+    void testReadArticleDublinCoreReadXmp() throws IOException, URISyntaxException {
         Path pathPdf = Path.of(XmpUtilShared.class.getResource("article_dublinCore.pdf").toURI());
-        List<BibEntry> entries = XmpUtilReader.readXmp(pathPdf, xmpPreferences);
-        BibEntry entry = entries.get(0);
+        List<BibEntry> entries = xmpUtilReader.readXmp(pathPdf, xmpPreferences);
+        Path bibFile = Path.of(XmpUtilShared.class.getResource("article_dublinCore.bib").toURI());
+        List<BibEntry> expected = testImporter.importDatabase(bibFile).getDatabase().getEntries();
 
-        String bibString = Resources.toString(XmpUtilShared.class.getResource("article_dublinCore.bib"), StandardCharsets.UTF_8);
-        Optional<BibEntry> entryFromBibFile = parser.parseSingleEntry(bibString);
-        entryFromBibFile.get().setFiles(Arrays.asList(
+        expected.forEach(bibEntry -> bibEntry.setFiles(Arrays.asList(
                 new LinkedFile("", Path.of("paper.pdf"), "PDF"),
                 new LinkedFile("", pathPdf.toAbsolutePath(), "PDF"))
-        );
+        ));
+
+        assertEquals(expected, entries);
+    }
+
+    @Test
+    void testReadArticleDublinCoreReadXmpPartialDate() throws IOException, URISyntaxException {
+        Path pathPdf = Path.of(XmpUtilShared.class.getResource("article_dublinCore_partial_date.pdf").toURI());
+        List<BibEntry> entries = xmpUtilReader.readXmp(pathPdf, xmpPreferences);
+        Path bibFile = Path.of(XmpUtilShared.class.getResource("article_dublinCore_partial_date.bib").toURI());
+        List<BibEntry> expected = testImporter.importDatabase(bibFile).getDatabase().getEntries();
+
+        expected.forEach(bibEntry -> bibEntry.setFiles(List.of(
+                new LinkedFile("", pathPdf.toAbsolutePath(), "PDF"))
+        ));
 
-        assertEquals(entryFromBibFile.get(), entry);
+        assertEquals(expected, entries);
     }
 
     /**
@@ -88,7 +100,7 @@ void testReadArticleDublinCoreReadXmp() throws IOException, URISyntaxException,
      */
     @Test
     void testReadEmtpyMetadata() throws IOException, URISyntaxException {
-        List<BibEntry> entries = XmpUtilReader.readXmp(Path.of(XmpUtilShared.class.getResource("empty_metadata.pdf").toURI()), xmpPreferences);
+        List<BibEntry> entries = xmpUtilReader.readXmp(Path.of(XmpUtilShared.class.getResource("empty_metadata.pdf").toURI()), xmpPreferences);
         assertEquals(Collections.emptyList(), entries);
     }
 
@@ -96,17 +108,18 @@ void testReadEmtpyMetadata() throws IOException, URISyntaxException {
      * Test non XMP metadata. Metadata are included in the PDInformation
      */
     @Test
-    void testReadPDMetadata() throws IOException, URISyntaxException, ParseException {
+    void testReadPDMetadata() throws IOException, URISyntaxException {
         Path pathPdf = Path.of(XmpUtilShared.class.getResource("PD_metadata.pdf").toURI());
-        List<BibEntry> entries = XmpUtilReader.readXmp(pathPdf, xmpPreferences);
+        List<BibEntry> entries = xmpUtilReader.readXmp(pathPdf, xmpPreferences);
+
+        Path bibFile = Path.of(XmpUtilShared.class.getResource("PD_metadata.bib").toURI());
+        List<BibEntry> expected = testImporter.importDatabase(bibFile).getDatabase().getEntries();
 
-        String bibString = Resources.toString(XmpUtilShared.class.getResource("PD_metadata.bib"), StandardCharsets.UTF_8);
-        Optional<BibEntry> entryFromBibFile = parser.parseSingleEntry(bibString);
-        entryFromBibFile.get().setFiles(Collections.singletonList(
+        expected.forEach(bibEntry -> bibEntry.setFiles(List.of(
                 new LinkedFile("", pathPdf.toAbsolutePath(), "PDF"))
-        );
+        ));
 
-        assertEquals(entryFromBibFile.get(), entries.get(0));
+        assertEquals(expected, entries);
     }
 
     /**
@@ -114,7 +127,7 @@ void testReadPDMetadata() throws IOException, URISyntaxException, ParseException
      */
     @Test
     void testReadNoDescriptionMetadata() throws IOException, URISyntaxException {
-        List<BibEntry> entries = XmpUtilReader.readXmp(Path.of(XmpUtilShared.class.getResource("no_description_metadata.pdf").toURI()), xmpPreferences);
+        List<BibEntry> entries = xmpUtilReader.readXmp(Path.of(XmpUtilShared.class.getResource("no_description_metadata.pdf").toURI()), xmpPreferences);
         assertEquals(Collections.emptyList(), entries);
     }
 }
diff --git a/src/test/java/org/jabref/logic/xmp/XmpUtilWriterTest.java b/src/test/java/org/jabref/logic/xmp/XmpUtilWriterTest.java
index 6013264bea4..20f3eb6906d 100644
--- a/src/test/java/org/jabref/logic/xmp/XmpUtilWriterTest.java
+++ b/src/test/java/org/jabref/logic/xmp/XmpUtilWriterTest.java
@@ -1,15 +1,14 @@
 package org.jabref.logic.xmp;
 
-import java.io.IOException;
 import java.nio.file.Path;
-import java.util.Arrays;
 import java.util.List;
 
-import javax.xml.transform.TransformerException;
-
+import org.jabref.logic.exporter.XmpExporterTest;
 import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.Date;
 import org.jabref.model.entry.Month;
 import org.jabref.model.entry.field.StandardField;
+import org.jabref.model.entry.field.UnknownField;
 import org.jabref.model.entry.types.StandardEntryType;
 
 import org.apache.pdfbox.pdmodel.PDDocument;
@@ -18,112 +17,191 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 
+import static org.jabref.logic.xmp.DublinCoreExtractor.DC_COVERAGE;
+import static org.jabref.logic.xmp.DublinCoreExtractor.DC_RIGHTS;
+import static org.jabref.logic.xmp.DublinCoreExtractor.DC_SOURCE;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+/**
+ * This tests the writing to a PDF. If the creation of the RDF content should be checked, please head to {@link XmpExporterTest}
+ */
 class XmpUtilWriterTest {
 
-    private static BibEntry olly2018;
-    private static BibEntry toral2006;
-    private static BibEntry vapnik2000;
+    @TempDir
+    private Path tempDir;
+
+    private final BibEntry olly2018 = new BibEntry(StandardEntryType.Article)
+            .withCitationKey("Olly2018")
+            .withField(StandardField.AUTHOR, "Olly and Johannes")
+            .withField(StandardField.TITLE, "Stefan's palace")
+            .withField(StandardField.JOURNAL, "Test Journal")
+            .withField(StandardField.VOLUME, "1")
+            .withField(StandardField.NUMBER, "1")
+            .withField(StandardField.PAGES, "1-2")
+            .withMonth(Month.MARCH)
+            .withField(StandardField.ISSN, "978-123-123")
+            .withField(StandardField.NOTE, "NOTE")
+            .withField(StandardField.ABSTRACT, "ABSTRACT")
+            .withField(StandardField.COMMENT, "COMMENT")
+            .withField(StandardField.DOI, "10/3212.3123")
+            .withField(StandardField.FILE, ":article_dublinCore.pdf:PDF")
+            .withField(StandardField.GROUPS, "NO")
+            .withField(StandardField.HOWPUBLISHED, "online")
+            .withField(StandardField.KEYWORDS, "k1, k2")
+            .withField(StandardField.OWNER, "me")
+            .withField(StandardField.REVIEW, "review")
+            .withField(StandardField.URL, "https://www.olly2018.edu");
+
+    private final BibEntry toral2006 = new BibEntry(StandardEntryType.InProceedings)
+            .withField(StandardField.AUTHOR, "Antonio Toral and Rafael Munoz")
+            .withField(StandardField.TITLE, "A proposal to automatically build and maintain gazetteers for Named Entity Recognition by using Wikipedia")
+            .withField(StandardField.BOOKTITLE, "Proceedings of EACL")
+            .withField(StandardField.PAGES, "56--61")
+            .withField(StandardField.EPRINTTYPE, "asdf")
+            .withField(StandardField.OWNER, "Ich")
+            .withField(StandardField.URL, "www.url.de");
+    private final BibEntry vapnik2000 = new BibEntry(StandardEntryType.Book)
+            .withCitationKey("vapnik2000")
+            .withField(StandardField.TITLE, "The Nature of Statistical Learning Theory")
+            .withField(StandardField.PUBLISHER, "Springer Science + Business Media")
+            .withField(StandardField.AUTHOR, "Vladimir N. Vapnik")
+            .withField(StandardField.DOI, "10.1007/978-1-4757-3264-1")
+            .withField(StandardField.OWNER, "Ich")
+            .withField(StandardField.LANGUAGE, "English, Japanese")
+            .withDate(new Date(2000, 5))
+            .withField(new UnknownField(DC_COVERAGE), "coverageField")
+            .withField(new UnknownField((DC_SOURCE)), "JabRef")
+            .withField(new UnknownField(DC_RIGHTS), "Right To X");
     private XmpPreferences xmpPreferences;
 
-    private void initBibEntries() {
-        olly2018 = new BibEntry(StandardEntryType.Article);
-        olly2018.setCitationKey("Olly2018");
-        olly2018.setField(StandardField.AUTHOR, "Olly and Johannes");
-        olly2018.setField(StandardField.TITLE, "Stefan's palace");
-        olly2018.setField(StandardField.JOURNAL, "Test Journal");
-        olly2018.setField(StandardField.VOLUME, "1");
-        olly2018.setField(StandardField.NUMBER, "1");
-        olly2018.setField(StandardField.PAGES, "1-2");
-        olly2018.setMonth(Month.MARCH);
-        olly2018.setField(StandardField.ISSN, "978-123-123");
-        olly2018.setField(StandardField.NOTE, "NOTE");
-        olly2018.setField(StandardField.ABSTRACT, "ABSTRACT");
-        olly2018.setField(StandardField.COMMENT, "COMMENT");
-        olly2018.setField(StandardField.DOI, "10/3212.3123");
-        olly2018.setField(StandardField.FILE, ":article_dublinCore.pdf:PDF");
-        olly2018.setField(StandardField.GROUPS, "NO");
-        olly2018.setField(StandardField.HOWPUBLISHED, "online");
-        olly2018.setField(StandardField.KEYWORDS, "k1, k2");
-        olly2018.setField(StandardField.OWNER, "me");
-        olly2018.setField(StandardField.REVIEW, "review");
-        olly2018.setField(StandardField.URL, "https://www.olly2018.edu");
-
-        toral2006 = new BibEntry(StandardEntryType.InProceedings);
-        toral2006.setField(StandardField.AUTHOR, "Toral, Antonio and Munoz, Rafael");
-        toral2006.setField(StandardField.TITLE, "A proposal to automatically build and maintain gazetteers for Named Entity Recognition by using Wikipedia");
-        toral2006.setField(StandardField.BOOKTITLE, "Proceedings of EACL");
-        toral2006.setField(StandardField.PAGES, "56--61");
-        toral2006.setField(StandardField.EPRINTTYPE, "asdf");
-        toral2006.setField(StandardField.OWNER, "Ich");
-        toral2006.setField(StandardField.URL, "www.url.de");
-
-        vapnik2000 = new BibEntry(StandardEntryType.Book);
-        vapnik2000.setCitationKey("vapnik2000");
-        vapnik2000.setField(StandardField.TITLE, "The Nature of Statistical Learning Theory");
-        vapnik2000.setField(StandardField.PUBLISHER, "Springer Science + Business Media");
-        vapnik2000.setField(StandardField.AUTHOR, "Vladimir N. Vapnik");
-        vapnik2000.setField(StandardField.DOI, "10.1007/978-1-4757-3264-1");
-        vapnik2000.setField(StandardField.OWNER, "Ich");
-    }
-
-    /**
-     * Create a temporary PDF-file with a single empty page.
-     */
     @BeforeEach
     void setUp() {
         xmpPreferences = mock(XmpPreferences.class);
+        when(xmpPreferences.getKeywordSeparator()).thenReturn(',');
         // The code assumes privacy filters to be off
         when(xmpPreferences.shouldUseXmpPrivacyFilter()).thenReturn(false);
-
-        when(xmpPreferences.getKeywordSeparator()).thenReturn(',');
-
-        this.initBibEntries();
     }
 
     /**
      * Test for writing a PDF file with a single DublinCore metadata entry.
      */
-    @Test
-    void testWriteXmp(@TempDir Path tempDir) throws IOException, TransformerException {
+    void singleEntryWorks(BibEntry entry) throws Exception {
         Path pdfFile = this.createDefaultFile("JabRef_writeSingle.pdf", tempDir);
 
-        // read a bib entry from the tests before
-        BibEntry entry = vapnik2000;
-        entry.setCitationKey("WriteXMPTest");
-        entry.setId("ID4711");
+        new XmpUtilWriter(xmpPreferences).writeXmp(pdfFile.toAbsolutePath(), entry, null);
 
-        // write the changed bib entry to the PDF
-        XmpUtilWriter.writeXmp(pdfFile.toAbsolutePath().toString(), entry, null, xmpPreferences);
+        List<BibEntry> entriesWritten = new XmpUtilReader().readXmp(pdfFile, xmpPreferences);
 
-        // read entry again
-        List<BibEntry> entriesWritten = XmpUtilReader.readXmp(pdfFile.toAbsolutePath().toString(), xmpPreferences);
         BibEntry entryWritten = entriesWritten.get(0);
         entryWritten.clearField(StandardField.FILE);
+        entry.clearField(StandardField.FILE);
 
-        // compare the two entries
-        assertEquals(entry, entryWritten);
+        assertEquals(List.of(entry), entriesWritten);
+    }
+
+    @Test
+    void olly2018Works() throws Exception {
+        singleEntryWorks(olly2018);
+    }
+
+    @Test
+    void toral2006Works() throws Exception {
+        singleEntryWorks(toral2006);
+    }
+
+    @Test
+    void vapnik2000Works() throws Exception {
+        singleEntryWorks(vapnik2000);
+    }
+
+    @Test
+    void testWriteTwoBibEntries(@TempDir Path tempDir) throws Exception {
+        Path pdfFile = this.createDefaultFile("JabRef_writeTwo.pdf", tempDir);
+        List<BibEntry> entries = List.of(olly2018, toral2006);
+        new XmpUtilWriter(xmpPreferences).writeXmp(pdfFile.toAbsolutePath(), entries, null);
+        List<BibEntry> entryList = new XmpUtilReader().readXmp(pdfFile.toAbsolutePath(), xmpPreferences);
+
+        // the file field is not written - and the read file field contains the PDF file name
+        // thus, we do not need to compare
+        entries.forEach(entry -> entry.clearField(StandardField.FILE));
+        entryList.forEach(entry -> entry.clearField(StandardField.FILE));
+
+        assertEquals(entries, entryList);
+    }
+
+    @Test
+    void testWriteThreeBibEntries(@TempDir Path tempDir) throws Exception {
+        Path pdfFile = this.createDefaultFile("JabRef_writeThree.pdf", tempDir);
+        List<BibEntry> entries = List.of(olly2018, vapnik2000, toral2006);
+        new XmpUtilWriter(xmpPreferences).writeXmp(pdfFile.toAbsolutePath(), entries, null);
+        List<BibEntry> entryList = new XmpUtilReader().readXmp(pdfFile.toAbsolutePath(), xmpPreferences);
+
+        // the file field is not written - and the read file field contains the PDF file name
+        // thus, we do not need to compare
+        entries.forEach(entry -> entry.clearField(StandardField.FILE));
+        entryList.forEach(entry -> entry.clearField(StandardField.FILE));
+
+        assertEquals(entries, entryList);
+    }
+
+    @Test
+    void proctingBracesAreRemovedAtTitle(@TempDir Path tempDir) throws Exception {
+        Path pdfFile = this.createDefaultFile("JabRef_writeBraces.pdf", tempDir);
+        BibEntry original = new BibEntry()
+                .withField(StandardField.TITLE, "Some {P}rotected {T}erm");
+        new XmpUtilWriter(xmpPreferences).writeXmp(pdfFile.toAbsolutePath(), List.of(original), null);
+        List<BibEntry> entryList = new XmpUtilReader().readXmp(pdfFile.toAbsolutePath(), xmpPreferences);
+
+        entryList.forEach(entry -> entry.clearField(StandardField.FILE));
+
+        BibEntry expected = new BibEntry()
+                .withField(StandardField.TITLE, "Some Protected Term");
+        assertEquals(List.of(expected), entryList);
     }
 
-    /**
-     * Test, which writes multiple metadata entries to a PDF and reads them again to test the size.
-     */
     @Test
-    void testWriteMultipleBibEntries(@TempDir Path tempDir) throws IOException, TransformerException {
-        Path pdfFile = this.createDefaultFile("JabRef_writeMultiple.pdf", tempDir);
+    void proctingBracesAreKeptAtPages(@TempDir Path tempDir) throws Exception {
+        Path pdfFile = this.createDefaultFile("JabRef_writeBraces.pdf", tempDir);
+        BibEntry original = new BibEntry()
+                .withField(StandardField.PAGES, "{55}-{99}");
+        new XmpUtilWriter(xmpPreferences).writeXmp(pdfFile.toAbsolutePath(), List.of(original), null);
+        List<BibEntry> entryList = new XmpUtilReader().readXmp(pdfFile.toAbsolutePath(), xmpPreferences);
 
-        List<BibEntry> entries = Arrays.asList(olly2018, vapnik2000, toral2006);
+        entryList.forEach(entry -> entry.clearField(StandardField.FILE));
 
-        XmpUtilWriter.writeXmp(Path.of(pdfFile.toAbsolutePath().toString()), entries, null, xmpPreferences);
+        assertEquals(List.of(original), entryList);
+    }
+
+    @Test
+    void doubleDashAtPageNumberIsKept(@TempDir Path tempDir) throws Exception {
+        Path pdfFile = this.createDefaultFile("JabRef_writeBraces.pdf", tempDir);
+        BibEntry original = new BibEntry()
+                .withField(StandardField.PAGES, "2--33");
+        new XmpUtilWriter(xmpPreferences).writeXmp(pdfFile.toAbsolutePath(), List.of(original), null);
+        List<BibEntry> entryList = new XmpUtilReader().readXmp(pdfFile.toAbsolutePath(), xmpPreferences);
+
+        entryList.forEach(entry -> entry.clearField(StandardField.FILE));
+
+        assertEquals(List.of(original), entryList);
+    }
 
-        List<BibEntry> entryList = XmpUtilReader.readXmp(Path.of(pdfFile.toAbsolutePath().toString()), xmpPreferences);
-        assertEquals(3, entryList.size());
+    @Test
+    void singleEntry(@TempDir Path tempDir) throws Exception {
+        Path pdfFile = this.createDefaultFile("JabRef.pdf", tempDir);
+        new XmpUtilWriter(xmpPreferences).writeXmp(pdfFile.toAbsolutePath(), List.of(vapnik2000), null);
+        List<BibEntry> entryList = new XmpUtilReader().readXmp(pdfFile.toAbsolutePath(), xmpPreferences);
+
+        vapnik2000.clearField(StandardField.FILE);
+        entryList.forEach(entry -> entry.clearField(StandardField.FILE));
+        assertEquals(List.of(vapnik2000), entryList);
     }
 
-    private Path createDefaultFile(String fileName, Path tempDir) throws IOException {
+    /**
+     * Creates a temporary PDF-file with a single empty page.
+     */
+    private Path createDefaultFile(String fileName, Path tempDir) throws Exception {
         // create a default PDF
         Path pdfFile = tempDir.resolve(fileName);
         try (PDDocument pdf = new PDDocument()) {
@@ -131,7 +209,6 @@ private Path createDefaultFile(String fileName, Path tempDir) throws IOException
             pdf.addPage(new PDPage());
             pdf.save(pdfFile.toAbsolutePath().toString());
         }
-
         return pdfFile;
     }
 }
diff --git a/src/test/java/org/jabref/migrations/PreferencesMigrationsTest.java b/src/test/java/org/jabref/migrations/PreferencesMigrationsTest.java
index 2a6f3cfb482..03d6aa23fcf 100644
--- a/src/test/java/org/jabref/migrations/PreferencesMigrationsTest.java
+++ b/src/test/java/org/jabref/migrations/PreferencesMigrationsTest.java
@@ -45,7 +45,6 @@ void testOldStyleBibtexkeyPattern0() {
 
     @Test
     void testOldStyleBibtexkeyPattern1() {
-
         when(prefs.get(JabRefPreferences.IMPORT_FILENAMEPATTERN)).thenReturn(oldStylePatterns[1]);
         when(mainPrefsNode.get(JabRefPreferences.IMPORT_FILENAMEPATTERN, null)).thenReturn(oldStylePatterns[1]);
         when(prefs.hasKey(JabRefPreferences.IMPORT_FILENAMEPATTERN)).thenReturn(true);
diff --git a/src/test/java/org/jabref/model/FieldChangeTest.java b/src/test/java/org/jabref/model/FieldChangeTest.java
index ec2c8300217..1625a1ae652 100644
--- a/src/test/java/org/jabref/model/FieldChangeTest.java
+++ b/src/test/java/org/jabref/model/FieldChangeTest.java
@@ -37,6 +37,24 @@ void equalFieldChange() {
         assertNotEquals(fc, fcBlankNewValue);
     }
 
+    @Test
+    void selfEqualsFieldchangeSameParameters() {
+        FieldChange fcBlankNewValue = new FieldChange(entry, StandardField.DOI, "foo", "bar");
+        assertEquals(fc, fcBlankNewValue);
+    }
+
+    @Test
+    void selfEqualsFieldchangeDifferentOldValue() {
+        FieldChange fcBlankNewValue = new FieldChange(entry, StandardField.DOI, null, "bar");
+        assertNotEquals(fc, fcBlankNewValue);
+    }
+
+    @Test
+    void selfEqualsFieldchangeDifferentEntry() {
+        FieldChange fcBlankNewValue = new FieldChange(entryOther, StandardField.DOI, "foo", "bar");
+        assertNotEquals(fc, fcBlankNewValue);
+    }
+
     @Test
     void fieldChangeDoesNotEqualString() {
         assertNotEquals(fc, "foo");
diff --git a/src/test/java/org/jabref/model/database/event/AutosaveEventTest.java b/src/test/java/org/jabref/model/database/event/AutosaveEventTest.java
deleted file mode 100644
index 10ed6f709de..00000000000
--- a/src/test/java/org/jabref/model/database/event/AutosaveEventTest.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.jabref.model.database.event;
-
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-
-public class AutosaveEventTest {
-
-    @Test
-    public void givenNothingWhenCreatingThenNotNull() {
-        AutosaveEvent e = new AutosaveEvent();
-        assertNotNull(e);
-    }
-}
diff --git a/src/test/java/org/jabref/model/entry/AuthorListTest.java b/src/test/java/org/jabref/model/entry/AuthorListTest.java
index 1417a50900f..60995a92d8a 100644
--- a/src/test/java/org/jabref/model/entry/AuthorListTest.java
+++ b/src/test/java/org/jabref/model/entry/AuthorListTest.java
@@ -117,7 +117,6 @@ public void parseCachesOneLatexFreeAuthor() {
 
     @Test
     public void testFixAuthorFirstNameFirstCommas() {
-
         // No Commas
         assertEquals("", AuthorList.fixAuthorFirstNameFirstCommas("", true, false));
         assertEquals("", AuthorList.fixAuthorFirstNameFirstCommas("", false, false));
@@ -137,7 +136,7 @@ public void testFixAuthorFirstNameFirstCommas() {
         assertEquals("J. Smith and P. Black Brown", AuthorList.fixAuthorFirstNameFirstCommas(
                 "John Smith and Black Brown, Peter", true, false));
 
-        // Method description is different than code -> additional comma
+        // Method description is different from code -> additional comma
         // there
         assertEquals("John von Neumann, John Smith and Peter Black Brown", AuthorList
                 .fixAuthorFirstNameFirstCommas(
@@ -560,7 +559,6 @@ public void getAsLastFirstNamesLatexFreeOneInstitutionWithParanthesisAtStartOxfo
 
     @Test
     public void testFixAuthorLastNameFirst() {
-
         // Test helper method
 
         assertEquals("Smith, John", AuthorList.fixAuthorLastNameFirst("John Smith"));
@@ -615,7 +613,6 @@ public void testFixAuthorLastNameFirst() {
 
     @Test
     public void testFixAuthorLastNameOnlyCommas() {
-
         // No comma before and
         assertEquals("", AuthorList.fixAuthorLastNameOnlyCommas("", false));
         assertEquals("Smith", AuthorList.fixAuthorLastNameOnlyCommas("John Smith", false));
@@ -703,7 +700,6 @@ public void testFixAuthorForAlphabetization() {
 
     @Test
     public void testSize() {
-
         assertEquals(0, AuthorListTest.size(""));
         assertEquals(1, AuthorListTest.size("Bar"));
         assertEquals(1, AuthorListTest.size("Foo Bar"));
@@ -737,7 +733,6 @@ public void testGetEmptyAuthor() {
 
     @Test
     public void testGetAuthor() {
-
         Author author = AuthorList.parse("John Smith and von Neumann, Jr, John").getAuthor(0);
         assertEquals(Optional.of("John"), author.getFirst());
         assertEquals(Optional.of("J."), author.getFirstAbbr());
@@ -824,7 +819,6 @@ public void testGetAuthorsNatbib() {
 
     @Test
     public void testGetAuthorsLastOnly() {
-
         // No comma before and
         assertEquals("", AuthorList.parse("").getAsLastNames(false));
         assertEquals("Smith", AuthorList.parse("John Smith").getAsLastNames(false));
@@ -925,7 +919,6 @@ public void testGetAuthorsLastFirstAnds() {
 
     @Test
     public void testGetAuthorsFirstFirst() {
-
         AuthorList al;
 
         al = AuthorList.parse("");
diff --git a/src/test/java/org/jabref/model/entry/AuthorTest.java b/src/test/java/org/jabref/model/entry/AuthorTest.java
index 8935c197a4d..a1176bf2ac6 100644
--- a/src/test/java/org/jabref/model/entry/AuthorTest.java
+++ b/src/test/java/org/jabref/model/entry/AuthorTest.java
@@ -75,5 +75,4 @@ void addDotIfAbbreviationEndsWithDoubleAbbreviation() {
     void addDotIfAbbreviationIfStartsWithNumber(String input) {
         assertEquals(input, Author.addDotIfAbbreviation(input));
     }
-
 }
diff --git a/src/test/java/org/jabref/model/entry/BibEntryTypesManagerTest.java b/src/test/java/org/jabref/model/entry/BibEntryTypesManagerTest.java
index 5cd22cda058..1e87c87abd7 100644
--- a/src/test/java/org/jabref/model/entry/BibEntryTypesManagerTest.java
+++ b/src/test/java/org/jabref/model/entry/BibEntryTypesManagerTest.java
@@ -13,6 +13,7 @@
 import org.jabref.model.entry.field.OrFields;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.field.UnknownField;
+import org.jabref.model.entry.types.BiblatexAPAEntryTypeDefinitions;
 import org.jabref.model.entry.types.BiblatexEntryTypeDefinitions;
 import org.jabref.model.entry.types.BiblatexSoftwareEntryTypeDefinitions;
 import org.jabref.model.entry.types.BibtexEntryTypeDefinitions;
@@ -74,6 +75,7 @@ void allTypesBibtexAreCorrect() {
     void allTypesBiblatexAreCorrect() {
         TreeSet<BibEntryType> defaultTypes = new TreeSet<>(BiblatexEntryTypeDefinitions.ALL);
         defaultTypes.addAll(BiblatexSoftwareEntryTypeDefinitions.ALL);
+        defaultTypes.addAll(BiblatexAPAEntryTypeDefinitions.ALL);
 
         assertEquals(defaultTypes, entryTypesManager.getAllTypes(BibDatabaseMode.BIBLATEX));
     }
@@ -162,7 +164,6 @@ void testParsingEmptyOptionalFieldsFieldsReturnsEmpyCollections(BibDatabaseMode
     @ParameterizedTest
     @MethodSource("mode")
     void testsModifyingArticle(BibDatabaseMode mode) {
-
         overwrittenStandardType = new BibEntryType(
                                                    StandardEntryType.Article,
                                                    List.of(new BibField(StandardField.TITLE, FieldPriority.IMPORTANT),
@@ -172,13 +173,12 @@ void testsModifyingArticle(BibDatabaseMode mode) {
                                                    Collections.emptySet());
 
         entryTypesManager.addCustomOrModifiedType(overwrittenStandardType, mode);
-        assertEquals(Collections.singletonList(overwrittenStandardType), entryTypesManager.getAllTypes(mode).stream().filter(t->t.getType().getName().equals("article")).collect(Collectors.toList()));
+        assertEquals(Collections.singletonList(overwrittenStandardType), entryTypesManager.getAllTypes(mode).stream().filter(t -> t.getType().getName().equals("article")).collect(Collectors.toList()));
     }
 
     @ParameterizedTest
     @MethodSource("mode")
     void testsModifyingArticleWithParsing(BibDatabaseMode mode) {
-
         overwrittenStandardType = new BibEntryType(
                                                    StandardEntryType.Article,
                                                    List.of(new BibField(StandardField.TITLE, FieldPriority.IMPORTANT),
@@ -197,7 +197,6 @@ void testsModifyingArticleWithParsing(BibDatabaseMode mode) {
     @ParameterizedTest
     @MethodSource("mode")
     void testsModifyingArticleWithParsingKeepsListOrder(BibDatabaseMode mode) {
-
         overwrittenStandardType = new BibEntryType(
                                                    StandardEntryType.Article,
                                                    List.of(new BibField(StandardField.TITLE, FieldPriority.IMPORTANT),
diff --git a/src/test/java/org/jabref/model/entry/DateTest.java b/src/test/java/org/jabref/model/entry/DateTest.java
index deba84b4dd5..b9ea9f77cd7 100644
--- a/src/test/java/org/jabref/model/entry/DateTest.java
+++ b/src/test/java/org/jabref/model/entry/DateTest.java
@@ -1,8 +1,14 @@
 package org.jabref.model.entry;
 
 import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.Month;
 import java.time.Year;
 import java.time.YearMonth;
+import java.time.ZoneId;
+import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
+import java.time.temporal.Temporal;
 import java.util.Optional;
 import java.util.stream.Stream;
 
@@ -12,59 +18,76 @@
 import org.junit.jupiter.params.provider.MethodSource;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 class DateTest {
+    private static Stream<Arguments> validDates() {
+        return Stream.of(
+                Arguments.of(LocalDateTime.of(2018, Month.OCTOBER, 3, 7, 24), "2018-10-03T07:24"),
+                Arguments.of(LocalDateTime.of(2018, Month.OCTOBER, 3, 17, 2), "2018-10-03T17:2"),
+                Arguments.of(LocalDateTime.of(2018, Month.OCTOBER, 3, 7, 24), "2018-10-03T7:24"),
+                Arguments.of(LocalDateTime.of(2018, Month.OCTOBER, 3, 7, 7), "2018-10-03T7:7"),
+                Arguments.of(LocalDateTime.of(2018, Month.OCTOBER, 3, 7, 0), "2018-10-03T07"),
+                Arguments.of(LocalDateTime.of(2018, Month.OCTOBER, 3, 7, 0), "2018-10-03T7"),
+                Arguments.of(LocalDate.of(2009, Month.JANUARY, 15), "2009-1-15"),
+                Arguments.of(YearMonth.of(2009, Month.NOVEMBER), "2009-11"),
+                Arguments.of(LocalDate.of(2012, Month.JANUARY, 15), "15-1-2012"),
+                Arguments.of(YearMonth.of(2012, Month.JANUARY), "1-2012"),
+                Arguments.of(YearMonth.of(2015, Month.SEPTEMBER), "9/2015"),
+                Arguments.of(YearMonth.of(2015, Month.SEPTEMBER), "09/2015"),
+                Arguments.of(YearMonth.of(2015, Month.SEPTEMBER), "9/15"),
+                Arguments.of(LocalDate.of(2015, Month.SEPTEMBER, 1), "September 1, 2015"),
+                Arguments.of(YearMonth.of(2015, Month.SEPTEMBER), "September, 2015"),
+                Arguments.of(LocalDate.of(2015, Month.JANUARY, 15), "15.1.2015"),
+                Arguments.of(LocalDate.of(2015, Month.JANUARY, 15), "2015.1.15"),
+                Arguments.of(Year.of(2015), "2015"),
+                Arguments.of(YearMonth.of(2020, Month.JANUARY), "Jan, 2020"));
+    }
 
-    @Test
-    void parseCorrectlyYearRangeDate() throws Exception {
-        Date expectedDataRange = new Date(Year.of(2014), Year.of(2017));
-        assertEquals(Optional.of(expectedDataRange), Date.parse("2014/2017"));
+    @ParameterizedTest
+    @MethodSource("validDates")
+    void parseByDatePattern(Temporal expected, String provided) {
+        assertEquals(Optional.of(new Date(expected)), Date.parse(provided));
     }
 
-    @Test
-    void parseCorrectlyDayMonthYearDate() throws Exception {
-        Date expected = new Date(LocalDate.of(2014, 6, 19));
-        assertEquals(Optional.of(expected), Date.parse("19-06-2014"));
+    private static Stream<Arguments> invalidCornerCases() {
+        return Stream.of(
+                Arguments.of("", "input value not empty"),
+                Arguments.of("32-06-2014", "day of month exists [1]"),
+                Arguments.of("00-06-2014", "day of month exists [2]"),
+                Arguments.of("30-13-2014", "month exists [1]"),
+                Arguments.of("30-00-2014", "month exists [2]")
+        );
     }
 
-    @Test
-    void parseCorrectlyMonthYearDate() throws Exception {
-        Date expected = new Date(YearMonth.of(2014, 6));
-        assertEquals(Optional.of(expected), Date.parse("06-2014"));
+    @ParameterizedTest
+    @MethodSource("invalidCornerCases")
+    void nonExistentDates(String invalidDate, String errorMessage) {
+        assertEquals(Optional.empty(), Date.parse(invalidDate), errorMessage);
     }
 
     @Test
-    void parseCorrectlyYearMonthDate() throws Exception {
-        Date expected = new Date(YearMonth.of(2014, 6));
-        assertEquals(Optional.of(expected), Date.parse("2014-06"));
+    void parseYearRange() {
+        Date expectedDataRange = new Date(Year.of(2014), Year.of(2017));
+        assertEquals(Optional.of(expectedDataRange), Date.parse("2014/2017"));
     }
 
     @Test
-    void parseCorrectlyYearDate() throws Exception {
-        Date expected = new Date(Year.of(2014));
-        assertEquals(Optional.of(expected), Date.parse("2014"));
+    void parseZonedTime() {
+        Optional<Date> expected = Optional.of(
+                new Date(ZonedDateTime.of(
+                        LocalDateTime.of(2018, Month.OCTOBER, 3, 7, 24, 14),
+                        ZoneId.from(ZoneOffset.ofHours(3)))
+                )
+        );
+
+        assertEquals(expected, Date.parse("2018-10-03T07:24:14+03:00"));
+        assertNotEquals(expected, Date.parse("2018-10-03T07:24:14+02:00"));
     }
 
     @Test
     void parseDateNull() {
         assertThrows(NullPointerException.class, () -> Date.parse(null));
     }
-
-    @ParameterizedTest
-    @MethodSource("provideInvalidCornerCaseArguments")
-    public void nonExistentDates(String invalidDate, String errorMessage) {
-        assertEquals(Optional.empty(), Date.parse(invalidDate), errorMessage);
-
-    }
-
-    private static Stream<Arguments> provideInvalidCornerCaseArguments() {
-        return Stream.of(
-                Arguments.of("", "input value not empty"),
-                Arguments.of("32-06-2014", "day of month exists [1]"),
-                Arguments.of("00-06-2014", "day of month exists [2]"),
-                Arguments.of("30-13-2014", "month exists [1]"),
-                Arguments.of("30-00-2014", "month exists [2]")
-        );
-    }
 }
diff --git a/src/test/java/org/jabref/model/entry/IdGeneratorTest.java b/src/test/java/org/jabref/model/entry/IdGeneratorTest.java
index 2775dd19590..83ef54af5eb 100644
--- a/src/test/java/org/jabref/model/entry/IdGeneratorTest.java
+++ b/src/test/java/org/jabref/model/entry/IdGeneratorTest.java
@@ -10,7 +10,6 @@ public class IdGeneratorTest {
 
     @Test
     public void testCreateNeutralId() {
-
         HashSet<String> set = new HashSet<>();
         for (int i = 0; i < 10000; i++) {
             String string = IdGenerator.next();
diff --git a/src/test/java/org/jabref/model/entry/KeywordListTest.java b/src/test/java/org/jabref/model/entry/KeywordListTest.java
index 6dbb9b08db5..0812991d371 100644
--- a/src/test/java/org/jabref/model/entry/KeywordListTest.java
+++ b/src/test/java/org/jabref/model/entry/KeywordListTest.java
@@ -88,4 +88,25 @@ public void parseTwoHierarchicalChains() throws Exception {
         assertEquals(new KeywordList(expectedOne, expectedTwo),
                 KeywordList.parse("Parent1 > Node1 > Child1, Parent2 > Node2 > Child2", ',', '>'));
     }
+
+    @Test
+    public void mergeTwoIdenticalKeywordsShouldReturnOnKeyword() {
+        assertEquals(new KeywordList("JabRef"), KeywordList.merge("JabRef", "JabRef", ','));
+    }
+
+    @Test
+    public void mergeOneEmptyKeywordAnAnotherNonEmptyShouldReturnTheNonEmptyKeyword() {
+        assertEquals(new KeywordList("JabRef"), KeywordList.merge("", "JabRef", ','));
+    }
+
+    @Test
+    public void mergeTwoDistinctKeywordsShouldReturnTheTwoKeywordsMerged() {
+        assertEquals(new KeywordList("Figma", "JabRef"), KeywordList.merge("Figma", "JabRef", ','));
+        assertEquals(new KeywordList("JabRef", "Figma"), KeywordList.merge("Figma", "JabRef", ','));
+    }
+
+    @Test
+    public void mergeTwoListsOfKeywordsShouldReturnTheKeywordsMerged() {
+        assertEquals(new KeywordList("Figma", "Adobe", "JabRef", "Eclipse", "JetBrains"), KeywordList.merge("Figma, Adobe, JetBrains, Eclipse", "Adobe, JabRef", ','));
+    }
 }
diff --git a/src/test/java/org/jabref/model/entry/field/FieldFactoryTest.java b/src/test/java/org/jabref/model/entry/field/FieldFactoryTest.java
index 4ee6c716a49..ddb60cb61a7 100644
--- a/src/test/java/org/jabref/model/entry/field/FieldFactoryTest.java
+++ b/src/test/java/org/jabref/model/entry/field/FieldFactoryTest.java
@@ -1,8 +1,11 @@
 package org.jabref.model.entry.field;
 
+import org.jabref.model.entry.types.BiblatexApaEntryType;
+
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
 
 class FieldFactoryTest {
     @Test
@@ -14,4 +17,14 @@ void testOrFieldsTwoTerms() {
     void testOrFieldsThreeTerms() {
         assertEquals("aaa/bbb/ccc", FieldFactory.serializeOrFields(new UnknownField("aaa"), new UnknownField("bbb"), new UnknownField("ccc")));
     }
+
+    @Test
+    void testDoesNotParseApaFieldWithoutEntryType() {
+        assertNotEquals(BiblatexApaField.ARTICLE, FieldFactory.parseField("article"));
+    }
+
+    @Test
+    void testDoesParseApaFieldWithEntryType() {
+        assertEquals(BiblatexApaField.ARTICLE, FieldFactory.parseField(BiblatexApaEntryType.Constitution, "article"));
+    }
 }
diff --git a/src/test/java/org/jabref/model/entry/identifier/ArXivIdentifierTest.java b/src/test/java/org/jabref/model/entry/identifier/ArXivIdentifierTest.java
index 888f8836861..d6892808fef 100644
--- a/src/test/java/org/jabref/model/entry/identifier/ArXivIdentifierTest.java
+++ b/src/test/java/org/jabref/model/entry/identifier/ArXivIdentifierTest.java
@@ -170,5 +170,4 @@ public void constructCorrectURLForEprint() throws Exception {
         Optional<ArXivIdentifier> parsed = ArXivIdentifier.parse("0706.0001v1");
         assertEquals(Optional.of(new URI("https://arxiv.org/abs/0706.0001v1")), parsed.get().getExternalURI());
     }
-
 }
diff --git a/src/test/java/org/jabref/model/entry/identifier/IacrEprintTest.java b/src/test/java/org/jabref/model/entry/identifier/IacrEprintTest.java
index ff0e55d67c2..cd8c8731c94 100644
--- a/src/test/java/org/jabref/model/entry/identifier/IacrEprintTest.java
+++ b/src/test/java/org/jabref/model/entry/identifier/IacrEprintTest.java
@@ -56,5 +56,4 @@ public void acceptCorrectIacrEprintIdentifier(String name, String identifier) {
     public void constructValidIacrEprintUrl() {
         assertEquals("https://ia.cr/2019/001", new IacrEprint("2019/001").getAsciiUrl());
     }
-
 }
diff --git a/src/test/java/org/jabref/model/groups/AutomaticKeywordGroupTest.java b/src/test/java/org/jabref/model/groups/AutomaticKeywordGroupTest.java
index 21bebfc69b7..a6a84698ff2 100644
--- a/src/test/java/org/jabref/model/groups/AutomaticKeywordGroupTest.java
+++ b/src/test/java/org/jabref/model/groups/AutomaticKeywordGroupTest.java
@@ -39,5 +39,4 @@ private Set<GroupTreeNode> createIncludingKeywordsSubgroup() {
 
         return expectedKeywordsSubgroup;
     }
-
 }
diff --git a/src/test/java/org/jabref/model/openoffice/CitationEntryTest.java b/src/test/java/org/jabref/model/openoffice/CitationEntryTest.java
index fd7ec48b9b3..8648d9b5df9 100644
--- a/src/test/java/org/jabref/model/openoffice/CitationEntryTest.java
+++ b/src/test/java/org/jabref/model/openoffice/CitationEntryTest.java
@@ -11,7 +11,7 @@
 class CitationEntryTest {
 
     @Test
-    void testCitationEntryInitalPageInfo() {
+    void testCitationEntryInitialPageInfo() {
         CitationEntry citationEntry = new CitationEntry("RefMark", "Context", "Info");
         assertTrue(citationEntry.getPageInfo().isPresent());
         assertEquals("Info", citationEntry.getPageInfo().get());
@@ -20,7 +20,7 @@ void testCitationEntryInitalPageInfo() {
     }
 
     @Test
-    void testCitationEntryOptionalInitalPageInfo() {
+    void testCitationEntryOptionalInitialPageInfo() {
         CitationEntry citationEntry = new CitationEntry("RefMark", "Context", Optional.of("Info"));
 
         assertEquals(Optional.of("Info"), citationEntry.getPageInfo());
@@ -35,7 +35,7 @@ void testCitationEntryInitalPageInfoChanged() {
     }
 
     @Test
-    void testCitationEntryNoInitalPageInfo() {
+    void testCitationEntryNoInitialPageInfo() {
         CitationEntry citationEntry = new CitationEntry("RefMark", "Context");
         assertEquals(Optional.empty(), citationEntry.getPageInfo());
     }
diff --git a/src/test/java/org/jabref/model/search/rules/ContainBasedSearchRuleTest.java b/src/test/java/org/jabref/model/search/rules/ContainBasedSearchRuleTest.java
deleted file mode 100644
index 337263b0dbc..00000000000
--- a/src/test/java/org/jabref/model/search/rules/ContainBasedSearchRuleTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package org.jabref.model.search.rules;
-
-import java.util.EnumSet;
-
-import org.jabref.model.entry.BibEntry;
-import org.jabref.model.entry.field.StandardField;
-import org.jabref.model.entry.types.StandardEntryType;
-
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-/**
- * Test case for ContainBasedSearchRule.
- */
-public class ContainBasedSearchRuleTest {
-
-    @Test
-    public void testBasicSearchParsing() {
-        BibEntry be = makeBibtexEntry();
-        ContainBasedSearchRule bsCaseSensitive = new ContainBasedSearchRule(EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE, SearchRules.SearchFlags.REGULAR_EXPRESSION));
-        ContainBasedSearchRule bsCaseInsensitive = new ContainBasedSearchRule(EnumSet.of(SearchRules.SearchFlags.REGULAR_EXPRESSION));
-        RegexBasedSearchRule bsCaseSensitiveRegexp = new RegexBasedSearchRule(EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE, SearchRules.SearchFlags.REGULAR_EXPRESSION));
-        RegexBasedSearchRule bsCaseInsensitiveRegexp = new RegexBasedSearchRule(EnumSet.of(SearchRules.SearchFlags.REGULAR_EXPRESSION));
-
-        String query = "marine 2001 shields";
-
-        assertFalse(bsCaseSensitive.applyRule(query, be));
-        assertTrue(bsCaseInsensitive.applyRule(query, be));
-        assertFalse(bsCaseSensitiveRegexp.applyRule(query, be));
-        assertFalse(bsCaseInsensitiveRegexp.applyRule(query, be));
-
-        query = "\"marine larviculture\"";
-
-        assertFalse(bsCaseSensitive.applyRule(query, be));
-        assertFalse(bsCaseInsensitive.applyRule(query, be));
-        assertFalse(bsCaseSensitiveRegexp.applyRule(query, be));
-        assertFalse(bsCaseInsensitiveRegexp.applyRule(query, be));
-
-        query = "marine [A-Za-z]* larviculture";
-
-        assertFalse(bsCaseSensitive.applyRule(query, be));
-        assertFalse(bsCaseInsensitive.applyRule(query, be));
-        assertFalse(bsCaseSensitiveRegexp.applyRule(query, be));
-        assertTrue(bsCaseInsensitiveRegexp.applyRule(query, be));
-    }
-
-    public BibEntry makeBibtexEntry() {
-        return new BibEntry(StandardEntryType.InCollection)
-                .withCitationKey("shields01")
-                .withField(StandardField.TITLE, "Marine finfish larviculture in Europe")
-                .withField(StandardField.YEAR, "2001")
-                .withField(StandardField.AUTHOR, "Kevin Shields");
-    }
-}
diff --git a/src/test/java/org/jabref/model/search/rules/ContainsBasedSearchRuleTest.java b/src/test/java/org/jabref/model/search/rules/ContainsBasedSearchRuleTest.java
new file mode 100644
index 00000000000..ed77afd40be
--- /dev/null
+++ b/src/test/java/org/jabref/model/search/rules/ContainsBasedSearchRuleTest.java
@@ -0,0 +1,58 @@
+package org.jabref.model.search.rules;
+
+import java.util.EnumSet;
+
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.field.StandardField;
+import org.jabref.model.entry.types.StandardEntryType;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * Test case for ContainBasedSearchRule.
+ */
+public class ContainsBasedSearchRuleTest {
+
+    private final BibEntry be = new BibEntry(StandardEntryType.InCollection)
+            .withCitationKey("shields01")
+            .withField(StandardField.TITLE, "Marine finfish larviculture in Europe")
+            .withField(StandardField.YEAR, "2001")
+            .withField(StandardField.AUTHOR, "Kevin Shields");
+    private final ContainsBasedSearchRule bsCaseSensitive = new ContainsBasedSearchRule(EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE, SearchRules.SearchFlags.REGULAR_EXPRESSION));
+    private final ContainsBasedSearchRule bsCaseInsensitive = new ContainsBasedSearchRule(EnumSet.of(SearchRules.SearchFlags.REGULAR_EXPRESSION));
+    private final RegexBasedSearchRule bsCaseSensitiveRegexp = new RegexBasedSearchRule(EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE, SearchRules.SearchFlags.REGULAR_EXPRESSION));
+    private final RegexBasedSearchRule bsCaseInsensitiveRegexp = new RegexBasedSearchRule(EnumSet.of(SearchRules.SearchFlags.REGULAR_EXPRESSION));
+
+    @Test
+    public void testContentOfSingleField() {
+        String query = "\"marine larviculture\"";
+
+        assertFalse(bsCaseSensitive.applyRule(query, be));
+        assertFalse(bsCaseInsensitive.applyRule(query, be));
+        assertFalse(bsCaseSensitiveRegexp.applyRule(query, be));
+        assertFalse(bsCaseInsensitiveRegexp.applyRule(query, be));
+    }
+
+    @Test
+    public void testContentDistributedOnMultipleFields() {
+        String query = "marine 2001 shields";
+
+        assertFalse(bsCaseSensitive.applyRule(query, be));
+        assertTrue(bsCaseInsensitive.applyRule(query, be));
+        assertFalse(bsCaseSensitiveRegexp.applyRule(query, be));
+        assertFalse(bsCaseInsensitiveRegexp.applyRule(query, be));
+    }
+
+    @Test
+    public void testRegularExpressionMatch() {
+        String query = "marine [A-Za-z]* larviculture";
+
+        assertFalse(bsCaseSensitive.applyRule(query, be));
+        assertFalse(bsCaseInsensitive.applyRule(query, be));
+        assertFalse(bsCaseSensitiveRegexp.applyRule(query, be));
+        assertTrue(bsCaseInsensitiveRegexp.applyRule(query, be));
+    }
+}
diff --git a/src/test/java/org/jabref/model/strings/StringUtilTest.java b/src/test/java/org/jabref/model/strings/StringUtilTest.java
index d68a832dc3a..4cda4ec874c 100644
--- a/src/test/java/org/jabref/model/strings/StringUtilTest.java
+++ b/src/test/java/org/jabref/model/strings/StringUtilTest.java
@@ -24,7 +24,7 @@ void StringUtilClassIsSmall() throws Exception {
         Path path = Path.of("src", "main", "java", StringUtil.class.getName().replace('.', '/') + ".java");
         int lineCount = Files.readAllLines(path, StandardCharsets.UTF_8).size();
 
-        assertTrue(lineCount <= 761, "StringUtil increased in size to " + lineCount + ". "
+        assertTrue(lineCount <= 765, "StringUtil increased in size to " + lineCount + ". "
                 + "We try to keep this class as small as possible. "
                 + "Thus think twice if you add something to StringUtil.");
     }
@@ -109,7 +109,6 @@ void testPutBracesAroundCapitals() {
 
     @Test
     void testShaveString() {
-
         assertEquals("", StringUtil.shaveString(null));
         assertEquals("", StringUtil.shaveString(""));
         assertEquals("aaa", StringUtil.shaveString("   aaa\t\t\n\r"));
@@ -148,7 +147,14 @@ void testStripBrackets() {
 
     @Test
     void testGetPart() {
-        // Should be added
+        // Get word between braces
+        assertEquals("{makes}", StringUtil.getPart("Practice {makes} perfect", 8, false));
+        // When the string is empty and start Index equal zero
+        assertEquals("", StringUtil.getPart("", 0, false));
+        // When the word are in between close curly bracket
+        assertEquals("", StringUtil.getPart("A closed mouth catches no }flies}", 25, false));
+        // Get the word from the end of the sentence
+        assertEquals("bite", StringUtil.getPart("Barking dogs seldom bite", 19, true));
     }
 
     @Test
@@ -374,4 +380,32 @@ private static Stream<Arguments> getQuoteStringIfSpaceIsContainedData() {
     void testGuoteStringIfSpaceIsContained(String expected, String source) {
         assertEquals(expected, StringUtil.quoteStringIfSpaceIsContained(source));
     }
+
+    @Test
+    void testStripAccents() {
+        assertEquals("aAoeee", StringUtil.stripAccents("åÄöéèë"));
+        assertEquals("Muhlbach", StringUtil.stripAccents("Mühlbach"));
+    }
+
+    static Stream<Arguments> testContainsWhitespace() {
+        return Stream.of(
+                Arguments.of(true, "file url"),
+                Arguments.of(true, "file\nurl"),
+                Arguments.of(true, "file\r\nurl"),
+                Arguments.of(true, "file\rurl"),
+                Arguments.of(true, "file\furl"),
+                Arguments.of(true, "file_url "),
+                Arguments.of(true, "file url\n"),
+                Arguments.of(true, " "),
+
+                Arguments.of(false, "file_url"),
+                Arguments.of(false, "PascalCase"),
+                Arguments.of(false, ""));
+    }
+
+    @ParameterizedTest
+    @MethodSource
+    void testContainsWhitespace(Boolean expected, String input) {
+        assertEquals(expected, StringUtil.containsWhitespace(input));
+    }
 }
diff --git a/src/test/java/org/jabref/model/util/FileHelperTest.java b/src/test/java/org/jabref/model/util/FileHelperTest.java
index 6d047662b12..9584a7b53f8 100644
--- a/src/test/java/org/jabref/model/util/FileHelperTest.java
+++ b/src/test/java/org/jabref/model/util/FileHelperTest.java
@@ -4,6 +4,8 @@
 import java.util.Optional;
 
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -25,4 +27,11 @@ public void testFileNameEmpty() {
       Path path = Path.of("/");
       assertEquals(Optional.of(path), FileHelper.find("", path));
     }
+
+    @ParameterizedTest
+    @ValueSource(strings = { "*", "?", ">", "\"" })
+    public void testFileNameIllegal(String fileName) {
+        Path path = Path.of("/");
+        assertEquals(Optional.empty(), FileHelper.find(fileName, path));
+    }
 }
diff --git a/src/test/resources/org/jabref/logic/autosaveandbackup/changes.bib.sav b/src/test/resources/org/jabref/logic/autosaveandbackup/changes.bib.bak
similarity index 100%
rename from src/test/resources/org/jabref/logic/autosaveandbackup/changes.bib.sav
rename to src/test/resources/org/jabref/logic/autosaveandbackup/changes.bib.bak
diff --git a/src/test/resources/org/jabref/logic/autosaveandbackup/no-changes.bib.sav b/src/test/resources/org/jabref/logic/autosaveandbackup/no-changes.bib.bak
similarity index 100%
rename from src/test/resources/org/jabref/logic/autosaveandbackup/no-changes.bib.sav
rename to src/test/resources/org/jabref/logic/autosaveandbackup/no-changes.bib.bak
diff --git a/src/test/resources/org/jabref/logic/auxparser/papertwoargmacro.aux b/src/test/resources/org/jabref/logic/auxparser/papertwoargmacro.aux
new file mode 100644
index 00000000000..347f3f78480
--- /dev/null
+++ b/src/test/resources/org/jabref/logic/auxparser/papertwoargmacro.aux
@@ -0,0 +1,8 @@
+\relax
+\abx@aux@cite{0}{Darwin1888}
+\abx@aux@cite{0}{Einstein1920}
+\bibstyle{plain}
+\bibdata{origin}
+\bibcite{Darwin1888}{1}
+\bibcite{Einstein1920}{2}
+\@writefile{toc}{\contentsline {section}{\numberline {1}}{1}}
diff --git a/src/test/resources/org/jabref/logic/crawler/study.yml b/src/test/resources/org/jabref/logic/crawler/study.yml
index 620edaf0eab..af2ed218297 100644
--- a/src/test/resources/org/jabref/logic/crawler/study.yml
+++ b/src/test/resources/org/jabref/logic/crawler/study.yml
@@ -1,7 +1,6 @@
 authors:
   - Jab Ref
 title: TestStudyName
-last-search-date: 2020-11-26
 research-questions:
   - Question1
   - Question2
@@ -12,5 +11,6 @@ queries:
 databases:
   - name: Springer
   - name: ArXiv
+  - name: Medline/PubMed
   - name: IEEEXplore
     enabled: false
diff --git a/src/test/resources/org/jabref/logic/exporter/OldOpenOfficeCalcExportFormatContentSingleEntry.xml b/src/test/resources/org/jabref/logic/exporter/OldOpenOfficeCalcExportFormatContentSingleEntry.xml
index 9695f3bdea2..0594bb222be 100644
--- a/src/test/resources/org/jabref/logic/exporter/OldOpenOfficeCalcExportFormatContentSingleEntry.xml
+++ b/src/test/resources/org/jabref/logic/exporter/OldOpenOfficeCalcExportFormatContentSingleEntry.xml
@@ -150,12 +150,6 @@
                 <table:table-cell>
                     <text:p>Gender</text:p>
                 </table:table-cell>
-                <table:table-cell>
-                    <text:p>Hal_id</text:p>
-                </table:table-cell>
-                <table:table-cell>
-                    <text:p>Hal_version</text:p>
-                </table:table-cell>
                 <table:table-cell>
                     <text:p>Holder</text:p>
                 </table:table-cell>
@@ -171,9 +165,6 @@
                 <table:table-cell>
                     <text:p>Introduction</text:p>
                 </table:table-cell>
-                <table:table-cell>
-                    <text:p>Introducedin</text:p>
-                </table:table-cell>
                 <table:table-cell>
                     <text:p>ISBN</text:p>
                 </table:table-cell>
@@ -216,9 +207,6 @@
                 <table:table-cell>
                     <text:p>Library</text:p>
                 </table:table-cell>
-                <table:table-cell>
-                    <text:p>License</text:p>
-                </table:table-cell>
                 <table:table-cell>
                     <text:p>Location</text:p>
                 </table:table-cell>
@@ -291,18 +279,9 @@
                 <table:table-cell>
                     <text:p>Related</text:p>
                 </table:table-cell>
-                <table:table-cell>
-                    <text:p>Relatedtype</text:p>
-                </table:table-cell>
-                <table:table-cell>
-                    <text:p>Relatedstring</text:p>
-                </table:table-cell>
                 <table:table-cell>
                     <text:p>Reportno</text:p>
                 </table:table-cell>
-                <table:table-cell>
-                    <text:p>Repository</text:p>
-                </table:table-cell>
                 <table:table-cell>
                     <text:p>Review</text:p>
                 </table:table-cell>
@@ -333,9 +312,6 @@
                 <table:table-cell>
                     <text:p>Subtitle</text:p>
                 </table:table-cell>
-                <table:table-cell>
-                    <text:p>Swhid</text:p>
-                </table:table-cell>
                 <table:table-cell>
                     <text:p>Title</text:p>
                 </table:table-cell>
@@ -566,15 +542,6 @@
                 <table:table-cell>
                     <text:p/>
                 </table:table-cell>
-                <table:table-cell>
-                    <text:p/>
-                </table:table-cell>
-                <table:table-cell>
-                    <text:p/>
-                </table:table-cell>
-                <table:table-cell>
-                    <text:p/>
-                </table:table-cell>
                 <table:table-cell>
                     <text:p>0097-8418</text:p>
                 </table:table-cell>
@@ -638,9 +605,6 @@
                 <table:table-cell>
                     <text:p/>
                 </table:table-cell>
-                <table:table-cell>
-                    <text:p/>
-                </table:table-cell>
                 <table:table-cell>
                     <text:p>4</text:p>
                 </table:table-cell>
@@ -719,18 +683,6 @@
                 <table:table-cell>
                     <text:p/>
                 </table:table-cell>
-                <table:table-cell>
-                    <text:p/>
-                </table:table-cell>
-                <table:table-cell>
-                    <text:p/>
-                </table:table-cell>
-                <table:table-cell>
-                    <text:p/>
-                </table:table-cell>
-                <table:table-cell>
-                    <text:p/>
-                </table:table-cell>
                 <table:table-cell>
                     <text:p>Design and usability in security systems: daily life as a context of use?</text:p>
                 </table:table-cell>
diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/CitaviXmlImporterTest1.bib b/src/test/resources/org/jabref/logic/importer/fileformat/CitaviXmlImporterTest1.bib
new file mode 100644
index 00000000000..768ea036e15
--- /dev/null
+++ b/src/test/resources/org/jabref/logic/importer/fileformat/CitaviXmlImporterTest1.bib
@@ -0,0 +1,1473 @@
+@Article{,
+  author  = {Agbaraji, Emmanuel and Ochulor, Deborah and Ezeh, Gloria},
+  title   = {Food and drug counterfeiting in the developing nations},
+  year    = {2012},
+  pages   = {24--31},
+  volume  = {3},
+  comment = {# Food counterfeiting similar to drug counterfeiting
+
+"Counterfeited drugs are drugs that are not authentic and have been manufactured using incorrect quantities, or incorrect ingredients, to either reduce the potency, or nullify the potency of drugs altogether, and the same is applicable to food counterfeit."
+
+page range: 24
+
+quotation type: Direct quotation
+
+quotation index: 0
+
+# Advantages of RFID
+
+"With RFID, drugs can be tracked at the item level throughout the supply chain. Individual packages are tagged at manufacturing and then read serially, in-bulk throughout the distribution chain. The read points include tag application, case packaging, total tracking throughout distribution and item level tracking and authentication at the pharmacy. With RFID, the entire drug supply chain becomes more efficient and secure."
+
+page range: 27
+
+quotation type: Direct quotation
+
+quotation index: 1
+
+# Digital mass serialization in the supply chain
+
+page range: 28
+
+quotation type: Image quotation
+
+quotation index: 2},
+}
+
+@Book{,
+  editor    = {Albala, Ken},
+  publisher = {SAGE Reference},
+  title     = {The SAGE encyclopedia of food issues},
+  year      = {2015},
+}
+
+@Article{,
+  author   = {Barlow, Susan and Boobis, Alan and Bridges, Jim and Cockburn, Andrew and Dekant, Wolfgang and Hepburn, Paul and Houben, Geert and König, Jürgen and Nauta, Maarten and Schuermans, Jeroen and Bánáti, Diána},
+  title    = {The role of hazard- and risk-based approaches in ensuring food safety},
+  year     = {2015},
+  pages    = {176--188},
+  volume   = {46},
+  abstract = {Background: Food legislation in the European Union and elsewhere includes both hazard- and risk-based approaches for ensuring safety. In hazard-based approaches, simply the presence of a potentially harmful agent at a detectable level in food is used as a basis for legislation and/or risk management action. Riskbased approaches allow consideration of exposure in assessing whether there may be unacceptable risks to health. Scope and approach: The advantages and disadvantages of hazard- and risk-based approaches for ensuring the safety of food chemicals, allergens, ingredients and microorganisms were explored at an ILSI Europe workshop. Key findings and conclusions: It was concluded that both types of approach have their place, depending on the context. However, problems can arise when both types of approach are used in regulation by separate agencies that address different aspects of the same agent/substance present in food. This separation of decision-making can result in hazard-based restrictions on marketing and use, whereas risk-based assessments for those exposed show there is reasonable certainty no harm will result. This in turn can lead to contradictory, confusing and ultimately unnecessary actions. Use of hazard-based approaches for foods also means that comparisons with benefits for nutrition and food security cannot be undertaken. This has the potential to lead to bias in the overall conclusions of regulators and risk managers, who may not have been presented with the benefits of particular foods. The value of riskbased approaches is becoming increasingly recognised.},
+  comment  = {# It's unrealistic to aim for completely risk-free food
+
+"…zero tolerance of risks is not feasible for the majority of foods and the majority of safety contexts."
+
+page range: 176
+
+quotation type: Direct quotation
+
+quotation index: 0},
+}
+
+@Misc{,
+  author    = {Bishop, Mac and Werschkul, Ben and Hodge, Channon and Rosado, Pedro and Stokes, Elaisha and Desai, Lisa},
+  title     = {Truth in seafood labeling},
+  year      = {2013-02-21},
+  abstract  = {A senior scientist at Oceana discusses the group’s new study that found that about one-third of fish samples in 12 metropolitan areas were mislabeled.},
+  publisher = {The New York Times},
+}
+
+@Book{,
+  author    = {Braden, Darrell},
+  publisher = {Nova Science Publishers},
+  title     = {Food fraud and adulterated ingredients},
+  year      = {2014},
+  keywords  = {Fishery products, Food adulteration and inspection, Food contamination, Government policy, Law and legislation, Marketing, Prevention},
+  pages     = {113},
+}
+
+@Misc{,
+  author    = {Burton, Tim},
+  title     = {Sweeney Todd},
+  year      = {2013},
+  abstract  = {Reinventing himself as Sweeney Todd, a man unjustly sent to prison returns to exact revenge on those who ruined his life, especially the evil Judge Turpin who sent the man to prison. Not only does he seek revenge for the cruel punishment he suffered in prison, but also for what happened to his wife and daughter. When he returns to his home town, he reopens his barber shop, where Mr. Todd becomes the Demon of Fleet Street. Mrs. Lovett is Sweeney's amorous accomplice who creates diabolical meat pies out of the remains of Mr. Todd's victims.},
+  comment   = {# Sweeney Todd = fictional work with food fraud in the plot
+
+I wonder if there's any way to work this into the paper? Perhaps in the introduction?
+
+quotation type: Comment
+
+quotation index: 0},
+  keywords  = {Todd, Sweeney (legendary character)},
+  publisher = {Warner Home Video},
+}
+
+@Article{,
+  author = {Che Man, Yaakob and Mustafa, Shuhaimi and Khalid, Farihah and Azmi, Aida and Sazili, Awis and Rahim, Raha},
+  title  = {Method for identifying a pork content in a food},
+  year   = {2010},
+}
+
+@Article{,
+  author   = {Dai, Cong and Jiang, Min},
+  title    = {Fake meat scandals add to Chinese food fears},
+  year     = {2013},
+  pages    = {f3385},
+  volume   = {346},
+  comment  = {# Situation in China
+
+“Meat smuggling and food adulteration are rampant in China. In these cases, the suspects are accused of using gelatin, red pigment, and nitrates to alter the dead pigs, ducks, and rats. Chinese food production is now on a larger scale and more technological, and sophisticated technology is being used to beat regulators and cheat customers. Tainted meats are an ongoing problem.”
+
+page range: 2147483647
+
+quotation type: Direct quotation
+
+quotation index: 0},
+  keywords = {China, Food safety, Fraud, Humans, Meat},
+}
+
+@Article{,
+  author   = {Manuell, Roy},
+  title    = {Fighting food fraud in 2017},
+  abstract = {In anticipation of Food Fraud 2017, New Food speaks exclusively to Eoghan Daly of Crowe Clark Whitehill about tackling food fraud in the 21st Century.},
+}
+
+@Book{,
+  editor    = {Dries, Liesbeth and Karantininis, Konstantinos and Martino, Gaetano and Codron, Jean and Pascucci, Stefano},
+  publisher = {Wageningen Academic Publishers},
+  title     = {It’s a jungle out there - the strange animals of economic organization in agri-food value chains},
+  year      = {[In press]},
+}
+
+@Article{,
+  title   = {Food Fraud Network activity report 2015},
+  pages   = {3},
+  comment = {# The 2013 horsemeat scandal --> Europe-wide process for information exchange related to food fraud.
+
+“In the wake of the horsemeat scandal of 2013, a pan-European mechanism to ensure the rapid exchange of information between national authorities and the Commission in cases of suspected fraudulent practices was set up.”
+
+page range: 1
+
+quotation type: Direct quotation
+
+quotation index: 0
+
+# 2015 statistics - European Food Fraud Network
+
+“In 2015, 108 cases were exchanged by the Food Fraud Network.”
+
+page range: 2
+
+quotation type: Direct quotation
+
+quotation index: 1
+
+# Types of violations
+
+“...alleged violations were mostly related to labelling noncompliance (notably with regard to ingredients mislabelling), suspicion of illegal exports, and prohibited treatments and/or processes applied to a certain foodstuff (e.g. addition of synthetic glycerol to wine).”
+
+page range: 2
+
+quotation type: Direct quotation
+
+quotation index: 2
+
+# Illegal exports and exchanges on fish products most common incidents (2015 Food Fraud Network)
+
+“The majority of exchanges that took place in the Network in 2015 concerned suspicion of illegal exports, followed by exchanges on fish and fish products. Importantly, however, statistical conclusions related to potential "food fraud" cases in Europe cannot be drawn from these data given that Member States may also exchange information outside of the FFN and that cases which do not have a cross-border dimension, i.e. which occur at purely national level, are not exchanged via the Network.”
+
+page range: 2
+
+quotation type: Direct quotation
+
+quotation index: 3},
+}
+@article{,
+  abstract = {Operation OPSON VI, the joint Europol-INTERPOL operation targeting counterfeit and substandard food and drink, as well as the organised crime networks behind this illicit trade, has resulted in the seizure of 9 800 tonnes, over 26.4 million litres, and 13 million units/items worth an estimated EUR 230 million of potentially harmful food and beverages ranging from every day products such as alcohol, mineral water, seasoning cubes, seafood and olive oil, to luxury goods such as caviar.},
+  comment = {# Results of recent 61-country operation to check for food fraud (12/1/2016 - 03/31/2017)
+
+“Operation OPSON VI, the joint Europol-INTERPOL operation targeting counterfeit and substandard food and drink, as well as the organised crime networks behind this illicit trade, has resulted in the seizure of 9 800 tonnes, over 26.4 million litres, and 13 million units/items worth an estimated EUR 230 million of potentially harmful food and beverages ranging from every day products such as alcohol, mineral water, seasoning cubes, seafood and olive oil, to luxury goods such as caviar.”
+
+page range: 2147483647
+
+quotation type: Direct quotation
+
+quotation index: 0
+
+# Summary of number and location of checks
+
+“More than 50 000 checks were carried out at shops, markets, airports, seaports and industrial estates.”
+
+page range: 2147483647
+
+quotation type: Direct quotation
+
+quotation index: 1
+
+# Quote from Françoise Dorcier, Coordinator of INTERPOL’s Illicit Goods and Global Health Programme
+
+“This operation has once again shown that criminals will fake any type of food and drink with no thought to the human cost as long as they make a profit. Whilst thousands of counterfeit goods have been taken out of circulation, we continue to encourage the public to remain vigilant about the products they buy.”
+
+page range: 2147483647
+
+quotation type: Direct quotation
+
+quotation index: 2
+
+# Findings in Europe
+
+Violations were related to food safety concerns and smuggling but also counterfeiting and food fraud. One example is the labeling of hazelnuts that were checked in Germany and determined to be other types of nuts. In Italy mineral water was determined to be fraudulent and unsafe. In Italy red wine was also found to be fraudulent and adulterated with additional alcohol. In Denmark olive oil was found to be fraudulent.
+
+page range: 2147483647
+
+quotation type: Summary
+
+quotation index: 3},
+  title = {EUR 230 million worth of fake food and beverages seized in global OPSON operation targeting food fraud},
+}
+
+@Book{,
+  author    = {Evershed, Richard and Temple, Nicola},
+  publisher = {Audible Studios for Bloomsbury},
+  title     = {Sorting the beef from the bull},
+  year      = {2016},
+  keywords  = {Screening},
+}
+
+@Article{,
+  author   = {Everstine, Karen},
+  title    = {Economically motivated adulteration},
+  abstract = {The food supply system is vulnerable to various types of contamination and adulteration. This research focuses on economically motivated adulteration (often called "food fraud"). Economically motivated adulteration (EMA) refers to the knowingly selling a food product that is not up to standards in order to gain economic advantage. There is a long history of EMA in a wide variety of food products. The food safety paradigm is not sufficient for food defense, or for prevention and deterrence of EMA. The goal of this research was to develop methods to improve capabilities for preventing and detecting EMA incidents. First, the food ingredient monographs in the United States Pharmacopeial (USP) Convention Food Chemicals Codex (FCC) were evaluated for susceptibility to EMA. These evaluations can be used to help target the most susceptible ingredients for monograph modernization within USP, and for inspection and laboratory testing resources by regulatory agencies. Second, economic and production data for dairy products in China leading up to the melamine adulteration event was analyzed to evaluate the utility of this data for alerting to the potential for EMA in a food commodity. This analysis shed insight on variables that may be useful for tracking the production of global commodities for early indications of EMA. Finally, a surveillance technique for trade data was evaluated using melamine adulteration of wheat gluten as a case study. This biosurveillance-like methodology can be applied to food import data to identify supply chain shifts that could indicate changes in the market for food products and a heightened risk of EMA. Regulatory agencies have an enormous burden of responsibility for regulating the food supply for both domestically-produced and imported food products. Given the constrained resources of these agencies, they need improved methods for targeting those resources towards the riskiest food products. These preliminary efforts to shed light on EMA vulnerabilities and potential mitigation efforts can contribute to efforts in that area. An integrated, systems-based approach to food protection that encompasses both food safety and food defense is imperative for ensuring the integrity of our food supply.},
+  keywords = {Adulteration, Food defense, Food safety, Fraud},
+}
+
+@Book{,
+  editor    = {Ewing-Chow, Michael and Slade, Melanie},
+  publisher = {Edward Elgar Publishing},
+  title     = {International trade and food security},
+  year      = {2016},
+  keywords  = {Food security, International trade},
+}
+
+@Article{,
+  title = {Vulnerability assessments of food systems},
+  pages = {30},
+}
+
+@Article{,
+  title    = {Mitigation strategies to protect food against intentional adulteration. Final rule},
+  year     = {2016},
+  pages    = {34165--223},
+  volume   = {81},
+  abstract = {The Food and Drug Administration (FDA or we) is issuing this final rule to require domestic and foreign food facilities that are required to register under the Federal Food, Drug, and Cosmetic Act (the FD&C Act) to address hazards that may be introduced with the intention to cause wide scale public health harm. These food facilities are required to conduct a vulnerability assessment to identify significant vulnerabilities and actionable process steps and implement mitigation strategies to significantly minimize or prevent significant vulnerabilities identified at actionable process steps in a food operation. FDA is issuing these requirements as part of our implementation of the FDA Food Safety Modernization Act (FSMA).},
+  keywords = {Food industry legislation and jurisprudence, Food safety, Humans, Law and legislation, Legislation, Terrorism prevention and control, United States},
+}
+
+@Article{,
+  author   = {Garver, Krista},
+  title    = {What is blockchain and how will it impact the food industry?},
+  abstract = {The food industry has been abuzz lately about the potential of blockchain to solve the problem of end-to-end traceability in the supply chain.},
+}
+
+@Article{,
+  title   = {GFSI position on mitigating the public health risk of food fraud},
+  pages   = {4},
+  comment = {# Food fraud definition (GFSI)
+
+“It is deception of consumers using food products, ingredients and packaging for economic gain and includes substitution, unapproved enhancements, misbranding, counterfeiting, stolen goods or others. Unlike food defence, which protects against tampering with intent to harm, the consumers’ health risk of food fraud often occurs through negligence or lack of knowledge on the fraudsters’ part and can be more dangerous than traditional food safety risks because the contaminants are unconventional.”
+
+page range: 2
+
+quotation type: Direct quotation
+
+quotation index: 0
+
+# Different topic areas and how they relate intentional and unintentional food fraud
+
+page range: 2
+
+quotation type: Image quotation
+
+quotation index: 1
+
+# GFSI's recommendations to food industry to mitigate risk of food fraud
+
+“Secondly, appropriate control measures shall be put in place to reduce the risks from these vulnerabilities. These control measures can include a monitoring strategy, a testing strategy, origin verification, specification management, supplier audits and anti-counterfeit technologies. A clearly documented control plan outlines when, where and how to mitigate fraudulent activities.”
+
+page range: 3
+
+quotation type: Direct quotation
+
+quotation index: 2},
+}
+
+@Article{,
+  author   = {Hong, Eunyoung and Lee, Sang and Jeong, Jae and Park, Jung and Kim, Byung and Kwon, Kisung and Chun, Hyang},
+  title    = {Modern analytical methods for the detection of food fraud and adulteration by food category},
+  year     = {[In press]},
+  abstract = {This review provides current information on the analytical methods used to identify food adulteration in the six most adulterated food categories: animal origin and seafood, oils and fats, beverages, spices and sweet foods (e.g. honey), grain-based food, and others (organic food and dietary supplements). The analytical techniques, both conventional and emerging, used to identify adulteration in these six food categories involve sensory, physicochemical, DNA-based, chromatographic, and spectroscopic methods, and have been combined with chemometrics, making these techniques more convenient and effective for the analysis of a broad variety of food products. Despite recent advances, a need remains for suitably sensitive and widely applicable methodologies that will encompass all the various aspects of food adulteration.},
+   comment = {# Definition of food fraud (Hong et al)
+
+“The key characteristics of food fraud are noncompliance with food laws and/or misleading the consumer, intentional fraud, and the purpose of financial gain.”
+
+quotation type: Direct quotation
+
+quotation index: 0
+
+# Typical kinds of adulterated foods
+
+“In general, foods and food ingredients commonly associated with food fraud include oil, fish, honey, milk and dairy products, meat products, grain-based foods, fruit juices, wine and alcoholic beverages, organic foods, spices, coffee, tea, and some highly processed foods.”
+
+quotation type: Direct quotation
+
+quotation index: 1
+
+# Mass spectrometry is the type of testing used for most types of food
+
+“A notable observation is that MS is used extensively in most food categories, and is also the most frequently used method in the analysis of spices, extracts, cereals, grains, and pulses.”
+
+quotation type: Direct quotation
+
+quotation index: 2
+
+# Most common detection method by food category
+
+“Detection methods were ranked according to their number of uses in the literature. MS accounted for the largest proportion at 20.6%; PCR for 18.5%, and LC for 11.6%. MS also accounted for the greatest proportion in Asian countries and South Korea (20.7% and 38.1%, respectively). A notable observation is that MS is used extensively in most food categories, and is also the most frequently used method in the analysis of spices, extracts, cereals, grains, and pulses. However, LC and GC are also used to a significant degree for spices, oils, and organic foods. NMR is used frequently to discriminate the authenticity of oils, cereals, grains, alcoholic beverages and fruit juices. PCR is the predominant detection technology used for the food categories of meat and meat products, fish and seafood, and milk and milk products. In addition to MS, HPLC and LC are often used for fruits, fruit juices, and sweeteners. IR spectroscopy, Raman, immunosorbent assays (e.g., ELISA), and biosensors are used less when compared with the other detection methods.”
+
+quotation type: Direct quotation
+
+quotation index: 3
+
+# Four categories used when authenticating meat
+
+“Authentication problems with respect to meat and meat products are grouped into four major categories: meat species, meat processing treatment (cooked meat, and fresh versus thawed meat), meat geographic origin, and non-meat ingredient addition (additives and water).”
+
+quotation type: Direct quotation
+
+quotation index: 4
+
+# DNA-based techniques most popular for meat authentication testing
+
+“The most common methodologies used to determine the authenticity of meat and meat products are unquestionably DNA-based techniques: real-time PCR, multiplex PCR, and species-specific PCR.”
+
+quotation type: Direct quotation
+
+quotation index: 5
+
+# Meat usually adulterated with pork and testing can be an issue to detect if the meat is minced or processed
+
+“A frequent adulteration of meat products is the addition of pork to beef products, which is done for economic gain. Particularly for minced and homogenized meat products, the development of a method to identify species is an important authenticity issue.”
+
+quotation type: Direct quotation
+
+quotation index: 6
+
+# How fish and seafood are typically adulterated
+
+“Forms of fish and seafood fraud include intentionally increasing the product weight and using illegal additives in production. Methods to increase weight include adding excess water to frozen product (overglazing), soaking products such as scallops in sodium tripolyphosphate so that they retain water, and overbreading.”
+
+quotation type: Direct quotation
+
+quotation index: 7},
+}
+
+@Article{,
+  title    = {Walmart, IBM and Tsinghua University explore the use of blockchain to help bring safer food to dinner tables across China},
+  abstract = {As Walmart opened its new Walmart Food Safety Collaboration Center in Beijing today, IBM, Walmart and Tsinghua University announced a collaboration to improve the way food is tracked, transported and sold to consumers across China. By harnessing the power of blockchain technology designed to generate transparency and efficiency in supply chain record-keeping, this work aims to help enhance the safety of food on the tables of Chinese consumers.},
+  keywords = {Asia, Blockchain, China, Linux Foundation Hyperledger Project, Safer food, Tsinghua University, Walmart Food Safety Collaboration Center},
+}
+
+@Article{,
+  title     = {Food safety management systems – Requirements for any organization in the food chain},
+  volume    = {67.020},
+  publisher = {International Organization for Standardization},
+}
+
+@Book{,
+  editor    = {Jen, Joseph and Chen, Junshi},
+  publisher = {John Wiley & Sons, Inc},
+  title     = {Food safety in China},
+  year      = {2017},
+  keywords  = {Food adulteration and inspection, Food contamination},
+  pages     = {696},
+}
+
+@Article{,
+  author = {Kelepouris, Thomas and Pramatari, Katerina and Doukidis, Georgios},
+  title  = {RFID-enabled traceability in the food supply chain},
+  year   = {2007},
+  pages  = {183--200},
+  volume = {107},
+}
+
+@Article{,
+  author   = {Lawrence, Felicity},
+  title    = {Horsemeat scandal},
+  abstract = {With the Europewide scandal over the contamination of meat products, from beefburgers to lasagne, showing no sign of abating, study the issue in depth and learn all you need to know about how it came to this with our essential guide},
+  keywords = {Europe, Food and drink industry, Food safety, Horsemeat scandal, Ireland, Meat, Supermarkets, The meat industry, United Kingdom},
+}
+
+@Article{,
+  title  = {Food and supply chain integrity},
+  year   = {2016},
+  volume = {119},
+  editor = {Manning, Louise},
+}
+
+@Article{,
+  author   = {Manning, Louise and Soon, Jan},
+  title    = {Food safety, food fraud, and food defense},
+  year     = {2016},
+  pages    = {R823--R834},
+  volume   = {81},
+  abstract = {Intentional food crime is plural in nature in terms of the types of crime and the differing levels of financial gain. Successful models of food crime are dependent on how well the crime has been executed and at what point, or even if, detection actually occurs. The aim of this paper is to undertake a literature review and critique the often contradictory definitions that can be found in the literature in order to compare and contrast existing food crime risk assessment tools and their application. Food safety, food defense, and food fraud risk assessments consider different criteria in order to determine the degree of situational risk for each criteria and the measures that need to be implemented to mitigate that risk. Further research is required to support the development of global countermeasures, that are of value in reducing overall risk even when the potential hazards may be largely unknown, and specific countermeasures that can act against unique risks.},
+  comment = {page range: 823
+
+quotation type: Highlight
+
+quotation index: 0
+
+page range: 823
+
+quotation type: Highlight
+
+quotation index: 1
+
+page range: 823
+
+quotation type: Highlight
+
+quotation index: 2
+
+page range: 823
+
+quotation type: Highlight
+
+quotation index: 3
+
+page range: 823
+
+quotation type: Highlight
+
+quotation index: 4
+
+page range: 824
+
+quotation type: Highlight
+
+quotation index: 5
+
+page range: 824
+
+quotation type: Highlight
+
+quotation index: 6
+
+page range: 824
+
+quotation type: Highlight
+
+quotation index: 7
+
+page range: 825
+
+quotation type: Highlight
+
+quotation index: 8
+
+page range: 825
+
+quotation type: Highlight
+
+quotation index: 9
+
+page range: 825
+
+quotation type: Highlight
+
+quotation index: 10
+
+page range: 826
+
+quotation type: Highlight
+
+quotation index: 11
+
+page range: 826
+
+quotation type: Highlight
+
+quotation index: 12
+
+page range: 829
+
+quotation type: Highlight
+
+quotation index: 13
+
+page range: 829
+
+quotation type: Highlight
+
+quotation index: 14
+
+page range: 830
+
+quotation type: Highlight
+
+quotation index: 15
+
+page range: 830
+
+quotation type: Highlight
+
+quotation index: 16
+
+page range: 830
+
+quotation type: Highlight
+
+quotation index: 17
+
+page range: 833
+
+quotation type: Highlight
+
+quotation index: 18
+
+page range: 833
+
+quotation type: Highlight
+
+quotation index: 19
+
+page range: 833
+
+quotation type: Highlight
+
+quotation index: 20
+
+page range: 833
+
+quotation type: Highlight
+
+quotation index: 21
+
+page range: 833
+
+quotation type: Highlight
+
+quotation index: 22
+
+page range: 833
+
+quotation type: Highlight
+
+quotation index: 23
+
+# Terminological difficulties - contamination vs. adulteration
+
+Sometimes in U.S. literature "contamination" = unintentional, while "adulteration" = intentional
+
+page range: 2147483647
+
+quotation type: Indirect quotation
+
+quotation index: 24
+
+# Concept of food safety is changing
+
+Unintentional and intentional contamination used to be considered together, now they are often looked at separately.
+
+page range: 2147483647
+
+quotation type: Summary
+
+quotation index: 25
+
+# High demand and low supply can create the conditions for food fraud
+
+“The potential for food crime is often influenced by a difference between availability and demand, creating an opportunity for criminals or fraudsters to financially benefit from the shortfall.”
+
+page range: 2147483647
+
+quotation type: Direct quotation
+
+quotation index: 26
+
+# Definition of food crime (Manning & Soon)
+
+“...food crime occurs when food is intentionally modified in order to bring harm to individuals or for purposes of economic gain and both situations may lead to issues of food safety or food quality.”
+
+page range: 2147483647
+
+quotation type: Direct quotation
+
+quotation index: 27
+
+# Example of food crime through intentional neglect
+
+See PDF
+
+page range: 2147483647
+
+quotation type: Comment
+
+quotation index: 28
+
+# Definition of food defense (Manning & Soon)
+
+“Therefore, food defense has been said to reflect the protection activities, and/or the security assurance process or procedures that deliver product safety with regard to intentional acts of adulteration.”
+
+page range: 2147483647
+
+quotation type: Direct quotation
+
+quotation index: 29
+
+# Types of food crime
+
+page range: 2147483647
+
+quotation type: Image quotation
+
+quotation index: 30
+
+# Definition of crime vulnerability
+
+“Crime vulnerability can be defined as the extent to which an individual, organization, supply chain or national food system is at risk from, or susceptible to, attack, emotional injury or physical harm, or damage from an intentional act.”
+
+page range: 2147483647
+
+quotation type: Direct quotation
+
+quotation index: 31
+
+# Drivers behind food crime and food defense
+
+page range: 2147483647
+
+quotation type: Image quotation
+
+quotation index: 32
+
+# There needs to be a better understanding of what motivates food criminals
+
+“Food defense needs to consider the perpetrator, the relevance of impact, and their motivation to cause harm. Food fraud is driven by singular motivation, that is, the desire for gain, and in order to implement appropriate countermeasures, the motivational element of food fraud needs to be fully understood.”
+
+page range: 2147483647
+
+quotation type: Direct quotation
+
+quotation index: 33
+
+# Intentional and unintentional adulteration
+
+page range: 2147483647
+
+quotation type: Image quotation
+
+quotation index: 34
+
+# Differences between GFSI (2014) and FSIS (2014) and FAO (2003)
+
+See PDF
+
+page range: 2147483647
+
+quotation type: Summary
+
+quotation index: 35
+
+# Both scientific and social scientific criteria needed for risk assessment
+
+page range: 2147483647
+
+quotation type: Highlight in red
+
+quotation index: 36
+
+# Plurality of food crime makes it difficult to define which in turn makes it difficult to create policies to fight it
+
+“Intentional food crime is plural in nature in terms of the types of crime and the differing levels of financial gain. This can also be said in terms of the multiplicity of definitions of food safety, food defense, food fraud, and food quality found in both academic and gray literature. This plurality creates confusion and multiple interpretations when FCRA is adopted and implemented.”
+
+page range: 2147483647
+
+quotation type: Direct quotation
+
+quotation index: 37},
+  keywords = {Crime, Food safety, Fraud, Humans, Risk Assessment},
+}
+
+@Article{,
+  author   = {Meyer, Samantha and Wilson, Annabelle and Calnan, Michael and Henderson, Julie and Coveney, John and McCullum, Dean and Pearce, Alex and Ward, Paul and Webb, Trevor},
+  title    = {In the interest of food safety},
+  year     = {2017},
+  pages    = {1--13},
+  volume   = {17},
+  abstract = {BACKGROUND: Food regulatory bodies play an important role in public health, and in reducing the costs of food borne illness that are absorbed by both industry and government. Regulation in the food industry involves a relationship between regulators and members of the industry, and it is imperative that these relationships are built on trust. Research has shown in a variety of contexts that businesses find the most success when there are high levels of trust between them and their key stakeholders. An evidence-based understanding of the barriers to communication and trust is imperative if we are to put forward recommendations for facilitating the (re)building of trusting and communicative relationships. METHODS: We present data from 72 interviews with regulators and industry representatives regarding their trust in and communication with one another. Interviews were conducted in the UK, New Zealand, and Australia in 2013. RESULTS: Data identify a variety of factors that shape the dynamic and complex relationships between regulators and industry, as well as barriers to communication and trust between the two parties. Novel in our approach is our emphasis on identifying solutions to these barriers from the voices of industry and regulators. CONCLUSIONS: We provide recommendations (e.g., development of industry advisory boards) to facilitate the (re)building of trusting and communicative relationships between the two parties.},
+}
+
+@Article{,
+  author   = {Millward, Steven},
+  title    = {Alibaba to use blockchain to fight China’s fake food},
+  abstract = {Fake soy sauce, fake rice, fake eggs – those are all actual and potentially deadly items found in China. The tech behind Bitcoin could help everyone avoid the problem.},
+  comment = {# Fake egg found on sale in China in 2012
+
+quotation type: Image quotation
+
+quotation index: 0},
+  keywords = {Asia, Jakarta, Singapore, Tokyo},
+}
+
+@Article{,
+  author   = {Nascimento, Carina and Santos, Poliana and Pereira-Filho, Edenir and Rocha, Fábio},
+  title    = {Recent advances on determination of milk adulterants},
+  year     = {2017},
+  pages    = {1232--1244},
+  volume   = {221},
+  abstract = {Milk adulteration is a current fraudulent practice to mask the quality parameters (e.g. protein and fat content) and increase the product shelf life. Milk adulteration includes addition of toxic substances, such as formaldehyde, hydrogen peroxide, hypochlorite, dichromate, salicylic acid, melamine, and urea. In order to assure the food safety and avoid health risks to consumers, novel analytical procedures have been proposed for detection of these adulterants. The innovations encompass sample pretreatment and improved detection and data processing, including chemometric tools. This review focuses on critical evaluation of analytical approaches for assay of milk adulteration, with emphasis on applications published after 2010. Alternatives for fast, environmentally friendly and in-situ detection of milk adulterants are highlighted.},
+}
+
+@Article{,
+  comment = {quotation type: Highlight
+
+quotation index: 0
+
+quotation type: Highlight
+
+quotation index: 1
+
+quotation type: Highlight
+
+quotation index: 2
+
+# Most often food fraud is not likely to cause health problems, but it does lead to lower quality food
+
+“The common factor in many cases of food fraud, is that the adulterant is neither a food safety hazard, nor readily identified (as this would defeat the aim of the fraudster). Common adulterants include water and sugar, or ingredients that may be legitimately used and declared, but whose improper use constitutes fraud. Food fraud deceives the consumers by providing them with lower quality foodstuff, against their knowledge and will.”
+
+page range: 4
+
+quotation type: Direct quotation
+
+quotation index: 3
+
+# Steps for prevention
+
+“A general approach to prevent food fraud can be summarised as follows:
+• Conduct vulnerability assessment, including:
+– Know your materials and risks (history, economic factors, geographical origins, physical state, emerging issues);
+– Know your suppliers (manufacturer, broker, history);
+ – Know your supply chain (length, complexity, supply & demand arrangements, ease of access);
+ – Know your existing control measures.
+• Design mitigation strategy and implement mitigation measures.
+• Validate and verify mitigation measures, continually review food fraud management system.”
+
+page range: 6
+
+quotation type: Direct quotation
+
+quotation index: 4
+
+# Factors that can contribute to fraud
+
+“Factors such as the demand for a specific ingredient (volume), the extent of its use (ingredient used in several products and businesses), or the market price fluctuation may contribute to an increased level of vulnerability to fraud.”
+
+page range: 6
+
+quotation type: Direct quotation
+
+quotation index: 5
+
+# Increases in prices for an ingredient and rarity are good conditions for fraud
+
+“Any anomaly in the economics of particular raw material sources is an indicator of the raw material potential vulnerability. Drastic increases in market price and scarce supplies of a raw material (e.g. poor harvest following bad weather, or caused by a new parasite) are good indicators of increased raw material vulnerability based on economic anomalies.”
+
+page range: 8
+
+quotation type: Direct quotation
+
+quotation index: 6
+
+# Geopolitical considerations
+
+“Geopolitical considerations are also important to characterise vulnerability to food fraud. A country-specific low price compared with the rest of the market may indicate a lack of food control and/or regulatory/enforcement framework in the country of origin (or any other country through which the ingredient may transit).”
+
+page range: 8
+
+quotation type: Direct quotation
+
+quotation index: 7
+
+# Vulnerability factors vs. control measures
+
+page range: 8
+
+quotation type: Image quotation
+
+quotation index: 8
+
+# What's needed to judge food fraud risk
+
+“In summary, assessing the risk of fraud for a food ingredient requires the understanding of the inherent raw material vulnerabilities, the business vulnerabilities, and the existing controls in place.”
+
+page range: 9
+
+quotation type: Direct quotation
+
+quotation index: 9
+
+# Two types of raw material monitoring
+
+“Raw material monitoring should be performed using appropriate analytical methods for the verification of authenticity. The methods must be selective, specific, and of appropriate sensitivity to verify that the food authenticity process is efficient. There are 2 approaches:
+ • Targeted analyses (linked to parameters specified in raw material specifications);
+ • Untargeted techniques (fingerprinting) that assess the raw material integrity against adulteration.”
+
+page range: 10
+
+quotation type: Direct quotation
+
+quotation index: 10
+
+# Businesses should use suppliers they can trust and who will share processes with them
+
+“Confidence is increased with a supplier’s readiness to share information on their supply chain and processes. This is why the development of trusted suppliers (rather than continuous rotation) is important in mitigating the risk of food fraud. The closer the relationship, the lower the risk.”
+
+page range: 11
+
+quotation type: Direct quotation
+
+quotation index: 11
+
+# Auditing examples
+
+“More targeted examination may be carried out by auditors during audits at a specific raw material production/handling site. For example on a meat production site – auditors may detect the presence of unapproved flavours, dyes or preservatives in the production and/or storage areas. On a poultry production site – auditors may look for the presence of equipment used to inject brine.”
+
+page range: 14
+
+quotation type: Direct quotation
+
+quotation index: 12
+
+# Definition of EMA (economically-motivated adulteration)
+
+“EMA is the intentional sale of substandard food products or ingredients for the purpose of economic gain. Common types of EMA include substitution or dilution of an authentic ingredient with a cheaper product (such as replacing extra virgin olive oil with a cheaper oil), flavour or colour enhancement using illicit or unapproved substances (such as unapproved dyes), and substitution of one species with another (such as fish species fraud).”
+
+page range: 16
+
+quotation type: Direct quotation
+
+quotation index: 13
+
+# Recommendations for consumers for avoiding food fraud
+
+“Whole, unprocessed foods (such as unground coffee and spices, or whole fruits instead of juice) are more difficult to adulterate, therefore buying these foods may offer some reassurance with regards to fraud. As for processed foods, it is a good idea to buy from reputable sources and brands that have a vested interest in protecting their reputation.”
+
+page range: 18
+
+quotation type: Direct quotation
+
+quotation index: 14},
+  title = {Food Fraud},
+  pages = {13},
+}
+
+@Article{,
+  author   = {Oceana},
+  title    = {Global seafood fraud},
+  year     = {2016},
+  abstract = {Seafood is a global commodity traded all over the world, following a long, complex and non-transparent supply chain. It also serves as an important source of protein for millions of people every day. However, seafood fraud and species substitutions occur regularly, cheating consumers out of what they ordered and putting public health and the oceans at risk. In addition, seafood fraud allows illegally caught fish to be laundered into the legal seafood trade.},
+}
+
+@Article{,
+  author   = {Oliveira, Gislene and Alewijn, Martin and Boerrigter-Eenling, Rita and van Ruth, Saskia},
+  title    = {Compositional signatures of conventional, free range, and organic pork meat using fingerprint techniques},
+  year     = {2015},
+  pages    = {359--375},
+  volume   = {4},
+  abstract = {Consumers' interest in the way meat is produced is increasing in Europe. The resulting free range and organic meat products retail at a higher price, but are difficult to differentiate from their counterparts. To ascertain authenticity and prevent fraud, relevant markers need to be identified and new analytical methodology developed. The objective of this pilot study was to characterize pork belly meats of different animal welfare classes by their fatty acid (Fatty Acid Methyl Ester-FAME), non-volatile compound (electrospray ionization-tandem mass spectrometry-ESI-MS/MS), and volatile compound (proton-transfer-reaction mass spectrometry-PTR-MS) fingerprints. Well-defined pork belly meat samples (13 conventional, 15 free range, and 13 organic) originating from the Netherlands were subjected to analysis. Fingerprints appeared to be specific for the three categories, and resulted in 100%, 95.3%, and 95.3% correct identity predictions of training set samples for FAME, ESI-MS/MS, and PTR-MS respectively and slightly lower scores for the validation set. Organic meat was also well discriminated from the other two categories with 100% success rates for the training set for all three analytical approaches. Ten out of 25 FAs showed significant differences in abundance between organic meat and the other categories, free range meat differed significantly for 6 out of the 25 FAs. Overall, FAME fingerprinting presented highest discrimination power.},
+}
+
+@Book{,
+  author    = {Olmsted, Larry},
+  publisher = {Algonquin Books of Chapel Hill},
+  title     = {Real food fake food},
+  year      = {2016},
+  abstract  = {[Description from publisher - J.S.] You've seen the headlines: Parmesan cheese made from sawdust. Lobster rolls containing no lobster at all. Extra virgin olive oil that isn't. Fake foods are in our supermarkets, our restaurants, and our kitchen cabinets. Award-winning food journalist and travel writer Larry Olmsted exposes the pervasive and dangerous fraud perpetrated on unsuspecting Americans. Real Food/Fake Food brings readers into the unregulated food industry, revealing the alarming truth: What we think we're eating is not what we're really eating. Olmsted examines how this shocking deception extends from high-end foods like olive oil, wine, and Kobe beef to everyday staples such as coffee, honey, juice, and cheese. It's a massive bait and switch where counterfeiting is rampant and where the consumer ultimately pays the price. But Olmstead does more than show us what foods to avoid. A bona fide gourmand, he travels to the sources of the real stuff, to help us recognize what to look for, eat, and enjoy. Genuine Parmigiano-Reggiano from Italy, fresh-caught grouper from Florida, authentic port from Portugal. Real foods that are grown, raised, produced, and prepared with care by masters of their craft. Part cautionary tale, part culinary crusade, Real Food/Fake Food is addictively readable, mouth-wateringly enjoyable, and utterly relevant. Larry Olmsted convinces us why real food matters},
+  keywords  = {Artificial foods, Consumer education, Food additives, Food substitutes, Fraud, Nutrition, Quality},
+  pages     = {318},
+}
+
+@Article{,
+  author = {Opara, Linus},
+  title  = {Traceability in agriculture and food supply chain},
+  year   = {2003},
+  pages  = {101--106},
+  volume = {1},
+}
+
+@Article{,
+  title     = {Reflections on supply chain research and practice},
+  year      = {2015},
+  editor    = {Pawar, Kulwant and Rogers, Helen and Ferrari, Emilio},
+  publisher = {Centre for Concurrent Enterprise},
+}
+
+@Article{,
+  author   = {Ramamurthy, Shanker},
+  title    = {Leveraging blockchain to improve food supply chain traceability},
+  year     = {2016-11-16},
+  abstract = {Leveraging blockchain for food supply chain tracking and authentication, is critical to finding and helping to address sources of contamination worldwide.},
+  comment = {quotation type: Highlight
+
+quotation index: 0
+
+quotation type: Highlight
+
+quotation index: 1
+
+# How blockchain works when applied to the food supply chain
+
+“When applied to the food supply chain, digital product information such as farm origination details, batch numbers, factory and processing data, expiration dates, storage temperatures and shipping detail are digitally connected to food items and the information is entered into the blockchain along every step of the process.”
+
+page range: 2147483647
+
+quotation type: Direct quotation
+
+quotation index: 2},
+}
+
+@Book{,
+  author    = {Ryan, John},
+  publisher = {Academic Press},
+  title     = {Food fraud},
+  year      = {2016},
+  abstract  = {Food Fraud provides an overview of the current state on the topic to help readers understand which products are being impacted, how pervasive food fraud is, and what laws are in effect across the developed world. As international food trade increases, food processors, distributors, and consumers are purchasing more and more food from foreign countries that, in many cases, have inadequate oversight or control over what is coming into our supermarkets, restaurants, and refrigerators. This book is an essential quick reference that will familiarize readers with the latest issues surrounding the food industry.},
+  keywords  = {Food adulteration and inspection, Food industry and trade, Law and legislation, United States},
+  pages     = {92 pages},
+}
+
+@Misc{,
+  author   = {Sample, Ian and Chambers, Iain},
+  title    = {A proper mouthful},
+  year     = {2016-02-26},
+  abstract = {From fake eggs to horsemeat burgers, food fraud is common, but hard to detect. How can we be sure that what we’re eating is the real thing?},
+   comment = {# Adulteration usually not complete subsitution but attempt to cover up something in the food
+
+Usually it's an attempt to mask something in the food and is not an outright 100% substitution.
+
+page range: 2147483647
+
+quotation type: Indirect quotation
+
+quotation index: 0
+
+# Adulteration can occur with almost all types of food
+
+“Pretty much every food is vulnerable. ”
+
+page range: 0
+
+quotation type: Direct quotation
+
+quotation index: 1
+
+# Testing in UK has revealed widespread adulteration or misrepresentation of ingredients
+
+“Since the horsemeat scandal, UK testing has revealed that 40% of lamb takeaways contain other meat, and more than 60% of ham and cheese pizzas tested contained neither ham nor cheese.”
+
+page range: 1
+
+quotation type: Direct quotation
+
+quotation index: 2},
+  keywords = {Food and drink industry, Food safety, Food science, Horsemeat scandal, The meat industry},
+}
+
+@Article{,
+  author   = {Sciex},
+  title    = {MarkerView Software},
+  year     = {2017-03-29},
+  abstract = {[Description from publisher - J.S.] A powerful program designed for metabolomics and protein/peptide biomarker profiling applications. Allows you to rapidly and easily review data acquired on all SCIEX mass spectrometers to determine up- and down-regulation of endogenous compounds in complex samples.},
+}
+
+@Article{,
+  author   = {Spink, John},
+  title    = {GFSI direction on food fraud and vulnerability assessment (VACCP)},
+  year     = {2014-05-08},
+  abstract = {In February 2014 the Global Food Safety Initiative (GFSI) presented their direction for including Food Fraud in their Food Safety Management System.  They have adopted a holistic Food Fraud scope and have shifted their focus from risks to vulnerabilities.},
+  comment = {# GFSI Approach to Food Fraud Prevention
+
+page range: 2147483647
+
+quotation type: Image quotation
+
+quotation index: 0
+
+# GFSI Terminology Comparison
+
+page range: 2147483647
+
+quotation type: Image quotation
+
+quotation index: 1},
+}
+
+@Article{,
+  author   = {Spink, John and Moyer, Douglas},
+  title    = {Defining the public health threat of food fraud},
+  year     = {2011},
+  pages    = {R157--R163},
+  volume   = {76},
+  abstract = {Food fraud, including the more defined subcategory ofeconomically motivated adulteration, is a food risk that is gaining recognition and concern. Regardless ofthe cause ofthe food risk, adulteration offood is both an industry and a government responsibility. Food safety, food fraud, and food defense incidents can create adulteration offood with public health threats. Food fraud is an intentional act for economic gain, whereas a food safety incident is an unintentional act with unintentional harm, and a food defense incident is an intentional act with intentional harm. Economically motivated adulteration may be just that—economically motivated—but the food-related public health risks are often more risky than traditional food safety threats because the contaminants are unconventional. Current intervention systems are not designed to look for a near infinite number ofpotential contaminants. The authors developed the core concepts reported here following comprehensive research ofarticles and reports, expert elicitation, and an extensive peer review. The intent of this research paper is to provide a base reference document for defining food fraud—it focuses specifically on the public health threat—and to facilitate a shift in focus from intervention to prevention. This will subsequently provide a framework for future quantitative or innovative research. The fraud opportunity is deconstructed using the criminology and behavioral science applications ofthe crime triangle and the chemistry ofthe crime. The research provides a food risk matrix and identifies food fraud incident types. This project provides a starting point for future food science, food safety, and food defense research.},
+  comment = {page range: 157
+
+quotation type: Highlight
+
+quotation index: 0
+
+page range: 157
+
+quotation type: Highlight
+
+quotation index: 1
+
+page range: 157
+
+quotation type: Highlight
+
+quotation index: 2
+
+page range: 157
+
+quotation type: Highlight
+
+quotation index: 3
+
+page range: 157
+
+quotation type: Highlight
+
+quotation index: 4
+
+page range: 157
+
+quotation type: Highlight
+
+quotation index: 5
+
+page range: 157
+
+quotation type: Highlight
+
+quotation index: 6
+
+page range: 157
+
+quotation type: Highlight
+
+quotation index: 7
+
+page range: 157
+
+quotation type: Highlight
+
+quotation index: 8
+
+page range: 157
+
+quotation type: Highlight
+
+quotation index: 9
+
+page range: 158
+
+quotation type: Highlight
+
+quotation index: 10
+
+page range: 158
+
+quotation type: Highlight
+
+quotation index: 11
+
+page range: 158
+
+quotation type: Highlight
+
+quotation index: 12
+
+page range: 158
+
+quotation type: Highlight
+
+quotation index: 13
+
+page range: 160
+
+quotation type: Highlight
+
+quotation index: 14
+
+page range: 161
+
+quotation type: Highlight
+
+quotation index: 15
+
+page range: 161
+
+quotation type: Highlight
+
+quotation index: 16
+
+page range: 162
+
+quotation type: Highlight
+
+quotation index: 17
+
+page range: 162
+
+quotation type: Highlight
+
+quotation index: 18
+
+# Definitions of food fraud, food safety incidents, and food defense incidents
+
+“Food Fraud is an intentional act for economic gain, whereas a food safety incident is an unintentional act with unintentional harm, and a food defense incident is an intentional act with intentional harm.”
+
+page range: 2147483647
+
+quotation type: Direct quotation
+
+quotation index: 19
+
+# Where food fraud fits as a term
+
+“Food fraud is a broader term than either the Food and Drug Administration (FDA) definition of economically motivated adulteration (EMA) or the more specific general concept of food counterfeiting.”
+
+page range: 2147483647
+
+quotation type: Direct quotation
+
+quotation index: 20
+
+# Difference between fraud in ancient and contemporary times
+
+Although fraud existed, it was geographically limited. Today the scale can be vast.
+
+page range: 2147483647
+
+quotation type: Indirect quotation
+
+quotation index: 21
+
+# Definition of food fraud (Spink & Moyer)
+
+“Food fraud is a collective term used to encompass the deliberate and intentional substitution, addition, tampering, or misrepresentation of food, food ingredients, or food packaging; or false or misleading statements made about a product, for economic gain.”
+
+page range: 2147483647
+
+quotation type: Direct quotation
+
+quotation index: 22
+
+# Components of a food protection plan
+
+page range: 2147483647
+
+quotation type: Image quotation
+
+quotation index: 23
+
+# Direct food fraud risk definition
+
+“Direct food fraud risk occurs when the consumer is put at immediate or imminent risk, such as the inclusion of an acutely toxic or lethal contaminant; that is, one exposure can cause adverse effects in the whole or a smaller at-risk population.”
+
+page range: 2147483647
+
+quotation type: Direct quotation
+
+quotation index: 24
+
+# Indirect food fraud risk - definition
+
+“Indirect food fraud risk occurs when the consumer is put at risk through long-term exposure, such as the buildup of a chronically toxic contaminant in the body, through the ingestion of low doses. Indirect risk also includes the omission of beneficial ingredients, such as preservatives or vitamins.”
+
+page range: 2147483647
+
+quotation type: Direct quotation
+
+quotation index: 25
+
+# Technical food fraud risk - definition
+
+“Technical food fraud risk is nonmaterial in nature. For example, food documentation fraud occurs when product content or country-of-origin information is deliberately misrepresented.”
+
+page range: 2147483647
+
+quotation type: Direct quotation
+
+quotation index: 26
+
+# Differences between food fraud and food defense
+
+Food fraud not intended to cause harm to the public and may be ongoing until detected. Food defense incidents are usually one-time events and are designed to cause harm.
+
+page range: 2147483647
+
+quotation type: Indirect quotation
+
+quotation index: 27
+
+# Food protection risk matrix
+
+page range: 2147483647
+
+quotation type: Image quotation
+
+quotation index: 28
+
+# How to reduce likelihood of food fraud
+
+“Fraud opportunities could be reduced by increasing the risk of detection, or increasing the costs of the necessary technology to commit the fraud and/or of developing quality levels that would attract consumers.”
+
+page range: 2147483647
+
+quotation type: Direct quotation
+
+quotation index: 29
+
+# Reasons enforcing food fraud laws is difficult
+
+“Effective enforcement is a challenge because the food fraud risk is emerging, evolving and extremely complex.”
+
+page range: 2147483647
+
+quotation type: Direct quotation
+
+quotation index: 30
+
+# What is needed to prevent food fraud
+
+“Deterring food fraud requires interdisciplinary research combining criminology with other fields, such as food safety, public health, packaging, food science, food law, supply chain management, consumer behavior, social anthropology, and political science. Focusing on the criminal component ofthe crime triangle provides insights to the motivations for seeking food fraud opportunities.”
+
+page range: 2147483647
+
+quotation type: Direct quotation
+
+quotation index: 31},
+  keywords = {Consumer product safety, Food safety methods, Fraud, Risk Assessment, Risk Factors, Terrorism},
+}
+
+@Article{,
+  author   = {Spink, John and Moyer, Douglas and Park, Hyeonho and Wu, Yongning and Fersht, Victor and Shao, Bing and Hong, Miao and Paek, Seung and Edelev, Dmitry},
+  title    = {Introducing food fraud including translation and interpretation to Russian, Korean, and Chinese languages},
+  year     = {2015},
+  pages    = {102--7},
+  volume   = {189},
+  abstract = {This paper introduces the topic of Food Fraud with translations to Russian, Korean, and Chinese. The concepts provide a system-wide focus leading to prevention. The goal is not to detect Food Fraud but to adjust entire food supply chains to reduce fraud opportunities. Food Fraud is a recently defined area of Food Protection between Food Safety (such as Salmonella or pesticide residue), and Food Defense (malicious intent to harm such as terrorism). Food Fraud is intentional with no intent to harm but only for economic gain. As with improving Food Safety and Food Defense, preventing Food Fraud is good for society and the economy. Society benefits through fewer public health threats from unauthorized acts. Society also benefits from increased consumer satisfaction and harmony. Food Security is increased through the production of more, higher-value products for consumers, commerce, and exporting. Food Fraud can reduce economic output because sickened citizens cannot work and it also reduces consumer confidence leading to less commerce.},
+  keywords = {China, Food contamination prevention and control, Food quality, Food safety, Fraud prevention and control, Language, Public Health, Republic of Korea, Russia},
+}
+
+@Book{,
+  editor    = {Tarnanidis, Theodore and Vlachopoulou, Maro and Papathanasiou, Jason},
+  publisher = {IGI Global},
+  title     = {Driving agribusiness with technology innovations},
+  year      = {2017},
+  abstract  = {[Description from publisher - J.S.] Modern web-based applications are pertinent for businesses, as they often encourage their core competencies and capabilities. As such, the agribusiness sector must begin to take advantage of the open networks and advances in communication and information technologies in order to grow their businesses exponentially. Driving Agribusiness With Technology Innovations highlights innovative business models and theories that encourage the use of emerging technological advances to produce thriving enterprises. Featuring extensive coverage on relevant topics including digital environments, mobile agriculture, supply chain platforms, and internet marketing models, this publication is an important reference source for business managers, practitioners, professionals, and engineers who are interested in discovering emerging technology trends for agribusiness.},
+}
+
+@Article{,
+  author   = {Toci, Aline and Farah, Adriana and Pezza, Helena and Pezza, Leonardo},
+  title    = {Coffee adulteration},
+  year     = {2016},
+  pages    = {83--92},
+  volume   = {46},
+  abstract = {Coffee is a ubiquitous food product of considerable economic importance to the countries that produce and export it. The adulteration of roasted coffee is a strategy used to reduce costs. Conventional methods employed to identify adulteration in roasted and ground coffee involve optical and electron microscopy, which require pretreatment of samples and are time-consuming and subjective. Other analytical techniques have been studied that might be more reliable, reproducible, and widely applicable. The present review provides an overview of three analytical approaches (physical, chemical, and biological) to the identification of coffee adulteration. A total of 30 published articles are considered. It is concluded that despite the existence of a number of excellent studies in this area, there still remains a lack of a suitably sensitive and widely applicable methodology able to take into account the various different aspects of adulteration, considering coffee varieties, defective beans, and external agents.},
+  keywords = {Coffee, Electron scanning microscopy, Food contamination analysis},
+}
+
+@Article{,
+  title = {FDA Food Safety Modernization Act},
+  pages = {89},
+}
+
+@Article{,
+  title = {United States v. Lexington Mill & Elevator Co.},
+}
+
+@Article{,
+  title  = {Food safety},
+  year   = {2016},
+  volume = {13},
+  editor = {Uyttendaele, Mieke and Franz, Eelco and Schlüter, Oliver},
+}
+
+@Article{,
+  author   = {Wang, Yunyu and He, Kai and Fan, Long and Wang, Yushui and Wu, Shifang and Murphy, Robert and Wang, Wenzhi and Zhang, Yaping},
+  title    = {DNA barcoding reveals commercial fraud related to yak jerky sold in China},
+  year     = {2016},
+  pages    = {106--8},
+  volume   = {59},
+ comment = {page range: 106
+
+quotation type: Highlight
+
+quotation index: 0
+
+# Why identifying species in certain food products is difficult
+
+“Globally, there is still inadequate regulation for species identification in food products, such as sliced and minced jerky. The main problem is that, after food processing, livestock products are morphologically indistinguishable because of the lack of discriminative features such as skull, fur, and tails.”
+
+page range: 106
+
+quotation type: Direct quotation
+
+quotation index: 1
+
+# DNA barcoding use
+
+“DNA barcoding uses a short, standardized region to distinguish different taxa at the species level.”
+
+page range: 106
+
+quotation type: Direct quotation
+
+quotation index: 2
+
+page range: 106
+
+quotation type: Highlight
+
+quotation index: 3
+
+# Example of food adulteration in a test of yak meat jerky
+
+“Only nine yak jerky samples were identified as yak (Bos grunniens) samples, whereas the other 21 were found to be adulterated (70%). Among the substituted samples, 18 (60%) were identified as beef meat (Bos taurus), buffalo beef (Bubalus bubalis), or pig meat (Sus scrofa). The other three samples (10%) were identified as those of small mammals, including the lesser striped shrew (Sorex bedfordiae) and the Chinese mole shrew (Anourosorex squamipes).”
+
+page range: 107
+
+quotation type: Direct quotation
+
+quotation index: 4
+
+# Percentage of yak jerky products that were adulterated
+
+“...90%, 75%, and 56% of yak jerky products were fraudulent in consumer markets of Kunming, Chengdu, and Xining, respectively.”
+
+page range: 108
+
+quotation type: Direct quotation
+
+quotation index: 5},
+  keywords = {Cattle genetics, China, DNA Barcoding, Food contamination, Food safety, Fraud, Hazard analysis and critical control points, Meat, Preserved food, RNA},
+}
+
+@Article{,
+  title = {2008 Chinese milk scandal},
+}
+
+@Misc{,
+  author    = {Winter, Carl},
+  title     = {Still seems like food to me},
+  year      = {2008},
+  publisher = {Food Safety Music - UC Davis},
+}
+
+@Article{,
+  author = {Yan, Yunxiang},
+  title  = {Food safety and social risk in contemporary China},
+  year   = {2012},
+  pages  = {705--729},
+  volume = {71},
+}
+
+@Article{,
+  title     = {2016 13th International Conference on Service Systems and Service Management (ICSSSM)},
+  year      = {2016},
+  editor    = {Yang, Baojian},
+  keywords  = {Computer networks, Service industries, Systems engineering},
+  publisher = {IEEE},
+}
+
+@Article{,
+  author = {Bitzios, Michail and Jack, Lisa and Krzyzaniak, Sally-Ann and Xu, Mark},
+  title  = {Dissonance in the food traceability regulatory environment and food fraud},
+}
+
+@Article{,
+  author  = {Fassam, Liam and Dani, Samir and Hills, Mils},
+  title   = {Supply chain food crime & fraud},
+  pages   = {659--666},
+   comment = {# Research not having any effect on food fraud incidents
+
+“Our analysis of the literature indicates that within the areas of business risk and resilience, publications focus on aggregate event-driven cause and effect relationships. Events in the food supply chain over the past two years has evidenced a disconnect between outcomes of research and actual impact. Little is being done to limit the exposure to risk and provide support to the food businesses of Europe, of which a majority are food manufacturing companies....”
+
+page range: 660
+
+quotation type: Direct quotation
+
+quotation index: 0
+
+# Disconnect between academic and public interest in food fraud
+
+page range: 662
+
+quotation type: Image quotation
+
+quotation index: 1
+
+# Factors leading to food fraud in the supply chain
+
+page range: 664
+
+quotation type: Image quotation
+
+quotation index: 2
+
+# Another problem of terminology: US uses "food fraud" and UK and Europe use "food crime" in the research
+
+“Finally, there is a further challenge in this area with confusion over terminology - as highlighted by the Elliot report (Elliott, 2013) - where US led systems prefer the use of ‘fraud’ and European based research adopts ‘crime’, which creates another divergence of topics within the research. The divergence of terminology use is creating confusion in the system and the authors support the need for academia and practitioners to utilise the term ‘food crime’ in order to build and strengthen a coherent body of knowledge.”
+
+page range: 665
+
+quotation type: Direct quotation
+
+quotation index: 3},
+}
+
+@Article{,
+  author = {Karipidis, Philippos and Tselempis, Dimitrios and Tsironis, Loukas},
+  title  = {Eco-certification and transparency in global food supply chains},
+  pages  = {70--90},
+}
+
+@Article{,
+  author  = {Manning, L.},
+  title   = {Food Integrity},
+  pages   = {2--6},
+  volume  = {119},
+  comment = {# Difficulty: not yet enough academic literature since the field of food integrity is still developing
+
+“The challenge in such an emerging academic field is that much of the evidence sits in non-academic literature...”
+
+page range: 2
+
+quotation type: Direct quotation
+
+quotation index: 0},
+}
+
+@Article{,
+  author = {Tian, Feng},
+  title  = {An agri-food supply chain traceability system for China based on RFID & blockchain technology},
+  pages  = {1--6},
+}
+
+@Article{,
+  author = {Uyttendaele, Mieke and Franz, Eelco and Schlüter, Oliver},
+  title  = {Food safety, a global challenge},
+  pages  = {1--6},
+  volume = {13},
+}
+
+@Article{,
+  author   = {Whitworth, Elizabeth and Druckman, Angela and Woodward, Amy},
+  title    = {Food scares},
+  pages    = {131--142},
+  volume   = {119},
+  abstract = {Purpose – The purpose of this paper is to describe the development of a comprehensive categorisation of food scares. Design/methodology/approach – Following an initial desktop study, the categorisation was developed collaboratively with industry experts through a workshop and series of semi-structured interviews. Findings – The new categorisation developed is in Venn diagram format allowing overlapping categories. It is organised around the two major types of contamination (biological, and chemical/physical contaminants) and the two major causes of contamination (wilful deception, and transparency and awareness issues). Practical implications – The long and complex supply chains characteristic of current food production systems have resulted in a rising number of food scares. There is thus an increased emphasis on developing strategies to reduce both the number of incidents of food scares, and their associated economic, social and environmental impacts. The new categorisation developed in this study enables experts to address categories of food scares. Inclusion of the cause of contamination is particularly important as the method through which contamination occurs is key in devising food scare prevention strategies. Originality/value – The new categorisation, unlike previous categorisations, enables food scares to fall into multiple categories, as appropriate. Also, again in contrast to previous categorisations, it takes into account not only the physical problem of a food scare but also the mechanism through which it arises.},
+  keywords = {Classification, Consumer risk, Contamination, Food safety, Risk reduction},
+}
diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/CitaviXmlImporterTest1.ctv6bak b/src/test/resources/org/jabref/logic/importer/fileformat/CitaviXmlImporterTest1.ctv6bak
new file mode 100644
index 00000000000..fa319a1ec91
Binary files /dev/null and b/src/test/resources/org/jabref/logic/importer/fileformat/CitaviXmlImporterTest1.ctv6bak differ
diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/CitaviXmlImporterTest2.bib b/src/test/resources/org/jabref/logic/importer/fileformat/CitaviXmlImporterTest2.bib
new file mode 100644
index 00000000000..2e27b84fe26
--- /dev/null
+++ b/src/test/resources/org/jabref/logic/importer/fileformat/CitaviXmlImporterTest2.bib
@@ -0,0 +1,1646 @@
+@Article{,
+  author = {Abrahamsen, Rita},
+  title  = {The power of partnerships in global governance},
+  pages  = {1453--1467},
+  volume = {25},
+  year   = {2004},
+}
+
+@Book{,
+  title     = {Contentious Politics in the Middle East},
+  editor    = {Albrecht, Holger},
+  publisher = {University Press of Florida},
+  year      = {2010},
+}
+
+@Article{,
+  author = {Altan-Olcay, Ozlem and Icduygu, Ahmet},
+  title  = {Mapping Civil Society in the Middle East: The Cases of Egypt, Lebanon and Turkey},
+  pages  = {157--179},
+  volume = {39},
+  year   = {2012},
+}
+
+@Book{,
+  title     = {Handbook of ethnography},
+  editor    = {Atkinson, Paul and Coffey, Amanda and Delamont, Sara and Lofland, John and Lofland, Lyn},
+  pages     = {xviii, 507 Seiten},
+  publisher = {SAGE},
+  year      = {2014},
+}
+
+@Book{,
+  title     = {The professionalization of public participation},
+  editor    = {Bherer, Laurence and Gauthier, Mario and Simard, Louis},
+  pages     = {x, 263 Seiten},
+  publisher = {Routledge},
+  year      = {2017},
+}
+
+@Article{,
+  author = {Blok, Anders},
+  title  = {Mapping the Super‐Whale: Towards a Mobile Ethnography of Situated Globalities},
+  pages  = {507--528},
+  volume = {5},
+  year   = {2010},
+}
+
+@Book{,
+  author    = {Bosancic, Sasa},
+  title     = {Arbeiter ohne Eigenschaften},
+  pages     = {418 S},
+  publisher = {Springer VS},
+  year      = {2014},
+}
+
+@Article{,
+  author = {Breidenstein, Georg and Hirschauer, Stefan},
+  title  = {Endlich fokussiert? Weder ,Ethno' noch ,Graphie'.},
+  pages  = {125--129},
+  volume = {3},
+  year   = {2002},
+}
+
+@Book{,
+  author    = {Breidenstein, Georg and Hirschauer, Stefan and Kalthoff, Herbert},
+  title     = {Ethnografie},
+  pages     = {250 S},
+  publisher = {UTB},
+  volume    = {3979},
+  year      = {2013},
+}
+
+@Book{,
+  author    = {Carapico, Sheila},
+  comment = {# Example of transnational favoritism in DP
+
+Clientelism
+The biased DP aid to liberal parties in Egypt is a good example for favoritism that is transnational but not clientelism. 151, FN3
+
+quotation type: Direct quotation
+
+quotation index: 0
+
+# Specifics of Political aid: information
+
+> this corresponds to what Krause, quoting Clifford Bob, says about the market for human rights whose product is information.
+
+quotation type: Comment
+
+quotation index: 1
+
+# The books orientation
+
+Carapico opens her book with an account of the crackdown on the five "overseas branches of the federally funded quasi-non-governmental National Democratic Institute (NDI), International Republican Institute (IRI), the International Center for Journalists, Freedom House, and Germany’s Konrad Adenauer Foundation and several locally headquartered pro- fessional advocacy organizations, including the Egyptian Organization for Human Rights and the Arab Center for the Independence of Judges and Lawyers" (1) in Egypt on Dec 29, 2011, and the ensuing controversy or rather: the different readings/interpetations of various parties involved in this conflict (former employees; other Egyptian HR organisations; Egyptian government; US politicians)
+I think this is very teling regarding her book's purpose. Her interest is to a certain degree to adjucate between or "sort through such conflicting claims and testimonials about justice, imperialism, and pushback" (2)
+After setting the stage with this snippet from political struggles in Egypt, she moves on to a one-page description of what PA has been looking like since 1990 in the region. The paragraph concludes with "This book investigates how such projects work, their proximate out- puts, and the experiences of practitioners." 3
+"My task is to describe and analyze the dynamics of Western or multilateral organizations’ programs ‘promoting’ Arab transitions from authoritari- anism in the context of national, regional, and international politics in the Middle East during two tumultuous decades. The main research question is not whether political aid ‘worked,’ but rather how it worked, in actual practice." 3
+The list of questions she then comes up with is absurdly long. It is 11 questions, most of them containing three subquestions. 3-4
+Summary of her answers: it's complex ;)
+"In response to the basic question of how democracy promotion works in practice, I venture a simple answer, a basic argument, a composite theo- retical structure, and a bottom-line political point. The simple answer is that political-development assistance consists of projects that are carried out by specialized professional agencies working through cross-national institutional channels. The specificities warrant further investigation. The straightforward argument is that institutional arrangements and profes- sional practices across and inside national domains are contextual, com- plex, and often contested. Regardless of nationality, professionals know that transnational engagements in matters of law, elections, gender, and what is ‘non-governmental’ intersect with international and domestic power arrangements in complicated, sometimes counter-intuitive ways. The paradoxes encompass but go beyond what a famous historian called the collocation of “megalomania and messianism” in macro-level American foreign policy.2 Agents and participant observers reflect ruefully on the mixed motives, messages, and blessings of political aid; ironic convergences of empowerment and power; ethical and practical dilemmas; differently scaled legal-political jurisdictions; grandiose plans gone awry; confluences and disruptures between domestic and international regimes; banal competition over symbolic capital, institutional access, and monetary advantage; and the rarified experience of conferences in fancy off-shore locations."4
+
+quotation type: Summary
+
+quotation index: 2
+
+# Summary of what PA looked like in the region since 1990
+
+European, Canadian, and American experts in ‘political transitions’ had been working in Arab countries for a couple of decades. After the end of the Cold War, more intently after 9/11/2001, and in another spurt after the ‘youth’ uprisings in 2011, professional democracy brokers (and some amateurs) flocked to the region with projects to upgrade legal systems, institutionalize competitive
+// elections, encourage female participation, and organize liberal civic net- works. Drawing on dollars, pounds sterling, and euros, often cooperating with United Nations programs, they were employed inside Egypt, Jordan, sometimes Lebanon, the Maghreb countries, Yemen, and the two excep- tional ill-fated cases of Palestine and Iraq. They offered technical advice, collected data, wrote assessments, conducted seminars, ran public infor- mation campaigns, and made grants to national or regional public advo- cacy think tanks for projects on human rights, political reform, civil society, and related topics. Involvement varied over time and space. In some countries, foreign experts offered boilerplates for commercial legis- lation; in Iraq, Americans created new courts. To different degrees, for- eigners participated in electoral events as technical consultants or volunteer monitors. Many donors worked directly with public sector or parastatal institutions such as parliamentary libraries or national councils for women. Other projects provided grants and training to civil society organizations defined as NGOs or CSOs. More broadly, democracy brokers sponsored or co-sponsored virtual networks and transnational conferences on topics such as how to run electoral campaigns, lobby for reforms to family law, or battle press censorship."
+
+page range: 2
+
+quotation type: Direct quotation
+
+quotation index: 3
+
+# Carapico's questions on political aid
+
+"The main research question is not whether political aid ‘worked,’ but rather how it worked, in actual practice. What work gets done, how, by whom, to what effect? Who gets what, when, where, and how? What were the actual channels, mecha- nisms, and institutional practices – inter-governmental, for instance, or non-governmental? Where are the sites of interaction inside or beyond national boundaries? Who are the agents, intermediaries, and audiences? How were goals relating to justice, representation, women’s rights, or civil society framed, routinized, or contested? How did theories about political transitions mesh or clash with pre-existing legal jurisdictions, political institutions, and public civic spheres? When, why and how did client governments embrace or reject overtures? How did initiatives jibe with the aspirations, inspirations, and counter-hegemonic claims of civic
+Downloaded from Cambridge Books Online by IP 87.77.219.225 on Tue Feb 16 09:28:02 GMT 2016.
+http://dx.doi.org/10.1017/CBO9781139022781.001
+Cambridge Books Online © Cambridge University Press, 20164 Introduction
+activists? What did professionals and close-hand observers see as the proximate benefits or risks? How relevant is applied transitology to indig- enous struggles for fair and decent governance? Does political aid advance social justice, representative political institutions, and popular empower- ment; or authoritarian retrenchment; or imperial domination – or what?"
+
+page range: 3
+
+quotation type: Direct quotation
+
+quotation index: 4
+
+# Components of political aid
+
+"Amidst these complexities, I suggest that it helps to break political aid into its component parts, goals, and fields of specialization. The formal organizing thesis around which this book is structured is that practitioners and researchers in four key sectors – the rule of law sector, projects dealing with formal electoral politics, gender programming, and funding for civil society"
+
+page range: 4
+
+quotation type: Direct quotation
+
+quotation index: 5
+
+# She sees PA as divided into four distinct sectors
+
+"Amidst these complexities, I suggest that it helps to break political aid into its component parts, goals, and fields of specialization. The formal organizing thesis around which this book is structured is that practitioners and researchers in four key sectors – the rule of law sector, projects dealing with formal electoral politics, gender programming, and funding for civil society – each identify distinctive terminologies, establishments, and con- tradictions.
+Legal scholar-practitioners explore layered articulations, har- monizations, and rifts between and among legal regimes. In Iraq, the disruptures were colossal. It is in the field of elections that Western powers earned their reputation for hypocrisy, because in the Middle East the ‘high politics’ of geo-strategic alliances so often contradicted professional //
+election monitoring and/or design. Feminist intellectuals and gender spe- cialists debated cultural and institutional ways of ‘representing’ women. Civil society promotion and hostile counterattacks caused scholars and activists (not that these are mutually exclusive categories) to consider what it means to be governmental or not, national or not; and to analyze ironic convergences and separations between sovereign and transnational man- ners of governmentality."
+
+page range: 4
+
+quotation type: Direct quotation
+
+quotation index: 6
+
+# She sees PA as divided into four distinct sectors (Comment)
+
+I completely disagree. Think of the PD in UNDP were it was decided to give it to women's organisations - because whatelse would you do? and then the RoL project worked on infrastructures in prisons and had to have a civil society component, and did conflict assessment or so.... not much to do with harmonizing laws, aye?
+And the civil society organistaions also did a lot of workshops and worked on legal issues - they didn't just debate self-reflectively.
+
+page range: 4
+
+quotation type: Comment
+
+quotation index: 7
+
+# Summary of NGO definition and its problems (NGOisation, exclusion)
+
+"In everyday English usage, the term ‘NGO’ connotes a non-governmental, non-profit, cause-driven association motivated by altruistic intent rather than pecuniary or political gain. NGOs are the good guys. However, scholars who scrutinized the habits of North–South NGO funding already warned us not to think that ‘non-governmental’ is synonymous with ‘democratic.’6 Many scholars and activists have critically interrogated prototypes of NGOs or CSOs as units of civic engagement: this construc- tion, they argue, constitutes a potentially potent classificatory scheme that excludes mass or spontaneous mobilization. One perceptive critic of devel- opment aid argued that civil society promotion amounts to the profession- alization and institutionalization of certain patterns of knowledge.7 The construct of the NGO, originally meant to distinguish independent advocacy from inter-governmental transactions, is problematic.8 The//governmental/non-governmental binary is a convenient dummy variable defining civic energies aphophatically for what they are not. Inside the industry there are a range of rhyming variations distinguishing para- statal qua-NGOs, government-organized GONGOs, royally-organized RONGOs, donor-oriented DONGOs, World Bank initiated BINGOs, and even entrepreneurial B-Y-O (bring-your-own) “bringos.”9 But they all call themselves NGOs, even in Arabic, where in lieu of translation the identical acronym is often rendered in text in Latin alphabet letters or in speech as pronounced in English. Overall, the ubiquitous neologism of the NGO is an imprecise linguistic expression that is left, as we will see, for various governments and donor agencies to define bureaucratically and ideologically. In practice, an NGO is something registered as such with national governments, the United Nations, or donor agencies. In compar- ing and contrasting criteria for inclusion and patronage, this chapter illustrates the politics and paradoxes of ‘NGOization.’ Many observers deduced that political aid stimulated a proliferation of professional, rather than grassroots, NGOs."
+
+page range: 153
+
+quotation type: Direct quotation
+
+quotation index: 8
+
+# DP NGOs are (historically) not NGOs
+
+"Calling Freedom House or NDI or International IDEA non- governmental, with the possible additional implication of apolitical, is not quite accurate. Most Western-based democracy brokers are ‘NGOs’ by fiat: that is, they were created and/or funded by governments to be ‘NGOs.’ During the Cold War, American, British, Canadian, and other NATO legislatures each endowed national ‘non-governmental’ political foundations to foment liberalization and combat communism abroad through unofficial channels.10 NED’s conservative champions envisioned a role now forbidden by Congress to the Central Intelligence Agency (CIA), of bolstering pro-American opposition parties, unions, and media in countries allied with the Soviet Union or led by left-leaning parties.11"
+
+page range: 154
+
+quotation type: Direct quotation
+
+quotation index: 9
+
+# Overall, the transnational democracy establishment is a pub- lically funded endeavor.
+
+"Shortly thereafter, the German Stiftungen that had pioneered overseas political aid (only to find their efforts to destabilize foreign governments the subject of domestic controversy) won West German federal budgetary support on grounds that they would pursue the national interest by ‘indi- rect’ means.12 Such “semi-private bodies” could engage in political advo- cacy “at two removes,” wrote a prominent European expert: first through the European Commission, then in turn back to the national political foundations.13 Even the relatively few, mostly American organizations with private endowments, notably the Ford Foundation, the Soros Foundation’s Open Society Institute, and the Carter Center at Emory University, helped extend U.S. foreign policy beyond formal governmental agencies.14 Overall, the transnational democracy establishment is a pub- lically funded endeavor. IRI, NDI, the Stiftungen, and kindred agencies are GONGOs or DONGOs as well as NGOs."
+
+page range: 155
+
+quotation type: Direct quotation
+
+quotation index: 10
+
+# The difference of Political Aid (in EGy)
+
+"Civil society promotion via ‘advocacy NGOs’ //was even more intently controversial. In the name of democratic advocacy it differed from welfare-oriented conventional aid in two important ways. First, as already analyzed with respect to projects for women, and unlike economic initiatives with material consequences, the content of political aid was almost entirely informational and ideological. Ergo, its practi- tioners and counterparts were constituted as professional lobbies generat- ing semantic, informational or instructive products. The second contrast is that even though conventional ODA snaked through parastatal and quasi- non-governmental sub-contracting channels, it remained primarily inter- governmental (bilateral or multilateral), administered by mutual consent. By contrast, political aid for NGOs that evaded conceptual and adminis- trative border patrols goaded special pushback from police states.
+
+page range: 161
+
+quotation type: Direct quotation
+
+quotation index: 11
+
+# The difference of Political Aid (in EGy) (Comment)
+
+Somewhere in the chapter on electoral assistance or in the introduction, she made a similar argument about the specifities of political aid (vs. conventional aid)
+
+page range: 161
+
+quotation type: Comment
+
+quotation index: 12
+
+# Political Aid organisations are Thinktanks
+
+"If political aid delivers information, persuasion, and symbiotic meanings, then organizations specialized in democratic transitions overseas resembled think tanks.29 Think tanks are “idea brokers,” professional research agencies with a policy mission that “monitor the latest political developments, pursue short- term research projects, organize seminars and conferences, publish occasional books or reports,” and apply for funds to keep their operations afloat.30 Democracy brokers and political institutes self-identify as think tanks based on the work they do. The turn-of-the-century web sites of the French Socialist Party’s Fondation Jean Jaures and the Friedrich Ebert Stiftung of Germany’s Green Party associated themselves with “a wider family of social-democratic foundations, named ‘fondation’ here, ‘think tank’ there, or ‘institut’ else- where”; the Christian Democrats’ Konrad Adenauer Stiftung considered itself a cross between a think tank and a political aid agency. Accordingly, research has shown that projects in the Middle East bolstered certain categories of research and instruction, or counterparts specialized in the production of those categories of information and ideas.31"
+
+page range: 162
+
+quotation type: Direct quotation
+
+quotation index: 13
+
+# Civil society programs in EGY and PAL advanced elite advocacy (not grassroots)
+
+There is research on the mismatch between NGO/advocacy success with donors and grassroots concerns! 163 plus: there is already the acknowledgement that „the impact of civil society programs was (...) at the ‚meso’ level of ‚elite advocacy’.“ 163
+
+page range: 163
+
+quotation type: Indirect quotation
+
+quotation index: 14
+
+# Negative effects of NGOisation
+
+"After a while, foreign consultants found little difference between “hybrid” Palestinian and Lebanese professional research consulting institutions and European counterparts.43 The term “Creolization” implied institutional as well as linguistic cross-breeding.44 Progressive intellectuals formerly in the nationalist vanguard of the first Intifada found themselves recast as “missionaries preaching the importance of advocacy, workshops and training programs,” their energies diverted from grassroots to “deterri- torialized” activism.45 The “project logic” itself as well as the//
+“NGOization” of street-level movements transform a social cause into an accounting unit while fostering both a culture of dependency and fancy- hotel modes of consumption.46 This is how it looked to practitioners on the ground."
+
+page range: 164
+
+quotation type: Direct quotation
+
+quotation index: 15
+
+# The „genre“ of NGO directories: You can only be Civil Society if you have a physical office.
+
+„Donors commissioned scores of surveys, studies, and reports on NGO/ CSO landscapes. This was partly a search for suitable sub-contractors and partly a mapping project reflected in the publication of NGO direc- tories. NGO and PVO directories were produced for Egypt, Palestine, Yemen, Jordan, and other countries. The genre is distinctive. A United Nations directory for the West Bank, issued by the Office of the Special Coordinator in the Occupied Territories, for instance, provided, in English and Arabic, alphabetically organized in the Latin alphabet, the name, address, phone and fax numbers, officers, background, and activ- ities of each of 400 NGOs in 10 cities and towns. Most also self-identified in English by Roman-alphabet acronyms. Directories were organized more or less like telephone books, with entries clustered by geographic location but not distinguishing among, for instance, the local offices of NDI, the Catholic charity CARITAS founded in Latin America, profes- sional organizations, political party affiliates, development contractors, non-profit law offices, or business networks. The key criterion for inclu- sion is an office address: physical premises. Low-budget, spontaneous, or informal associations would not appear on the map or in the directory. Ultimately, directories seemed to be but were not ‘really’ reliable maps of civil society.“
+
+page range: 166
+
+quotation type: Direct quotation
+
+quotation index: 16
+
+# Describes extremely well how NGOs/CSOs were reshaped
+
+1) directory
+2) adherence to organizational routines (handbooks)
+3) status as observer/official registering etc
+4) mimicking forms of knowledge (167)
+5) formation of networks/federations (167)
+
+page range: 166
+
+quotation type: Direct quotation
+
+quotation index: 17
+
+# Strategic Planning as skill to be learned by NGOs
+
+"It began with 12 pages on why and how NGOs should engage in “strategic planning” based on a clear “mission statement” and well-kept “financial accounts.” "
+
+page range: 166
+
+quotation type: Direct quotation
+
+quotation index: 18
+
+# the transformation of NGOs through political aid and the exclusionary mechanisms
+
+see her details on p.166-168
+
+page range: 166
+
+quotation type: Summary
+
+quotation index: 19
+
+# Strategic Planning as skill to be learned by NGOs (Comment)
+
+Is it pure coincidence that the same mantra that I hear all the time in Police-BUilding was part of a MEPI manual for NGOs/CSOs
+
+page range: 166
+
+quotation type: Comment
+
+quotation index: 20
+
+# The managerial model of social change
+
+All she has described on pages 166-167 about the demands of MEPI, FFF, USAID boils down to:
+"This is a highly mana- gerial model of democratic change."
+
+page range: 168
+
+quotation type: Direct quotation
+
+quotation index: 21
+
+# Siphoning away energy
+
+"Many partners felt that human and material assets were siphoned away from ground-level activism toward paperwork, specialized routines, and organizational meetings. To craft successful grant proposals, native English-speaking exchange student interns were recruited. Professionally produced audits and reports were essential to success. A report to a German foundation gave the example of the Democracy and Workers Rights Center, which in one year produced fourteen audited reports, twenty-five quarterly reports, and twenty-five annual reports for its exter- nal donors, each with its own format. Documentation obligations were so “onerous” that DWRC hired four new administrators and spent more than $70,000 a year “servicing donors.”54 Other organizations in the Territories and across the region spent time and energy entertaining civil society tourist ‘missions’ from abroad that visited with amazing frequency. (Methodologically, this observation urged me to turn away from request- ing personal interviews and toward analyzing published transcripts and public performances.)"
+
+page range: 168
+
+quotation type: Direct quotation
+
+quotation index: 22
+
+# Summary of what is wrong with NGOisation
+
+"Mapping projects, licensing criteria, and ceremonial certifications sig- nify transnational governmentality, here a kind of domination exercised through the denationalization and non-governmentalization of civic involvement. Thematic agendas, declaratory principles, registration pro- cedures, NGO directories, and control of purse-strings impose self- discipline. Many scholarly critics interpreted this as a way of regimenting or foreclosing proletarian and subaltern movements. Latin American and African specialists labeled operational NGOs helping to privatize welfare services “subcontractors” in the “relief and reconstruction complex”55 or “modern-day secular missionaries.”56 Alongside this, and sidelining poverty-alleviating welfare and service entitlements, think tanks were//enlisted to rationalize neo-liberal economic policies and cloister intellec- tual counter-elites into non-confrontational, white-collar activities outside the body politic.57 One observer concluded that “The idealized space where the weak are supposed to be fighting their battles for freedom and justice has been hijacked by segments of the (petite) bourgeoisie who have found their niche in the growing sector of NGOs.”58 Concurrently, the separation of welfare from advocacy seemed to disfavor social justice activism."
+
+page range: 168
+
+quotation type: Direct quotation
+
+quotation index: 23
+
+# Battles over both material and symbolic capital
+
+"These were battles over symbolic capital, monetary resources, and ownership of national narratives about rights and justice. They were also boundary disputes about claims of trespassing. When, whether on their own or in consultation with international agencies, governments created national machineries for women or national human rights councils, they staked rhetorical and institutional claims to feminism and legalism in an ongoing quest for absolute executive jurisdiction. So, for instance, ruling party or family elites could ‘represent’ women. Adversarial rights monitor- ing by professionals trained and/or financed from abroad contradicted those claims. They did so in front of domestic and international audiences, perhaps eroding crony structures. Ruling kleptocrats cloned parastatal GONGOs to recapture not only small change for advocacy projects but also public patriotic narratives; and brought charges of defaming the state or slandering the President against human rights defenders documenting serious abuses. In the highly publicized cases of the imprisonment of Saad Eddine Ibrahim and the Sudanese accountant at the Ibn Khaldun Center,//for instance, opinion was divided as to whether international pressure
+failed to keep them from prison or helped eventually to secure his release."
+
+page range: 175
+
+quotation type: Direct quotation
+
+quotation index: 24
+
+# Supranational zones of sponsored activism
+
+"Civil society programming penetrated national territorial and institutional boundaries. In addition it also activated spheres geographically outside and metaphorically above sovereign civic realms. This is the other con- notation of denationalization. I want to call special attention to this supra- national zone of sponsored activism, including the human rights and women’s conferences mentioned in earlier chapters. Intercontinental meet- ings in five-star facilities with trilingual interpreters speaking into head- phones from glassed-in cubicles signaled globalization, extra-territoriality, and de-nationalization. In some ways, the workshops and web sites con- stituted portals of counter-elite expression outside the bounds of national censorship, an opportunity to rail against restraints on association, and to bring abuses into the international limelight. These meetings were rather more upscale than the usual academic conference. They were civil, infor- mative multicultural conversations in zones of harmonization in one way. In another they constituted schizophrenic spaces. They could be seen as air-conditioned hot air; imperial co-optation of bilingual secular counter- elites; or spaces for extra-systemic freedom of association."
+
+page range: 176
+
+quotation type: Direct quotation
+
+quotation index: 25
+
+# Regional dimension of DP in the MENA = globalisation?neoliberalisation?
+
+"All along, there was a strong transnational Arab-regional dimension to democracy promotion in the Middle East, in the tier between domestic and global. Considerable material and symbolic capital was invested in NGO networks of the caliber invited to the Forum for the Future and dozens of other high-end summits. These extra-territorial Arab and Mediterranean consortia, pretty much outside the Arab League’s purview, went unnoticed in national case studies of domestic civil society or bilateral aid programs. But they were a salient component of political aid. The Ibn Khaldun Center’s founder counted among the non-governmental federations “inspired or induced” by the world-wide UN conferences in the nineties the Arab Democracy Network, the Arab Organization of Human Rights, the Arab Network for the Protection of Human Rights Activists, and the Cairo-based Arab NGOs Network.78 In a complex co-sponsorship, the Ford Foundation in Cairo and UNDP jointly backed affiliations of interna- tional, Arab, and national organizations with IFEX, the International//Freedom of Information Exchange that raised both public and corporate money for its projects. MEPI, the World Bank, the OECD, UNDP and others fostered an Arab Center for the Rule of Law and Integrity head- quartered in Beirut, with a branch in Amman and associates in ten other Arab countries. In 2010, something called the Network of Think Tanks for Developing Countries was hosted by the Egyptian Cabinet’s Information and Decision Support Center with support from the Japan Foundation, the Swedish Institute of Alexandria, UNDP, and other agencies.
+These were interlocking webs. Their proliferation beyond and inside national domains was consistent with a theory of transnational non- governmental governmentality in an era of neo-liberal globalization, which is often thought to erode the conceptual boundaries of states. Practitioners knew this. At a World Bank meeting for NGO delegations under the Mediterranean Development Forum sessions, one contributor remarked on the “the rising influence of the donor-civil-society nexus.”79 A self-identified pro-market civil society think tank, Maroc 2020, associ- ated with a Bank-sponsored Global Development Network, hosted a Club de Madrid study of ways to strengthen rights of association financed by the European Commission’s Initiative for Democracy and Human Rights and the United Nations Fund for Democracy. These examples of quasi-non- inter-governmental matrices were symptomatic of globalization, and intensified transnationalism in the Mediterranean, closely allied with the neo-liberal Washington consensus. These trajectories are not self- actualizing, however; the counter-offensive was fierce.
+
+page range: 176
+
+quotation type: Direct quotation
+
+quotation index: 26
+
+# summary of dialectical dynamics between nationalisation and de-natioanlistaion, DP and backlash
+
+"These dynamics seemed dialectical. Domestic repression banished organizers to offshore portals and international councils, where they con- tinued domestic struggles in the transnational/pan-Arab arena. Yet these venues had their own discursive price of admission and conditions of patronage. Oppressive internal restrictions legitimated outside interfer- ence, which prompted greater repression, which impelled the intensifica- tion of transnational schemes, which generated yet more intense backlash. In an age of globalization, dictatorship helped create the circumstances for its own negation in the form of extra-territorial activism. Simultaneously, donors’ civil society programming seemingly intensified counter-reactions in the form of upgraded predatory curbs on organizational freedoms. The outcome, then, was a synthetic transitory space for elite activism that at least partly eluded both national and global forms of authority, but was itself a zone of highly antagonistic politics. At the end of this chapter we//will listen to more commentary from bilingual intellectuals about their experiences in that space, which echo some of the wisecracks from women cited in the previous chapter."
+
+page range: 182
+
+quotation type: Direct quotation
+
+quotation index: 27
+
+# DP and the Egyptian Revolution
+
+"did civil society promotion foment rebellion?
+'Not only were the democracy-promotion projects marginal within the political landscape in Egypt, meaning that the overwhelming majority of activists avoided them like the plague because they knew it would be a kiss of death for their//credibility, but also the circle of democracy activists itself was marginal in this revolution.113" FN 113:credibility, but also the circle of democracy activists itself was marginal in this revolution.113
+
+page range: 188
+
+quotation type: Direct quotation
+
+quotation index: 28
+
+# The standard (indigenous) critique of DP
+
+"For over a decade before 2011, bilingual Arab intellectuals and other local project partners echoed widespread public skepticism about the parlances and mechanisms of civil society promotion. Mindful of colonial histories, invasions, and military backing for national security states, they took a critical view of definitions of terrorism as anti-systemic rather than struc- tural violence, calls for technocratic ‘reform’ over real elections, and purely ceremonial inclusion in international civil society forums.115 The fixation with NGOs, international funding of NGOs, liberalization of NGO laws, and non-governmental representation at international conferences seemed to misconstrue bases of social solidarity in Afghanistan, Palestine, and elsewhere, wrote one observer.116 To most, it appeared that democracy ‘promotion’ was designed to foreclose prospects for unruly or take-to-the- streets revolutionary upheavals by entrusting democratization to paid Western consultants and their slick promotional advertisements."
+
+page range: 189
+
+quotation type: Direct quotation
+
+quotation index: 29
+
+# The main paradox is known!
+
+"Bilingual public intellectuals invited to international conferences spoke frequently about the paradoxes of civil society sponsorship and the patron-//client relationship between Middle Eastern invitees and Atlantic backers."
+
+page range: 189
+
+quotation type: Direct quotation
+
+quotation index: 30
+
+# A transnational clientelistic relationship?
+
+It's a pretty harsh but probably accurate cirticism, and it is later repeated with a different label, calling the catering to donor preferences "corruption"
+
+page range: 189
+
+quotation type: Comment
+
+quotation index: 31
+
+# More criticism of donor-civil society relation
+
+"A Cairo seminar called International Aspects of the Arab Human Rights Movement dwelt on what one discussant called “risks” of accepting invitations to international conferences that come “with strings attached” and might end up bolstering neither indigenous human rights movements nor human rights protection.117 A prominent Egyptian said resources and themes originating in the North for programs in the South reflected vertical power imbalances that define and constrain even human rights dis- courses.118 Aid “depends on personal relations and knowledge of complex procedures within foreign funding agencies” rather than qualitative cri- teria, agreed a well-respected Yemeni intellectual.119 The bottom line, wrote another conferee, was that the most common form of corruption “is when organizations design projects in line with donor priorities.”120"
+
+page range: 190
+
+quotation type: Direct quotation
+
+quotation index: 32
+
+# More criticism of donor-civil society relation (Comment)
+
+Quote in TWT article on the power relationship, agenda setting and the need to study donors as institutions
+
+page range: 190
+
+quotation type: Comment
+
+quotation index: 33
+
+# Professional NGOs not movements
+
+"If anything, the definition of civil society as formal NGOs partic- ipating in ceremonial networks discounted the possibility of grassroots collective action; intensive highly professionalized data collection, political//intelligence, and codification schemes yielded few clues to community mobilization.
+
+page range: 193
+
+quotation type: Direct quotation
+
+quotation index: 34
+
+# Brief description of the global democracy bureaucracy
+
+"The global democracy bureaucracy is a collection of think tanks where highly educated professionals produce specialized knowledge. They are able to devote their full-time energies to research and/or advocacy. Those stationed long-term in North Africa and the Middle East thought about these issues, one way or the other. Not everyone will agree with my analysis, of course. Some will feel that I have been unduly considerate of loathsome dictatorships; others might say I have white-washed the political-aid industry. Anyone with experience would be able to offer additional or counter-examples to those cited here. Nonetheless, few will//quarrel with the basic argument that civil society promotion is inherently and intensely political, and many have pointed to its paradoxes."
+
+page range: 197
+
+quotation type: Direct quotation
+
+quotation index: 35
+
+# Summary: the two contradictory regimes of governmentality and the twofold denationalization
+
+"The story of civil society aid and the pushback against it was full of contradictions manifested in litigious, bitterly contested disputes. Drawing on the testimony of direct participants, I have depicted these as skirmishes between national and global regimes of governmentality, each seeking to channel civic energies into manageable parameters. In the name of anti- imperialism and self-determination, autocratic governments nationalized and regulated all forms of public activism. Conventional inter-governmental development assistance aimed at improving the governance capacity of state institutions often enhanced central administration and control. In the same way, some rule-of-law programs, elections projects, and support for national women’s organizations or GONGOs served the interests of national security establishments. The projects that most persistently enraged corrupt officials were those that circumvented their patronage channels and bureaucratic oversight. Metaphorically, non-governmental pathways dena- tionalized some forms of professional activism, including the production of political information, by placing them outside state budgets. Whereas some analysts saw in state capacity-building the potential for political aid to abet the upgrading of authoritarianism, others observed a reverse effect in the pushback – the continual re-regulation, re-registration, subversion, and co-optation of civic activities in response to donor initiatives. Then, the more transnational donor networks pressed, the more dictatorial regimes over-reacted, and the more activists took their projects offshore. This was the second dimension of denationalization. Professional human rights, women’s, and NGO networks proliferated, meeting periodically in extra- territorial spaces physically owned and operated by multinational hotel chains. Recognizing a consensual rather than coercive domain, many scholars and participants found there a different sort of governmentality with its own discursive rules and licensing restrictions. When UNDP and other agencies fixed on establishing a “knowledge society” in the Arab world, they were referring to very particular epistemological and professional practices."
+
+page range: 197
+
+quotation type: Direct quotation
+
+quotation index: 36
+
+# The fundamental paradox: Empowerment and Domination are both part of PA
+
+"In each subfield, contradictions surfaced between the transformative potential of political aid operating in conjunction with international regimes and the ways in which democracy promotion could simply per- petuate Western domination. Activists, professionals, practitioners, and engaged social scientists (overlapping categories, to be sure) told me this, over and over." 207
+
+"These circumstances speak to the paradoxes. The social science litera- ture has given us two main theories about the purposes and effects of political aid. One posits the positive diffusion effects of transnational regimes that work to establish norms and practices concerning law, elec- tions, and the protections and participation of women and associational life, and it cites the roles of multilateral initiatives, normative actors, and professional expertise in facilitating political liberalization. The other sit- uates these discourses and institutional arrangement in the overall context of asymmetric North-South or core-periphery exchanges and neo-liberal globalization, finding instead of democratization a way of deepening and intensifying Western hegemony. Examples, testimonials and some coun- terfactual evidence presented here variously supported both of these anti- thetical theories, each of which is persuasive in its own right but both of which tend inadequately to distinguish intentions from outcomes. First- hand accounts also point to a third possibility, that ‘target audiences’ make creative use of resources within the parameters of constraints." 200
+
+page range: 200
+
+quotation type: Summary
+
+quotation index: 37
+
+# the banal or ordinary competition or low politics …
+
+On competition and politics: I like her observation or find it intriguing at least, that the influx of resources naturally leads to conflict and competition. She highlights the “banality” of it (Carapico 2014: 200?) and labels it “low politics” (ibd.?). For the gender area:  “In practice, of course, material, symbolic, and administra- tive capital did not help half the population, but only some individuals or agencies designated to ‘represent women.’ This in turn spawned ordinary political competition over positions, podiums, and power.“ (Carapico 2014: 205)
+
+Generally:
+"By definition political aid interjects external symbolic, material, and institutional resources into national (and, in the Middle East, pan-Arab) arenas. If all politics involves competition over scarce resources, then political aid naturally stimulates controversy and rivalries. Inevitably resources flow to selected organizations, agents, and causes, but not others. Donors’ provision of expertise, technology, publicity, or funds to executive, judicial, legislative, or civic institutions affects the balance of power between and within those bodies. Even if the idea is that interna- tional agencies are supporting ‘transitions to democracy’ or ‘women’s empowerment,’ projects entail complex forms of cooperation and conflict. Practitioners and participants, including many cited here, realize the banal- ities of interagency and office politics on a commonplace level. This is ‘low’ politics." 199
+
+page range: 205
+
+quotation type: Indirect quotation
+
+quotation index: 38
+
+# Orientalist elements of gender reform
+
+"Therefore, two kinds of evidence were presented. First, I quoted an abrasive pattern of lectures and quizzes on religio-cultural oppression given to people coping with dire military and economic distress. In witty asides, the occasional heckle, and plenty of thoughtful analysis, women outside the empowerment industry called into question its stock significa- tions of autonomy, voting, gender quotas, Shari’a, public comportment, safety, Women’s Day, ‘sexist stereotypes,’ and Western superiority. In these exchanges, outsiders consistently scoffed at the consciousness of Muslims; equally, locals ridiculed foreign hubris and naiveté. The impli- cation was that an emphasis on changing mindsets too guilelessly under- estimates the hard constraints of firepower and poverty."
+
+page range: 205
+
+quotation type: Direct quotation
+
+quotation index: 39
+
+# Orientalist elements of gender reform (Comment)
+
+This reminds me of the conversation with Nader who rejected the Western stereotypes and lectures about gender
+
+page range: 205
+
+quotation type: Comment
+
+quotation index: 40
+
+# Empowerment as a discourse
+
+"Empowerment was not only a discourse" 205
+I wonder what she means with discourse here. It is worth asking whether the empowerment discourse (beyond female empowerment btw) is one element of a development discourse
+
+page range: 205
+
+quotation type: Indirect quotation
+
+quotation index: 41
+
+# relation ideas and institutional practices
+
+Like Krause, Carapico distinguishes an idea (or norm?) from the practices:
+"The evidence supports and qualifies this proposition. That is, central executive authorities (if not courts and legislatures) were more likely to embrace the rhetorical and institutional practices of gender representation than those of either elections monitoring or NGO regimes. The Beijing apparatus appears to be a strong example of multilateral constructivism, outside the U.S. orbit. It is grounded in ideas but realized through institu- tional practices. This way of looking at things shed light on how concep- tually quite different definitions of ‘regimes’ – regimes of truth, mechanisms of transnational governmentality, national dictatorships – can be mutually constitutive."
+
+page range: 206
+
+quotation type: Summary
+
+quotation index: 42
+
+# Tensions of civil society promotion
+
+"Even more than in other sectors, the dialectic between nationalized and dena- tionalized activism manifestly played out in theoretical debates and every- day contests over right-of-way, resources, and ideological hegemony. Its permutations and contradictions were profound. That means we need to be wary of any explanatory framework that over-determines causality: neither Western imperialism nor Arab authoritarianism nor other modes of repression or ‘governmentality’ are as unmovable as they may seem.
+The relatively elite strata of professional civic activists working in Arab countries often found English-language parlances about ‘promoting’ something called ‘democratization’ rarified and disjointed. ‘Promotion’ after all can refer to advertising campaigns. Catchphrases, project clusters, and institutional formats fixated on some issues to the exclusion of others, women and men complained. Amidst so much attention to elections and ‘culture change,’ neither ballot-driven ‘regime change’ nor ‘transitions in power’ were on UN, U.S. or EU agendas. In the aggregate, neo-liberal entrepreneurial freedoms were more popular with donors than were labor rights. Women bristled at obsessions with sexual rather than national self- determination and the privileging of gender over class solidarity. Only in the Muslim world, some observed, was ‘secularism’ considered a prereq- uisite for democratization."
+
+page range: 207
+
+quotation type: Direct quotation
+
+quotation index: 43
+
+# Western blindspots and irrelevant foci in civil society promotion
+
+"Thus the null set of concerns – themes and phrases that barely registered in English-language word-counts – included social justice, military rule, working conditions, existing social contracts, popular safety nets, regular power transitions, police brutality, and national sovereignty. Yet these issues – not ‘democracy’ by name – were the slogans and concepts that mobilized millions to take to the streets in 2011. All along, in Anglophone and UN ‘donor-speak,’ transcriptions of Arab ‘deficits’ in democracy and women’s rights were chalked up to socio-cultural sediments variously labeled patriarchal, traditional, tribal, sectarian, or Islamic. Armed forces’//abuses (amply documented by Amnesty International, Human Rights Watch, and dozens of regional watch-dogs) were not given much attention in democracy brokers’ reports on problems facing women or NGOs. Indeed, in the rhetoric of transitions to democracy, strangely, the word ‘civilian’ or word combination ‘civilian rule’ rarely, if ever, appeared. Religion, ‘sharia,’ and secularism were mentioned frequently, especially in documents about gender. Militarism and the securitization of gover- nance, by comparison, were not presented as a serious obstacle to realiza- tion of justice, representation, female participation, or freedom."
+
+page range: 208
+
+quotation type: Direct quotation
+
+quotation index: 44
+
+# A managerial vie of civil society, not a revolutionary one
+
+"Nor, even in the field of civil society advancement, was the prospect of mass popular uprisings against police brutality part of the democratization template presented to the Arab world in late 2010. Panelists pointed out that ‘civil society’ referred to effete think tanks rather than popular organ- izations. The donor construct of civil society never included anti-war protests of the sort that spilled into Arab streets during the American-led invasion of Iraq and Israeli bombardments of Gaza, the West Bank, and Lebanon. Consulting reports did not refer to marches, demonstrations or out-of-doors collective mobilization as instances of civic engagement: in the ‘transitions to democracy’ narrative it is as if they never happened. The discourses and institutional practices of civil society promotion seemed, instead, to foreclose prospects for contentious challenges to despotism. Project conceptualizations put ‘democratization’ or ‘liberalization’ in the hands of office-bound professionals fulfilling log-frames laid out in fund- ing proposals featuring three-year ‘strategic’ plans. Civil society was oper- ationalized in terms of hierarchical organizations and tactical planning, not spontaneously or vertically mobilized multitudes. As Tawakkul Karman told the United Nations General Assembly on November 1, 2011, the ‘international community’ insisted in describing events in Yemen as a ‘crisis,’ not a ‘revolution.’ What Tunisians, Egyptians, and Yemenis called ‘thawra’ (revolution) outsiders choose to dub ‘the Arab Spring.’"
+
+page range: 208
+
+quotation type: Direct quotation
+
+quotation index: 45
+
+# A managerial vie of civil society, not a revolutionary one (Comment)
+
+Actually, at first sight, this might be an explanation for the principle struggle that Nahnoo is fighting: doing advocacy, mobilizing but at the same time functioning as a profesisonal organisation.
+At a second glance, though, I doubt Nahnoo's potential to actually mobilize for (big?) protests.
+the question would be: have they already lost their appeal? or have they never had one for mass mobilisation? The donors however see them as ppl able to mobilize. What is their weird role in the BaladiCAP programme? > taming advocacy....
+
+page range: 208
+
+quotation type: Comment
+
+quotation index: 46
+
+# Appropriation of the revolutions by managers of transition
+
+"This point registered squarely among Cairo’s engaged intelligentsia when ‘revolutionary tourists’ – not only Middle East scholars enthused by the radical turn of events but transitologists and specialists in ‘democ- ratization’ with little familiarity with the region who flocked to Egypt to ‘see Tahrir Square’ first-hand and ‘help’ Egyptian democrats – reframed events as ‘transitions to democracy’ in need of expert consultation. The influx of foreigners was a matter of consternation to Egyptian intellectuals who were asked to facilitate their visits. Now, many of the donor- sponsored sessions I attended in the spring of 2011 featured well-informed//comparative insights from South Africa, Chile, the Ukraine, and around the globe. Still, the supply of expert transitologists who flew into Cairo after February 11, when Mubarak relinquished power, exceeded demand for their advice on how to manage a transition. Egyptian political party organizers I talked to were not familiar with Gene Sharp and few were interested in IRI’s free training modules on how to run an American-style political campaign. Activists in Cairo, Sana’a, and other capitals in upheaval were talking about revolution, not transition. Also, contrary to the Anglophone narrative, popular slogans in Arabic did not vocalize demands for ‘democracy’ so much as regime change, social justice, popular self-determination, constraints on police brutality, and decent standards of living. So, even naming the uprisings a ‘pro-democracy’ movement was a kind of appropriation by managers of transitions. The fact that a certain discourse was hegemonic in English did not make it so in Arabic.
+This was amply clear to those living ‘in the region.’ In practice, donor projects endorsing judicial and democratic reform were political and para- doxical on global, regional, national, and grassroots levels. Only oblivious or disingenuous advisors or counterparts working in Egypt, Iraq, Yemen, Algeria, Palestine, or any Arab territory pretended otherwise. Project staff, consultants, and grantees continually confronted competing significations, regulations, and interests – even in quite mundane day-to-day circum- stances. Yet circumstances were not normally mundane before, during, or after the turn of the millennium in the Middle East. Instead, political aid projects were inevitably entangled with international and domestic power alignments, and sometimes radical readjustments. These imbroglios in turn shaped how messages about political transitions, justice, and empow- erment were transmitted, received, operationalized, and re-purposed by various agents and actors. It is one thing to frame a meta-narrative about transitions from authoritarianism in English, or diagram outcomes in a project proposal. It is something else to engineer institutions and practices inside complex societies to match the model, or even to convince commit- ted change agents that international democracy brokers know best."
+
+page range: 208
+
+quotation type: Direct quotation
+
+quotation index: 47},
+  title     = {Political aid and Arab activism},
+  pages     = {xii, 250},
+  publisher = {Cambridge University Press},
+  volume    = {[44]},
+  abstract  = {What does it mean to promote "transitions to democracy" in the Middle East? How have North American, European, and multilateral projects advanced human rights, authoritarian retrenchment, or Western domination? Political Aid and Arab Activism examines transnational programs in Egypt, Jordan, Morocco, Yemen, Lebanon, Tunisia, Algeria, the exceptional cases of Palestine and Iraq, and the Arab region at large during two tumultuous decades. To understand the controversial and contraadictory effects of pGlitical aid, Sheila Carapico analyzes discursive and professional practices in four key subfields: the rule of law, electoral design and monitoring, women's political empowerment, and civil society. From the institutional arrangements for extraordinary underrtakings such as Saddam Hussein's trial or Palestinian elections to routine templates for national women's machineries or NGO nettworks, her research explores the paradoxes and jurisdictional disputes confronted by Arab activists for justice, representation, and "nonngovernmental" agency.--},
+  year      = {2014},
+}
+
+@Book{,
+  author    = {Cavatorta, Francesco and Durac, Vincent},
+  comment   = {# Their description of civil society
+
+"Civil society activism in Lebanon has the standard feature of being largely divided between a social sector and a more political one. thus there are a significant number of service-provision associations and groups. (...) The more politicized sector is also active and significantly more outspoken than anywhere else in the Arab world. There are a number of large and well-functioning civil society groups working on democratization and human rights issues. When it comes to this sector, there are two strong trends. The first is related to the prevalence of sectarianism in Lebanese society. Given that the most significant feature of the Lebanese political and social system is indeed its sectarianism, it is not a surprise that civil society activism reflects this sectarian divide. Many organizations, even those engaged in human rights and democracy issues, often subscribe to the political agenda of one particular sect, although not necessarily formally so. [NO REFERNECE! ABSOLUTELY NO REFERENCE!] There is however a second trend  that has been growing for a number of years which realtes to the work of associations attempting to build what can be termed a nationalist Lebanese activist sector.Driven by the belief that domestic conflicts and international interference are the product of weak Lebanese nationalism and sense//of belonging to a Lebanese state, a number of organizations have recently emerged attempting to overcome sectarian barriers. THis entails working for the promotion of genuine democratic accountability, which would see the progressive replacement of the sectarian political system with one based on individual representation. Following the same logic, a number of organizations have emerged with the objectives of reducing sectarianism enshrined in legislation and building bridges through post-conflict resolution and reconciliation. (Safa, 2007)"
+As "representative" of this development, they describe in detail LADE
+Lebanese Association for HUman Rights (LAHR) or ALDHOM? is the second example. I have no clue who they are, they don't seem to be in the picture anymore? They have a facebook page with  21 likes https://www.facebook.com/Lebanese-Association-for-Human-Rights-284544538248613/
+There's a beautiful description of the triple-orientation of intermediaries/leaders/people in that field: politicians - civil society - international community. 125
+I just doN't know why LAHR shoudl have more problems with political class then LADE. Because they are more staunchly anti-sectarian?
+AMEL is the next organisation. They also mention and describe at length an organisation called MIRSAD. Then they summarize and move on to the René Mouawad Foundation.
+About RMF they amongst other things say that in order to do their lobbying for children's educational rights for example, they have to mobilize their contacts to decision makers which inevitably are in the Maronite community. which "reinforces rather than weakens sectarian divisions." 129
+on page 130 they move on to a committee working on disappeared, and a "Center" but guiven that pages 131-132 are missing from google books, I can't tell which one...
+133 "Palestinian civil society", Palestinian Association for HUman Rights
+p. 135 compares the situation to other Arab countries, coming to the conclusion that a "fully-fledged dictatorship" is impossible because of "the necessity for compromise between the sects in order to manage the country" 135, and that also the space for civil society is larger;
+then this sectarian logic of power finds its reflection in citizen's orientation and in also in the networks of power that civil society can mobilize for their lobbying. 135 Also, it invites external actors, "In this game, the Lebanese sects also use external patrons in order to gain domestic advantages. This has considerable repercussions on how civil society is structured and the issues dealt with, leading to divisions and difficulties of coordination."
+
+page range: 123
+
+quotation type: Summary
+
+quotation index: 0},
+  title     = {Civil society and democratization in the Arab world},
+  pages     = {XIII, 172 S.},
+  publisher = {Routledge},
+  volume    = {22},
+  year      = {2011},
+}
+
+@Book{,
+  author    = {Clarke, Adele},
+  comment = {# Situational Map
+
+pretty much everything 87
+all human elements - "individuals, groups, organizations, institutions, subcultures and so on" 87
+nonhiman actants that force sth. on the humans, e.g. reliable electricity, ease of access to medical supplies (stored in warehouses), email communication
+> for the access: what hinders it, what facilitates it? is it on the map? And: does it really matter? (in the situation and in this project? and to whom or to what?) See: what is taken for granted, and by whom, I would add. 88
+"what ideas, concepts, discourses, symbols, sites of debate, and cultural 'stuff' may 'matter' in this situation" 88 > "the symbolic and discursive meanings of elements in situational maps" 89, e.g." some research materials" as example 88
+But I mean, her map  3.1 on p. 88  is TINY!!!!
+
+quotation type: Summary
+
+quotation index: 0
+
+# the features of PM-GT
+
+on page 33 she contrasts old GT with Postmodern GT in a table. Pretty much all the attributes she lists here for PMGT fit with my research project.
+
+page range: 32
+
+quotation type: Summary
+
+quotation index: 1
+
+# The use/standng of situational analysis
+
+- opening up data 83
+- providing an entrance point and a way of entering
+- analytic exercise 83
+- it's about finding relations 84
+-84/85 memos are the most important thing
+- focus on silences, the "thousand-pound gorillas (..) sitting around in our situations of concern that nobody has bothered to mention yet. Why not?" 85
+- maps for "big picture"news" 85
+- answer the questions: "Where in the world is this project? Why is it important? What is going on in this situation?" 85 > But doesnt that mix academic and field discourse?
+- Three types of maps:
+1) situational map - "STRATEGISES for articulating the elements in the situation and examining relations among them"
+2) social worlds/arenas maps as cartographies of collective commitments, relations, and sites of action
+3) Positional maps as simplification strategies for plotting positions articulated and not articulated in discourses" 86
+Plus: 4) traditional GT map = codes and categories; 5) project map (?) 86
+2)
+
+page range: 83
+
+quotation type: Summary
+
+quotation index: 2},
+  title     = {Situational analysis},
+  pages     = {xli, 365},
+  publisher = {Sage Publications},
+  abstract  = {"Situational Analysis: Grounded Theory After the Postmodern Turn provides an innovative approach to grounded theory useful in a wide array of qualitative research projects. Extending Anselm Strauss's ecological social worlds/arenas/discourses framework, situational analysis offers researchers three kinds of maps that place emphasis on the range of differences rather than commonalities, as found via the traditional grounded theory approach."--Jacket.},
+  year      = {2005},
+}
+
+@Book{,
+  author    = {Cooke, Bill and Kothari, Uma},
+  title     = {Participation},
+  pages     = {XII, 207 S. ;},
+  publisher = {Zed Books},
+  year      = {2007},
+}
+
+@Book{,
+  title    = {Understanding global development research},
+  editor   = {Crawford, Gordon and Kruckenberg, Lena and Loubere, Nicholas and Morgan, Rosemary},
+  pages    = {xvii, 262},
+  abstract = {Built around interviews and personal field notes of authorities and researchers, which really help readers to see what actually happens during field work, this exciting new book gives practical advice on the key aspects of doing developmental fieldwork. A must read for all students, researchers and aid workers contemplating field work in emerging economies. -- Admos Chimhowu This is an up-to-date, thought-provoking and well-balanced publication that brings together the best insights of leading and young scholars at the nexus of development and participatory field research. Its relational, ethics- and power-sensitive perspective makes this book special.--},
+}
+
+@Book{,
+  author    = {Dellwing, Michael and Prus, Robert},
+  title     = {Einführung in die interaktionistische Ethnografie},
+  pages     = {233 S},
+  publisher = {Springer VS},
+  year      = {2012},
+}
+
+@Article{,
+  author = {Desmond, Matthew},
+  title  = {Relational ethnography},
+  pages  = {547--579},
+  volume = {43},
+  year   = {2014},
+}
+
+@Article{,
+  author = {Doyle, Jessica},
+  title  = {Civil Society as Ideology in the Middle East: A Critical Perspective},
+  pages  = {403--422},
+  volume = {43},
+  year   = {2016},
+}
+
+@Article{,
+  author = {DuBois, Marc},
+  title  = {The Governance of the Third World: A Foucauldian Perspective on Power Relations in Development},
+  pages  = {1--30},
+  volume = {16},
+  year   = {1991},
+}
+
+@Book{,
+  author    = {Emerson, Robert and Fretz, Rachel I. and Shaw, Linda},
+  title     = {Writing ethnographic fieldnotes},
+  pages     = {xxiii, 289},
+  publisher = {The University of Chicago Press},
+  year      = {2011},
+}
+
+@Article{,
+  author = {Fechter, A.-M.},
+  title  = {Aid work as moral labour},
+  pages  = {228--243},
+  volume = {36},
+  year   = {2016},
+}
+
+@Article{,
+  author = {Fechter, Anne-Meike},
+  title  = {The Personal and the Professional: Aid workers' relationships and values in the development process},
+  pages  = {1387--1404},
+  volume = {33},
+  year   = {2012},
+}
+
+@Book{,
+  author    = {Fechter, Anne-Meike and Hindman, Heather},
+  title     = {Inside the everyday lives of development workers},
+  pages     = {vi, 224},
+  publisher = {Kumarian Press},
+  abstract  = {Fechter and Hindman break new ground by illuminating the social and cultural world of the aid agency, a world that is neglected in most discussions of aid policy. They examine how aid workers' moral beliefs interlink and conflict with their initial motivations, how they relate to aid beneficiaries, their local NGO counterparts, and other aid workers, their views on race and sexuality, the effect of transient lifestyles and insider language, and the security and family issues that come with choosing such a career. Ultimately, they arrive at a more comprehensive understanding of development processes that acknowledges a rich web of relationships at all levels of the system.},
+  year      = {2011},
+}
+
+@Article{,
+  author = {Fechter, Anne-Meike and Walsh, Katie},
+  title  = {Examining ‘Expatriate’ Continuities: Postcolonial Approaches to Mobile Professionals},
+  pages  = {1197--1210},
+  volume = {36},
+  year   = {2010},
+}
+
+@Book{,
+  title     = {The New Expatriates},
+  editor    = {Fechter, Anne-Meike and Walsh, Katie},
+  pages     = {174},
+  publisher = {Routledge},
+  abstract  = {While scholarship on migration has been thriving for decades, little attention has been paid to professionals from Europe and America who move temporarily to destinations beyond ' the West' . Such migrants are marginalised and depoliticised by debates on immigration policy, and thus there is an urgent need to develop nuanced understanding of these more privileged movements. In many ways, these are the modern-day equivalents of colonial settlers and expatriates, yet the continuities in their migration practices have rarely been considered.The...},
+  year      = {2013},
+}
+
+@Article{,
+  author = {Ferguson, James},
+  title  = {The Uses of Neoliberalism},
+  pages  = {166--184},
+  volume = {41},
+  year   = {2010},
+}
+
+@Article{,
+  author = {Härdig, Anders},
+  title  = {Beyond the Arab revolts: conceptualizing civil society in the Middle East and North Africa},
+  pages  = {1131--1153},
+  volume = {22},
+  year   = {2014},
+}
+
+@Book{,
+  title     = {Hermeneutische Wissenssoziologie},
+  editor    = {Hitzler, Ronald and Reichertz, Jo and Schröer, Norbert},
+  pages     = {348 S},
+  publisher = {UVK-Verl.-Ges.},
+  year      = {1999},
+}
+
+@Book{,
+  author    = {Inhetveen, Katharina},
+  comment = {# Most relevant literature
+
+Donini, Antonio (1996): „The Bureaucracy and the Free Spirits: Stagnation and Innovation in the Relationship Between the UN and NGOs“, in: Weiss/Gordenker, NGOs, the UN and Global Governance, S. 83-101.
+
+Hilhorst, Dorothea (2002): „Being Good at Doing Good? Quality and Ac-
+countability of Humanitarian NGOs“, in: Disasters 26, S. 193-212.
+
+quotation type: Summary
+
+quotation index: 0
+
+# Money, morals, and the market
+
+Can I call a chapter: money, morals, and the market
+
+quotation type: Comment
+
+quotation index: 1
+
+# Ihre Fragestellung
+
+"Die Fragestellung, die die Untersuchung leitet, ist primär eine empiri- sche: Wie funktionieren Flüchtlingslager konkret, als komplexe soziale Ein- heiten mit heterogenen Akteuren, die jeweils ihre eigenen Perspektiven, In- teressen und Ressourcen einbringen? Wie ist die politische Ordnung von Flüchtlingslagern gestaltet?1 Welche Charakteristika hat also die Institution, in der Flüchtlinge nach ihrer Flucht untergebracht und verwaltet werden und wo sie weiterleben?"
+
+page range: 15
+
+quotation type: Direct quotation
+
+quotation index: 2
+
+# Ihre Fragestellung (Comment)
+
+Wieso darf sie das? Wieso darf sie eine empirische Frage stellen und wenn ich sage: I want to know what they do, dann ist das nicht ausreichend?!
+> Vielleicht muss ich das einfach mal klarer schreiben?
+
+page range: 15
+
+quotation type: Comment
+
+quotation index: 3
+
+# Doppelte Einbindung der Lager-Organisationsteile
+
+"Die Organisationsgliederungen im Lager sind damit doppelt organisatorisch eingebunden, einmal innerhalb des Flüchtlingslagers zusammen mit anderen Organisationen, einmal innerhalb der eigenen Mutterorganisation."
+
+page range: 16
+
+quotation type: Direct quotation
+
+quotation index: 4
+
+# Doppelte Einbindung der Lager-Organisationsteile (Comment)
+
+I like this idea. To point out: SfCG Lebanon is embedded in SfCG global, but at the same time horizontally (? that is not a good term here...say: on the same scale? on the ground? In the country?) they are also part of a network/social construct/whatever. So here you have a second element of double orientation.
+
+page range: 16
+
+quotation type: Comment
+
+quotation index: 5
+
+# Double Orientation: Werte und Organisationsinteresse
+
+"In Flüchtlingslagern sind typischerweise eine ganze Reihe humanitärer und administrativer Organisationen tätig. Sie alle sind durch die institutionali- sierten Werte des internationalen Flüchtlingsregimes geprägt, die einen ge- meinsamen Bezugspunkt ihrer Arbeit bilden. Gleichzeitig besteht innerhalb jeder der Organisationen auch die Norm, Organisationsinteressen zu verfol- gen. Die Mehrzahl der Organisationen im Flüchtlingslager sind NGOs."
+
+page range: 119
+
+quotation type: Direct quotation
+
+quotation index: 6
+
+# Definition NGO (nach Neubert)
+
+"Der im Folgenden zugrundegelegte Begriff der NGO ist an Dieter Neu- bert orientiert und beinhaltet die Organisationen, die er als Nichtregierungs- organisationen „im engeren Sinne“ (Neubert 2003: 259) bezeichnet. Dies sind Organisationen, die weder staatlich noch profitorientiert und deren Ak- tivitäten auf Nicht-Mitglieder als Nutznießer bezogen sind. Die Aktivitäten können aus anwaltlicher Tätigkeit oder aus Dienstleistungen bestehen. Nach Neubert haben diese NGOs einen doppelten gesellschaftlichen Anschluss. Sie sind mit der Gesellschaft einerseits über ihre Ressourcengewinnung, an- dererseits über ihre klientenbezogenen Tätigkeiten, also ihr Wirkungsfeld, verbunden (vgl. Neubert 2003: 258-260; 2001: 54-56)."
+
+page range: 119
+
+quotation type: Direct quotation
+
+quotation index: 7
+
+# Double Orientation No. II: beneficiary (refugees) and customer (donor)
+
+"Zum Dritten schließlich verweist der Aspekt des doppelten gesellschaftlichen Anschlusses auf ein folgenreiches Merkmal von NGOs im Vergleich zu vielen anderen Dienst- leistungsorganisationen: Die Klientel, auf die sich die Arbeit von NGOs richtet, überschneidet sich nicht mit den Akteuren, von denen die Ressour- cen eingeworben werden. Damit gilt für NGOs: „they separate clients (ser- vice recipients) and customers (sources of funds)“ (Gronbjerg 1992: 74).4 In der täglichen Hilfsarbeit im Flüchtlingslager sind die Flüchtlinge das Ge- genüber der NGOs. Rechenschaftspflichtig sind die Organisationen dagegen ihren Geldgebern. Ihnen gegenüber müssen die NGOs ihre Arbeit legitimie- ren, wenn sie Ressourcen von ihnen bekommen und den Geldfluss aufrecht- erhalten wollen. Für dieses Ziel spielt es nur bedingt und mittelbar eine Rol- le, inwieweit eine NGO auch bei ihrer Klientel, den Flüchtlingen, Legitimi- tät genießt. Antonio Donini spricht allgemein von einer „top-down accoun- tability“ (Donini 1996: 98), der das Finanzierungssystem von NGOs Vor- schub leistet.
+
+page range: 120
+
+quotation type: Direct quotation
+
+quotation index: 8
+
+# Double Orientation No. II: beneficiary (refugees) and customer (donor) (Comment)
+
+She speaks of "clients" here (following Grojberg 1992) as the beneficiaries. However, the police general for example would call the donors "clients"...
+
+page range: 120
+
+quotation type: Comment
+
+quotation index: 9
+
+# Spannung zwischen Norm der Partnerschaftlichkeit und organisationalem Eigeninteresse-Förder-Zwang
+
+"Die hier anklingende „Partnerschaftlichkeit“ stellt in der Welt der huma- nitären Arbeit ein hoch bewertetes Prinzip dar (vgl. Raper 2003: 355). Gleichzeitig stehen Hilfsorganisationen zueinander in Konkurrenz- und Ab- hängigkeitsstrukturen, und von den Mitarbeitern wird erwartet, die jeweils eigenen Organisationsinteressen zu verfolgen (vgl. Hilhorst 2002). Das Per- sonal der Hilfsorganisationen, die in einem Flüchtlingslager zusammenar- beiten, steht damit vor ambivalenten Anforderungen.5 Die Spannung zwi- schen Normen der Partnerschaftlichkeit und solchen der Verfolgung von Eigeninteressen prägt die Praktiken und Strategien des Lageralltags, die wiederum auf die ambivalente Normenstruktur zurückwirken können."
+
+page range: 120
+
+quotation type: Direct quotation
+
+quotation index: 10
+
+# zur Gruppe der Expats
+
+es scheint nur 14 Expats zu geben insgesamt in den in ihrer Forschung beobachteten Lagern. Sie schreibt ca. 0,5 Seiten über deren Motivation, Hintergründe etc.
+
+page range: 123
+
+quotation type: Summary
+
+quotation index: 11
+
+# comparison motivation expats and Zambian staff
+
+"Für viele der sambischen Mitarbeiter sind die Motive für ihre Arbeit im Flüchtlingslager anders ge- wichtet als bei den Expatriates. Während der Wunsch zu helfen durchaus eine Rolle spielt, ist für die Einheimischen die Tätigkeit bei den NGOs auch, und manchmal vor allem, ein Arbeitsplatz, der dem Lebensunterhalt dient. Ein großer Teil des sambischen Personals hat Familienangehörige zu ver- sorgen, und sowohl unter finanziellen Aspekten wie unter solchen des Re- nommees sind NGOs – zumal internationale NGOs – attraktive Arbeitgeber."
+> I wonder. Isn't this a JOB, a way of earning your living (and not a bad one btw...) also for expats? 
+> If she hasnt heard that from expats, maybe it's because of the Thematisierungsregeln? 
+
+page range: 124
+
+quotation type: Direct quotation
+
+quotation index: 12
+
+# These locals want allowances....they do it for the money....
+
+"Manche Expatriates klagen etwa, sambi- sches Personal käme zu Weiterbildungen und anderen Veranstaltungen nur wegen der allowances, der Reisezulagen. Die Empörung der Expatriates darüber überrascht ebenso wenig wie die finanziellen Motive der Sambier."
+
+page range: 124
+
+quotation type: Direct quotation
+
+quotation index: 13
+
+# Moralität erstreckt sich auch auf Einzlene, durchgehender Diskurs
+
+"Manche Expatriates klagen etwa, sambi- sches Personal käme zu Weiterbildungen und anderen Veranstaltungen nur wegen der allowances, der Reisezulagen. Die Empörung der Expatriates darüber überrascht ebenso wenig wie die finanziellen Motive der Sambier." (Inhetveen 2014:124)
+macht mich darauf aufmerksam, dass dieser Dikurs: "die wollen nur business machen" nicht nur zwischen NGOs (über andere ) geführt wird, sondern ja auch in Bezug auf Einzelne. Es geht ja eigentlich ganz oft darum, gerade auf Seiten der Geldgeber und Expats, zu verhindern/anzuprangern, dass hier versucht wird Geld zu machen. > Sammle mal Beispiele dafür!
+
+page range: 124
+
+quotation type: Comment
+
+quotation index: 14},
+  title     = {Die politische Ordnung des Flüchtlingslagers},
+  pages     = {1 online resource (444 S.)},
+  publisher = {Transcript},
+  year      = {2014},
+}
+
+@Article{,
+  author = {Jaeger, Hans-Martin},
+  title  = {"Global Civil Society" and the Political Depoliticization of Global Governance},
+  pages  = {257--277},
+  volume = {1},
+  year   = {2007},
+}
+
+@Article{,
+  author = {Jennings, Kathleen and Boas, Morten},
+  title  = {Transactions and Interactions: Everyday Life in the Peacekeeping Economy},
+  pages  = {281--295},
+  volume = {9},
+  year   = {2015},
+}
+
+@Article{,
+  author = {Knoblauch, Hubert},
+  title  = {Fokussierte Ethnographie : Soziologie, Ethnologie und die neue Welle der Ethnographie},
+  pages  = {123--141},
+  volume = {2},
+  year   = {2001},
+}
+
+@Book{,
+  author    = {Krause, Monika},
+  comment = {# Krause's reception of economic research on non-profits
+
+- she takes this market idea seriously and follows through with what it means analytically
+- Her claim is that economics has two persepectives on it:
+research on charitable giving: charity - but ignores organisational aspect 44
+research on non-profit firms: non-profit as organizations - but ignores the charity aspect
+- donors are the buyers, not the other way round
+- NGOs are not neutral conduits of anything
+- following Hansmann (1980) relief NGOs are described as donnative and non-mutual, meaning that its income stems from donations (not business?) and that it is not primarily members that benefit (other than in a club) 46-47
+- A market in which the buyer  is not the consumer (charity etc.): "The market may reflect preferences of buyers more accurately than the preferences of the end consumers." 47 Her examples here are a landlord hiring an exterminator or employer providing health insurance and negotiating the contract. But in the field of charity, there is no legal framework!!!! super important realisation. 47
+Plus: donor does not only decide about the goods but also selects the consumer. (I'd however say this is - with a different sequencing also true for the landlord or the employer.)
+- "What is being consumed by donors are not pots and pans or tents or food, but the act of giving. This should invite us to rethink our expectations about the organization's process of planning, production, and marketing." 47
+
+quotation type: Summary
+
+quotation index: 0
+
+# UNDP and Nahnoo fit the same grid
+
+Political science or at least IR would place UNDP as an international organisation and Nahnoo as a Lebanese NGO on different ends of a spectrum. The one is global and international, the other one is local  and national.
+> IR is really reproducing the distinctionary categories that order reality and reinforces them  maybe even beyond their relevance in practice
+They could however also be seen as organisations that are both non-profit (in theory), function as implementers (to a certain degree), and donnative and non-mutual (Krause 2014: 46)
+
+quotation type: Comment
+
+quotation index: 1
+
+# The relation of beneficiary and organisation and project
+
+She says that the benfeciaries or populations in need cannot be divided from the organisation doing the project, nor from the project itself.
+"A specified target population is an impirtant part of the definition of a project."  50
+And populations in need do labor (51)
+"Beneficiariesare rarely simply benefiting ina passive way. They cooperate with and contribute to the project.in various ways. In what follows I ana- lyze this cooperation to show .thatifthe project is produced and sold, beneficiaries are not just part of that product but also labor for it." 51
+
+quotation type: Summary
+
+quotation index: 2
+
+# the assesment
+
+while different in so far as the people whose needs are assessed are a) professionals and b) not the victims of a catastrophe, the assessment that Rohan and Christelle had done can well be compared to the way assessments are described here by Krause 52-53
+Interesting points.:
+- assessments already require people's cooperation and concretely: labor before anything is delivered
+- There is no guarantee that assessments are followed up by actual projects and there might be several assessments in parallel or repetaedly by different sectors and agencies. > there is already a name for the resulting phenomenon "Assessment Fatigue" 53, and it has been problematised in practice and reports
+- assessments can take on a life of their own (whatever exactly this means) 52
+
+quotation type: Summary
+
+quotation index: 3
+
+# Chapter 6: comparison and mixing of human rights and humanitarianism
+
+Chapter 6 is extremely interesting to me because of two aspects: first, it compares human rights practices and the field of organisations/its history to that of humanitarianian assistance. Second, she opens up the basic distinction between ideas – practices – organisations.
+
+Her argument goes: there is basically two camps of scholars, those that say HR&humanitarianism go together or not. and then comes her qualification: ""Whether scholars and commentators assume an essential unity or an essential difference between these approaches, whether they prefer one over the other, subscribe to both or reject both, they often share a focus on the content of ideas. I have argued in chapter 1 that ideas are not just contested, or contradictory, but are, on a very basic level, in their relation-ship to practice, indeterminate. I will now argue that in order to understand the role of human rights and the relationship between human rights and humanitarian relief, we need to distinguish first between human rights and humanitarian relief as sets of ideas, second between the universe of practices that are or could be claimed to-be human rights or humanitarian practices, and third between the field of human rights organizations and the field of humanitarian relief organizations.
+I have argued that the practices that could be claimed to be humanitarian practices are diverse and are not confined to specific: organizations or actors. Similarly, the practices that could be claimed to be human rights practices are not confined to human rights organizations. Practices by local social movement actors, and state officials, for example, are or could be claimed as human rights practices according to one definition or another.' " p.150
+
+Another interesting aspect is that she frames both HR and HUM as "a way of relating to distant suffering" 148 (doesn't she quote COOKE on it elsewhere?) - I think that is a very interesting way of seeing it. I would also see development and DP as forms of relating to distant societies/orders that one wants to maintain influence on.
+In the first paragraph she even enunciates development, 'conflict resolution' and 'peace building' as readings:
+"Humanitarianism is not the only discourse that plays a role in framing how Western audiences read social problems in faraway places. 'Development' has  been an important concept since the end of colonialism, but it has lost some of its power, partly because of the rise of humanitarian relief." 147
+
+The parts where she describes practices and also how HR has become integrated/appropriated in HUM are very interesting because it provides many relevant points of comaprison.
+
+quotation type: Summary
+
+quotation index: 4
+
+# What is being consumed by donors are not …
+
+"What is being consumed by donors are not pots and pans or tents or food, but the act of giving. This should invite us to rethink our expectations about the organization's process of planning, production, and marketing." 47
+
+page range: 47
+
+quotation type: Direct quotation
+
+quotation index: 5
+
+# Double function of project
+
+Double function of project: funds raised for a project but project done to raise funds
+
+page range: 47
+
+quotation type: Summary
+
+quotation index: 6
+
+# contradiction between values/norms and market structure
+
+When reading about MSF and how their different funding structure "frees them to some extent from the pressure to develop an instrumental attitude toward beneficiaries." 49, I am reminded of how much praise they get. Everyone likes them, and they are used as the standard good example counter the rest. But that also reminds me of the fact that all of this is problematized by those in the field, isn't it? Everyone says its a market. But at the same time, those who actually embrace this market logic are scolded (bad NGO, supermarket NGO, they just want to get the next project) and those who don't do it are praised, turn into heroes (self-description with pride; MSF)
+
+page range: 49
+
+quotation type: Comment
+
+quotation index: 7
+
+# training as a form of project
+
+"Some projects are delivered in the form o.ftraining. This is especially prevalentinthe human rights field and in developmentwo.rkbut also.has its place in humanitarian relief. Hygiene projects, fer example, usually require people totake part in educationalmeetings, where they learn abouthewto.uselatrines safely,hewto.usewatersafely,andhowto.mini- mize the risk of the spread of disease. The point here is net to.imply any criticism ofthesetypes ofintervention,as someonewritingJro.m a liber- tarian or Foucauldian perspective ;might. I am sure behavio.rmo.dificatio.n can have impo.rtant ro.lesto. play-Ljust want to..note fer the mo.ment that they invo.lvetime also.en behalfof.beneficiaries.
+(...)
+In cases wherethe wo.rkco.uld be do.ne by ethers, which is true fo.rlatrine buHdingbutno.t fer hygiene training, the participatio.n o.fbeneficiaries leeks mo.stlikewo.rkinother settings.
+"
+
+page range: 55
+
+quotation type: Direct quotation
+
+quotation index: 8
+
+# Krause explicitly distances herself from Foucauldian critique
+
+here, Krause explicitly distances herself from Foucauldian critique
+
+page range: 55
+
+quotation type: Comment
+
+quotation index: 9
+
+# Partner Agencies as beneficiaries
+
+"Second, the partner agencies are also.an important element of the product of relief; they teo. are marketed to. donors as-worthy beneficiaries that are being helped.."Capacity building" has become mere prominent since the 1990s,28and itis thro.ughthisterm that working with partners can be sold to.donors.as an added valueof a project, In.developmentaid, a related discourse of geed governance rums supporting o.therNGOs into. a possible resultofaidwo.rk."
+
+page range: 55
+
+quotation type: Direct quotation
+
+quotation index: 10
+
+# Chapter four: The humanitarian field
+
+the whole chapter is about the divisions/differentiations between NGOs in the field.
+She speaks of axes of differentiation in her mapping oft he field. The humanitarian authority is the field specific symbolic capital at the core, and there is different forms of „pollution“ from this purity. By proximity to states, to groups, or to religion. (Krause 2014: 113-120)
+The major point then is that "[a]gencies develop their policy positions not only directly in response to practical dilemmas but from within a field" (122) > I would even add that they develop all their actions and thinking (not exclusively but also) from within this specific field. At the same time, though, such a separation of "practical dillemmas" and field might obscure that also an assessment of what the practical dilemmas are is not neutral, it's not independent of these other aspects but dialectically related.
+
+page range: 123
+
+quotation type: Summary
+
+quotation index: 11
+
+# Humanitarian Capital/Authority
+
+Humanitarian Capital/Authority
+- intially a combination of "the authority of the duffering produced by war with the authority of the states responsible for that suffering, and the authority of the medical profession." 124
+- somehwhat changed by the entrance of MSF in 1971 (but I have not understood how exactly it changed the humanitarian authority?) though deregulation > contestation, various positions posisble, even though MSf wanted to make it more pure again.
+
+page range: 124
+
+quotation type: Summary
+
+quotation index: 12
+
+# Chapter 5: The reform of humanitarianism
+
+Krause looks at two major reform projects in the field of humanitarian aid since the 90s, Sphere and HAP.
+She considers these as "forms of self-observation and reflexivity" 126, and adds that there is a certain irony (or so) to the fact that here humanitarianism, which is in itself a kind of reform project/movement, or at least a component of many major societal reform projects, now turns onto itself, reforming itself  138
+There is an interesting statement on/critque of critique in this field as ritualistic on p. 127, taken from Alex de Waal (1997) Famine Crimes p. xvi
+Her basic argument is that also these reform processes are "mediated by the focus of agencies on producing projects and by the symbolic divisions among actors in the field" 128. So in other words, every attempt to reform is filtered/funneled through the managerial practices (or logic of practice) and the structures of the field. The reform attempts "have become incorporated into the logic of the humanitarian field" [I am sceptical about this latter point because I am not sure that it is the field-specific logics that have given the reform its shape. Isn't it this whole idea of managerialism that is more decisive? And isn't it telling that Sphere itself is a PROJECT?]
+Once it has been adopted into practice, Sphere basically introduces "a standard for the products of relief; in some tension with the intentions of the project [of Sphere itself], it begins to work in analogy to a technical, and not a professional standard." 128
+HAP on the other hand suffered more from the problem that the beneficiaries don't simply take on the role that they are expected to take on in complaining etc. This means you first have to train or "socialize" them into how to criticise, or "into a specific role". 142 She does not quite address the fact that beneficiaries (imho rightly so) complain about larger politcal issues and constellations. [So in a way it is a conflict between: please complain but do it on a managerial level. And ppl complaining politically. She actually has so far not used the term depoliticise!]
+She draws the conclusion [I don't know how she got there....] that HAP does not empower beneficiaries as consumers but rather functions like a voluntary fair-trade standard in which the  beneficiaries are akin to laborers, and donors as consumers are "discipline[d]" 142-144, quote 144.
+There is a whole subchapter on professionalisation which briefly discusses the relationship of professionalisation to these reform projects and of porfessions and the field. 135-138
+
+page range: 126
+
+quotation type: Summary
+
+quotation index: 13
+
+# On professionalisation
+
+There is a whole subchapter on professionalisation which briefly discusses the relationship of professionalisation to these reform projects and of professions and the field.
+
+- The benefit of Professionalisation in humanitarian relief is contested 135-136
+- She references Stichweh and Abbott on professionalisation and fields; and mainly Barnett on professionalisation in humanitarian field. 135
+- Sphere has been considered a professional standard "But it is important to remember that these classical professions precisely resist the standardization of output. In the classical professions, standardization is in tension with professional autonomy." 136 > she reads the debates and practices in medicine as one where professionalism is somehow in the person (rather than in a standard for output/product); alternatively, it is a standard for conduct - but in any case not one for the product 136 - in medicine, this standardization of products can even be seen as deprofessionalization 136
+In terms of field: the humanitarian field is not identical with one profession (other than the field of law) 137 - [but I feel her account is somewhat unclear because on different occasions, she seems to nearly equate it with medicine. in any case, medicine seems to represent the core? 137]
+there is something about the sacred and profane (137)
+
+page range: 135
+
+quotation type: Summary
+
+quotation index: 14
+
+# ACCOUNTABILITY RUNS UPWARD
+
+from her book, one can get the impression that the notion that accountability runs upward is rather common sense. The quote is only one example:
+"Agencies participating in this intiative [HAP] are ready to accept the criticism that agencies tend to cater to the preferences of those with resources, or as they would put it, they are 'more accountable to donors rather than beneficiaries,' (...)
+
+page range: 140
+
+quotation type: Direct quotation
+
+quotation index: 15
+
+# Ways of reading social problems in faraway places
+
+""Humanitarianism is not the only discourse that plays a role in framing how Western audiences read social problems [and their fixes!] in faraway places. 'Development' has  been an important concept since the end of colonialism, but it has lost some of its power, partly because of the rise of humanitarian relief." 147
+
+page range: 147
+
+quotation type: Direct quotation
+
+quotation index: 16
+
+# Practices as diverse and ideas as indeterminate
+
+"Whether scholars and commentators assume an essential unity or an essential difference between these approaches, whether they prefer one over the other, subscribe to both or reject both, they often share a focus on the content of ideas. I have argued in chapter 1 that ideas are not just contested, or contradictory, but are, on a very basic level, in their relation-ship to practice, indeterminate. I will now argue that in order to understand the role of human rights and the relationship between human rights and humanitarian relief, we need to distinguish first between human rights and humanitarian relief as sets of ideas, second between the universe of practices that are or could be claimed to-be human rights or humanitarian practices, and third between the field of human rights organizations and the field of humanitarian relief organizations.
+I have argued that the practices that could be claimed to be humanitarian practices are diverse and are not confined to specific: organizations or actors. Similarly, the practices that could be claimed to be human rights practices are not confined to human rights organizations. Practices by local social movement actors, and state officials, for example, are or could be claimed as human rights practices according to one definition or another.' "
+
+page range: 150
+
+quotation type: Direct quotation
+
+quotation index: 17
+
+# Practices vary on several dimensions
+
+She has a chart on p. 151 that opens up 11 distinctions that cut across humanitarian or human rights. These "axes of variation" are independent of each other.
+short-term vs long-term goals
+short-term vs. long-term funding
+short-term needs vs. long-term needs
+local/within national borders/across national borders/within the borders of an empire
+respect vs. partonizing attitude
+state-sponsored vs. not state-sponsored
+volunteers vs. full-time paid staff
+self-organized vs. on behalf of others
+managerial concerns vs. grassroots struggles
+targeting groups/trageting issues/targeting individuals
+political rights/economic and social rights/no rights [I'd add gender rights for my relevant fields]
+
+page range: 151
+
+quotation type: Direct quotation
+
+quotation index: 18
+
+# Practices vary on several dimensions (Comment)
+
+I find this chart very interesting but am also quite surprised that she suddenly pulls this out of her hat. No references come with it, and it is not used much in the follwoing pages. Even though if she is serious, it would be a very interesting tool for analysing the field, no?
+Also, these categories seem to mirror what I have been writing in the memo 11.5.17 - I there collected alternative categories of differentiation (or axes of variation if you want to call them that way) that are relevant for my field (compared to the state-political, group-political, and religious pollution she has found). They might be of a more discoursive type. (Or is that a question of perspective only?)
+
+page range: 151
+
+quotation type: Comment
+
+quotation index: 19
+
+# The field of HR organisations
+
+Practices diverse but hierarchy in power to shape definition: "There is a set of organizations that under- stand themselves as humanitarian organizations and see humanitarian organizations as their peers, and a set of organizations that understand themselves as human rights organizations and see human rights orga- nizations as their peers. I focus here on what Alex de Waa\} has termed
+secondary-as opposed to primary-human nghts.organlzations," The practices in the field of human rights organizations are only a subset of all human rights practices-but the organizations that strive to be part of the global field of human rights organizations have been influential in the way the concept of human rights is imagined inthe international arena." In its shared routines and practices, the organizations that form part of the field of human rights select from the range of meanings that the concept of human rights might have in terms of action." 152
+
+History of the field; also here a boom in the 1980/90s, Dezalay and Garth as main reference
+consolidation of the field in a specific way, related to actors and linking to certain practices:
+"It is important to note that the most prominent specialized human rights organizations interpretthe concept of human rights in a specific way. As partofits consblidationas a field, human rights has taken a legal turn, a development that does not bynecessity follow from the ideas handed down as human.rtghts, for example, in the antislavery move- ment." Human rights organizations ofthis type callforvery specificprac- tices. Human rights organizations focus on collecting evidence in specific ways, and on writing reports. They engage in advocacy work, conduct campaigns, and educate people about rights. As Alex deWaalhas pointed out, these organizations combine a focus on research, documentation, and publication with the skilled use ofthemedia and lobbying of politt- dans to maketheir concerns known. The basic premise ofthese activities is thatif people or the public know about an abuse, theywill be movedto wanttostopit\}6 CliffordBobidentifiestheproductinwhatheanalyzesas "the marketforhumanrights" as "information."!?"
+> These practices are very similar to the ones I saw in Nahnoo!
+
+She provides me – thanks good with the argument that some see HR as part of DP  p. 154
+
+page range: 151
+
+quotation type: Summary
+
+quotation index: 20
+
+# Blurring of distinctions - difficulty of drawing them
+
+Together with the subsequent chapter, i feel,"The field of HR organizations" shows the blurring of practices and lines. She also quotes one reading of HR as aiming for DP (154, drawing on NICHOLAS GUILHOT). And states that HR has been incorporated into development aid.
+
+page range: 152
+
+quotation type: Comment
+
+quotation index: 21
+
+# Trägheit der Praxis
+
+I think the examples and analyses in her book repeatedly point us to the inertia of practices.
+One case:
+"Relief workers incorporate the concept [of human rights] in ways that fit with what they have already been doing; in its different meanings, it is mediated by practcies of project managment, and by the practices of symbolic contestation." 167
+But I'd say it's similar for the logframe, and the reform projects Sphere and HAP; she even somewhere else spoke of old wine in new bottles and how we'd still have to analyse these new bottles as the institutions matter (p.63)
+Yet, I have in some instances the impresison that she does not take this inertia seriously enough. She seems to prefer explanations that contain more agency then the boring "we just do what we have always done"...
+
+page range: 167
+
+quotation type: Comment
+
+quotation index: 22
+
+# the typical process: new things become incoporated
+
+"Human rights becomes an accessory to the production of projects (...)
+
+page range: 167
+
+quotation type: Direct quotation
+
+quotation index: 23},
+  title     = {The good project},
+  pages     = {xi, 220},
+  publisher = {University of Chicago Press},
+  abstract  = {NGOs set out to save lives, relieve suffering, and service basic human needs. They are committed to serving people across national borders and without regard to race, ethnicity, gender, or religion, and they offer crucial help during earthquakes, tsunamis, wars, and pandemics. But with so many ailing areas in need of assistance, how do these organizations decide where to go{u2014}and who gets the aid? In The Good Project, Monika Krause dives into the intricacies of the decision-making process at NGOs and uncovers a basic truth: It may be the case that relief agencies try to help people but, in practical terms, the main focus of their work is to produce projects. Agencies sell projects to key institutional donors, and in the process the project and its beneficiaries become commodities. In an effort to guarantee a successful project, organizations are incentivized to help those who are easy to help, while those who are hardest to help often receive no assistance at all. The poorest of the world are made to compete against each other to become projects{u2014}and in exchange they offer legitimacy to aid agencies and donor governments. Sure to be controversial, The Good Project offers a provocative new perspective on how NGOs succeed and fail on a local and global level. --Provided by publisher.},
+  year      = {2014},
+}
+
+@Article{,
+  author = {Kurki, Milja},
+  title  = {Governmentality and EU Democracy Promotion: The European Instrument for Democracy and Human Rights and the Construction of Democratic Civil Societies1},
+  pages  = {349--366},
+  volume = {5},
+  year   = {2011},
+}
+
+@Article{,
+  author = {Merry, Sally},
+   comment = {# article shows how …
+
+article shows how
+1) indicators produce knowledge and therefore social reality (ex: British created caset-system as a fixed hierarchy in India) 85
+2) to govern: to make decisions 85
+
+quotation type: Summary
+
+quotation index: 0},
+  title  = {Measuring the World},
+  pages  = {S83--S95},
+  volume = {52},
+  year   = {2011},
+}
+
+@Article{,
+  author = {Norman, Long},
+  title  = {The Multiple Optic of Interface Analysis},
+  year   = {1999},
+}
+
+@Book{,
+  title     = {Methoden der vergleichenden Politik- und Sozialwissenschaft},
+  editor    = {Pickel, Susanne and Jahn, Detlef and Lauth, Hans-Joachim and Pickel, Gert},
+  pages     = {1 online resource (Online--Ressource.)},
+  publisher = {VS Verlag für Sozialwissenschaften / GWV Fachverlage GmbH, Wiesbaden},
+  year      = {2009},
+}
+
+@Article{,
+  author = {Reichertz, Jo},
+  comment = {# Der Profi und sein Wissen
+
+"Der „Profi" am Flugsimulator, der auch nachts mit seiner Maschine ohne Schramme enge Täler durchfliegt, hat sehr subtile Hypothesen über die Welt dort draußen, ohne je etwas anderes gesehen zu haben als seine Instrumente und deren Zeigers."
+
+page range: 198
+
+quotation type: Direct quotation
+
+quotation index: 0
+
+# Fragestellung finden ist Zwischen-ergebnis
+
+"Hat man einmal die Frage gefunden, auf welche die Untersuchung eine Antwort erbringen soll, hat manschon viel gewonnen, weiß man doch jetzt, welcher Aspekt der Daten einen interessiert."
+
+page range: 199
+
+quotation type: Direct quotation
+
+quotation index: 1
+
+# Theory and empirics
+
+"Klärt man diese Fragen nicht vor einer Analyse, dann bleibt sie blind und beliebig. DaßDatenvonsich ausetwaserzählen,daßausihnenohne Zutun geistiger Anspannungvonselbst etwaserwüchse, daßTheorien sich Schritt für Schritt aus Daten verdichten lassen, das ist eine Vorstellung, die genauso liebenswert und weltfremd ist wie die Vorstellung von der Existenz des Grals. Typisieren heißt immer, sich den Daten in einer bestimmten alltäglichen und wissenschaftlichen Einstellung nähern und - das ist wichtig - sich über den Prozeß der Annäherung reflexiv zu vergewissern."
+
+page range: 199
+
+quotation type: Direct quotation
+
+quotation index: 2
+
+# Typen zur Vermessung und Darstellung des Feldes
+
+" Aufgrund der hermeneutischen Auslegung dieser Daten entlang den Prämissen einer sozialwissenschaftlichen Hermeneutik möchte ich Typen konstruieren, welche mir bei der Vermessung und Darstellung des Feldes behilflich sind."
+
+page range: 199
+
+quotation type: Direct quotation
+
+quotation index: 3
+
+# Kurzbeschreibung wissenssoziologische Hermeneutik
+
+""Auf die Gmndiagen der sozialwissenschaftlichen Hermeneutik möchte ich hier nicht eingehen. Nur soviel: ähnlich wie die objektive Hermeneutik analysiert sie am liebsten natürliche Daten, favorisiert sie die Sequenzanalyse und möchte die objektiveBedeutungvonErscheinungenermitteln-.allerdings verzichtetsieauf weitreichende strukturtheoretischen Annahmen. Außerungen von Personen werden stets als Handlungen betrachtet und diese immer als Reaktionen auf vorangegangenesHandeln und die antizipierteBedeutungder eigenen Handlung. Und sie weisen besondere Merkmale auf. Läßt sich eine wiederkehrende Besonderheit in Aufbau und Vollzug von Handlungen ausmachen, hat man die typische Besonderheit oder die Falltypik."
+
+page range: 199
+
+quotation type: Direct quotation
+
+quotation index: 4
+
+# Fragestellung Ergebnis des Prozesses
+
+"Nun will ich nicht behaupten, diese Fragen seien schon bei der Konzeption meines Forschungsprojektes in dieser Form klar gewesen. Dies zu behaupten hieße, die Forschungspraxis völlig zu ignorieren. Zu Beginn stand nicht eine klar umrissene Frage, sondern eher eine diffuse Fragerich- tung nach dem Detektionsprozeß von Kriminalpolizisten im Vergleich zu Sozialwissenschaftlern. Die Datenerhebung und die allererste Sichtung der Daten beeinflußte nicht nur tiefsitzende Hintergrundtheorien und emotional eingefärbte Einstellungen, sondern auch die Fragen, die an das
+//
+Material gestellt wurden. Aber erst nachdem die Fragen klar waren - und allein darauf zielen meine Bemerkungen - ließ sich das Material systema- tisch auswerten, was nichts anderes heißt, als daß durch die Systematisie- rung die Analyse darstellbar und kririsierbar geworden ist."
+
+page range: 200
+
+quotation type: Direct quotation
+
+quotation index: 5
+
+# Beschreibung Forschungsablauf
+
+"Zum methodischen Vorgehen kurz folgendes: Aus zehn verschrifteten Interviews, die während einer teilnehmenden Beobachtung mit Kriminal- beamten einer Großstadt geführt wurden, wurden willkürlich vier ausge- wählt.DiesevierwurdenineinemSchnelldurchlaufdanachdurchgesehen, o b sich die Beamten explizit zum Umgang mit dem Wissen um typisches Verhalten geäußert haben. Diese Teile wurden dann herausgegriffen und extensiv sequenzanalytisch interpretiert. Am Ende der Interpretation stand dann die Verdichtung zu einem Typus. Dieser Typus wurde dann benannt mit einer für diesen Typus kennzeichnenden Außerung in der Sprache des Falles. Um Mißverständnissen vorzubeugen: dieser Typus entspricht nicht notwendigerweise der gesamten Falltypik. Um diese zu bestimmen, müßten weitere Textstellen ausgedeutet und miteinander verdichtet werden. Der hier von mir ermittelte Typus kann mit der Falltypikidentischsein,mußesabernicht. DieermitteltenTypensinderst einmal allein Arbeitsmittel zu heuristischen Zwecken. Im übrigen versteht es sich von selbst, daß ich nur Ergebnisse darstellen werde, nicht den Prozeß, der zu diesen Ergebnissen führte."
+
+page range: 200
+
+quotation type: Direct quotation
+
+quotation index: 6
+
+# Ohne Fragehorizont läuft nichts!
+
+"Man kann nun versuchen, diese vier Typen miteinander zu vergleichen, d. h. nach Gemeinsamen und Trennungenzusuchen. Auch hier ist wichtig. daß ohne einen Fragehorizont gar nichts läuft."
+
+page range: 201
+
+quotation type: Direct quotation
+
+quotation index: 7
+
+# Verwechselt er nicht Selbstdarstellung mit Praxis?
+
+Reichertz hat 4 Typen rekonstruiert, von denen jeweils zwei einer gemeinsamen Logik folgen: die erste Gruppe geht davon aus, dass altes, bestehendes Wissen ihnen die Identifikation ermöglihct, während die zweite Gruppe eher auf die Kontingenz und die Nötigkeit der Neugenerierung und Anpassung von existierenden Typen, also bestehendem Wissen setzt.  "WerseineSchweineamGangerkennt,vertrautaufseinvorhandenes Wissen, nutzt dieses als Vermessungsinstrument und ordnet alles Beob- achtete mit Hilfe seines Wissens ein. Mit „feeling und Einsatz" findet man dagegen nicht nur das bereits Bekannte, sondern schafft sich für das Neue
+neue Typen, welche sich in der Zukunft bewähren können." 202
+> Ich frage mich allerdings ob nicht in der Praxis alle in etwa dasselbe machen, eine Mischung aus beidem. (Ist natürlich eine empirische Frage.) Allerdings würde ich auf Basis der bloßen Selbstdarstellungen im Interview und der Diskussion untereinander erst einmal nur davon ausgehen, dass es verschieden Arten gibt, Polizeiarbeit zu denken und einen guten Polizisten zu geben.
+
+> Allerdings ist Reichertz ja weder Anfänger noch ein Idiot, und insofern führt er gleich ein Beispiel an wo Typus-gruppe 1 in Handeln umgesetzt wird:
+"Die Betrachtung der Typisierungsleistungen der Kriminalbeamten zeigt, daßeszumindest zwei unterschiedliche Arten derTypisierunggibt: einmal
+die Typisierung als Unterordnung einer Beobachtung unter einen bereits bekannten Typus, zum anderen die Typisierung als die (Re)Kortstruktion
+eines noch nicht bekannten Typus aus den Daten der Beobachtung. (Ob
+man letzteres Rekonstruktion nennt oder Konstruktion, hängt von dem
+jeweils vorhandenen Erkenntnisoptimismus ab.) Unterordnung und (Re)Konstmktion sind zwei völlig verschiedene geistige Akte, was ein
+weiteres Beispiel erläutern soll.
+Zivilstreife im Auto durch ein Wohnviertel einer Großstadt: Drei Zigeu- nerinnen6,eine davon offensichtlich schwanger, werden beobachtet, wie sie von Haus zu Haus gehen und schellen. Verdacht auf Tagesraub. Unterstelltes zigeunertypisches Vorgehen: Bei den Leuten wird angeläu- tet mit der Bitte, ein Glas Wasser für die schwangere Frau zu erhalten. Bei der Versorgung der scheinbar Kranken wird gestohlen, was in Reichweite ist und wertvoll erscheint. Begleitet wird das Trio in der Regel von zwei//
+Männern, die das Beutegut in Empfang nehmen und in einem in der Nähe abgestellten Fahrzeug deponieren sollen. Soweit die Typik!
+Die Kriminalbeamten observieren nun die drei Zigeunerinnen, entdecken auch bald deren Helfero,werden jedoch auch entdeckt. Daraufhin versu- chen die Beamten, das Basisfahrzeug zu finden, um Beute sicherzustellen und zugleicheine Straftat nachweisenzu können. Sie fahren die Gegendab und suchen nach dem typischen Zigeunerfahrzeug - einem großen Mercedes mit Anhängerkupplung, älteres Modell, metallic, sehr breit, sehr wuchtig, vermutliches Kennzeichen von H.-Stadt (Stadt in der Nähe mit hohem Zigeuneranteil). Ein Wagen mit dem passenden Nmmernschild wird gefunden, auch alle anderen Merkmale stimmen. Aber: Am Heck- fenster befinden sich Aufkleber. Diese künden von der letzten Rallye auf dem Nürburgring und von der Auffassung, daß man gut und gerne auf Atomkraftwerke verzichten könne. Aufgrund dieser Aufkleber („Zigeu- ner haben an ihren Wagen nie solche Aufkleber!") unterlassen die Beamten sowohl eine Halterabfrage als auch eine eingehende Untersu- chung des Wagens. Sie fahren weiter, finden jedoch das Basisfahrzeug nicht.
+Ich will hier nicht behaupten, daß das gefundene Fahrzeug tatsächlich das Täterfahrzeug war, mir geht es allein um die Plausibilisierung der Unterscheidung zwischen Unterordnung und (Re)Konstruktion. Die Beamten verfügen über ein Wissen, wie sich bestimmte Zigeuner beim Tageseinbruchverhalten. (WohersiediesesWissenhabenundobesetwas mit der Wirklichkeit zu tun hat, steht hier nicht zur Debatte.) Dieses Verhalten ist an bestimmten Merkmalen erkennbar. Die Konstellation bestimmter Merkmale macht das Typische aus. Beobachtet man das V orhandensein einiger Merkmale, dann schließt man auch auf die Präsenz der übrigen. Und andersherum: sind einige beobachtete Merkmale nicht Teil des Typus, dann liegt ein anderer Typus vor. Die oben beschriebenen Beamten ordnen ihre Beobachtungen einem bereits bekannten Typus unter, sie (re)konstruieren keinen neuen. Anders wäre es gewesen, wenn sie an der Gültigkeit ihres Wissens gezweifelt hätten. Dann hätten sie möglicherweise gedankenexperimentell einen Tätertypus entworfen, der um die Ermittlungspraxisder Polizei weiß und aufgrund dieses Wissens mit minimalem Aufwand eine gelungene Tarnhandlung entwerfen kann. In diesem Falle wäre das unverdächtige Fahrzeug gerade wegen der untypi- schen Aufkleber näher untersucht worden." 202-203
+
+Dies zeigt, dass im praktischen Handeln nur ein Typus verwendet wurde. Allerdings wissen wir noch nicht, (und genau das würde ich anzweifeln) tatsächlich die Beamten immer nur einen Typus verwenden. Oder ob nicht noch mehr Faktoren als die Überzeugungen der Beamten eine Rolle spielen.
+
+page range: 202
+
+quotation type: Comment
+
+quotation index: 8
+
+# Explanation of Abduction
+
+"Es lassen sich also zwei Formen des Typisierens bestimmen:
+(1) Die Unterordnung des Beobachteten unter einen bereits bekannten Typus aufgmnd gemeinsamer Merkmale und
+(2) die Erfindung einer neuen Regel, welche eine bestimmte Auswahl von Merkmalen zu einem neuen Typus zusammenbindet.
+Beide Formen sind Teil des normalen, aber auch des wissenschaftlichen
+Alltags. Beide wechseln sich ab und ergänzen einander. Stets werden
+aktuelle Daten der Wahrnehmung (das sind natürlich auch die erhobenen Felddaten) daraufhin geprüft, ob ihre Merkmale mit den Merkmalen bereits bestehender Typen hinreichend übereinstimmen. Kommt das Angemessenheitsurteil zu einem positiven Ergebnis, wird mittels qualitativer Induktion zugeordnet. Kommt das Angemessenheitsurteil jedoch zu dem Ergebnis, daß keine der bisher bekannten Typen zu den wahrge- nommenen Merkmalen hinreichend paßt, dann ist die Abduktion gefragt. Die Abduktion greift nicht auf bereits vorhandene Typen zurück, um etwas Beobachtetes zu erklären, sie erschafft einen neuen Typus. Dabei ist der Schluß, bestimmte Merkmale zu einem neuen Typus zusammenzubin- den, äußerst waghalsig. Aber nicht nur das: zudem ist er durch keinen Algorithmus herbeizuführen, sondern er stellt sich eher unwillkürlich ein. Begleitet wird die Abduktion (aber auch die qualitative Induktion) von einem angenehmen Gefühl, das überzeugender ist als jede Wahrschein- lichkeitsrechnung. Leider irrt dieses gute Gefühl nur allzu oft. Abduktio- nen und in begrenztem Maße auch qualitative Induktionen sind geistige Akte, die nie allein kognitiv und rational fundiert sind. Sie gründen in Prozessen, die nicht rational begründ- und kritisierbar sind - das gilt natürlich nicht für deren Ergebnisse. Diese Prozesse sind noch nicht einmal vollständig darstellbar."
+
+page range: 205
+
+quotation type: Direct quotation
+
+quotation index: 9
+
+# Typisierung ist nicht Kategorisierung
+
+"VondieserFormderTypisierungistdasVerfahrenderKategorisiertrng trotz der manchmal fließenden Grenzen zu unterscheiden. Die Kategorisierunp geht//
+von einer bereits bekannten Merkmalskombination aus und sucht diese in den Daten wiederzufinden, sie prägt das Material nach einem Vorbild. Hier wird bekannte Ordnung lediglich verallgemeinert. Die logische Form dieser Operation ist die Deduktion. Bei einer Typisierung steht die Entscheidung an, ob man sich einer bereits bestehenden Typik anschließt, bei der Kategorisierung hat man sich entschlossen, alles als Wiederkehr des Bewährten anzusehen. Die Grenzen zwischen diesen beiden Operationen sind deshalb oft fließend, weil Merkmals- kombinationen nicht von den Qualitäten der Daten erzwungen werden, sondern Ergebnis einer interessierten Zuwendung zu den Daten sind. Stimmen Merkmals- kombinationen überein, dann ist dies die Folge des mehr oder weniger bewußten Entschlusses, die Dinge so zu sehen, wie sie andere schon sahen."
+
+page range: 205
+
+quotation type: Direct quotation
+
+quotation index: 10},
+  title  = {"Meine Schweine erkenne ich am Gang" : zur Typisierung typisierender Kriminalpolizisten},
+  pages  = {194--207},
+  volume = {22},
+  year   = {1999},
+}
+
+@Book{,
+  title     = {The persistence of critical theory},
+  editor    = {Ricci, Gabriel},
+  pages     = {1 online resource (xvii, 257},
+  publisher = {Routledge},
+  volume    = {volume 8},
+  abstract  = {The latest volume of Culture & Civilization gathers contemporary exponents of critical theory, specifically those based in the Frankfurt School of social thinking. Collectively, this volume demonstrates the continuing intellectual viability of critical theory, which challenges the limits of positivism and materialism. We may question how the theoretical framework of Marxism fails to coordinate with the conditions that defined labor forces, as did Max Horkheimer and Theodor Adorno, or deliberate on the conditions that justify the claims we make through public discourse, as did Jürgen Habermas. Or, like Axel Honneth, we may reflect on recognition theory as a means of addressing social problems. Whatever our objective, the focus of critical theory continues to be the consciousness of established "positive" interests that, without debate, may sustain injustices or conditions which the public may not have chosen to impose. Throughout the hardship of punitive dismissal and exile in the 1930s and 40s, and the shock of the New Left in the 1960s and 70s, and finally the later linguistic and pragmatic turn, the Frankfurt School has sustained the idea that people escape disaffection and alienation when their knowledge of the social and political world is dialectically mediated through creative interaction. This new volume in the Culture & Civilization series continues the tradition of critical thought.},
+  year      = {2017},
+}
+
+@Article{,
+  author = {SENDING, O. and NEUMANN, I. V. E. R.},
+  title  = {Governance to Governmentality: Analyzing NGOs, States, and Power},
+  pages  = {651--672},
+  volume = {50},
+  year   = {2006},
+}
+
+@Book{,
+  title     = {Studying the agency of being governed},
+  editor    = {Stern, Maria and Hellberg, Sofie and Hansson, Stina},
+  pages     = {xiii, 209},
+  publisher = {Routledge},
+  abstract  = {"This edited volume seeks to provide guidance on how we can approach questions of governing and agency--particularly those who endeavour to embark on grounded empirical research--by rendering explicit some key challenges, tensions, dilemmas, and confluences that such endeavours elicit. Indeed, the contributions in this volume reflect the growing tendency in governmentality studies to shift focus to empirically grounded studies. The volume thus explicitly aims to move from theory to practice, and to step back from the more top-down governmentality studies approach to one that examines how one can/does study how relations of power affect lives, experience and agency. This book offers insight into the intricate relations between the workings of governing and (the possibility for) people's agency on the one hand, and about the possible effects of our attempts to engage in such studies on the other. In numerous ways, and from different starting points, the contributions to this volume provide thoughtful insights into, and creative suggestions for, how to work with the methodological challenges of studying the agency of being governed. This work will be of great interest to students and scholars of international relations, global governance and research methods"--},
+  year      = {2015},
+}
+
+@Article{,
+  author = {Stirrat, Roderick and Henkel, Heiko},
+  title  = {The Development Gift: The Problem of Reciprocity in the NGO World},
+  pages  = {66--80},
+  volume = {554},
+  year   = {1997},
+}
+
+@Article{,
+  author = {Streck, Rebekka and Unterkofler, Ursula and Reinecke-Terner, Anja},
+  title  = {Das "Fremdwerden" eigener Beobachtungsprotokolle – Rekonstruktionen von Schreibpraxen als methodische Reflexion},
+  pages  = {Art. 16},
+  volume = {14},
+  year   = {2013},
+}
+
+@Article{,
+  author = {Vorhölter, Julia},
+  title  = {Studying development organizations – towards a culture of participation?},
+  pages  = {178--194},
+  volume = {1},
+  year   = {2012},
+}
+
+@Book{,
+  title     = {Knowing Governance},
+  editor    = {Voß, Jan-Peter and Freeman, Richard},
+  publisher = {Palgrave Macmillan},
+  year      = {2016},
+}
+
+@Article{,
+  author = {Weidner, Jason},
+  title  = {Governmentality, Capitalism, and Subjectivity},
+  pages  = {387--411},
+  volume = {23},
+  year   = {2009},
+}
+
+@Book{,
+  author    = {Ziai, Aram},
+  title     = {Development discourse and global history},
+  pages     = {viii, 244 Seiten},
+  publisher = {Routledge},
+  year      = {2016},
+}
+
+@Book{,
+  title     = {Postkoloniale Politikwissenschaft},
+  editor    = {Ziai, Aram},
+  pages     = {350 S},
+  publisher = {Transcript},
+  volume    = {27},
+  abstract  = {Welche Relevanz hat die Perspektive der postkolonialen Studien für die Politikwissenschaft? Die Frage nach den Auswirkungen der Epoche des Kolonialismus lässt verschiedene Bereiche der Disziplin - darunter Politische Theorie, Geschlechterverhältnisse, Internationale Beziehungen und Politische Systeme - in einem neuen Licht erscheinen. Die in diesem Band versammelten postkolonialen Analysen politischer Theorien, Institutionen und Prozesse, die sich auf empirischer und theoretischer Ebene bewegen, machen eurozentrische Strukturen und koloniale Argumentationsmuster in der Politikwissenschaft, in der Politikpraxis auf deutscher und internationaler Ebene sowie in postkolonialen Ländern sichtbar. (Quelle: www.buchhandel.de).},
+  year      = {2016},
+}
+
+@Article{,
+  author = {Baya-Laffite, Nicolas},
+  title  = {Black-boxing Sustainable Development: Environmental Impact Assessment on the River Uruguay},
+  pages  = {237--256},
+}
+
+@Article{,
+  author = {Cavatorta, Francesco and Elananza, Azzam},
+  title  = {Show Me the Money!},
+  pages  = {75--93},
+}
+
+@Article{,
+  author = {Emerson, Robert and Fretz, Rachel I. and Shaw, Linda},
+  title  = {Participant Observation and Fieldnotes},
+  pages  = {352--368},
+}
+
+@Article{,
+  author = {Kerner, Ina},
+  title  = {Transnational Governmentality and Civil Society: Ambivalences of Power in a Globalized World},
+  pages  = {85--102},
+}
+
+@Article{,
+  author = {Laurent, Brice},
+  title  = {Boundary-making in the International Organization: Public Engagement Expertise at the OECD},
+  pages  = {217--236},
+}
+
+@Article{,
+  author = {Meuser, Michael and Nagel, Ulrike},
+  title  = {Das Experteninterview — konzeptionelle Grundlagen und methodische Anlage},
+  pages  = {465--479},
+}
+
+@Article{,
+  author = {Reichertz, Jo and Hitzler, Ronald and Schröer, Norbert},
+ comment = {# Grundzüge der hermeneutischen Wissenssoziologie
+
+1) "In Gesellschaften bzw. durch deren Institutionen stehen den sozialen Akteuren relativ komplexe, teilweise hochkomplexe Wissensbest//ände zur verfügung. Dieses Wissen bezieht sich zum ersten auf die Welt im Ganzen, zum zweiten auf die Gesellschaft und deren Ordnung und zum dritten auch auf das Verständnis des Einzelnen, auf seine Bedeutung und auf sein Verhältnis zu anderen, zur Gesellschaft, und zur Welt 'im Ganzen'." 11-12
+> "Dieses Wissen ist grdunsätzlich handlungsorientiert, d.h. es ident insbesondere dazu, gesellscjaftlich als relevant erachtete Handlungsprobleme und -möglichkeiten, Optionen und Obligationen, Chancen und Risiken zu identifizieren, (...)" 12
+> das Wissen, das als erfolgreich gilt, wird belohnt, das andere sanktioniert.
+2) und obwohl es also so eine Ordnung gibt, wo für das erreichen eines Ziel in einer typischen Situation typischen Mittel nahe liegen, dies führt aber "nicht automatisch zur Ausführung entsprechender typischer Handlungen" 12 "Angelpunkt einer sozialwissenschaftlichen Theorie des Verstehens sozialer Handlungen ist also die 'freie' Stellungnahme der oder des Handelnden zu (den) gesellschaftlich bereitgestellten Orientierungsmustern." 12
+"Mit ihrer je 'eigenwilligen' Stellungnahme leisten Akteure demzufolge (zumindest) zweierlei: Sie legen das gesellschaftlich vorausgesetzte Wissen entsprechend den eigenen Dispositionen aus, und sie entwerfen auf dieser Basis Handlungsziele und Handlungsabläufe."
+> Allerdings: auch wenn es diese EIngenwilligkeit gibt, "um sich zu entlasten" entfernen sich die Akteure meist nicht zu weit vom Skript 12; In vielen Fällen wird dieser "je idnividuelle Aushandllungsprozess" also gar nicht ohne Weiteres sichtbar
+> sie sprechen hier auch von einem "Typenrepertoire" 12
+
+3) in der individuellen Auslegung des "Typenrepertoires" findet sowohl "Bewahrung" als auch "Erneuerung" statt (wird "strukturell auf Dauer gestellt" 12)
+"Wirklichkeit wird, fundiert in selbstverständlichten Rekursen auf je Überkommenes, stets aufs Neue durch aufeinander bezogene Handlungen gesellschaftlich konstruiert. So betrachtet, rückt der Handlungsbegriff ins Zentrum des sozialwissenschaftlichen Interesses - ein Handlungsbegriff, der sich gleich zweifach auf den Akteur bezieht: Einmal versteht er ihn als selbstreflexives Subjekt, das in der alltäglichen Aneignung soziale Wissensbestände ausdeutet und sie prüft, sie differenziert oder zusammenfasst. ZUm anderen versteht er ihn als Adressaten von Wissensbeständen und darin eingelassenen Wertungen."
+
+page range: 11
+
+quotation type: Summary
+
+quotation index: 0},
+  title  = {Das Arbeitsfeld einer hermeneutischen Wissenssoziologie},
+  pages  = {9--14},
+}
+
+@Article{,
+  author = {Stirling, Andrew},
+  title  = {Knowing Doing Governing: Realizing Heterodyne Democracies},
+  pages  = {259--286},
+}
+
+@Article{,
+  author = {Swetha Rao Dhananka},
+  comment = {# parallels to my experience
+
+she describes that because of the previous research by development practitioners - or in this case: government employees of some sort - people were suspicious when they encountered her research project. (The previous research was a survey to "serve as the basis for the distribution of social housing" that "presented either a critical opportunity to gain access to housing or the threat of eviction" 111)
+She also, in a differnet context, where an NGO had promised to help and act as a broker, pulled out and left behind a community that "had been put in a position where they coud expect someone else to stand up for them, instead of developing self-organiding collective capacity." 112 encountered that people's first question was: "what I would do for them" - so "her identity as a researcher was conflated with  that of an external agent in a position to 'help'." 112
+the third encounter she terms "encountering empowerment": a social movement that has been succesfful and is very willing to share their stories and educate her about their experiences 112-113
+
+page range: 111
+
+quotation type: Summary
+
+quotation index: 0},
+  title  = {Encounters at the margins: situating the researcher under conditions of aid},
+  pages  = {109--113},
+}
+
+@Article{,
+  author = {Sylvester, Christine},
+  title  = {Avoiding the ‘killing’ of lives: representations in academia and fiction},
+  pages  = {64--73},
+}
+
+@Article{,
+  author = {Voß, Jan-Peter and Freeman, Richard},
+  title  = {Introduction: Knowing Governance},
+  pages  = {1--34},
+}
diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/CitaviXmlImporterTest2.ctv6bak b/src/test/resources/org/jabref/logic/importer/fileformat/CitaviXmlImporterTest2.ctv6bak
new file mode 100644
index 00000000000..426f4dabb8f
Binary files /dev/null and b/src/test/resources/org/jabref/logic/importer/fileformat/CitaviXmlImporterTest2.ctv6bak differ
diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/CitaviXmlImporterTest3.bib b/src/test/resources/org/jabref/logic/importer/fileformat/CitaviXmlImporterTest3.bib
new file mode 100644
index 00000000000..1ad8e3c861c
--- /dev/null
+++ b/src/test/resources/org/jabref/logic/importer/fileformat/CitaviXmlImporterTest3.bib
@@ -0,0 +1,2061 @@
+@Book{,
+  title     = {Critical library instruction},
+  editor    = {Accardi, Maria and Drabinski, Emily and Kumbier, Alana},
+  publisher = {Library Juice Press},
+  abstract  = {A collection of articles about various ways of applying critical pedagogy and related educational theories to library instruction},
+  year      = {2010},
+}
+
+@Misc{,
+  author   = {Adamo, Stefano},
+  title    = {The Social Diffusion of Specialist Knowledge},
+  abstract = {[Author:] I argue that the social diffusion of specialist knowledge is contingent upon a combination of environmental and cognitive factors that make such ideas significant to the lay person and motivates their social transmission and retention. The same combination of factors, however, also engenders an incomplete comprehension of the ideas being spread. I propose a qualitative method to understand what makes specialist knowledge relevant and anticipate how lay peoplemay retain and spread such knowledge. Stefano Adamo is Reader in Italian History and Culture at the University of Banja Luka, Bosnia Herzegovina, and fellowat the International Center of Economic Research, Turin, Italy. His research interests include the history of ideas and the cognitive theory of culture,especially the history of economic concepts (money, market, etc.) and their social diffusion.},
+  year     = {2011},
+}
+
+@Book{,
+  author    = {Allan, Barbara},
+  title     = {E-learning and teaching in library and information services},
+  pages     = {273},
+  publisher = {Facet},
+  abstract  = {Online learning is becoming an increasingly important approach to user education, information literacy and ILS staff development. ILS staff are becoming increasingly involved in the business of e-learning and teaching, from designing and developing materials and programmes through to supporting individual and group learning using virtual learning environments. This text provides an overview and guide to the rapidly developing field of virtual learning environments and provides practical guidance to the development, use and delivery of online learning and teaching materials and programmes. It includes ready-to-use aids such as checklists, questionnaires, charts and tables, and also a wide range of case studies in an ILS context, taken from current practice of the information and library world in the UK and worldwide. Key areas covered include: models of online learning and teaching; the Internet and Web - using learning resources; visual learning environments; electronic assessment; basic conferencing skills for tutors; managing online learning and teaching; moving from conventional learning and teaching to online.},
+  keywords  = {computer-aided learning, training sessions, information literacy, E-Learning, libraries, e-tutoring, online media},
+  year      = {2002},
+}
+
+@book{,
+  author    = {Ambrose, Susan and Bridges, Michael and DiPietro, Michele and Lovett, Marsha and Norman, Marie},
+  title     = {How learning works},
+  publisher = {Jossey-Bass},
+  abstract  = {From the Inside Flap Any conversation about effective teaching must begin with a consideration of how students learn. However, instructors may find a gap between resources that focus on the technical research on learning and those that provide practical classroom strategies. How Learning Works provides the bridge for such a gap. In this volume, the authors introduce seven general principles of learning, distilled from the research literature as well as from twenty-seven years of experience working one-on-one with college faculty. They have drawn on research from a breadth of perspectives (cognitive, developmental, and social psychology; educational research; anthropology; demographics; and organizational behavior) to identify a set of key principles underlying learning-from how effective organization enhances retrieval and use of information to what impacts motivation. These principles provide instructors with an understanding of student learning that can help them see why certain teaching approaches are or are not supporting student learning, generate or refine teaching approaches and strategies that more effectively foster student learning in specific contexts, and transfer and apply these principles to new courses. For anyone who wants to improve his or her students' learning, it is crucial to understand how that learning works and how to best foster it. This vital resource is grounded in learning theory and based on research evidence, while being easy to understand and apply to college teaching.},
+  year      = {2010},
+}
+
+@Article{,
+  title    = {Information Literacy Competency Standards for Higher Education},
+  editor   = {American Library Association},
+  pages    = {20},
+  abstract = {These standards were reviewed by the ACRL Standards Committee and approved by the Board of Directors of the Association of College and Research Libraries (ACRL) on January 18, 2000, at the Midwinter Meeting of the American Library Association in San Antonio, Texas. These standards were also endorsed by the American Association for Higher Education (October 1999) and the Council of Independent Colleges (February 2004).},
+  comment = {# Definition "information literacy" by ALA - USA
+
+"Information literacy is a set of abilities requiring individuals to recognize when information is needed and have the ability to locate, evaluate, and use effectively the needed information."
+
+page range: 2
+
+quotation type: Direct quotation
+
+quotation index: 0
+
+# Computer literacy helps to achieve personal goals
+
+"Information technology skills enable an individual to use computers, software applications, databases, and other technologies to achieve a wide variety of academic, work-related, and personal goals. "
+
+page range: 5
+
+quotation type: Direct quotation
+
+quotation index: 1},
+  keywords = {standards, information literacy},
+  year     = {2008},
+}
+
+@Book{,
+  title     = {Publication manual of the American Psychological Association},
+  publisher = {American Psychological Association},
+  year      = {2010},
+}
+
+@Book{,
+  author    = {Andretta, Susie},
+  title     = {Information literacy},
+  pages     = {208},
+  publisher = {Chandos},
+  abstract  = {Taking an international approach, this book explores two main models of information literacy (IL) : the SCONUL (Society of College, National and University Libraries) Seven Pillars of Information Skills and the IL competencies identified by the ALA (American Library Association). Practical examples for the development of IL skills identified by these models are illustrated using printed and web-based resources. The process of integrating IL provision within a programme of study is outlined to illustrate two strategies underpinning this integration at generic-skills level, the "plug & play" approach, and at subject-specific level, the "research skills approach". A range of diagnostic and assessment methods, to monitor the iterative process of IL skills development, are also presented within these frameworks.},
+  keywords  = {information literacy, information sciences},
+  year      = {2004},
+}
+
+@Book{,
+  author    = {Baker, Kim},
+  title     = {Information literacy and cultural heritage},
+  pages     = {198},
+  publisher = {Woodhead},
+  year      = {2013},
+}
+
+@Article{,
+  author   = {Bawden, David},
+  title    = {Information and digital literacies},
+  comment  = {# Journal of Documentation
+
+quotation type: Comment
+
+quotation index: 0},
+  pages    = {218--259},
+  volume   = {57},
+  abstract = {The concepts of `information literacy' and `digital literacy' are described, and reviewed, by way of a literature survey and analysis. Related concepts, including computer literacy, library literacy, network literacy, Internet literacy and hyper-literacy are also discussed, and their relationships elucidated. After a general introduction, the paper begins with the basic concept of `literacy', which is then expanded to include newer forms of literacy, more suitable for complex information environments. Some of these, for example library, media and computer literacies, are based largely on specific skills, but have some extension beyond them. They lead to general concepts, such as information literacy and digital literacy which are based on knowledge, perceptions and attitudes, though reliant on the simpler skills-based literacies.},
+  keywords = {computer literacy, Library literacy, information literacy},
+  year     = {2001},
+}
+
+@Article{,
+  author = {Bent, Moira and Stubbings, Ruth},
+  title  = {The SCONUL Seven Pillars of Information Literacy},
+  pages  = {14},
+}
+
+@Article{,
+  author   = {Black, Richard},
+  comment  = {# The amount of available information is exploding: 1.2 million new articles/year
+
+"Ever since the Royal Society published the first issue of Philosophical Transactions in 1665 scientific publishing has concentrated on the printed word. As the knowledge base in science has grown so too has the number of journals.
+Over time an impressive industry dedicated to the dissemination of scientific research has grown up.
+Now there are over 2,000 publishers, publishing an estimated 1.2 million articles in around 20,000 different journal titles every year; and this is where the problems begin."
+
+quotation type: Direct quotation
+
+quotation index: 0},
+  title    = {The Future of Published Science},
+  abstract = {Scientific publishing is undergoing a revolution. Scientists and policy makers, fed up with valuable research being locked away in expensive subscription only journals, are mounting a challenge to the publishers. They are launching their own competing journals and giving away the results for free. But not everyone is happy. In Publish or be Damned, Richard Black examines this dramatic change from both sides of the debate and assesses its likely consequences for science.},
+  keywords = {open access, publication rate},
+}
+
+@Book{,
+  author    = {Bloch, Joel},
+  title     = {Plagiarism, intellectual property and the teaching of L2 writing},
+  publisher = {Multilingual Matters},
+  year      = {2012},
+}
+
+@Book{,
+  author    = {Breivik, Patricia and Gee, Gordon},
+  title     = {Information Literacy},
+  publisher = {Greenwood Publishing Group},
+  abstract  = {What should be the role of college and university libraries in the search for educational excellence in the information age? In this book, a university president and a library director take a close, critical look at new roles for academic libraries as resources for information literacy. This book provides a visionary blueprint for librarians, presidents, and educators concerned with satisfying the growing information needs of American society.},
+  year      = {1989},
+}
+
+@Article{,
+  author   = {Bruce, Christine},
+  title    = {Workplace experiences of information literacy},
+  pages    = {33--47},
+  volume   = {19},
+  abstract = {The idea of information literacy, broadly defined as the ability to recognise information needs and identify, evaluate and use information effectively, has been of growing concern in the education sectors for a number of years; whilst in the workplace, employers and managers have perhaps attended more to the need for computer and information technology skill. New descriptions of information literacy, that may be of value to the business sector, are now beginning to appear as a result of qualitative research into how professional employees experience the effective use of information. This paper summarises the outcomes of an investigation into the experience of information literacy amongst various types of professionals; and explores the possible differences and interrelations between individual and organisational information literacy suggested by these outcomes. Seven different ways of experiencing information literacy were identified. These experiences are closely related to important workplace processes such as environmental scanning, information management, corporate memory, and research and development; confirming that information literacy should be considered a significant part of the character of learning organisations as well as being a key characteristic of the organisation's employees. Implications of individual and organisational information literacy for beginning and continuing professional education are explored.},
+  year     = {1999},
+}
+
+@Book{,
+  author    = {Burkhardt, Joanna and MacDonald, Mary and Rathemacher, Andrée},
+  title     = {Teaching information literacy},
+  publisher = {American Library Association},
+  abstract  = {From high schools and colleges to technical and graduate schools, research involves making sense of information: learning the basics of planning, winnowing, and evaluating the quality of sources. As information proliferates, it's tempting to use the handiest tool rather than working to identify the best one. But there's a better way! Updated for today's ever-expanding world of electronic information, Teaching Information Literacy: 50 Standards-Based Exercises for College Students, Second Edition is the best single resource for fundamental information literacy instruction. Covering the basics of planning, collecting, and evaluating, the 50 standards-based exercises in this book * Address one or more of the ACRL Information Literacy Competency Standards for Higher Education * Promote conceptual and applied skills via active learning, problem-based learning, and resource-based learning * Are ready for use by reference and instruction librarians at colleges and community colleges, as well as others responsible for teaching students how to conduct research Perfect for a full semester course or a single focused seminar or workshop, these 50 lessons show how to engage with electronic and print information resources alike.},
+  keywords  = {American Library Association, instruction concepts},
+  year      = {2010},
+}
+
+@Article{,
+  author = {Cacchione, Pamela and Zurkowski, Paul},
+  title  = {Nurse scientists' information literacy is supported by librarians},
+  pages  = {3--6},
+  volume = {23},
+  year   = {2014},
+}
+
+@Article{,
+  author   = {Carder, Linda and Willingham, Patricia and Bibb, David},
+  title    = {Case-based, problem-based learning},
+  pages    = {181--190},
+  volume   = {18},
+  abstract = {Case-based, problem-based learning (CBPBL) is a student-centered approach that uses tightly focused minicases to help students demonstrate their ability to identify their information needs. It has been used successfully in science and medical learning, and lends itself easily to helping students develop the critical thinking skills that lead to information literacy. In this approach, after students are provided with a minicase, they control the chalkboard and direct their own learning by initiating the topics and setting the agenda that will lead to solving the case. The instructor's task is to serve as a facilitator, asking questions only when it serves to help clarify students' thinking, and guiding group processes when necessary.},
+  year     = {2001},
+}
+
+@Article{,
+  author   = {Clairoux, Natalie and Desbiens, Sylvie and Clar, Monique and Dupont, Patrice and St-Jean, Monique},
+  title    = {Integrating information literacy in health sciences curricula: a case study from Québec},
+  pages    = {201--211},
+  volume   = {30},
+  abstract = {OBJECTIVE To portray an information literacy programme demonstrating a high level of integration in health sciences curricula and a teaching orientation aiming towards the development of lifelong learning skills. The setting is a French-speaking North American university. METHODS The offering includes standard workshops such as MEDLINE searching and specialised sessions such as pharmaceutical patents searching. A contribution to an international teaching collaboration in Haiti where workshops had to be thoroughly adapted to the clientele is also presented. Online guides addressing information literacy topics complement the programme. RESULTS AND EVALUATION A small team of librarians and technicians taught 276 hours of library instruction (LI) during the 2011-2012 academic year. Methods used for evaluating information skills include scoring features of literature searches and user satisfaction surveys. DISCUSSION Privileged contacts between librarians and faculty resulting from embedded LI as well as from active participation in library committees result in a growing reputation of library services across academic departments and bring forth collaboration opportunities. Sustainability and evolution of the LI programme is warranted by frequent communication with partners in the clinical field, active involvement in academic networks and health library associations, and reflective professional strategies.},
+  keywords = {information retrieval, curriculum, information literacy, Universities, Organizational Case Studies},
+  year     = {2013},
+}
+
+@Book{,
+  author    = {Coiro, Julie and Knobel, Michele and Lankshear, Colin and Leu, Donald},
+  title     = {Handbook of research on new literacies},
+  publisher = {Routledge},
+  year      = {2014},
+}
+
+@Article{,
+  author   = {Correia, Ana and Teixeira, José},
+  title    = {Information literacy},
+  pages    = {311--320},
+  volume   = {27},
+  abstract = {This paper aims to provide an overview of some of the most recent developments in concepts and practices associated with information literacy worldwide, revealing the paradox that, while information literacy is a key discipline of the information society and knowledge economy and is well-understood in its broader sense, it has made little progress educationally, save for a few exceptions in countries such as Australia, the USA, Canada and the UK. Deriving from the authors' background as university professors, the paper concentrates on approaches to promote information literacy in higher education. The paper concludes by pointing to the need to expand the debate on information literacy and how to raise ethical and moral concerns in the use of the Internet and the new technologies. It also explores the potential role that the European Commission eSafe (2003-2004) programme can play to encourage research and practice on information literacy in its widest sense, as an intrinsic competency in the fight against the effects of disseminating illegal and harmful content through online and other new technologies.},
+  keywords = {internet, information literacy},
+  year     = {2003},
+}
+
+@Book{,
+  author    = {Cox, Christopher},
+  title     = {Information literacy instruction handbook},
+  publisher = {Association of College and Research Libraries},
+  year      = {2008},
+}
+
+@Article{,
+  author = {Downes, Stephen},
+  title  = {Models for sustainable open educational resources},
+  year   = {2007},
+}
+
+@Book{,
+  author    = {Eisenberg, Michael and Lowe, Carrie and Spitzer, Kathleen},
+  title     = {Information literacy essential skills for the information age},
+  publisher = {Libraries Unlimited},
+  abstract  = {This is the definitive work on information literacy. Dr. Michael Eisenberg, known worldwide as one of the originators of the innovative Big6 Information Problem Solving Process, and frequent presenters on the subject Carrie A. Lowe and Kathleen L. Spitzer have extensively revised and updated this long-awaited second edition. Tracing the history of information literacy, the authors discuss its economic importance; examine past, present, and current research in the field; and explain how information literacy relates to the national standards transforming K-12 education and higher education today.},
+  keywords  = {information literacy},
+  year      = {2004},
+}
+
+@Book{,
+  author    = {Fulton, Crystal},
+  title     = {Information pathways},
+  publisher = {Scarecrow Press},
+  year      = {2010},
+}
+
+@Book{,
+  title     = {A guide to faculty development},
+  editor    = {Gillespie, Kay},
+  publisher = {Jossey-Bass},
+  abstract  = {From the Back Cover Prepared under the auspices of the Professional and Organizational Development (POD) Network in Higher Education, this book is a fundamental resource for faculty developers, as well as for faculty and administrators interested in promoting and sustaining faculty development within their institution. Based on POD's classic volume, A Handbook for New Practitioners, this new book offers up-to-date and relevant information on a range of faculty development topics, including: Setting up a faculty development program, including discussions of options, program types, and ten principles of good practice in creating and sustaining centers Assessing teaching practices: the evaluation process, individual consultation, classroom observation, and small group instructional diagnosis Offering a range of programs and services with focuses on promoting your program, staging successful workshops, producing newsletters, using technology, and creating a positive classroom climate Reaching specific audiences such as department chairs and poor teachers Using problem-based learning Addressing diversity issues, including multicultural faculty development activities and diversity in the classroom Establishing a successful faculty development committee},
+  year      = {2010},
+}
+
+@Book{,
+  author    = {Gilton, Donna},
+  title     = {Lifelong learning in public libraries},
+  pages     = {245},
+  publisher = {Scarecrow Press},
+  abstract  = {Lifelong Learning in Public Libraries demonstrates that public librarians can promote learning by combining the elements of Information Literacy Instruction (ILI) with traditional practices of public libraries. This approach contributes to the information enfranchisement of patrons and enhances the fulfillment of the traditional goals and purposes of libraries. Donna L. Gilton provides background on ILI and current developments in public library instruction and also examines educational theories and practices derived from the fields of behaviorism, cognitive psychology, constructivism, and educational humanism. Additional chapters delve into practices developed to deal with diverse groups and translate the theories and practices that have been outlined into a well-coordinated plan. The final chapters survey the role of libraries as cultural institutions. This book introduces the field of ILI to public librarians in the context of their own traditions and shows the unique ways that ILI can be implemented in public library settings. It encourages librarians to rethink practices to incorporate the principles of ILI and will enable public librarians to extend and enrich their instruction on information use. Lifelong Learning in Public Libraries is a valuable resource for librarians, educators, and leaders of public organizations. (Verlag).},
+  year      = {2012},
+}
+
+@Book{,
+  author    = {Goad, Tom},
+  title     = {Information literacy and workplace performance},
+  publisher = {Quorum Books},
+  abstract  = {Today's workplace demands skills for a knowledgeable, productive use of information. Success, both personal and organizational, comes from finding what is essential and optimizing its effectiveness. Goad teaches readers how to swim in a potentially overwhelming sea of data. This easy-to-read, lucid guide attends to basic skills, thinking and decision-making, creativity enhancement, innovation and risk taking, computer literacy, subject matter literacy, learning how to learn, and securement of on-the-job help.},
+  keywords  = {workplace literacy, information literacy},
+  year      = {2002},
+}
+
+@Article{,
+  author   = {Gormally, Cara and Brickman, Peggy and Lutz, Mary},
+  title    = {Developing a Test of Scientific Literacy Skills (TOSLS): measuring undergraduates' evaluation of scientific information and arguments},
+  pages    = {364--377},
+  volume   = {11},
+  abstract = {Life sciences faculty agree that developing scientific literacy is an integral part of undergraduate education and report that they teach these skills. However, few measures of scientific literacy are available to assess students' proficiency in using scientific literacy skills to solve scenarios in and beyond the undergraduate biology classroom. In this paper, we describe the development, validation, and testing of the Test of Scientific Literacy Skills (TOSLS) in five general education biology classes at three undergraduate institutions. The test measures skills related to major aspects of scientific literacy: recognizing and analyzing the use of methods of inquiry that lead to scientific knowledge and the ability to organize, analyze, and interpret quantitative data and scientific information. Measures of validity included correspondence between items and scientific literacy goals of the National Research Council and Project 2061, findings from a survey of biology faculty, expert biology educator reviews, student interviews, and statistical analyses. Classroom testing contexts varied both in terms of student demographics and pedagogical approaches. We propose that biology instructors can use the TOSLS to evaluate their students' proficiencies in using scientific literacy skills and to document the impacts of curricular reform on students' scientific literacy.},
+  keywords = {Demography, learning, Knowledge},
+  year     = {2012},
+}
+
+@Article{,
+  author = {Gouveia, Luis},
+  comment = {# Communication literacy is the highest skill level
+
+"1. Basic Literacy
+2. Technological Literacy
+3. Information Literacy
+4. Communication Literacy”
+
+quotation type: Direct quotation
+
+quotation index: 0},
+  title  = {Emergent skills in higher education: from know-how to know-where, know-who, know-what, know-when and know-why},
+  year   = {2002},
+}
+
+@Article{,
+  author   = {Grafstein, Ann},
+  comment = {# Difference "information literacy" vs "bibliographic instruction"
+
+"Although the distinctions between IL and bibliographic instruction (BI) are not always clear or consistent, there does appear to be a general consensus that an important difference is that BI refers to instruction in traditional (i.e., print) library resources compared with IL, which […] is a more inclusive concept […] its focus is not restricted to the library."
+
+page range: 197
+
+quotation type: Direct quotation
+
+quotation index: 0
+
+# Information literacy is not restricted to library resources
+
+"[...] IL [...] is not restricted to library resources or holdings; it presupposes the acquisition of the technical skills needed to access digital information, and, crucially, it extends beyond the ability to locate information simply to include the ability to understand it, evaluate it, and use it appropriately."
+
+page range: 198
+
+quotation type: Direct quotation
+
+quotation index: 1
+
+# Demand: library instruction should be woven into curriculum
+
+"Patricia Knapp was the first to articulate the position that the library is an integral and organic part of a college and that library instruction should not be offered as a discrete event, but rather should be woven into the general curriculum."
+
+page range: 198
+
+quotation type: Direct quotation
+
+quotation index: 2},
+  title    = {A discipline-based approach to information literacy},
+  pages    = {197--204},
+  volume   = {28},
+  abstract = {This article, which proposes a discipline-based approach to teaching information literacy, argues that the responsibility for teaching information literacy should be shared throughout an academic institution, rather than limited to the library. An outline of the complementary responsibilities of librarians and classroom faculty in teaching information literacy is presented.},
+  keywords = {training sessions, evaluation, information literacy, teaching},
+  year     = {2002},
+}
+
+@Book{,
+  author    = {Grassian, Esther and Kaplowitz, Joan},
+  title     = {Information literacy instruction},
+  publisher = {Neal-Schuman},
+  abstract  = {For techno-stressed librarians, the authors address the pressing questions of what to do, how to do it, when to do it, and how to measure success. They overview core issues in information literacy instruction (ILI), then discuss learning theory, library anxiety, critical thinking and active learning; planning and delivering ILI; and the future of ILI. Chapters contain self-tests, sample scenarios and forms, and further reading. The CD-ROM offers supporting instructional materials (e.g., Web pages, and a teaching with technology checklist). Grassian and Kaplowitz alternate teaching a "User Education/Bibliographic Instruction" course at UCLA. Annotation c. Book News, Inc., Portland, OR},
+  keywords  = {information literacy},
+  year      = {2009},
+}
+
+@Article{,
+  author = {Hamilton, Angela and Chang, Kayo and Williams, Brett and Koopmans, Heather},
+  title  = {International Perspectives on Information Literacy: A Panel Discussion},
+  year   = {2014},
+}
+
+@Article{,
+  author   = {Harris, Robert},
+  comment = {# Criteria for assessing the trustworthiness of a source
+
+"Credibility:trustworthy source, author’s credentials, evidence of quality control, known or respected authority, organizational support. Goal: an authoritative source, a source that supplies some good evidence that allows you to trust it.
+Accuracy: up to date, factual, detailed, exact, comprehensive, audience and purpose reflect intentions of completeness and accuracy. Goal: a source that is correct today (not yesterday), a source that gives the whole truth.
+Reasonableness:fair, balanced, objective, reasoned, no conflict of interest, absence of fallacies or slanted tone. Goal: a source that engages the subject thoughtfully and reasonably, concerned with the truth.
+Support: listed sources, contact information, available corroboration, claims supported, documentation supplied. Goal: a source that provides convincing evidence for the claims made, a source you can triangulate (find at least two other sources that support it). "
+
+quotation type: Direct quotation
+
+quotation index: 0},
+
+  title    = {Evaluating Internet Research Sources},
+  keywords = {CARS, information quality},
+}
+
+@Article{,
+  author = {Heinrichs, John and Lim, Jeen-su},
+  title  = {Information literacy and office tool competencies},
+  pages  = {153--164},
+  volume = {85},
+  year   = {2010},
+}
+
+@Book{,
+  author    = {Huang, Kuan-Tsae and Wang, Richard and Lee, Yang},
+  title     = {Quality Information and Knowledge},
+  publisher = {Prentice Hall},
+  abstract  = {Three leaders in intellectual capital management, Dr. Kuan-Tsae Huang, Professor Yang W. Lee, and Professor Richard Y. Wang, show how information can be assessed, evaluated, managed, and promulgated to make your business more responsive, efficient, and effective. They illustrate their ideas with real-world examples of companies that have faced million-dollar losses due to poor data management, as well as industry leaders who have prospered through Total Data Quality Management.},
+  keywords  = {information quality, knowledge management},
+  year      = {1998},
+}
+
+@Article{,
+  author   = {Hyldegård, Jette},
+  title    = {Beyond the search process - Exploring group members' information behavior in context},
+  pages    = {142--158},
+  volume   = {45},
+  abstract = {This paper reports on the findings from a longitudinal case study exploring Kuhlthau’s information search process (ISP)-model in a group based academic setting. The research focus is on group members’ activities and cognitive and emotional experiences during the task process of writing an assignment. It is investigated if group members’ information behavior differ from the individual information seeker in the ISP-model and to what extent this behavior is influenced by contextual (work task) and social (group work) factors. Three groups of LIS students were followed during a 14 weeks period in 2004/2005 (10 participants). Quantitative and qualitative methods were employed, such as demographic surveys, process surveys, diaries and interviews. Similarities in behavior were found between group members and the individual in Kuhlthau’s ISP-model with regard to the general stages of information seeking, the cognitive pattern associated with focus formulation and the tendency towards an increase in writing activities while searching activities decreased. Differences in behavior were also found, which were associated with contextual and social factors beyond the mere search process. It is concluded that the ISP-model does not fully comply with group members’ problem solving process and the involved information seeking behavior. Further, complex academic problem solving seems to be even more complex when it is performed in a group based setting. The study contributes with a new conceptual understanding of students’ behavior in small groups.},
+  keywords = {information search process},
+  year     = {2009},
+}
+
+@Article{,
+  title  = {35th annual IATUL Conference},
+  editor = {International Association of Technological University Libraries},
+  year   = {2014},
+}
+
+@Article{,
+  author   = {Janke, Robert and Pesut, Barbara and Erbacker, Lynnelle},
+  title    = {Promoting information literacy through collaborative service learning in an undergraduate research course},
+  pages    = {920--923},
+  volume   = {32},
+  abstract = {Information literacy is an important foundation for evidence-based nursing practice. Librarians, the experts in information literacy, are important collaborators in the process of teaching nursing students information literacy skills. In this article we describe a service learning project, offered in a third year nursing research course, designed to teach information literacy and to enhance students' appreciation of the role of evidence in nursing practice. Students worked in groups, and under the guidance of a nursing instructor and librarian, to answer a question posed by practice-based partners. Through the project students learned essential skills of refining a question, identifying systematic search strategies, gleaning essential information from a study and using a bibliographic management tool. Evaluation of the project indicated that although the project was challenging and labour intensive students felt they learned important skills for their future practice. Several recommendations for further enhancing the collaboration are made.},
+  keywords = {learning, Attitude of Health Personnel, information literacy, Cooperative Behavior},
+  year     = {2012},
+}
+
+@Article{,
+  author   = {Johnston, Bill and Weber, Sheila},
+  comment = {# Definition "information literacy" by ACRL - USA
+
+"1. determines the nature and extent of the information needed;
+2. accesses needed information effectively and efficiently;
+3. evaluates information and its sources critically and incorporates selected information into his or her knowledge base and value system;
+4. uses information effectively to accomplish a specific purpose;
+5. understands many of the economic, legal, and social issues surrounding the use of information and accesses and uses information ethically and legally."
+
+page range: 337
+
+quotation type: Direct quotation
+
+quotation index: 0},
+  title    = {Information Literacy in Higher Education},
+  pages    = {335--352},
+  volume   = {28},
+  abstract = {The aim of this article is to review and critique the current state of information literacy education, and propose a way forward. Key developments in the UK, USA and Australia are reviewed, including standards and models of information literacy. The place of information literacy in the higher education curriculum is discussed. Problems with current practice are identified, in particular, prescriptive guidelines which encourage a surface learning approach; delivery by librarians who may lack both educational training and power to influence the curriculum; and poor assessment methods. Alternative approaches are highlighted. A case study of a credit bearing information literacy class, offered by the authors to undergraduates at Strathclyde Business School, is analysed, to argue that information literacy can stand alone as a subject of study, with appropriate learning and teaching methods. The article concludes by proposing models for the information literate student and the information literate university.},
+  keywords = {ACRL, curriculum, CAUL},
+  year     = {2003},
+}
+
+@Article{,
+  author   = {Joint, Nicholas},
+  title    = {Information literacy evaluation},
+  pages    = {322--334},
+  volume   = {21},
+  abstract = {Evaluates the evidence for and against the effectiveness of electronically delivered information literacy programmes in comparison with personal contact teaching. Shows that computer-aided learning approaches to user education have great strengths but also undeniable weaknesses. The way to promote higher levels of information literacy in the electronic library environment is to increase the levels of computer-led delivery, as long as this is done in such a way as to maximise the strengths of the format. This is best done in the context of an integrated virtual learning environment (VLE). Such an environment would promote information literacy synergistically as one of a suite of multiple electronic literacies that can be learnt alongside each other. Exploiting a VLE in this way would also facilitate the integration of information literacy into the broader curriculum. Computer-based user education to date could be viewed as having been constrained by a need to imitate well-established, tutor-delivered user education methods. Without an ambitious programme of integration into larger scale e-learning models, this pattern of constraint will continue.},
+  keywords = {evaluation, E-Learning},
+  year     = {2003},
+}
+
+@Article{,
+  author   = {Joint, Nicholas},
+  title    = {eLiteracy or information literacy: which concept should we prefer?},
+  pages    = {505--507},
+  volume   = {54},
+  abstract = {Purpose - To give a comparative analysis of the validity of the concepts of eLiteracy (eL) and Information Literacy (IL). Design/methodology/approach - A purely abstract, conceptual discussion. Findings - That eLiteracy and Information Literacy are different but mutually compatible concepts with validity within specific contexts. Research limitations/implications - An entirely abstract discussion of theoretical descriptions. Practical implications - By defining concepts clearly, this paper attempts to inform and clarify the framework for practical LIS research. Originality/value - In contrast to other discussions (which tend to focus either on eLiteracy, or on Information Literacy) this editorial squarely addresses criticism of the eL concept in comparison to IL. It sets out the difference with IL and recognises the strength of both ideas, as long as they are each applied within their appropriate frame of reference.},
+  keywords = {learning, information literacy, e-literacy},
+  year     = {2005},
+}
+
+@Article{,
+  author   = {Julien, Heidi and Breu, Reegan},
+  title    = {Instructional practices in Canadian public libraries},
+  pages    = {281--301},
+  volume   = {27},
+  abstract = {This article reports on a national survey of information literacy (IL) instruction in urban and rural public libraries in Canada and public librarians' attitudes towards these services. The survey is the first phase of a study exploring the actual and potential role of Canadian public libraries in developing the public's IL skills. Despite an urgent need to develop such skills, and expectations that public libraries fulfill that role (specifically articulated by the federal government through its “Connecting Canadians” initiative), the real experiences of public librarians and of public library customers may not bear out this expectation. The survey analyzes the role of the public library, as a non-profit institution and primary stakeholder, in advancing federal government information policy. In addition, the study gives voice to a community of professionals expected to fulfill an important federal policy function, but provided with few resources with which to do so.},
+  keywords = {information literacy, investigation, public library},
+  year     = {2005},
+}
+
+@Article{,
+  author   = {Kingsley, Karl and Galbraith, Gillian and Herring, Matthew and Stowers, Eva and Stewart, Tanis and Kingsley, Karla},
+  title    = {Why not just Google it? An assessment of information literacy skills in a biomedical science curriculum},
+  pages    = {17},
+  volume   = {11},
+  abstract = {BACKGROUND Few issues in higher education are as fundamental as the ability to search for, evaluate, and synthesize information. The need to develop information literacy, the process of finding, retrieving, organizing, and evaluating the ever-expanding collection of online information, has precipitated the need for training in skill-based competencies in higher education, as well as medical and dental education. METHODS The current study evaluated the information literacy skills of first-year dental students, consisting of two, consecutive dental student cohorts (n = 160). An assignment designed to evaluate information literacy skills was conducted. In addition, a survey of student online search engine or database preferences was conducted to identify any significant associations. Subsequently, an intervention was developed, based upon the results of the assessment and survey, to address any deficiencies in information literacy. RESULTS Nearly half of students (n = 70/160 or 43%) missed one or more question components that required finding an evidence-based citation. Analysis of the survey revealed a significantly higher percentage of students who provided incorrect responses (n = 53/70 or 75.7%) reported using Google as their preferred online search method (p < 0.01). In contrast, a significantly higher percentage of students who reported using PubMed (n = 39/45 or 86.7%) were able to provide correct responses (p < 0.01). Following a one-hour intervention by a health science librarian, virtually all students were able to find and retrieve evidence-based materials for subsequent coursework. CONCLUSIONS This study confirmed that information literacy among this student population was lacking and that integration of modules within the curriculum can help students to filter and establish the quality of online information, a critical component in the training of new health care professionals. Furthermore, incorporation of these modules early in the curriculum may be of significant value to other dental, medical, health care, and professional schools with similar goals of incorporating the evidence base into teaching and learning activities.},
+  keywords = {Adult, Young Adult, Educational Measurement, curriculum, information literacy, Data Collection},
+  year     = {2011},
+}
+
+@Article{,
+  author = {Knapp, Patricia},
+  title  = {A Suggested Program of College Instruction in the Use of the Library},
+  pages  = {224--231},
+  volume = {26},
+  year   = {1956},
+}
+
+@Article{,
+  author = {Kreps, Dennis},
+  title  = {Information Literacy: The Search for Practices and Policies},
+  pages  = {9--12},
+  volume = {16},
+  year   = {2014},
+}
+
+@Article{,
+  author = {Lacy, Meagan},
+  title  = {Sources: Information Literacy Instruction That Works: A Guide to Teaching by Discipline and Student Population},
+  pages  = {367--368},
+  volume = {53},
+  year   = {2014},
+}
+
+@Article{,
+  author = {Leino, Kaisa},
+  title  = {The relationship between ICT use and reading literacy},
+}
+
+@Article{,
+  author   = {Lloyd, Annemaree},
+  title    = {Information Literacy: The Meta-Competency of the Knowledge Economy?},
+  pages    = {87--91},
+  volume   = {35},
+  abstract = {Information literacy is a meta-competency that encapsulates the generic skills of defining, locating and accessing information. It is an essential and integral competency for both the knowledge worker and effective knowledge management. Librarians need to realign their roles from providers and organizers of information, to facilitators and educators of clients’ information access and process. This requires librarians to develop partnerships with workplace communities so as to understand the role that information plays in the knowledge economy; and to develop a new language that is relevant to workplace communities and ties information literacy instruction to the authentic situations of the workplace. Information literacy is a meta-competency: it is the currency of the knowledge economy. The themes introduced in this paper are drawn from the current doctoral research of the author. The research examines what it means to individuals to be information literate in a workplace context, and how information literacy manifests and transfers in to workplace practice.},
+  keywords = {information literacy},
+  year     = {2003},
+}
+
+@Article{,
+  author   = {Lloyd, Annemaree},
+  title    = {Information literacy},
+  pages    = {82--88},
+  volume   = {37},
+  abstract = {This article reports on doctoral research which explored the meaning and role of information literacy among a specific group of workers - firefighters. An alternative concept of information literacy and a broader definition of information literate people are introduced. The article suggests that librarians are currently bound by an educational concept of what information literacy is and how it manifests itself. They must begin to engage with and explore other contexts and practices that facilitate becoming information literate, in order to understand the role of information literacy in learning outside educational settings. By engaging with different contexts, concepts and truths, our provision of information literacy education will be enhanced and contribute towards learning practices which are transformative, generic and transferable.},
+  keywords = {information literacy},
+  year     = {2005},
+}
+
+@Book{,
+  author    = {Lombard, Emmett},
+  title     = {Pursuing information literacy},
+  publisher = {Chandos},
+  year      = {2010},
+}
+
+@Article{,
+  author = {Marcum, J.},
+  title  = {Rethinking Information Literacy},
+  pages  = {1},
+  volume = {72},
+  year   = {2002},
+}
+
+@Book{,
+  author    = {Markey, Karen and Leeder, Chris and Rieh, Soo},
+  title     = {Designing Online Information Literacy Games Students Want to Play},
+  pages     = {286},
+  publisher = {Rowman & Littlefield},
+  abstract  = {Designing Online Information Literacy Games Students Want to Play sets the record straight with regard to the promise of games for motivating and teaching students in educational environments. The authors draw on their experience designing the BiblioBouts information literacy game, deploying it in dozens of college classrooms across the country, and evaluating its effectiveness for teaching students how to conduct library research. The multi-modal evaluation of BiblioBouts involved qualitative and quantitative data collection methods and analyses. Drawing on the evaluation, the authors describe how students played this particular information literacy game and make recommendations for the design of future information literacy games. You’ll learn how the game’s design evolved in response to student input and how students played the game including their attitudes about playing games to develop information literacy skills and concepts specifically and playing educational games generally. The authors describe how students benefited as a result of playing the game. Drawing from their own first-hand experience, research, and networking, the authors feature best practices that educators and game designers in LIS specifically and other educational fields generally need to know so that they build classroom games that students want to play. Best practices topics covered include pre-game instruction, rewards, feedback, the ability to review/change actions, ideal timing, and more. The final section of the book covers important concepts for future information literacy game design.},
+  year      = {2014},
+}
+
+@Book{,
+  title     = {Information and IT literacy},
+  editor    = {Martin, Allan and Rader, Hannelore},
+  publisher = {Facet},
+  keywords  = {computer literacy, information literacy},
+  year      = {2004},
+}
+
+@Book{,
+  author    = {McAdoo, Monty},
+  title     = {Building bridges},
+  publisher = {American Library Association},
+  year      = {2010},
+}
+
+@Article{,
+  author   = {McLoughlin, Catherine and Luca, Joe},
+  title    = {Learning Through Self-Direction},
+  abstract = {There is a growing emphasis in tertiary education that students should develop professional and work related skills within the course of their education. In order to learn these skills effectively, students must be able to learn in a self-regulated way, which means having the capacity to plan, set goals and analyse tasks to achieve particular outcomes. Often referred to as self-directed or metacognitive skills, these abilities characterise learners who are equipped with a range of personal transferable skills. Designing learning activities that support self-direction must become one of the core concerns of tertiary educators if enduring learning outcomes are to be achieved. This paper takes as its focus a professional learning context where students learn project management and work related skills in the final year of their studies. In this study, students were required to submit solutions to an on-line discussion space, where other teams provided peer assessment and constructive feedback. Analysis of verbal transactions informed by socio-cultural theory showed that successful learning took place, the evidence for which was the quality of group processes, problem solving and verbal interaction, together with personal reflections on task and self-reports of skills developed. Several important issues emerge from this research that have implications for the design of online courses for professional learning at tertiary level. These include task design that enables team-based problem solving, feedback processes, autonomy in student learning and support for reflection.},
+  keywords = {independent learning, task design, E-Learning},
+  year     = {2000},
+}
+
+@Book{,
+  author    = {Menager, Rosemarie and Paulos, Lyn},
+  title     = {Quick coach guide to avoiding plagiarism},
+  publisher = {Heinle & Heinle},
+  year      = {2009},
+}
+
+@Book{,
+  author    = {Mühlbacher, Susanne},
+  title     = {Information literacy in enterprises},
+  pages     = {338},
+  publisher = {Hülsbusch},
+  volume    = {51},
+  year      = {2009},
+}
+
+@Book{,
+  author    = {Mutch, Alistair},
+  title     = {Managing information and knowledge in organizations},
+  pages     = {267},
+  publisher = {Routledge},
+  keywords  = {Organizational learning, knowledge management, Information technology, Management},
+  year      = {2008},
+}
+
+@Article{,
+  title  = {Information Literacy},
+  editor = {NHS Education for Scotland},
+}
+
+@Article{,
+  author = {Niederhauser, Jürg and Meurer, Peter and Schluchter, Manfred},
+  title = {Writing a Research Paper with Citavi 5},
+}
+
+@Article{,
+ comment = {# Engaging students in digital literacy projects …
+
+Institutions are engaging students in digital literacy projects through a range of roles such as co-researchers, mentors, and technical support. The advantages are that students are generally more digitally confident and fluent than staff in the use of personal and social media. Although students need support in applying this digital know-how successfully to academic study, they are often more willing to explore the possibilities that technology can bring to their learning.
+
+quotation type: Direct quotation
+
+quotation index: 0},
+  title    = {Developing digital literacies},
+  editor   = {Northumbria University},
+  pages    = {27},
+  keywords = {information literacy},
+  year     = {2014},
+}
+
+@Book{,
+  author    = {Pears, Richard and Shields, Graham},
+  title     = {Cite them right},
+  pages     = {120},
+  publisher = {Palgrave Macmillan},
+  year      = {2013},
+}
+
+@Book{,
+  title     = {Teaching and assessing information skills in the twenty-first century},
+  editor    = {Rader, Hannelore},
+  publisher = {University of Illinois Press},
+  keywords  = {information literacy},
+  year      = {2002},
+}
+
+@Book{,
+  title     = {Information literacy instruction that works a guide to teaching by discipline and student population},
+  editor    = {Ragains, Patrick},
+  publisher = {Neal-Schuman},
+  year      = {2013},
+}
+
+@Article{,
+  author   = {Robertson, James},
+    comment = {# Key principles of information management
+
+"Ten key principles to ensure that information management activities are effective and successful:
+1. recognise (and manage) complexity
+2. focus on adoption
+3. deliver tangible & visible benefits
+4. prioritise according to business needs
+5. take a journey of a thousand steps
+6. provide strong leadership
+7. mitigate risks
+8. communicate extensively
+9. aim to deliver a seamless user experience
+10. choose the first project very carefully."
+
+page range: 2
+
+quotation type: Direct quotation
+
+quotation index: 0},
+  title    = {10 principles of effective information management},
+  abstract = {This article has outlined ten key principles of effective information management. These focus on the organisational and cultural changes required to drive forward improvements. The also outline a pragmatic, step-by-step approach to implementing solutions that starts with addressing key needs and building support for further initiatives. A focus on adoption then ensures that staff actually use the solutions that are deployed.},
+  keywords = {information management},
+  year     = {2005},
+}
+
+@Article{,
+  author   = {Rogow, Faith},
+  title    = {Shifting from Media to Literacy},
+  pages    = {30--34},
+  volume   = {48},
+  abstract = {Reflecting on how media literacy has changed in the United States in recent years, this article argues that the field has shifted from an emphasis on media to an emphasis on literacy. The result is a change in practice that makes more pedagogical sense than media literacy conceived of as an ideological or political movement.},
+  keywords = {information literacy, media literacy},
+  year     = {2004},
+}
+
+@Book{,
+  author    = {Ross-Larson, Bruce},
+  title     = {Writing for the Information Age},
+  publisher = {W.W. Norton},
+  abstract  = {In today's society, a wealth of information can be obtained at the touch of a button. But while information is abundant, time, unfortunately, is not. How do you present your material in a way that grabs-and holds-the attention of your audience? Whether you are writing a report, drafting email, creating a Power Point presentation, or building a Web site, this book shows how to use language that is easily accessible, never oppressive. It explains how to organize content in progressive, digestible detail, allowing readers to navigate a document's contents and to move quickly to areas of interest. And it describes how to link ideas within a document and across the mediums of print, Internet, and CD-ROM. Each two-page spread covers one subject and is linked to other subjects for further study. More than one hundred sets of recommendations, backed by concrete examples, cover everything from common grammatical mistakes to the basics of using charts and tables. Author Biography: Bruce Ross-Larson is the founder of the American Writing Institute and president of Communications Development Incorporated. He lives in Washington, DC. His books include Edit Yourself, Powerful Paragraphs, Riveting Reports, and Stunning Sentences.},
+  year      = {2002},
+}
+
+@Book{,
+  author    = {Rumsey, Sally},
+  title     = {How to find information},
+  publisher = {Open University Press},
+  abstract  = {Anyone setting out to research a topic, whether undertaking a project, report, dissertation or PhD, needs to find appropriate resources to inform their work and support their arguments. This book enables researchers to become expert at tracking down, accessing and evaluating information." This concise and contemporary book covers all major areas of information seeking and selection for researchers. Written by an information professional, it is invaluable for anyone researching a topic, including academics and students, public and government researchers and researchers in the private sector.},
+  keywords  = {research methodology, information retrieval, information resources, information literacy, plagiarism},
+  year      = {2008},
+}
+
+@Article{,
+  author   = {Senkbeil, Martin and Ihme, Jan and Wittwer, Jörg},
+  comment = {# Not much empirical research examining the role of ICT literacy as a meta-competence
+
+“ICT literacy is assumed to function as a meta-competence that helps people to acquire other important competencies and skills that are relevant in educational and work settings across the lifespan [...]. Since globalization processes require more flexibility and adaptability both at work and in society, the ability to acquire new knowledge and new skills in a self-regulated manner and with the help of information and communication technologies has become an important precondition for both finding new jobs and acting as responsible citizens [...]. Accordingly, deficits in ICT literacy are expected to lead to social disparities […]. However, there is not much empirical research examining the role of ICT literacy as a meta-competence and its effects on social disparities across the lifespan [...].”
+
+page range: 141
+
+quotation type: Direct quotation
+
+quotation index: 0
+
+# Seven process components of ICT literacy
+
+The framework identifies seven process components of ICT literacy that represent the knowledge and skills needed for a problem-oriented use of modern ICT (ETS, 2002; Katz, 2007). The seven process components are defi ned as follows:
+1) Define: basic knowledge of hardware components, operating systems, and relevant software applications (e.g., word processing, e-mail);
+2) Access: knowledge of basic operations used to retrieve information (e.g., entering a search term in an internet browser, opening and saving a document);
+3) Manage: the ability to fi nd information within a program (e.g., retrieving information from tables, processing the hits returned by a search engine);
+4) Create: the ability to create and edit documents and files (e.g., setting up tables, creating formulas);
+5) Integrate: the ability to retrieve information efficiently (e.g., entering appropriate search terms), to compare it in terms of specific criteria (e.g., sorting datasets), or to organize and structure information with the aid of software applications (e.g., presenting the information retrieved in a table);
+6) Evaluate: the ability to assess information and to use it as the basis for informed decisions (e.g., assessing the credibility of the information retrieved);
+7) Communicate: the ability to communicate information in appropriate and understandable form (e.g., writing e-mails, creating meaningful charts).
+
+page range: 142
+
+quotation type: Direct quotation
+
+quotation index: 1
+
+# Assessment framework for ICT literacy
+
+page range: 144
+
+quotation type: Image quotation
+
+quotation index: 2
+
+# Assessment framework for ICT literacy (Comment)
+
+Is e-mail still relevant? What about social software?
+
+page range: 144
+
+quotation type: Comment
+
+quotation index: 3},
+  title    = {The Test of Technological and Information Literacy (TILT) in the National Educational Panel Study},
+  pages    = {139--161},
+  volume   = {5},
+  abstract = {#englisch#In this article, we present an assessment framework for assessing information and communication technologies literacy (ICT literacy) in the context of the National Educational Panel Study (NEPS). NEPS is the first study aiming to examine ICT literacy longitudinally across the lifespan using objective paper-pencil test instruments. To do so, it is necessary to develop reliable and valid test instruments that are capable of assessing ICT literacy longitudinally. On the basis of an assessment framework, we developed in an initial step an item pool for assessing the ICT literacy of secondary school students and tested the item pool in three pilot studies (Grade 5, 7 and 9). The item and scale analyses provided satisfying results and the item pool proved to be suitable for assessing ICT literacy longitudinally. In addition, validity analyses showed a satisfactory content validity and a high test fairness with regard to gender and school type. Concerning criterion validity, there were expected correlations with variables of computer familiarity. (DIPF/Orig.).;;#deutsch#Im Mittelpunkt dieses Beitrags steht die Vorstellung und empirische Erprobung einer Rahmen- und Testkonzeption zur Erfassung von Information and Communication Technologies Literacy (ICT Literacy) im Rahmen der National Educational Panel Study (NEPS). Das Ziel dieser Studie ist es, ICT Literacy anhand längsschnittlich angelegter Datenerhebungen über die gesamte Lebensspanne und mit Hilfe objektiver und zunächst Papier-und-Bleistiftbasierter Testverfahren zu erfassen. Deshalb ist es notwendig, reliable und valide Testinstrumente zu entwickeln, die sich für die längsschnittliche Erfassung von ICT Literacy eignen. Hierfür wurde auf der Grundlage der Rahmen- und Testkonzeption zunächst ein Itempool für Schülerinnen und Schüler der Sekundarstufe I entwickelt und in drei Pilotstudien (Klassenstufen 5, 7 und 9) erprobt. Für den Itempool wurden zufriedenstellende Item- und Skalenwerte ermittelt. Die Ergebnisse wiesen darüber hinaus auf die Eignung des Instrumentariums für längsschnittliche Erhebungen hin. Die Validitätsprüfungen sprachen für eine ausreichende inhaltliche Validität des Itempools und seine Fairness im Hinblick auf Geschlecht und Schulart. Im Sinne der Kriteriumsvalidität ergaben sich inhaltlich gut interpretierbare Zusammenhänge mit Merkmalen der Computervertrautheit. (DIPF/Orig.).},
+  year     = {2013},
+}
+
+@Article{,
+  author   = {Sharp, Laurie},
+  title    = {Literacy in the Digital Age},
+  pages    = {74--82},
+  volume   = {24},
+  abstract = {21st century learners arrive at school with technological knowledge and skills that necessitate the need for educational systems to transform instructional practices to meet learners’ needs. The International Society for Technology in Education (ISTE) developed ISTE Standards for students, teachers, administrators, coaches, and computer science educators that define best practices and standards of excellence with technology. Literacy educators are greatly impacted by the technological shift in education and require a deep level of proficiency with the ISTE Standards for Teachers. The purpose of this article is to provide an overview of the ISTE Standards for Teachers and provide literacy educators with an evaluative tool to measure their adeptness with the knowledge and skills needed to teach in the digital age.},
+  year     = {2014},
+}
+
+@Book{,
+  author    = {Sharpless Smith, Susan},
+  comment = {# Sharpless Smith 2010 - Web based Instruction
+
+quotation type: Image quotation
+
+quotation index: 0},
+  title     = {Web Based Instruction},
+  publisher = {American Library Association},
+  abstract  = {Expanding on the popular, practical how-to guide for public, academic, school, and special libraries, technology expert Susan Sharpless Smith offers library instructors the confidence to take Web-based instruction into their own hands. Smith has thoroughly updated Web-Based Instruction: A Guide for Libraries to include new tools and trends, including current browsers, access methods, hardware, and software. She also supplies tips to secure project funding and provides strategic guidance for all types of libraries. This completely revised edition also * Builds Web instruction advice on a foundation of the latest research in how learning takes place * Translates technical Web-speak into plain English, so even nonexperts can make effective use of the Web in their teaching * Includes an accompanying Web gallery, providing examples of screen shots and links to exemplary programs * Shows instructors best practices for incorporating the Web into teaching A proven winner, this newly revised hands-on manual remains indispensable. Librarians facing the challenge of creating a Web-based instruction program will find easy-to-understand guidance to deliver a productive and memorable experience.},
+  keywords  = {instruction concepts, web based training},
+  year      = {2010},
+}
+
+@Book{,
+  author    = {Smith, Jane and Churchill, Lisa and Mason, Lucy},
+  title     = {Teaching & testing information literacy skills},
+  pages     = {138},
+  publisher = {Linworth Books},
+  abstract  = {Regardless of what educators maintain, the general public believes test scores accurately reflect student performance and school success. This situation places enormous pressure on schools to improve, and it offers opportunities for library media specialists to help students learn valuable information literacy skills that in turn will improve test scores. By joining forces with educators, media specialists can demonstrate how information literacy skills strengthen student performance as well as instruct teachers on teaching and testing information skills within the context of classroom content. Teaching and Testing Information Literacy Skills will help library media specialists educate teachers on information literacy skills and increase collaboration for effective test-taking preparation.},
+  keywords  = {instruction concepts, information literacy, learning success tracking},
+  year      = {2005},
+}
+
+@Article{,
+  author   = {Snavely, Loanne and Cooper, Natasha},
+  title    = {The information literacy debate},
+  pages    = {9--14},
+  volume   = {23},
+  abstract = {The issues surrounding the term and the meaning of the phrase information literacy have propelled academic librarians into a debate over their role in meeting the educational mission of an institution of higher education and over what they should be calling what they are doing.},
+  year     = {1997},
+}
+
+@Book{,
+  author    = {Stark, Birgit},
+  title     = {Die Googleisierung der Informationssuche},
+  pages     = {327},
+  publisher = {De Gruyter},
+  volume    = {10},
+  year      = {2014},
+}
+
+@Book{,
+  author    = {Staw, Jane},
+  comment = {# The most elusive of writing blocks masquerades …
+
+“The most elusive of writing blocks masquerades as writing to deadline. We all know people who wait until the night before a term paper, a legal brief a business report is due to sit down and begin writing. If asked, most of these writers would claim, “I write best if I wait until the last minute." Most people who write to deadline don’t realize they are blocked-until they face a writing project that simply can’t be completed the night before it is due. For a long time l thought that journalism nurtured this adrenaline-filled, roller-coaster relationship with writing. After all, you can only write about news once it has broken. Then l became a member of a writing group that included a journalist who had moved from news to feature stories, and no matter what her topic or how far in advance she received the assignment, she continued to write to deadline. With disastrous results. Watching this woman panic about not being able to finish each piece that was due, l realized that my logic might have been backward. Newswriting doesn't necessarily nurture writing to deadline; instead, it might attract writers who are most comfortable waiting until the last possible minute.”
+
+page range: 13
+
+quotation type: Direct quotation
+
+quotation index: 0},
+  title     = {Unstuck},
+  publisher = {St. Martin's Griffin},
+  abstract  = {None of us is immune to writer's block. From well-known novelists to students, associates in business and law firms, and even those who struggle to sit down to write personal correspondence or journal entries -- everyone who writes has experienced either brief moments or longer periods when the words simply won't come. In Unstuck, poet, author and writing coach Jane Anne Staw uncovers the reasons we get blocked - from practical to emotional, and many in between - and offers powerful ways to get writing again. Based on her experiences working with writers as well as her own struggle with writer's block, Staw provides comfort and encouragement, along with effective strategies for working through this common yet vexing problem. Topics include: understanding what's behind the block * handling anxiety and fear * carving out time and space to write * clearing out old beliefs and doubts * techniques to relax and begin * managing your expectations as well as those of family and friends * experimenting with genre, voice, and subject matter * defusing the emotional traps that sabotage progress and success * ending the struggle and regaining confidence and freedom by finding your true voice - and using it. Writers of all levels will find solace, support, and help in this book, leading them to an even deeper connection with their work and more productivity on the page.},
+  year      = {2005},
+}
+
+@Article{,
+  author   = {Strong, Diane and Lee, Yang and Wang, Richard},
+  title    = {10 Potholes in the Road to Information Quality},
+  pages    = {38--46},
+  volume   = {30},
+  keywords = {information quality},
+  year     = {1997},
+}
+
+@Article{,
+  author   = {Swiss Academic Software GmbH},
+  title    = {Citavi},
+  abstract = {Citavi supports the entire research process: from searching for sources to finishing your paper.},
+  keywords = {Citavi, reference management},
+  year     = {2015},
+}
+
+@Book{,
+  author    = {Thompson, Kim and Jaeger, Paul and Taylor, Natalie and Bertot, John},
+  title     = {Digital Literacy and Digital Inclusion},
+  pages     = {200},
+  publisher = {Rowman & Littlefield},
+  abstract  = {Digital Literacy and Digital Inclusion: Information Policy and the Public Library examines the interrelationships between digital literacy, digital inclusion, and public policy, emphasizing the impacts of these policy decisions on the ability of individuals and communities to successfully participate in the information society. This book is the first detailed consideration of digital literacy and digital inclusion as policy problems and as core issues in information policy and libraries. The unique features of this book include drawing together the key themes and findings from the discourse on digital literacy and digital inclusion widely spread among many fields; analyzing digital literacy and digital inclusion as policy issues, both being driven and regulated by policy; building on a wealth of original research conducted by the authors using different quantitative and qualitative data collection approaches on four different continents when analyzing these issues, providing unique examples, case studies, and perspectives; using information behavior theory to provide important insights about these issues at individual, community, and political levels; providing recommendations to inform practice in libraries and help libraries to frame their advocacy for public policies that support literacy and inclusion; and providing policy recommendations to improve the creation and implementation of policy instruments that promote digital literacy and digital inclusion. The authors of this book have been involved in this research for many years, and their experience provides a broad view across the literature, inherent problems, and national perspectives. This breadth allows this book to offer comprehensive policy recommendations, solutions, and best practices for an area that is fragmented in discourse, practice, and policy.},
+  year      = {2014},
+}
+
+@Book{,
+  author    = {Townsend, Kevin and Cufí, Carles and Akiba and Davidson, Robert},
+  title     = {Getting started with Bluetooth Low Energy},
+  pages     = {164},
+  publisher = {O'Reilly},
+  keywords  = {Bluetooth technology},
+  year      = {2014},
+}
+
+@Article{,
+  author   = {Trauth, Eileen},
+  title    = {A college curriculum for information literacy},
+  pages    = {251--258},
+  volume   = {2},
+  abstract = {Educators are currently being challenged to develop curricula which will prepare students for life in an information-based society. Given the computer literacy efforts at the elementary and secondary levels, a college-level curriculum should build upon those skills by focusing on information literacy. Information literacy is the ability to acquire, process, use and communicate the information which is needed in one's personal and work life, regardless of the technology involved. There are three components of this information literacy curriculum. The Information Environment provides the motivation for understanding about technology and its uses. The Components of an Information System considers the acquisition and proper use of computer-based tools. Information Management is concerned with ensuring that relevant information is available, accurate and in a useful format. The intended students for this course are the end users, the non-computer science majors.},
+  keywords = {computer literacy, curriculum, information literacy},
+  year     = {1986},
+}
+
+@Book{,
+  author    = {University of Chicago Press},
+  title     = {The Chicago manual of style},
+  pages     = {XVII, 956},
+  publisher = {University of Chicago Press},
+  year      = {2008},
+}
+
+@Article{,
+  author   = {Urquhart, Christine and Thomas, Rhian and Spink, Siân and Fenton, Roger and Yeoman, Alison and Lonsdale, Ray and Armstrong, Chris and Banwell, Linda and Ray, Kathryn and Coulson, Graham and Rowley, Jennifer},
+  title    = {Student use of electronic information services in further education},
+  pages    = {347--362},
+  volume   = {25},
+  abstract = {This paper presents a profile of user behaviour in relation to the use of electronic information services (EIS), information skills, and the role of training and wider learning experiences in UK further education colleges. The research was conducted under the JISC User Behaviour Monitoring and Evaluation Framework. Work was conducted in two strands, by two project teams, JUSTEIS and JUBILEE. JUSTEIS profiled the use of EIS and assessed the availability of EIS. JUBILEE objectives focussed on understanding the barriers and enablers, with a view to developing success criteria. JUSTEIS used a multi-stage stratified sampling process, and collected data from 270 respondents from 17 departments in the baseline survey (2001/2002). JUBILEE conducted in-depth fieldwork in five institutions and snapshot fieldwork in 10 institutions, collecting data from 528 respondents. Information skills and experience develop across work, home and study. There is a growing use of EIS in curriculum, but practice varies between institutions and disciplines. Tutors express concern about student's ability to evaluate and use the information that they find. Assignments can promote EIS use. The main categories of EIS used by students are search engines and organisational web sites. Search engines are the preferred search tools and search strategies are basic. Information skills are acquired through a variety of routes, with peer instruction, surfing and personal experience, instruction from tutors, and LIS induction and training all making an important contribution. The solutions to improving students’ information skills may include use of the Virtual Training Suites, but librarians need to adopt different roles in promoting and evaluating use of such tools.},
+  keywords = {digital libraries, electronic information services, information literacy, continuing education, digital information resources},
+  year     = {2005},
+}
+
+@Article{,
+  author = {van Acker, Frederik and Vermeulen, Marjan and Kreijns, Karel and Lutgerink, Jan and van Buuren, Hans},
+  title  = {The role of knowledge sharing self-efficacy in sharing Open Educational Resources},
+  pages  = {136--144},
+  volume = {39},
+  year   = {2014},
+}
+
+@Article{,
+  author   = {Virkus, Sirje},
+  title    = {Information literacy in Europe},
+  volume   = {8},
+  abstract = {Examines the developments in information literacy in Europe and provides an overview of the concepts used and discussed by European authors. Some examples of information literacy initiatives in schools and the higher education sector, as well as of institutions and organizations, projects and conferences concerned with information literacy, are given. Some research initiatives are also introduced. The overview is based on literature reviews and personal observations and involvement and presents a selective review.},
+  keywords = {standards, research methodology, information literacy, historical development},
+  year     = {2003},
+}
+
+@Article{,
+  author   = {Warmkessel, Marjorie and McCade, Joseph},
+  title    = {Integrating information literacy into the curriculum},
+  pages    = {80--88},
+  volume   = {15},
+  abstract = {This article describes a two-week graduate course on information literacy, developed and taught by a librarian and a professor of industry and technology, and intended for teachers and librarians in elementary and secondary schools. Information literacy is not only the content of the course but also the basis of its structure: active, student-centered learning with several group assignments helps students develop skills in finding information, analyzing and interpreting it, and putting it to practical use. Both pedagogical and evaluation methods reflect recent educational reforms, and the team teaching provides a model of collaboration between teachers and librarians.},
+  keywords = {curriculum},
+  year     = {1997},
+}
+
+@Article{,
+  author = {Weaver, Kari and Rhodes, Lynne},
+  title  = {Tracking Information Literacy Competencies through Institutional Assessments},
+  year   = {2014},
+}
+
+@Article{,
+  author    = {Weber, Max},
+  title     = {Max Weber-Studienausgabe},
+  editor    = {Mommsen, Wolfgang and Schluchter, Wolfgang},
+  publisher = {Mohr},
+  year      = {1994},
+}
+
+@Article{,
+  author   = {Weiner, Sharon and Wang, Li},
+  title    = {Preparing Librarians to be Campus Leaders through Mapping and Integrating Information Literacy into Curriculum},
+  keywords = {curriculum mapping, librarians, curriculum, information literacy, institutional assessment},
+}
+
+@Book{,
+  author    = {Weyers, Jonathan and McMillan, Kathleen},
+  title     = {How to cite, reference & avoid plagiarism at university},
+  publisher = {Pearson},
+  year      = {2013},
+}
+
+@Article{,
+  author = {Williamson, Kirsty and Asla, Terryl},
+  title  = {Information behavior of people in the fourth age: Implications for the conceptualization of information literacy},
+  pages  = {76--83},
+  volume = {31},
+  year   = {2009},
+}
+
+@Article{,
+  author   = {Windham, Cary},
+  title    = {Getting Past Google},
+  editor   = {Oblinger, Diana},
+  abstract = {Many Net Generation students understand how to find information and post their own content online. However, they may have only limited knowledge about how to effectively evaluate online resources and ethically use them. Likewise, large numbers seem unaware of the limited control they may have over the personal information they divulge online and the implications that holds for how their content is used, by whom, and for what purposes. This student perspective on information literacy uses anecdotes, personal examples, and statistics on Net Generation Web usage to highlight gaps in students’ net savviness. Also discussed is how faculty, librarians, administrators, and students must work together to close those gaps.},
+}
+
+@Article{,
+  author   = {Yaminfirooz, Mousa and Siamian, Hasan and Shahrabi, Afsaneh},
+  title    = {Librarians' Role in Development and Achievement of Central Library Users' Information Literacy},
+  pages    = {238--241},
+  volume   = {25},
+  abstract = {INTRODUCTION Due to the development of technologies, communications, databases and information resource varieties in today's information age, our various social, economic, cultural and political needs cannot be fulfilled by relying merely on past knowledge and skills as done previously. Information literacy (IL) as a set of necessary skills for all of us is an effective way of treating new technologies and their effective application in our lives. The study aimed to survey the library users' views in the Central Library of Babol University of Medical Sciences (The Library), Iran, on the role and influences of librarians on their IL development and improvement. METHODS This analytical survey used a researcher-made questionnaire for data collection. Research population consisted of all users referring Information Unit of The Library during 22 September - 20 December 2010. Of them, 150 users participating in at least 5 workshops held by The Library were selected as the study sample. RESULTS Based on the findings, 52.7 percent of the subjects rated the influence of the librarians on their IL development much and very much. 44.7 percent claimed that they more acquired IL skills from librarians rather than others. 100 (63.3%) subjects preferred workshops held by the librarian to other workshops. CONCLUSION The users of Information Unit of The Library perceived the training IL skills by librarians as a main influencing factor in their IL development and achievement. This emphasized the necessity of teaching IL to users and training the librarians in better teaching IL skills to library user.},
+  year     = {2013},
+}
+
+@Article{,
+  author   = {Hohmann, Tina},
+  title    = {Long Term Evaluation of Information Literacy Programme},
+  abstract = {The Technische Universität München library was the first university library in Germany to be certified by TÜV with respect to its ISO 9001:2001 quality management. One of the main objectives of our quality management policy is to measure customer satisfaction not only in the short-term, but also over longer periods of time, in order to constantly develop and improve our services. To this end, TUM library management have decided to conduct a long term evaluation of its information literacy (IL) programme. We regularly ask course participants for feedback immediately after the events and evaluate these yearly. Additionally, we have started to survey long term changes in awareness and sustainability of course content. The library’s IL programme has been in place for over three years, and has thus generated sufficient data for reliable evaluation. The main object of our investigation is the assessment of effectiveness of our IL programme and further guidance as to how we can improve our services. We have been evaluating about 100 IL events, which took place between 6 and 24 months ago. Our study includes the four main types of workshops, which comprise basic and advanced literature search, referencing, and reference management. An online survey contains questions regarding the significance and the application of the skills taught during the courses. We also ask about any identified lack of resources or learning goals, and our e-learning material. The first phase of the evaluation was conducted between February and March 2014. This paper presents our findings from the evaluation project, our conclusions, and recommendations for the further development of the IL programme.},
+  keywords = {information literacy, long-term evaluation, quality management},
+}
+
+@Article{,
+  author = {Jackson, Brian and MacMillan, Margy and Sinotte, Michelle},
+  title  = {Great Expectations: Results from a Faculty Survey of Students’ Information Literacy Proficiency},
+  year   = {2014},
+}
+
+@Article{,
+  author = {Lewis, Karron},
+  title  = {The Process of Individual Consultation},
+  pages  = {59--73},
+}
+
+@Article{,
+  author = {Ragains, Patrick and Emmons, Mark},
+  title  = {Setting the Stage for Information Literacy Education},
+  pages  = {Chapter 1},
+}
+
+@Article{,
+  author = {Sorcinelli, Mary},
+  title  = {Ten Principles of Good Practice in Creating and Sustaining Teaching and Learning Centers},
+  pages  = {9--23},
+}
+
+@Article{,
+  author = {Tiberius, Richard},
+  title  = {Problem-Based Learning},
+  pages  = {180--194},
+}
+
+@Article{,
+  author = {Weber, Max},
+  comment = {quotation type: Highlight
+
+quotation index: 0
+
+quotation type: Highlight
+
+quotation index: 1
+
+quotation type: Highlight
+
+quotation index: 2
+
+quotation type: Highlight
+
+quotation index: 3
+
+quotation type: Highlight
+
+quotation index: 4
+
+quotation type: Highlight
+
+quotation index: 5
+
+quotation type: Highlight
+
+quotation index: 6
+
+quotation type: Highlight
+
+quotation index: 7
+
+quotation type: Highlight
+
+quotation index: 8
+
+quotation type: Highlight
+
+quotation index: 9
+
+quotation type: Highlight
+
+quotation index: 10
+
+quotation type: Highlight
+
+quotation index: 11
+
+quotation type: Highlight
+
+quotation index: 12
+
+quotation type: Highlight
+
+quotation index: 13
+
+quotation type: Highlight
+
+quotation index: 14
+
+quotation type: Highlight
+
+quotation index: 15
+
+quotation type: Highlight
+
+quotation index: 16
+
+quotation type: Highlight
+
+quotation index: 17
+
+quotation type: Highlight
+
+quotation index: 18
+
+quotation type: Highlight
+
+quotation index: 19
+
+quotation type: Highlight
+
+quotation index: 20
+
+quotation type: Highlight
+
+quotation index: 21
+
+quotation type: Highlight
+
+quotation index: 22
+
+quotation type: Highlight
+
+quotation index: 23
+
+quotation type: Highlight
+
+quotation index: 24
+
+quotation type: Highlight
+
+quotation index: 25
+
+quotation type: Highlight
+
+quotation index: 26
+
+quotation type: Highlight
+
+quotation index: 27
+
+quotation type: Highlight
+
+quotation index: 28
+
+quotation type: Highlight
+
+quotation index: 29
+
+quotation type: Highlight
+
+quotation index: 30
+
+quotation type: Highlight
+
+quotation index: 31
+
+quotation type: Highlight
+
+quotation index: 32
+
+quotation type: Highlight
+
+quotation index: 33
+
+quotation type: Highlight
+
+quotation index: 34
+
+quotation type: Highlight
+
+quotation index: 35
+
+quotation type: Highlight
+
+quotation index: 36
+
+quotation type: Highlight
+
+quotation index: 37
+
+quotation type: Highlight
+
+quotation index: 38
+
+quotation type: Highlight
+
+quotation index: 39
+
+quotation type: Highlight
+
+quotation index: 40
+
+quotation type: Highlight
+
+quotation index: 41
+
+quotation type: Highlight
+
+quotation index: 42
+
+quotation type: Highlight
+
+quotation index: 43
+
+quotation type: Highlight
+
+quotation index: 44
+
+quotation type: Highlight
+
+quotation index: 45
+
+quotation type: Highlight
+
+quotation index: 46
+
+quotation type: Highlight
+
+quotation index: 47
+
+quotation type: Highlight
+
+quotation index: 48
+
+quotation type: Highlight
+
+quotation index: 49
+
+quotation type: Highlight
+
+quotation index: 50
+
+quotation type: Highlight
+
+quotation index: 51
+
+quotation type: Highlight
+
+quotation index: 52
+
+quotation type: Highlight
+
+quotation index: 53
+
+quotation type: Highlight
+
+quotation index: 54
+
+quotation type: Highlight
+
+quotation index: 55
+
+quotation type: Highlight
+
+quotation index: 56
+
+quotation type: Highlight
+
+quotation index: 57
+
+quotation type: Highlight
+
+quotation index: 58
+
+quotation type: Highlight
+
+quotation index: 59
+
+quotation type: Highlight
+
+quotation index: 60
+
+quotation type: Highlight
+
+quotation index: 61
+
+quotation type: Highlight
+
+quotation index: 62
+
+quotation type: Highlight
+
+quotation index: 63
+
+quotation type: Highlight
+
+quotation index: 64
+
+quotation type: Highlight
+
+quotation index: 65
+
+quotation type: Highlight
+
+quotation index: 66
+
+quotation type: Highlight
+
+quotation index: 67
+
+quotation type: Highlight
+
+quotation index: 68
+
+quotation type: Highlight
+
+quotation index: 69
+
+quotation type: Highlight
+
+quotation index: 70
+
+quotation type: Highlight
+
+quotation index: 71
+
+quotation type: Highlight
+
+quotation index: 72
+
+quotation type: Highlight
+
+quotation index: 73
+
+quotation type: Highlight
+
+quotation index: 74
+
+quotation type: Highlight
+
+quotation index: 75
+
+quotation type: Highlight
+
+quotation index: 76
+
+quotation type: Highlight
+
+quotation index: 77
+
+quotation type: Highlight
+
+quotation index: 78
+
+quotation type: Highlight
+
+quotation index: 79
+
+quotation type: Highlight
+
+quotation index: 80
+
+quotation type: Highlight
+
+quotation index: 81
+
+quotation type: Highlight
+
+quotation index: 82
+
+quotation type: Highlight
+
+quotation index: 83
+
+quotation type: Highlight
+
+quotation index: 84
+
+quotation type: Highlight
+
+quotation index: 85
+
+quotation type: Highlight
+
+quotation index: 86
+
+quotation type: Highlight
+
+quotation index: 87
+
+quotation type: Highlight
+
+quotation index: 88
+
+quotation type: Highlight
+
+quotation index: 89
+
+quotation type: Highlight
+
+quotation index: 90
+
+quotation type: Highlight
+
+quotation index: 91
+
+quotation type: Highlight
+
+quotation index: 92
+
+quotation type: Highlight
+
+quotation index: 93
+
+quotation type: Highlight
+
+quotation index: 94
+
+quotation type: Highlight
+
+quotation index: 95
+
+quotation type: Highlight
+
+quotation index: 96
+
+quotation type: Highlight
+
+quotation index: 97
+
+quotation type: Highlight
+
+quotation index: 98
+
+quotation type: Highlight
+
+quotation index: 99
+
+quotation type: Highlight
+
+quotation index: 100
+
+quotation type: Highlight
+
+quotation index: 101
+
+quotation type: Highlight
+
+quotation index: 102
+
+quotation type: Highlight
+
+quotation index: 103
+
+quotation type: Highlight
+
+quotation index: 104
+
+quotation type: Highlight
+
+quotation index: 105
+
+quotation type: Highlight
+
+quotation index: 106
+
+quotation type: Highlight
+
+quotation index: 107
+
+quotation type: Highlight
+
+quotation index: 108
+
+quotation type: Highlight
+
+quotation index: 109
+
+quotation type: Highlight
+
+quotation index: 110
+
+quotation type: Highlight
+
+quotation index: 111
+
+quotation type: Highlight
+
+quotation index: 112
+
+quotation type: Highlight
+
+quotation index: 113
+
+quotation type: Highlight
+
+quotation index: 114
+
+quotation type: Highlight
+
+quotation index: 115
+
+quotation type: Highlight
+
+quotation index: 116
+
+quotation type: Highlight
+
+quotation index: 117
+
+quotation type: Highlight
+
+quotation index: 118
+
+quotation type: Highlight
+
+quotation index: 119
+
+quotation type: Highlight
+
+quotation index: 120
+
+quotation type: Highlight
+
+quotation index: 121
+
+quotation type: Highlight
+
+quotation index: 122
+
+quotation type: Highlight
+
+quotation index: 123
+
+quotation type: Highlight
+
+quotation index: 124
+
+quotation type: Highlight
+
+quotation index: 125
+
+quotation type: Highlight
+
+quotation index: 126
+
+quotation type: Highlight
+
+quotation index: 127
+
+quotation type: Highlight
+
+quotation index: 128
+
+quotation type: Highlight
+
+quotation index: 129
+
+quotation type: Highlight
+
+quotation index: 130
+
+quotation type: Highlight
+
+quotation index: 131
+
+quotation type: Highlight
+
+quotation index: 132
+
+quotation type: Highlight
+
+quotation index: 133
+
+quotation type: Highlight
+
+quotation index: 134
+
+quotation type: Highlight
+
+quotation index: 135
+
+quotation type: Highlight
+
+quotation index: 136
+
+quotation type: Highlight
+
+quotation index: 137
+
+quotation type: Highlight
+
+quotation index: 138
+
+quotation type: Highlight
+
+quotation index: 139
+
+quotation type: Highlight
+
+quotation index: 140
+
+quotation type: Highlight
+
+quotation index: 141
+
+quotation type: Highlight
+
+quotation index: 142
+
+quotation type: Highlight
+
+quotation index: 143
+
+quotation type: Highlight
+
+quotation index: 144
+
+quotation type: Highlight
+
+quotation index: 145
+
+quotation type: Highlight
+
+quotation index: 146
+
+quotation type: Highlight
+
+quotation index: 147
+
+quotation type: Highlight
+
+quotation index: 148
+
+quotation type: Highlight
+
+quotation index: 149
+
+quotation type: Highlight
+
+quotation index: 150
+
+quotation type: Highlight
+
+quotation index: 151
+
+quotation type: Highlight
+
+quotation index: 152
+
+quotation type: Highlight
+
+quotation index: 153
+
+quotation type: Highlight
+
+quotation index: 154
+
+quotation type: Highlight
+
+quotation index: 155
+
+quotation type: Highlight
+
+quotation index: 156
+
+quotation type: Highlight
+
+quotation index: 157
+
+quotation type: Highlight
+
+quotation index: 158
+
+quotation type: Highlight
+
+quotation index: 159
+
+quotation type: Highlight
+
+quotation index: 160
+
+quotation type: Highlight
+
+quotation index: 161
+
+quotation type: Highlight
+
+quotation index: 162
+
+quotation type: Highlight
+
+quotation index: 163
+
+quotation type: Highlight
+
+quotation index: 164
+
+quotation type: Highlight
+
+quotation index: 165
+
+quotation type: Highlight
+
+quotation index: 166
+
+quotation type: Highlight
+
+quotation index: 167
+
+quotation type: Highlight
+
+quotation index: 168
+
+quotation type: Highlight
+
+quotation index: 169
+
+quotation type: Highlight
+
+quotation index: 170
+
+quotation type: Highlight
+
+quotation index: 171
+
+quotation type: Highlight
+
+quotation index: 172
+
+quotation type: Highlight
+
+quotation index: 173
+
+quotation type: Highlight
+
+quotation index: 174
+
+quotation type: Highlight
+
+quotation index: 175
+
+quotation type: Highlight
+
+quotation index: 176
+
+quotation type: Highlight
+
+quotation index: 177
+
+quotation type: Highlight
+
+quotation index: 178
+
+quotation type: Highlight
+
+quotation index: 179
+
+quotation type: Highlight
+
+quotation index: 180
+
+quotation type: Highlight
+
+quotation index: 181
+
+quotation type: Highlight
+
+quotation index: 182
+
+quotation type: Highlight
+
+quotation index: 183
+
+quotation type: Highlight
+
+quotation index: 184
+
+quotation type: Highlight
+
+quotation index: 185
+
+quotation type: Highlight
+
+quotation index: 186
+
+quotation type: Highlight
+
+quotation index: 187
+
+quotation type: Highlight
+
+quotation index: 188
+
+quotation type: Highlight
+
+quotation index: 189
+
+quotation type: Highlight
+
+quotation index: 190
+
+quotation type: Highlight
+
+quotation index: 191
+
+quotation type: Highlight
+
+quotation index: 192
+
+quotation type: Highlight
+
+quotation index: 193
+
+quotation type: Highlight
+
+quotation index: 194
+
+quotation type: Highlight
+
+quotation index: 195
+
+quotation type: Highlight
+
+quotation index: 196
+
+quotation type: Highlight
+
+quotation index: 197
+
+quotation type: Highlight
+
+quotation index: 198
+
+quotation type: Highlight
+
+quotation index: 199
+
+quotation type: Highlight
+
+quotation index: 200
+
+quotation type: Highlight
+
+quotation index: 201
+
+quotation type: Highlight
+
+quotation index: 202
+
+quotation type: Highlight
+
+quotation index: 203
+
+quotation type: Highlight
+
+quotation index: 204
+
+quotation type: Highlight
+
+quotation index: 205
+
+quotation type: Highlight
+
+quotation index: 206
+
+quotation type: Highlight
+
+quotation index: 207
+
+quotation type: Highlight
+
+quotation index: 208
+
+quotation type: Highlight
+
+quotation index: 209
+
+quotation type: Highlight
+
+quotation index: 210
+
+quotation type: Highlight
+
+quotation index: 211
+
+quotation type: Highlight
+
+quotation index: 212
+
+quotation type: Highlight
+
+quotation index: 213
+
+quotation type: Highlight
+
+quotation index: 214
+
+quotation type: Highlight
+
+quotation index: 215
+
+quotation type: Highlight
+
+quotation index: 216
+
+quotation type: Highlight
+
+quotation index: 217
+
+quotation type: Highlight
+
+quotation index: 218
+
+quotation type: Highlight
+
+quotation index: 219
+
+quotation type: Highlight
+
+quotation index: 220
+
+quotation type: Highlight
+
+quotation index: 221
+
+quotation type: Highlight
+
+quotation index: 222
+
+quotation type: Highlight
+
+quotation index: 223
+
+quotation type: Highlight
+
+quotation index: 224
+
+quotation type: Highlight
+
+quotation index: 225
+
+quotation type: Highlight
+
+quotation index: 226
+
+quotation type: Highlight
+
+quotation index: 227
+
+quotation type: Highlight
+
+quotation index: 228
+
+quotation type: Highlight
+
+quotation index: 229
+
+quotation type: Highlight
+
+quotation index: 230
+
+quotation type: Highlight
+
+quotation index: 231
+
+# Ohne Spezialisierung keine wissenschaftliche Leistung
+
+"Eine wirklich endgültige und tüchtige Leistung ist heute stets: eine spezialistische Leistung."
+
+page range: 5
+
+quotation type: Direct quotation
+
+quotation index: 232
+
+# Kleiner interner Widerspruch?
+
+Weiter unten im Text (S. 8) heißt es, dass es "endgültige" Leistungen in der Wissenschaft gar nicht geben könne.
+
+page range: 5
+
+quotation type: Comment
+
+quotation index: 233
+
+# Der Zusammenhang von Leidenschaft, Arbeit, Eingebung, "Gabe" und Hingabe an die Sache bei der wissenschaftlichen Arbeit
+
+Nach Weber verlangt der "Beruf zur Wissenschaft" Leidenschaft und harte Arbeit als "Vorbedingung des Entscheidenden: der 'Eingebung'". Dazu gehören zwar auch persönliche Voraussetzungen wie eine (von Weber nicht näher beschriebene) "Gabe" (Begabung?); doch einen Kult der "Persönlichkeit" oder des "Erlebens" lehnt Weber strikt ab. Er fordert "Hingabe an die Sache", hinter die alles "Persönliche" zurücktreten muss.
+
+page range: 6
+
+quotation type: Summary
+
+quotation index: 234
+
+# Der Einfall ersetzt nicht die Arbeit …
+
+"Der Einfall ersetzt nicht die Arbeit. Und die Arbeit ihrerseits kann den Einfall nicht ersetzen oder erzwingen, so wenig wie die Leidenschaft es tut. Beide – vor allem: beide zusammen – locken ihn."
+
+page range: 6
+
+quotation type: Direct quotation
+
+quotation index: 235
+
+# "Sache" und "Persönlichkeit"
+
+"'Persönlichkeit' auf wissenschaftlichem Gebiet hat nur der, der rein der Sache dient."
+
+page range: 7
+
+quotation type: Direct quotation
+
+quotation index: 236
+
+# Fortschritt in Wissenschaft und Kunst
+
+"Die wissenschaftliche Arbeit ist eingespannt in den Ablauf des Fortschritts. Auf dem Gebiete der Kunst dagegen gibt es – in diesem Sinne – keinen Fortschritt."
+
+page range: 8
+
+quotation type: Direct quotation
+
+quotation index: 237
+
+# Wissenschaft veraltet
+
+"Jeder von uns dagegen in der Wissenschaft weiß, daß das, was er gearbeitet hat, in 10, 20, 50 Jahren veraltet ist. [...] Damit hat sich jeder abzufinden, der der Wissenschaft dienen will."
+
+page range: 8
+
+quotation type: Direct quotation
+
+quotation index: 238
+
+# Praktische und technische Zwecke der Wissenschaft
+
+"Warum betreibt man etwas, das in der Wirklichkeit nie zu Ende kommt und kommen kann? Nun zunächst: zu rein praktischen, im weiteren Wortsinn: technischen Zwecken" [Nach Weber, das zeigt der weitere Text, ist das aber nicht der einzige Zweck der Wiss.]
+
+page range: 8
+
+quotation type: Direct quotation
+
+quotation index: 239
+
+# Wissenschaft als zentraler Teil des historischen Intellektualisierungsprozesses
+
+"Der wissenschaftliche Fortschritt ist ein Bruchteil, und zwar der wichtigste Bruchteil, jenes Intellektualisierungsprozesses, dem wir seit Jahrtausenden unterliegen"
+
+page range: 9
+
+quotation type: Direct quotation
+
+quotation index: 240
+
+# Die zunehmende Intellektualisierung und Rationalisierung führt zur "Entzauberung der Welt"
+
+Nach Weber führt die "zunehmende Intellektualisierung und Rationalisierung" nicht dazu, dass der einzelne Mensch mehr oder Genaueres über seine konkreten Lebensbedingungen weiß, sondern nur dazu, dass er glaubt, prinzipiell alles darüber erfahren zu können. "Das aber bedeutet: die Entzauberung der Welt".
+
+page range: 9
+
+quotation type: Indirect quotation
+
+quotation index: 241
+
+# Die Frage nach dem Sinn wissenschaftlicher Arbeit
+
+"Hat der ‘Fortschritt’ als solcher einen erkennbaren, über das Technische hinausreichenden Sinn, so daß dadurch der Dienst an ihm ein sinnvoller Beruf würde?"
+
+page range: 10
+
+quotation type: Direct quotation
+
+quotation index: 242
+
+# Illusionen über den Sinn der Wissenschaft
+
+Die Hoffnungen, Wissenschaft könne den Weg weisen zum "wahren Sein" (Antike), zur "wahren Kunst" und "wahren Natur" (Renaissance), zum "wahren Gott" (Protestantismus und frühe Naturwissenschaften) oder gar zum "wahren Glück", haben sich als Illusionen erwiesen. Nach Tolstoj ist Wissenschaft sinnlos, weil sie keine Antwort gibt auf die Fragen: "Was sollen wir tun? Wie sollen wir leben?"
+
+page range: 10
+
+quotation type: Summary
+
+quotation index: 243
+
+# Was kann Wissenschaft leisten?
+
+Sie kann nicht die Sinnfragen der Menschheit beantworten. Aber Weber ist sicher, dass sie dennoch Sinnvolles leistet. [Was das sein könnte, steht leider nicht mehr im vorliegenden Auszug, sondern erst auf den Seiten 19ff. des Originaltextes]
+
+page range: 13
+
+quotation type: Indirect quotation
+
+quotation index: 244
+
+# Voraussetzung wissenschaftlicher Arbeit ist etwas wissenschaftlich nicht Beweisbares: ihre Wichtigkeit
+
+"Vorausgesetzt ist bei jeder wissenschaftlichen Arbeit immer die Geltung der Regeln der Logik und Methodik [...]. Vorausgesetzt ist aber ferner: daß das, was bei wissenschaftlicher Arbeit herauskommt, wichtig im Sinn von 'wissenswert' sei. Und da stecken nun offenbar alle unsere Probleme darin. Denn diese Voraussetzung ist nicht wieder ihrerseits mit den Mitteln der Wissenschaft beweisbar. Sie läßt sich nur auf ihren letzten Sinn deuten, den man dann ablehnen oder annehmen muß, je nach der eigenen letzten Stellungnahme zum Leben."
+
+page range: 13
+
+quotation type: Direct quotation
+
+quotation index: 245
+
+# Wissenschaft ist nicht per se sinnvoll
+
+Kein Naturwissenschaftler, Mediziner, Kunstwissenschaftler, Jurist, Historiker oder Kulturwissenschaftler kann mit den Mitteln seiner Wissenschaft beweisen, dass seine Arbeit sinnvoll ist. Alle setzen es als selbstverständlich voraus. Das ist es aber nach Weber "ganz und gar nicht".
+
+page range: 13
+
+quotation type: Summary
+
+quotation index: 246},
+  title  = {Wissenschaft als Beruf [1919]},
+  pages  = {1--23},
+}
diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/CitaviXmlImporterTest3.ctv6bak b/src/test/resources/org/jabref/logic/importer/fileformat/CitaviXmlImporterTest3.ctv6bak
new file mode 100644
index 00000000000..28daa5b6625
Binary files /dev/null and b/src/test/resources/org/jabref/logic/importer/fileformat/CitaviXmlImporterTest3.ctv6bak differ
diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/CitaviXmlImporterTest4.bib b/src/test/resources/org/jabref/logic/importer/fileformat/CitaviXmlImporterTest4.bib
new file mode 100644
index 00000000000..17287e0cd99
--- /dev/null
+++ b/src/test/resources/org/jabref/logic/importer/fileformat/CitaviXmlImporterTest4.bib
@@ -0,0 +1,16 @@
+@article{,
+abstract = {Abstract},
+author = {Harris, Robert},
+comment = {# Criteria for assessing the trustworthiness of a source
+
+"Credibility:trustworthy source, author’s credentials, evidence of quality control, known or respected authority, organizational support. Goal: an authoritative source, a source that supplies some good evidence that allows you to trust it.
+Accuracy: up to date, factual, detailed, exact, comprehensive, audience and purpose reflect intentions of completeness and accuracy. Goal: a source that is correct today (not yesterday), a source that gives the whole truth.
+Reasonableness:fair, balanced, objective, reasoned, no conflict of interest, absence of fallacies or slanted tone. Goal: a source that engages the subject thoughtfully and reasonably, concerned with the truth.
+Support: listed sources, contact information, available corroboration, claims supported, documentation supplied. Goal: a source that provides convincing evidence for the claims made, a source you can triangulate (find at least two other sources that support it). "
+
+quotation type: Direct quotation
+
+quotation index: 0},
+keywords = {CARS, information quality},
+title = {Evaluating Internet Research Sources},
+}
diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/CitaviXmlImporterTest4.ctv6bak b/src/test/resources/org/jabref/logic/importer/fileformat/CitaviXmlImporterTest4.ctv6bak
new file mode 100644
index 00000000000..9d1c9f0224f
Binary files /dev/null and b/src/test/resources/org/jabref/logic/importer/fileformat/CitaviXmlImporterTest4.ctv6bak differ
diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/encoding-us-ascii-with-header.bib b/src/test/resources/org/jabref/logic/importer/fileformat/encoding-us-ascii-with-header.bib
new file mode 100644
index 00000000000..4eb34fbc82b
--- /dev/null
+++ b/src/test/resources/org/jabref/logic/importer/fileformat/encoding-us-ascii-with-header.bib
@@ -0,0 +1,5 @@
+% Encoding: US-ASCII
+
+@article{,
+  title = {testtitle},
+}
diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/encoding-utf-16BE-with-header.bib b/src/test/resources/org/jabref/logic/importer/fileformat/encoding-utf-16BE-with-header.bib
new file mode 100644
index 00000000000..c5702abaef8
Binary files /dev/null and b/src/test/resources/org/jabref/logic/importer/fileformat/encoding-utf-16BE-with-header.bib differ
diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/encoding-utf-16BE-without-header.bib b/src/test/resources/org/jabref/logic/importer/fileformat/encoding-utf-16BE-without-header.bib
new file mode 100644
index 00000000000..821a42676ba
Binary files /dev/null and b/src/test/resources/org/jabref/logic/importer/fileformat/encoding-utf-16BE-without-header.bib differ
diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/encoding-utf-8-with-header-with-databasetypecomment.bib b/src/test/resources/org/jabref/logic/importer/fileformat/encoding-utf-8-with-header-with-databasetypecomment.bib
new file mode 100644
index 00000000000..da07711f44f
--- /dev/null
+++ b/src/test/resources/org/jabref/logic/importer/fileformat/encoding-utf-8-with-header-with-databasetypecomment.bib
@@ -0,0 +1,7 @@
+% Encoding: UTF-8
+
+@article{,
+  title = {Ü ist ein Umlaut},
+}
+
+@Comment{jabref-meta: databaseType:bibtex;}
diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/encoding-utf-8-with-header.bib b/src/test/resources/org/jabref/logic/importer/fileformat/encoding-utf-8-with-header.bib
new file mode 100644
index 00000000000..ac8d4f84400
--- /dev/null
+++ b/src/test/resources/org/jabref/logic/importer/fileformat/encoding-utf-8-with-header.bib
@@ -0,0 +1,5 @@
+% Encoding: UTF-8
+
+@article{,
+  title = {Ü ist ein Umlaut},
+}
diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/encoding-utf-8-without-header-with-databasetypecomment.bib b/src/test/resources/org/jabref/logic/importer/fileformat/encoding-utf-8-without-header-with-databasetypecomment.bib
new file mode 100644
index 00000000000..8b5992c4277
--- /dev/null
+++ b/src/test/resources/org/jabref/logic/importer/fileformat/encoding-utf-8-without-header-with-databasetypecomment.bib
@@ -0,0 +1,5 @@
+@article{,
+  title = {Ü ist ein Umlaut},
+}
+
+@Comment{jabref-meta: databaseType:bibtex;}
diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/encoding-utf-8-without-header.bib b/src/test/resources/org/jabref/logic/importer/fileformat/encoding-utf-8-without-header.bib
new file mode 100644
index 00000000000..bf9f81c70c2
--- /dev/null
+++ b/src/test/resources/org/jabref/logic/importer/fileformat/encoding-utf-8-without-header.bib
@@ -0,0 +1,3 @@
+@article{,
+  title = {Ü ist ein Umlaut},
+}
diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/encoding-windows-1252-but-utf-8-declared--decoding-fails.bib b/src/test/resources/org/jabref/logic/importer/fileformat/encoding-windows-1252-but-utf-8-declared--decoding-fails.bib
new file mode 100644
index 00000000000..936023e48a0
--- /dev/null
+++ b/src/test/resources/org/jabref/logic/importer/fileformat/encoding-windows-1252-but-utf-8-declared--decoding-fails.bib
@@ -0,0 +1,5 @@
+% Encoding: UTF-8
+
+@Article{,
+  author  = {Test�I. Last},
+}
diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/encoding-windows-1252-without-header.bib b/src/test/resources/org/jabref/logic/importer/fileformat/encoding-windows-1252-without-header.bib
new file mode 100644
index 00000000000..c6269cc88e6
--- /dev/null
+++ b/src/test/resources/org/jabref/logic/importer/fileformat/encoding-windows-1252-without-header.bib
@@ -0,0 +1,7 @@
+% Encoding: windows-1252
+
+@Article{,
+  abstract = {25� C},
+}
+
+@Comment{jabref-meta: databaseType:bibtex;}
diff --git a/src/test/resources/org/jabref/logic/xmp/PD_metadata.bib b/src/test/resources/org/jabref/logic/xmp/PD_metadata.bib
index 67ba5a1888b..d7b768dedd2 100644
--- a/src/test/resources/org/jabref/logic/xmp/PD_metadata.bib
+++ b/src/test/resources/org/jabref/logic/xmp/PD_metadata.bib
@@ -2,5 +2,5 @@ @misc{
   abstract = {how to annotate a pdf},
   author = {Chris},
   keywords = {pdf, annotation},
-  title = {The best Pdf ever}
-}
\ No newline at end of file
+  title = {The best Pdf ever},
+}
diff --git a/src/test/resources/org/jabref/logic/xmp/article_dublinCore.bib b/src/test/resources/org/jabref/logic/xmp/article_dublinCore.bib
index 7a0af0f2d01..f959a333921 100644
--- a/src/test/resources/org/jabref/logic/xmp/article_dublinCore.bib
+++ b/src/test/resources/org/jabref/logic/xmp/article_dublinCore.bib
@@ -7,6 +7,7 @@ @Article{Olly2018
   number       = {1},
   pages        = {1-2},
   month        = mar,
+  day          = {1},
   issn         = {978-123-123},
   note         = {That's a note},
   abstract     = {That's an abstract},
@@ -20,4 +21,4 @@ @Article{Olly2018
   review       = {Here are the reviews},
   timestamp    = {2018-02-15},
   url          = {https://www.olly2018.edu},
-}
\ No newline at end of file
+}
diff --git a/src/test/resources/org/jabref/logic/xmp/article_dublinCore_partial_date.bib b/src/test/resources/org/jabref/logic/xmp/article_dublinCore_partial_date.bib
new file mode 100644
index 00000000000..39c4e5d137e
--- /dev/null
+++ b/src/test/resources/org/jabref/logic/xmp/article_dublinCore_partial_date.bib
@@ -0,0 +1,8 @@
+@Article{,
+  coverage  = {coverageField},
+  language  = {English,Japanese},
+  month     = jan,
+  rights    = {Right To X},
+  source    = {JabRef},
+  year      = {2005},
+}
diff --git a/src/test/resources/org/jabref/logic/xmp/article_dublinCore_partial_date.pdf b/src/test/resources/org/jabref/logic/xmp/article_dublinCore_partial_date.pdf
new file mode 100644
index 00000000000..b9343488134
Binary files /dev/null and b/src/test/resources/org/jabref/logic/xmp/article_dublinCore_partial_date.pdf differ
diff --git a/src/test/resources/org/jabref/logic/xmp/article_dublinCore_without_day.bib b/src/test/resources/org/jabref/logic/xmp/article_dublinCore_without_day.bib
new file mode 100644
index 00000000000..82c5604dd38
--- /dev/null
+++ b/src/test/resources/org/jabref/logic/xmp/article_dublinCore_without_day.bib
@@ -0,0 +1,23 @@
+@Article{Olly2018,
+  author       = {Olly and Johannes},
+  title        = {Stefan's palace},
+  journal      = {Test Journal},
+  year         = {2018},
+  volume       = {1},
+  number       = {1},
+  pages        = {1-2},
+  month        = mar,
+  issn         = {978-123-123},
+  note         = {That's a note},
+  abstract     = {That's an abstract},
+  comment      = {That's a comment},
+  doi          = {10/3212.3123},
+  file         = {:paper.pdf:PDF},
+  groups       = {NO},
+  howpublished = {Online},
+  keywords     = {Keyword1, Keyword2},
+  owner        = {Me},
+  review       = {Here are the reviews},
+  timestamp    = {2018-02-15},
+  url          = {https://www.olly2018.edu},
+}
diff --git a/src/test/resources/org/jabref/logic/xmp/article_dublinCore_without_day.pdf b/src/test/resources/org/jabref/logic/xmp/article_dublinCore_without_day.pdf
new file mode 100644
index 00000000000..ae2d982b0a3
Binary files /dev/null and b/src/test/resources/org/jabref/logic/xmp/article_dublinCore_without_day.pdf differ
diff --git a/src/test/resources/tinylog-test.properties b/src/test/resources/tinylog-test.properties
index af2f719ac2b..5d580acbfac 100644
--- a/src/test/resources/tinylog-test.properties
+++ b/src/test/resources/tinylog-test.properties
@@ -1,2 +1,5 @@
 level = info
 writer = console
+# uncomment the following line to enable debug logging outputs
+#level@org.jabref.model.entry.BibEntry = debug
+#level@org.jabref.logic.importer.fetcher.ResearchGate = trace